1.1 --- a/moinformat/parsers/moin.py Mon Jul 01 19:23:29 2019 +0200
1.2 +++ b/moinformat/parsers/moin.py Mon Jul 01 22:30:28 2019 +0200
1.3 @@ -387,8 +387,8 @@
1.4
1.5 "Handle a horizontal rule within 'region'."
1.6
1.7 - length = len(self.match_group("rule"))
1.8 - rule = Rule(length)
1.9 + height = len(self.match_group("rule")) - 4
1.10 + rule = Rule(height)
1.11 self.add_node(region, rule)
1.12 self.new_block(region)
1.13
2.1 --- a/moinformat/resources/fixlinks.xsl Mon Jul 01 19:23:29 2019 +0200
2.2 +++ b/moinformat/resources/fixlinks.xsl Mon Jul 01 22:30:28 2019 +0200
2.3 @@ -53,8 +53,10 @@
2.4
2.5 <!-- Add a path separator and document index. -->
2.6
2.7 - <xsl:text>/</xsl:text>
2.8 - <xsl:value-of select="$document_index"/>
2.9 + <xsl:if test="not(contains(., '#')) or substring-before(., '#')">
2.10 + <xsl:text>/</xsl:text>
2.11 + <xsl:value-of select="$document_index"/>
2.12 + </xsl:if>
2.13
2.14 <!-- Add any fragment identifier. -->
2.15
3.1 --- a/moinformat/serialisers/html/moin.py Mon Jul 01 19:23:29 2019 +0200
3.2 +++ b/moinformat/serialisers/html/moin.py Mon Jul 01 22:30:28 2019 +0200
3.3 @@ -321,8 +321,8 @@
3.4 key, value = key_value
3.5 self.out("%s='%s'" % (key, escape_attr(value)))
3.6
3.7 - def rule(self, length):
3.8 - self.out("<hr style='height: %dpt' />" % min(length, 10))
3.9 + def rule(self, height):
3.10 + self.out("<hr style='height: %dpt' />" % min(height, 10))
3.11
3.12 def table_attrs(self, nodes):
3.13
4.1 --- a/moinformat/serialisers/moin/moin.py Mon Jul 01 19:23:29 2019 +0200
4.2 +++ b/moinformat/serialisers/moin/moin.py Mon Jul 01 22:30:28 2019 +0200
4.3 @@ -199,8 +199,8 @@
4.4 else:
4.5 self.out("=".join(key_value))
4.6
4.7 - def rule(self, length):
4.8 - self.out("-" * length)
4.9 + def rule(self, height):
4.10 + self.out("-" * (height + 4))
4.11
4.12 def table_attrs(self, nodes):
4.13 for node in nodes:
5.1 --- a/moinformat/tree/moin.py Mon Jul 01 19:23:29 2019 +0200
5.2 +++ b/moinformat/tree/moin.py Mon Jul 01 22:30:28 2019 +0200
5.3 @@ -761,17 +761,17 @@
5.4
5.5 "A horizontal rule."
5.6
5.7 - def __init__(self, length):
5.8 - self.length = length
5.9 + def __init__(self, height):
5.10 + self.height = height
5.11
5.12 def __repr__(self):
5.13 - return "Rule(%d)" % self.length
5.14 + return "Rule(%d)" % self.height
5.15
5.16 def prettyprint(self, indent=""):
5.17 - return "%sRule: length=%d" % (indent, self.length)
5.18 + return "%sRule: height=%d" % (indent, self.height)
5.19
5.20 def to_string(self, out):
5.21 - out.rule(self.length)
5.22 + out.rule(self.height)
5.23
5.24 class TableAttr(Node):
5.25