EPUB reader: don't put `#` characters in identifiers.

5 files changed, 114 insertions, 114 deletions

diff --git a/src/Text/Pandoc/Readers/EPUB.hs b/src/Text/Pandoc/Readers/EPUB.hs
index 2a7c54750..c8090f7cb 100644
--- a/src/Text/Pandoc/Readers/EPUB.hs
+++ b/src/Text/Pandoc/Readers/EPUB.hs
@@ -239,7 +239,7 @@ fixAttrs s (ident, cs, kvs) =
 
 addHash :: FilePath -> Text -> Text
 addHash _ ""    = ""
-addHash s ident = T.pack (takeFileName s) <> "#" <> ident
+addHash s ident = T.pack (takeFileName s) <> "_" <> ident
 
 removeEPUBAttrs :: [(Text, Text)] -> [(Text, Text)]
 removeEPUBAttrs kvs = filter (not . isEPUBAttr) kvs
diff --git a/test/command/5986.md b/test/command/5986.md
index aaa1e6568..648ae8ffa 100644
--- a/test/command/5986.md
+++ b/test/command/5986.md
@@ -8,11 +8,11 @@
 <ol>
 <li><a href="text/title_page.xhtml" class="titlepage">Title
 Page</a></li>
-<li><a href="#nav.xhtml#toc" class="toc">Table of Contents</a></li>
+<li><a href="#nav.xhtml_toc" class="toc">Table of Contents</a></li>
 </ol>
 </nav>
 <p><span id="ch001.xhtml"></span></p>
-<section id="ch001.xhtml#hi" class="level1" data-number="1">
+<section id="ch001.xhtml_hi" class="level1" data-number="1">
 <h1 data-number="1"><span class="header-section-number">1</span> Hi</h1>
 </section>
 ```
diff --git a/test/epub/features.native b/test/epub/features.native
index 2a4580092..ef3c8f942 100644
--- a/test/epub/features.native
+++ b/test/epub/features.native
@@ -563,10 +563,10 @@
     ( "" , [ "section" ] , [] )
     [ Header
         2
-        ( "content-mathml-001.xhtml#mathml" , [] , [] )
+        ( "content-mathml-001.xhtml_mathml" , [] , [] )
         [ Str "MathML" ]
     , Div
-        ( "content-mathml-001.xhtml#mathml-010"
+        ( "content-mathml-001.xhtml_mathml-010"
         , [ "section" , "ctest" ]
         , []
         )
@@ -640,7 +640,7 @@
             ]
         ]
     , Div
-        ( "content-mathml-001.xhtml#mathml-020"
+        ( "content-mathml-001.xhtml_mathml-020"
         , [ "section" , "otest" ]
         , []
         )
@@ -766,7 +766,7 @@
             ]
         ]
     , Div
-        ( "content-mathml-001.xhtml#mathml-021"
+        ( "content-mathml-001.xhtml_mathml-021"
         , [ "section" , "otest" ]
         , []
         )
@@ -894,7 +894,7 @@
             ]
         ]
     , Div
-        ( "content-mathml-001.xhtml#mathml-022"
+        ( "content-mathml-001.xhtml_mathml-022"
         , [ "section" , "otest" ]
         , []
         )
@@ -1012,7 +1012,7 @@
             ]
         ]
     , Div
-        ( "content-mathml-001.xhtml#mathml-023"
+        ( "content-mathml-001.xhtml_mathml-023"
         , [ "section" , "otest" ]
         , []
         )
@@ -1132,7 +1132,7 @@
             ]
         ]
     , Div
-        ( "content-mathml-001.xhtml#mathml-024"
+        ( "content-mathml-001.xhtml_mathml-024"
         , [ "section" , "ctest" ]
         , []
         )
@@ -1207,7 +1207,7 @@
             ]
         ]
     , Div
-        ( "content-mathml-001.xhtml#mathml-025"
+        ( "content-mathml-001.xhtml_mathml-025"
         , [ "section" , "ctest" ]
         , []
         )
@@ -1312,7 +1312,7 @@
             ]
         ]
     , Div
-        ( "content-mathml-001.xhtml#mathml-026"
+        ( "content-mathml-001.xhtml_mathml-026"
         , [ "section" , "ctest" ]
         , []
         )
@@ -1379,7 +1379,7 @@
             ]
         ]
     , Div
-        ( "content-mathml-001.xhtml#mathml-027"
+        ( "content-mathml-001.xhtml_mathml-027"
         , [ "section" , "ctest" ]
         , []
         )
@@ -1478,14 +1478,14 @@
     ]
 , Para [ Span ( "content-switch-001.xhtml" , [] , [] ) [] ]
 , Div
-    ( "content-switch-001.xhtml#epub-switch"
+    ( "content-switch-001.xhtml_epub-switch"
     , [ "section" ]
     , []
     )
     [ Header
         3 ( "" , [] , [] ) [ Code ( "" , [] , [] ) "epub:switch" ]
     , Div
-        ( "content-switch-001.xhtml#switch-010"
+        ( "content-switch-001.xhtml_switch-010"
         , [ "section" , "ctest" ]
         , []
         )
@@ -1582,7 +1582,7 @@
             ]
         ]
     , Div
-        ( "content-switch-001.xhtml#switch-020"
+        ( "content-switch-001.xhtml_switch-020"
         , [ "section" , "otest" ]
         , []
         )
diff --git a/test/epub/formatting.native b/test/epub/formatting.native
index 41559d1bd..b7ddf04ab 100644
--- a/test/epub/formatting.native
+++ b/test/epub/formatting.native
@@ -558,7 +558,7 @@
     ]
 , Para [ Span ( "styling-xhtml-001.xhtml" , [] , [] ) [] ]
 , Div
-    ( "styling-xhtml-001.xhtml#epub-css" , [ "section" ] , [] )
+    ( "styling-xhtml-001.xhtml_epub-css" , [ "section" ] , [] )
     [ Header
         1
         ( "" , [] , [] )
@@ -583,7 +583,7 @@
     ]
 , Para [ Span ( "styling-xhtml-003.xhtml" , [] , [] ) [] ]
 , Div
-    ( "styling-xhtml-003.xhtml#style-110"
+    ( "styling-xhtml-003.xhtml_style-110"
     , [ "section" , "ctest" ]
     , []
     )
@@ -1900,13 +1900,13 @@
     ]
 , Para [ Span ( "styling-xhtml-002.xhtml" , [] , [] ) [] ]
 , Div
-    ( "styling-xhtml-002.xhtml#style-lists"
+    ( "styling-xhtml-002.xhtml_style-lists"
     , [ "section" ]
     , []
     )
     [ Header 2 ( "" , [] , [] ) [ Str "Lists" ]
     , Div
-        ( "styling-xhtml-002.xhtml#style-list-style-type"
+        ( "styling-xhtml-002.xhtml_style-list-style-type"
         , [ "section" ]
         , []
         )
@@ -1920,7 +1920,7 @@
             , Str "property"
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-009"
+            ( "styling-xhtml-002.xhtml_style-009"
             , [ "section" , "ctest" ]
             , []
             )
@@ -1999,7 +1999,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-010"
+            ( "styling-xhtml-002.xhtml_style-010"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2071,7 +2071,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-011"
+            ( "styling-xhtml-002.xhtml_style-011"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2143,7 +2143,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-012"
+            ( "styling-xhtml-002.xhtml_style-012"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2215,7 +2215,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-013"
+            ( "styling-xhtml-002.xhtml_style-013"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2294,7 +2294,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-014"
+            ( "styling-xhtml-002.xhtml_style-014"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2373,7 +2373,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-015"
+            ( "styling-xhtml-002.xhtml_style-015"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2452,7 +2452,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-016"
+            ( "styling-xhtml-002.xhtml_style-016"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2531,7 +2531,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-017"
+            ( "styling-xhtml-002.xhtml_style-017"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2610,7 +2610,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-018"
+            ( "styling-xhtml-002.xhtml_style-018"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2689,7 +2689,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-019"
+            ( "styling-xhtml-002.xhtml_style-019"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2768,7 +2768,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-020"
+            ( "styling-xhtml-002.xhtml_style-020"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2847,7 +2847,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-021"
+            ( "styling-xhtml-002.xhtml_style-021"
             , [ "section" , "ctest" ]
             , []
             )
@@ -2926,7 +2926,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-022"
+            ( "styling-xhtml-002.xhtml_style-022"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3005,7 +3005,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-023"
+            ( "styling-xhtml-002.xhtml_style-023"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3084,7 +3084,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-024"
+            ( "styling-xhtml-002.xhtml_style-024"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3163,7 +3163,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-025"
+            ( "styling-xhtml-002.xhtml_style-025"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3242,7 +3242,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-026"
+            ( "styling-xhtml-002.xhtml_style-026"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3321,7 +3321,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-027"
+            ( "styling-xhtml-002.xhtml_style-027"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3400,7 +3400,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-028"
+            ( "styling-xhtml-002.xhtml_style-028"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3479,7 +3479,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-029"
+            ( "styling-xhtml-002.xhtml_style-029"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3553,7 +3553,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-002.xhtml#style-list-style"
+        ( "styling-xhtml-002.xhtml_style-list-style"
         , [ "section" ]
         , []
         )
@@ -3567,7 +3567,7 @@
             , Str "property"
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-030"
+            ( "styling-xhtml-002.xhtml_style-030"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3650,7 +3650,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-002.xhtml#style-list-style-position"
+        ( "styling-xhtml-002.xhtml_style-list-style-position"
         , [ "section" ]
         , []
         )
@@ -3664,7 +3664,7 @@
             , Str "property"
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-040"
+            ( "styling-xhtml-002.xhtml_style-040"
             , [ "section" , "ctest" ]
             , []
             )
@@ -3963,7 +3963,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-041"
+            ( "styling-xhtml-002.xhtml_style-041"
             , [ "section" , "ctest" ]
             , []
             )
@@ -4269,7 +4269,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-002.xhtml#style-list-start"
+        ( "styling-xhtml-002.xhtml_style-list-start"
         , [ "section" ]
         , []
         )
@@ -4285,7 +4285,7 @@
             , Str "attribute"
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-050"
+            ( "styling-xhtml-002.xhtml_style-050"
             , [ "section" , "ctest" ]
             , []
             )
@@ -4364,7 +4364,7 @@
                 ]
             ]
         , Div
-            ( "styling-xhtml-002.xhtml#style-051"
+            ( "styling-xhtml-002.xhtml_style-051"
             , [ "section" , "ctest" ]
             , []
             )
@@ -4448,7 +4448,7 @@
     ]
 , Para [ Span ( "styling-xhtml-004.xhtml" , [] , [] ) [] ]
 , Div
-    ( "styling-xhtml-004.xhtml#style-media-rules"
+    ( "styling-xhtml-004.xhtml_style-media-rules"
     , [ "section" ]
     , []
     )
@@ -4457,7 +4457,7 @@
         ( "" , [] , [] )
         [ Code ( "" , [] , [] ) "@media" , Space , Str "Rules" ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-210"
+        ( "styling-xhtml-004.xhtml_style-210"
         , [ "section" , "ctest" ]
         , []
         )
@@ -4513,7 +4513,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-211"
+        ( "styling-xhtml-004.xhtml_style-211"
         , [ "section" , "ctest" ]
         , []
         )
@@ -4569,7 +4569,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-212"
+        ( "styling-xhtml-004.xhtml_style-212"
         , [ "section" , "ctest" ]
         , []
         )
@@ -4625,7 +4625,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-213"
+        ( "styling-xhtml-004.xhtml_style-213"
         , [ "section" , "ctest" ]
         , []
         )
@@ -4681,7 +4681,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-220"
+        ( "styling-xhtml-004.xhtml_style-220"
         , [ "section" , "ctest" ]
         , []
         )
@@ -4765,7 +4765,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-221"
+        ( "styling-xhtml-004.xhtml_style-221"
         , [ "section" , "ctest" ]
         , []
         )
@@ -4849,7 +4849,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-230"
+        ( "styling-xhtml-004.xhtml_style-230"
         , [ "section" , "ctest" ]
         , []
         )
@@ -4905,7 +4905,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-231"
+        ( "styling-xhtml-004.xhtml_style-231"
         , [ "section" , "ctest" ]
         , []
         )
@@ -4961,7 +4961,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-240"
+        ( "styling-xhtml-004.xhtml_style-240"
         , [ "section" , "ctest" ]
         , []
         )
@@ -5017,7 +5017,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-004.xhtml#style-241"
+        ( "styling-xhtml-004.xhtml_style-241"
         , [ "section" , "ctest" ]
         , []
         )
@@ -5075,7 +5075,7 @@
     ]
 , Para [ Span ( "styling-xhtml-005.xhtml" , [] , [] ) [] ]
 , Div
-    ( "styling-xhtml-005.xhtml#style-text-xform"
+    ( "styling-xhtml-005.xhtml_style-text-xform"
     , [ "section" ]
     , []
     )
@@ -5089,7 +5089,7 @@
         , Str "property"
         ]
     , Div
-        ( "styling-xhtml-005.xhtml#style-310"
+        ( "styling-xhtml-005.xhtml_style-310"
         , [ "section" , "ctest" ]
         , []
         )
@@ -5287,7 +5287,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-005.xhtml#style-311"
+        ( "styling-xhtml-005.xhtml_style-311"
         , [ "section" , "ctest" ]
         , []
         )
@@ -5499,7 +5499,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-005.xhtml#style-312"
+        ( "styling-xhtml-005.xhtml_style-312"
         , [ "section" , "ctest" ]
         , []
         )
@@ -5699,7 +5699,7 @@
     ]
 , Para [ Span ( "styling-xhtml-006.xhtml" , [] , [] ) [] ]
 , Div
-    ( "styling-xhtml-006.xhtml#style-ruby"
+    ( "styling-xhtml-006.xhtml_style-ruby"
     , [ "section" ]
     , []
     )
@@ -5713,7 +5713,7 @@
         , Str "property"
         ]
     , Div
-        ( "styling-xhtml-006.xhtml#style-410"
+        ( "styling-xhtml-006.xhtml_style-410"
         , [ "section" , "ctest" ]
         , []
         )
@@ -5804,7 +5804,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-006.xhtml#style-411"
+        ( "styling-xhtml-006.xhtml_style-411"
         , [ "section" , "ctest" ]
         , []
         )
@@ -5897,7 +5897,7 @@
             ]
         ]
     , Div
-        ( "styling-xhtml-006.xhtml#style-412"
+        ( "styling-xhtml-006.xhtml_style-412"
         , [ "section" , "ctest" ]
         , []
         )
diff --git a/test/epub/wasteland.native b/test/epub/wasteland.native
index 1e90cc1ae..ee1bf3caa 100644
--- a/test/epub/wasteland.native
+++ b/test/epub/wasteland.native
@@ -2,18 +2,18 @@
     [ Image ( "" , [] , [] ) [] ( "wasteland-cover.jpg" , "" ) ]
 , Para [ Span ( "wasteland-content.xhtml" , [] , [] ) [] ]
 , Div
-    ( "wasteland-content.xhtml#frontmatter"
+    ( "wasteland-content.xhtml_frontmatter"
     , [ "section" , "frontmatter" ]
     , []
     )
     []
 , Div
-    ( "wasteland-content.xhtml#bodymatter"
+    ( "wasteland-content.xhtml_bodymatter"
     , [ "section" , "bodymatter" ]
     , []
     )
     [ Div
-        ( "wasteland-content.xhtml#ch1" , [ "section" ] , [] )
+        ( "wasteland-content.xhtml_ch1" , [ "section" ] , [] )
         [ Header
             2
             ( "" , [] , [] )
@@ -394,7 +394,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln20" , [] , [] )
+                ( "wasteland-content.xhtml_ln20" , [] , [] )
                 [ Plain
                     [ Str "Out"
                     , Space
@@ -416,7 +416,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "Line" , Space , Str "20." ]
-                                ( "#wasteland-content.xhtml#ln20" , "" )
+                                ( "#wasteland-content.xhtml_ln20" , "" )
                             , Space
                             , Str "Cf."
                             , Space
@@ -473,7 +473,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln23" , [] , [] )
+                ( "wasteland-content.xhtml_ln23" , [] , [] )
                 [ Plain
                     [ Str "And"
                     , Space
@@ -501,7 +501,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "23." ]
-                                ( "#wasteland-content.xhtml#ln23" , "" )
+                                ( "#wasteland-content.xhtml_ln23" , "" )
                             , Space
                             , Str "Cf."
                             , Space
@@ -665,7 +665,7 @@
                 [ Div
                     ( "" , [] , [] )
                     [ Div
-                        ( "wasteland-content.xhtml#ln31" , [] , [] )
+                        ( "wasteland-content.xhtml_ln31" , [] , [] )
                         [ Plain
                             [ Str "Frisch"
                             , Space
@@ -679,7 +679,7 @@
                                     [ Link
                                         ( "" , [] , [] )
                                         [ Str "31." ]
-                                        ( "#wasteland-content.xhtml#ln31"
+                                        ( "#wasteland-content.xhtml_ln31"
                                         , ""
                                         )
                                     , Space
@@ -876,7 +876,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln42"
+                ( "wasteland-content.xhtml_ln42"
                 , []
                 , [ ( "lang" , "de" ) ]
                 )
@@ -898,7 +898,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "42." ]
-                                ( "#wasteland-content.xhtml#ln42" , "" )
+                                ( "#wasteland-content.xhtml_ln42" , "" )
                             , Space
                             , Str "Id."
                             , Space
@@ -963,7 +963,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln46" , [] , [] )
+                ( "wasteland-content.xhtml_ln46" , [] , [] )
                 [ Plain
                     [ Str "With"
                     , Space
@@ -987,7 +987,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "46." ]
-                                ( "#wasteland-content.xhtml#ln46" , "" )
+                                ( "#wasteland-content.xhtml_ln46" , "" )
                             , Space
                             , Str "I"
                             , Space
@@ -1493,7 +1493,7 @@
         , Div
             ( "" , [ "linegroup" ] , [] )
             [ Div
-                ( "wasteland-content.xhtml#ln60" , [] , [] )
+                ( "wasteland-content.xhtml_ln60" , [] , [] )
                 [ Plain
                     [ Str "Unreal"
                     , Space
@@ -1503,7 +1503,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "60." ]
-                                ( "#wasteland-content.xhtml#ln60" , "" )
+                                ( "#wasteland-content.xhtml_ln60" , "" )
                             , Space
                             , Str "Cf."
                             , Space
@@ -1587,7 +1587,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln63" , [] , [] )
+                ( "wasteland-content.xhtml_ln63" , [] , [] )
                 [ Plain
                     [ Str "I"
                     , Space
@@ -1611,7 +1611,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "63." ]
-                                ( "#wasteland-content.xhtml#ln63" , "" )
+                                ( "#wasteland-content.xhtml_ln63" , "" )
                             , Space
                             , Str "Cf."
                             , Space
@@ -1658,7 +1658,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln64" , [] , [] )
+                ( "wasteland-content.xhtml_ln64" , [] , [] )
                 [ Plain
                     [ Str "Sighs,"
                     , Space
@@ -1676,7 +1676,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "64." ]
-                                ( "#wasteland-content.xhtml#ln64" , "" )
+                                ( "#wasteland-content.xhtml_ln64" , "" )
                             , Space
                             , Str "Cf."
                             , Space
@@ -1791,7 +1791,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln68" , [] , [] )
+                ( "wasteland-content.xhtml_ln68" , [] , [] )
                 [ Plain
                     [ Str "With"
                     , Space
@@ -1817,7 +1817,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "68." ]
-                                ( "#wasteland-content.xhtml#ln68" , "" )
+                                ( "#wasteland-content.xhtml_ln68" , "" )
                             , Space
                             , Str "A"
                             , Space
@@ -1957,7 +1957,7 @@
         , Div
             ( "" , [ "linegroup" ] , [] )
             [ Div
-                ( "wasteland-content.xhtml#ln74" , [] , [] )
+                ( "wasteland-content.xhtml_ln74" , [] , [] )
                 [ Plain
                     [ Str "\"Oh"
                     , Space
@@ -1983,7 +1983,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "74." ]
-                                ( "#wasteland-content.xhtml#ln74" , "" )
+                                ( "#wasteland-content.xhtml_ln74" , "" )
                             , Space
                             , Str "Cf."
                             , Space
@@ -2027,7 +2027,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln76" , [] , [] )
+                ( "wasteland-content.xhtml_ln76" , [] , [] )
                 [ Plain
                     [ Str "\"You!"
                     , Space
@@ -2056,7 +2056,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "76." ]
-                                ( "#wasteland-content.xhtml#ln76" , "" )
+                                ( "#wasteland-content.xhtml_ln76" , "" )
                             , Space
                             , Str "V."
                             , Space
@@ -2078,7 +2078,7 @@
             ]
         ]
     , Div
-        ( "wasteland-content.xhtml#ch2" , [ "section" ] , [] )
+        ( "wasteland-content.xhtml_ch2" , [ "section" ] , [] )
         [ Header
             2
             ( "" , [] , [] )
@@ -2095,7 +2095,7 @@
         , Div
             ( "" , [ "linegroup" ] , [] )
             [ Div
-                ( "wasteland-content.xhtml#ln77" , [] , [] )
+                ( "wasteland-content.xhtml_ln77" , [] , [] )
                 [ Plain
                     [ Str "The"
                     , Space
@@ -2119,7 +2119,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "77." ]
-                                ( "#wasteland-content.xhtml#ln77" , "" )
+                                ( "#wasteland-content.xhtml_ln77" , "" )
                             , Space
                             , Str "Cf."
                             , Space
@@ -2397,7 +2397,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln92" , [] , [] )
+                ( "wasteland-content.xhtml_ln92" , [] , [] )
                 [ Plain
                     [ Str "Flung"
                     , Space
@@ -2415,7 +2415,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "92." ]
-                                ( "#wasteland-content.xhtml#ln92" , "" )
+                                ( "#wasteland-content.xhtml_ln92" , "" )
                             , Space
                             , Str "Laquearia."
                             , Space
@@ -2544,7 +2544,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln98" , [] , [] )
+                ( "wasteland-content.xhtml_ln98" , [] , [] )
                 [ Plain
                     [ Str "As"
                     , Space
@@ -2568,7 +2568,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "98." ]
-                                ( "#wasteland-content.xhtml#ln98" , "" )
+                                ( "#wasteland-content.xhtml_ln98" , "" )
                             , Space
                             , Str "Sylvan"
                             , Space
@@ -2590,7 +2590,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln99" , [] , [] )
+                ( "wasteland-content.xhtml_ln99" , [] , [] )
                 [ Plain
                     [ Str "The"
                     , Space
@@ -2612,7 +2612,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "99." ]
-                                ( "#wasteland-content.xhtml#ln99" , "" )
+                                ( "#wasteland-content.xhtml_ln99" , "" )
                             , Space
                             , Str "V."
                             , Space
@@ -2628,7 +2628,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln100" , [] , [] )
+                ( "wasteland-content.xhtml_ln100" , [] , [] )
                 [ Plain
                     [ Str "So"
                     , Space
@@ -2648,7 +2648,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "100." ]
-                                ( "#wasteland-content.xhtml#ln100"
+                                ( "#wasteland-content.xhtml_ln100"
                                 , ""
                                 )
                             , Space
@@ -2937,7 +2937,7 @@
             , Div
                 ( "" , [ "linegroup" ] , [] )
                 [ Div
-                    ( "wasteland-content.xhtml#ln115" , [] , [] )
+                    ( "wasteland-content.xhtml_ln115" , [] , [] )
                     [ Plain
                         [ Str "I"
                         , Space
@@ -2957,7 +2957,7 @@
                                 [ Link
                                     ( "" , [] , [] )
                                     [ Str "115." ]
-                                    ( "#wasteland-content.xhtml#ln115"
+                                    ( "#wasteland-content.xhtml_ln115"
                                     , ""
                                     )
                                 , Space
@@ -3009,7 +3009,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln118" , [ "indent" ] , [] )
+                ( "wasteland-content.xhtml_ln118" , [ "indent" ] , [] )
                 [ Plain
                     [ Str "The"
                     , Space
@@ -3025,7 +3025,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "118." ]
-                                ( "#wasteland-content.xhtml#ln118"
+                                ( "#wasteland-content.xhtml_ln118"
                                 , ""
                                 )
                             , Space
@@ -3142,7 +3142,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln126" , [] , [] )
+                ( "wasteland-content.xhtml_ln126" , [] , [] )
                 [ Plain
                     [ Str "\"Are"
                     , Space
@@ -3170,7 +3170,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "126." ]
-                                ( "#wasteland-content.xhtml#ln126"
+                                ( "#wasteland-content.xhtml_ln126"
                                 , ""
                                 )
                             , Space
@@ -3370,7 +3370,7 @@
                     ]
                 ]
             , Div
-                ( "wasteland-content.xhtml#ln138" , [] , [] )
+                ( "wasteland-content.xhtml_ln138" , [] , [] )
                 [ Plain
                     [ Str "Pressing"
                     , Space
@@ -3398,7 +3398,7 @@
                             [ Link
                                 ( "" , [] , [] )
                                 [ Str "138." ]
-                                ( "#wasteland-content.xhtml#ln138"
+                                ( "#wasteland-content.xhtml_ln138"
                                 , ""
                                 )
                             , Space
@@ -4224,12 +4224,12 @@
         ]
     ]
 , Div
-    ( "wasteland-content.xhtml#backmatter"
+    ( "wasteland-content.xhtml_backmatter"
     , [ "section" , "backmatter" ]
     , []
     )
     [ Div
-        ( "wasteland-content.xhtml#rearnotes"
+        ( "wasteland-content.xhtml_rearnotes"
         , [ "rearnotes" ]
         , []
         )