X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=46c61c55ad5343f95bbf6541eb959a6cab0f0638;hb=25befe4147c23d55b1ef3fc8af45c719e2e39f8c;hp=aa6d332a449e2b9b3ce481e38c0862f820ce67af;hpb=a0e866e20240e1b4c862a16c1ce798628985b823;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index aa6d332..46c61c5 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -264,10 +264,10 @@ def send_footer(name, mod_string=None): # ---------------------------------------------------------- # Macros -def _macro_TitleSearch(): +def _macro_TitleSearch(*vargs): return _macro_search("titlesearch") -def _macro_FullSearch(): +def _macro_FullSearch(*vargs): return _macro_search("fullsearch") def _macro_search(type): @@ -275,9 +275,9 @@ def _macro_search(type): default = form["value"].value else: default = '' - return """
""" % (type, default) + return """""" % (type, default) -def _macro_WordIndex(): +def _macro_WordIndex(*vargs): s = make_index_key() pages = list(page_list()) map = {} @@ -310,7 +310,7 @@ def _macro_WordIndex(): return s -def _macro_TitleIndex(): +def _macro_TitleIndex(*vargs): s = make_index_key() pages = list(page_list()) pages.sort() @@ -337,6 +337,7 @@ class PageFormatter: self.raw = raw self.is_em = self.is_b = 0 self.h_level = 0 + self.h_count = 0 self.list_indents = [] self.in_pre = False self.in_table = False @@ -354,60 +355,61 @@ class PageFormatter: def _tit_repl(self, word): if self.h_level: - result = "" % self.h_level + result = "" % self.h_level self.h_level = 0 else: self.h_level = len(word) - 1 - result = "