1.1 --- a/moinformat/serialisers/html/moin.py Tue Jul 24 18:45:32 2018 +0200
1.2 +++ b/moinformat/serialisers/html/moin.py Tue Jul 24 23:36:13 2018 +0200
1.3 @@ -141,28 +141,28 @@
1.4 def end_listitem(self, indent, marker, space, num):
1.5 self.out("</li>")
1.6
1.7 - def start_macro(self, name, args):
1.8 + def start_macro(self, name, args, nodes):
1.9 + self.out("<span class='macro'>")
1.10
1.11 # Fallback case for when macros are not replaced.
1.12
1.13 - self.out("<span class='macro'>")
1.14 - self.out(escape_text("<<"))
1.15 - self.out("<span class='name'>%s</span>" % escape_text(name))
1.16 - if args:
1.17 - self.out("(")
1.18 - first = True
1.19 - for arg in args:
1.20 - if not first:
1.21 - self.out(",")
1.22 - self.out("<span class='arg'>%s</span>" % escape_text(arg))
1.23 - first = False
1.24 - if args:
1.25 - self.out(")")
1.26 - self.out(escape_text(">>"))
1.27 - self.out("</span>")
1.28 + if not nodes:
1.29 + self.out(escape_text("<<"))
1.30 + self.out("<span class='name'>%s</span>" % escape_text(name))
1.31 + if args:
1.32 + self.out("(")
1.33 + first = True
1.34 + for arg in args:
1.35 + if not first:
1.36 + self.out(",")
1.37 + self.out("<span class='arg'>%s</span>" % escape_text(arg))
1.38 + first = False
1.39 + if args:
1.40 + self.out(")")
1.41 + self.out(escape_text(">>"))
1.42
1.43 def end_macro(self):
1.44 - pass
1.45 + self.out("</span>")
1.46
1.47 def start_monospace(self):
1.48 self.out("<tt>")