1.1 --- a/moinformat/serialisers/html/moin.py Fri Apr 12 00:22:22 2019 +0200
1.2 +++ b/moinformat/serialisers/html/moin.py Fri Apr 12 18:53:04 2019 +0200
1.3 @@ -20,6 +20,7 @@
1.4 """
1.5
1.6 from moinformat.serialisers.common import escape_attr, escape_text, Serialiser
1.7 +from moinformat.tree.moin import LinkLabel, LinkParameter
1.8
1.9 class HTMLSerialiser(Serialiser):
1.10
1.11 @@ -256,15 +257,23 @@
1.12
1.13 self.out('<%s %s="%s"' % (tag, attr, escape_attr(link.get_target())))
1.14
1.15 + # Provide link parameters as attributes.
1.16 +
1.17 if nodes:
1.18 - for node in nodes[1:]:
1.19 - self.out(" ")
1.20 - node.to_string(self)
1.21 + for node in nodes:
1.22 + if isinstance(node, LinkParameter):
1.23 + self.out(" ")
1.24 + node.to_string(self)
1.25
1.26 self.out(">")
1.27
1.28 - if nodes:
1.29 - nodes[0].to_string(self)
1.30 + # Provide the link label if specified. Otherwise, use a generated
1.31 + # default for the label.
1.32 +
1.33 + for node in nodes or []:
1.34 + if isinstance(node, LinkLabel):
1.35 + node.to_string(self)
1.36 + break
1.37 else:
1.38 self.out(escape_text(link.get_label()))
1.39