# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1562013028 -7200
# Node ID f2e0284e93d46a9afefb6eb453e5d5b33ee1fd48
# Parent  f034ee75cc12a99d1ddcc5a26708660ab4b4cea7# Parent  a0c28d5cff8fc2ac7f83772359596bb86f7bd673
Merged changes from the default branch.

diff -r f034ee75cc12 -r f2e0284e93d4 moinformat/parsers/moin.py
--- a/moinformat/parsers/moin.py	Mon Jul 01 19:23:29 2019 +0200
+++ b/moinformat/parsers/moin.py	Mon Jul 01 22:30:28 2019 +0200
@@ -387,8 +387,8 @@
 
         "Handle a horizontal rule within 'region'."
 
-        length = len(self.match_group("rule"))
-        rule = Rule(length)
+        height = len(self.match_group("rule")) - 4
+        rule = Rule(height)
         self.add_node(region, rule)
         self.new_block(region)
 
diff -r f034ee75cc12 -r f2e0284e93d4 moinformat/resources/fixlinks.xsl
--- a/moinformat/resources/fixlinks.xsl	Mon Jul 01 19:23:29 2019 +0200
+++ b/moinformat/resources/fixlinks.xsl	Mon Jul 01 22:30:28 2019 +0200
@@ -53,8 +53,10 @@
 
         <!-- Add a path separator and document index. -->
 
-        <xsl:text>/</xsl:text>
-        <xsl:value-of select="$document_index"/>
+        <xsl:if test="not(contains(., '#')) or substring-before(., '#')">
+          <xsl:text>/</xsl:text>
+          <xsl:value-of select="$document_index"/>
+        </xsl:if>
 
         <!-- Add any fragment identifier. -->
 
diff -r f034ee75cc12 -r f2e0284e93d4 moinformat/serialisers/html/moin.py
--- a/moinformat/serialisers/html/moin.py	Mon Jul 01 19:23:29 2019 +0200
+++ b/moinformat/serialisers/html/moin.py	Mon Jul 01 22:30:28 2019 +0200
@@ -321,8 +321,8 @@
             key, value = key_value
             self.out("%s='%s'" % (key, escape_attr(value)))
 
-    def rule(self, length):
-        self.out("<hr style='height: %dpt' />" % min(length, 10))
+    def rule(self, height):
+        self.out("<hr style='height: %dpt' />" % min(height, 10))
 
     def table_attrs(self, nodes):
 
diff -r f034ee75cc12 -r f2e0284e93d4 moinformat/serialisers/moin/moin.py
--- a/moinformat/serialisers/moin/moin.py	Mon Jul 01 19:23:29 2019 +0200
+++ b/moinformat/serialisers/moin/moin.py	Mon Jul 01 22:30:28 2019 +0200
@@ -199,8 +199,8 @@
         else:
             self.out("=".join(key_value))
 
-    def rule(self, length):
-        self.out("-" * length)
+    def rule(self, height):
+        self.out("-" * (height + 4))
 
     def table_attrs(self, nodes):
         for node in nodes:
diff -r f034ee75cc12 -r f2e0284e93d4 moinformat/tree/moin.py
--- a/moinformat/tree/moin.py	Mon Jul 01 19:23:29 2019 +0200
+++ b/moinformat/tree/moin.py	Mon Jul 01 22:30:28 2019 +0200
@@ -761,17 +761,17 @@
 
     "A horizontal rule."
 
-    def __init__(self, length):
-        self.length = length
+    def __init__(self, height):
+        self.height = height
 
     def __repr__(self):
-        return "Rule(%d)" % self.length
+        return "Rule(%d)" % self.height
 
     def prettyprint(self, indent=""):
-        return "%sRule: length=%d" % (indent, self.length)
+        return "%sRule: height=%d" % (indent, self.height)
 
     def to_string(self, out):
-        out.rule(self.length)
+        out.rule(self.height)
 
 class TableAttr(Node):