git.iko.soy/typeable/pandoc
on master help sign in
Remove extraneous, significant whitespace in JATS writer output (#4335)
7d193b2Nokome Bentley
src/Text/Pandoc/Writers/JATS.hs+6−6
compare with master
unifiedsplit
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
28
28
29Conversion of 'Pandoc' documents to JATS XML.
29Conversion of 'Pandoc' documents to JATS XML.
30Reference:
30Reference:
31−https://jats.nlm.nih.gov/publishing/tag-library/1.1d3/element/mml-math.html
31+https://jats.nlm.nih.gov/publishing/tag-library
32-}
32-}
33module Text.Pandoc.Writers.JATS ( writeJATS ) where
33module Text.Pandoc.Writers.JATS ( writeJATS ) where
34import Control.Monad.Reader
34import Control.Monad.Reader
@@ -139,7 +139,7 @@ deflistItemToJATS opts term defs = do
139 term' <- inlinesToJATS opts term
139 term' <- inlinesToJATS opts term
140 def' <- blocksToJATS opts $ concatMap (map plainToPara) defs
140 def' <- blocksToJATS opts $ concatMap (map plainToPara) defs
141 return $ inTagsIndented "def-item" $
141 return $ inTagsIndented "def-item" $
142− inTagsIndented "term" term' $$
142+ inTagsSimple "term" term' $$
143 inTagsIndented "def" def'
143 inTagsIndented "def" def'
144
144
145-- | Convert a list of lists of blocks to a list of JATS list items.
145-- | Convert a list of lists of blocks to a list of JATS list items.
@@ -156,7 +156,7 @@ listItemToJATS :: PandocMonad m
156listItemToJATS opts mbmarker item = do
156listItemToJATS opts mbmarker item = do
157 contents <- blocksToJATS opts item
157 contents <- blocksToJATS opts item
158 return $ inTagsIndented "list-item" $
158 return $ inTagsIndented "list-item" $
159− maybe empty (\lbl -> inTagsIndented "label" (text lbl)) mbmarker
159+ maybe empty (\lbl -> inTagsSimple "label" (text lbl)) mbmarker
160 $$ contents
160 $$ contents
161
161
162imageMimeType :: String -> [(String, String)] -> (String, String)
162imageMimeType :: String -> [(String, String)] -> (String, String)
@@ -250,7 +250,7 @@ blockToJATS _ (Para [Image (ident,_,kvs) _ (src, tit)]) = do
250 "xlink:type"]]
250 "xlink:type"]]
251 return $ selfClosingTag "graphic" attr
251 return $ selfClosingTag "graphic" attr
252blockToJATS opts (Para lst) =
252blockToJATS opts (Para lst) =
253− inTagsIndented "p" <$> inlinesToJATS opts lst
253+ inTagsSimple "p" <$> inlinesToJATS opts lst
254blockToJATS opts (LineBlock lns) =
254blockToJATS opts (LineBlock lns) =
255 blockToJATS opts $ linesToPara lns
255 blockToJATS opts $ linesToPara lns
256blockToJATS opts (BlockQuote blocks) =
256blockToJATS opts (BlockQuote blocks) =
@@ -326,10 +326,10 @@ tableItemToJATS :: PandocMonad m
326 -> [Block]
326 -> [Block]
327 -> JATS m Doc
327 -> JATS m Doc
328tableItemToJATS opts isHeader [Plain item] =
328tableItemToJATS opts isHeader [Plain item] =
329− inTags True (if isHeader then "th" else "td") [] <$>
329+ inTags False (if isHeader then "th" else "td") [] <$>
330 inlinesToJATS opts item
330 inlinesToJATS opts item
331tableItemToJATS opts isHeader item =
331tableItemToJATS opts isHeader item =
332− (inTags True (if isHeader then "th" else "td") [] . vcat) <$>
332+ (inTags False (if isHeader then "th" else "td") [] . vcat) <$>
333 mapM (blockToJATS opts) item
333 mapM (blockToJATS opts) item
334
334
335-- | Convert a list of inline elements to JATS.
335-- | Convert a list of inline elements to JATS.
test/Tests/Writers/JATS.hs+12−26
@@ -30,8 +30,8 @@ infix 4 =:
30
30
31tests :: [TestTree]
31tests :: [TestTree]
32tests = [ testGroup "inline code"
32tests = [ testGroup "inline code"
33− [ "basic" =: code "@&" =?> "<p>\n <monospace>@&amp;</monospace>\n</p>"
33+ [ "basic" =: code "@&" =?> "<p><monospace>@&amp;</monospace></p>"
34− , "lang" =: codeWith ("", ["c"], []) "@&" =?> "<p>\n <code language=\"c\">@&amp;</code>\n</p>"
34+ , "lang" =: codeWith ("", ["c"], []) "@&" =?> "<p><code language=\"c\">@&amp;</code></p>"
35 ]
35 ]
36 , testGroup "block code"
36 , testGroup "block code"
37 [ "basic" =: codeBlock "@&" =?> "<preformat>@&amp;</preformat>"
37 [ "basic" =: codeBlock "@&" =?> "<preformat>@&amp;</preformat>"
@@ -44,7 +44,7 @@ tests = [ testGroup "inline code"
44 ]
44 ]
45 , testGroup "inlines"
45 , testGroup "inlines"
46 [ "Emphasis" =: emph "emphasized"
46 [ "Emphasis" =: emph "emphasized"
47− =?> "<p>\n <italic>emphasized</italic>\n</p>"
47+ =?> "<p><italic>emphasized</italic></p>"
48 ]
48 ]
49 , "bullet list" =: bulletList [ plain $ text "first"
49 , "bullet list" =: bulletList [ plain $ text "first"
50 , plain $ text "second"
50 , plain $ text "second"
@@ -52,19 +52,13 @@ tests = [ testGroup "inline code"
52 ]
52 ]
53 =?> "<list list-type=\"bullet\">\n\
53 =?> "<list list-type=\"bullet\">\n\
54 \ <list-item>\n\
54 \ <list-item>\n\
55− \ <p>\n\
56− \ first\n\
55+ \ <p>first</p>\n\
57− \ </p>\n\
58 \ </list-item>\n\
56 \ </list-item>\n\
59 \ <list-item>\n\
57 \ <list-item>\n\
60− \ <p>\n\
61− \ second\n\
58+ \ <p>second</p>\n\
62− \ </p>\n\
63 \ </list-item>\n\
59 \ </list-item>\n\
64 \ <list-item>\n\
60 \ <list-item>\n\
65− \ <p>\n\
66− \ third\n\
61+ \ <p>third</p>\n\
67− \ </p>\n\
68 \ </list-item>\n\
62 \ </list-item>\n\
69 \</list>"
63 \</list>"
70 , testGroup "definition lists"
64 , testGroup "definition lists"
@@ -72,24 +66,18 @@ tests = [ testGroup "inline code"
72 [plain (text "hi there")])] =?>
66 [plain (text "hi there")])] =?>
73 "<def-list>\n\
67 "<def-list>\n\
74 \ <def-item>\n\
68 \ <def-item>\n\
75− \ <term>\n\
76− \ <xref alt=\"testing\" rid=\"go\">testing</xref>\n\
69+ \ <term><xref alt=\"testing\" rid=\"go\">testing</xref></term>\n\
77− \ </term>\n\
78 \ <def>\n\
70 \ <def>\n\
79− \ <p>\n\
80− \ hi there\n\
71+ \ <p>hi there</p>\n\
81− \ </p>\n\
82 \ </def>\n\
72 \ </def>\n\
83 \ </def-item>\n\
73 \ </def-item>\n\
84 \</def-list>"
74 \</def-list>"
85 ]
75 ]
86 , testGroup "math"
76 , testGroup "math"
87 [ "escape |" =: para (math "\\sigma|_{\\{x\\}}") =?>
77 [ "escape |" =: para (math "\\sigma|_{\\{x\\}}") =?>
88− "<p>\n\
89− \ <inline-formula><alternatives>\n\
78+ "<p><inline-formula><alternatives>\n\
90− \ <tex-math><![CDATA[\\sigma|_{\\{x\\}}]]></tex-math>\n\
79+ \<tex-math><![CDATA[\\sigma|_{\\{x\\}}]]></tex-math>\n\
91− \ <mml:math display=\"inline\" xmlns:mml=\"http://www.w3.org/1998/Math/MathML\"><mml:mrow><mml:mi>σ</mml:mi><mml:msub><mml:mo stretchy=\"false\" form=\"prefix\">|</mml:mo><mml:mrow><mml:mo stretchy=\"false\" form=\"prefix\">{</mml:mo><mml:mi>x</mml:mi><mml:mo stretchy=\"false\" form=\"postfix\">}</mml:mo></mml:mrow></mml:msub></mml:mrow></mml:math></alternatives></inline-formula>\n\
80+ \<mml:math display=\"inline\" xmlns:mml=\"http://www.w3.org/1998/Math/MathML\"><mml:mrow><mml:mi>σ</mml:mi><mml:msub><mml:mo stretchy=\"false\" form=\"prefix\">|</mml:mo><mml:mrow><mml:mo stretchy=\"false\" form=\"prefix\">{</mml:mo><mml:mi>x</mml:mi><mml:mo stretchy=\"false\" form=\"postfix\">}</mml:mo></mml:mrow></mml:msub></mml:mrow></mml:math></alternatives></inline-formula></p>"
92− \</p>"
93 ]
81 ]
94 , testGroup "headers"
82 , testGroup "headers"
95 [ "unnumbered header" =:
83 [ "unnumbered header" =:
@@ -97,9 +85,7 @@ tests = [ testGroup "inline code"
97 (text "Header 1" <> note (plain $ text "note")) =?>
85 (text "Header 1" <> note (plain $ text "note")) =?>
98 "<sec id=\"foo\">\n\
86 "<sec id=\"foo\">\n\
99 \ <title>Header 1<fn>\n\
87 \ <title>Header 1<fn>\n\
100− \ <p>\n\
101− \ note\n\
88+ \ <p>note</p>\n\
102− \ </p>\n\
103 \ </fn></title>\n\
89 \ </fn></title>\n\
104 \</sec>"
90 \</sec>"
105 , "unnumbered sub header" =:
91 , "unnumbered sub header" =:
test/jats-reader.native+2−2
@@ -1,5 +1,5 @@
1Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"]]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
1Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"]]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
2−[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",SoftBreak,Str "Gruber's",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
2+[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber's",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
3,Header 1 ("headers",[],[]) [Str "Headers"]
3,Header 1 ("headers",[],[]) [Str "Headers"]
4,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",SoftBreak,Link ("",[],[]) [Str "embedded",SoftBreak,Str "link"] ("/url","")]
4,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",SoftBreak,Link ("",[],[]) [Str "embedded",SoftBreak,Str "link"] ("/url","")]
5,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Emph [Str "emphasis"]]
5,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Emph [Str "emphasis"]]
@@ -13,7 +13,7 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa
13,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
13,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
14,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
14,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
15,Para [Str "Here's",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
15,Para [Str "Here's",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
16−,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",Space,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",SoftBreak,Str "list",Space,Str "item.",Space,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",SoftBreak,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item."]
16+,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",Space,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",Space,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item."]
17,Para [Str "Here's",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",Space,Str "*",Space,Str "criminey."]
17,Para [Str "Here's",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",Space,Str "*",Space,Str "criminey."]
18,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
18,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
19,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
19,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
test/jats-reader.xml+352−977
@@ -29,10 +29,7 @@
29</article-meta>
29</article-meta>
30</front>
30</front>
31<body>
31<body>
32−<p>
33− This is a set of tests for pandoc. Most of them are adapted from John
32+<p>This is a set of tests for pandoc. Most of them are adapted from John Gruber's markdown test suite.</p>
34− Gruber's markdown test suite.
35−</p>
36<sec id="headers">
33<sec id="headers">
37 <title>Headers</title>
34 <title>Headers</title>
38 <sec id="level-2-with-an-embedded-link">
35 <sec id="level-2-with-an-embedded-link">
@@ -56,91 +53,53 @@
56 <title>Level 2 with <italic>emphasis</italic></title>
53 <title>Level 2 with <italic>emphasis</italic></title>
57 <sec id="level-3">
54 <sec id="level-3">
58 <title>Level 3</title>
55 <title>Level 3</title>
59− <p>
60− with no blank line
56+ <p>with no blank line</p>
61− </p>
62 </sec>
57 </sec>
63 </sec>
58 </sec>
64 <sec id="level-2">
59 <sec id="level-2">
65 <title>Level 2</title>
60 <title>Level 2</title>
66− <p>
67− with no blank line
61+ <p>with no blank line</p>
68− </p>
69 </sec>
62 </sec>
70</sec>
63</sec>
71<sec id="paragraphs">
64<sec id="paragraphs">
72 <title>Paragraphs</title>
65 <title>Paragraphs</title>
73− <p>
74− Here's a regular paragraph.
66+ <p>Here's a regular paragraph.</p>
75− </p>
76− <p>
77− In Markdown 1.0.0 and earlier. Version 8. This line turns into a
78− list item. Because a hard-wrapped line in the middle of a paragraph
67+ <p>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item.</p>
79− looked like a list item.
80− </p>
81− <p>
82− Here's one with a bullet. * criminey.
68+ <p>Here's one with a bullet. * criminey.</p>
83− </p>
84− <p>
85− There should be a hard line break<break />here.
69+ <p>There should be a hard line break<break />here.</p>
86− </p>
87</sec>
70</sec>
88<sec id="block-quotes">
71<sec id="block-quotes">
89 <title>Block Quotes</title>
72 <title>Block Quotes</title>
90− <p>
91− E-mail style:
73+ <p>E-mail style:</p>
92− </p>
93 <disp-quote>
74 <disp-quote>
94− <p>
95− This is a block quote. It is pretty short.
75+ <p>This is a block quote. It is pretty short.</p>
96− </p>
97 </disp-quote>
76 </disp-quote>
98 <disp-quote>
77 <disp-quote>
99− <p>
100− Code in a block quote:
78+ <p>Code in a block quote:</p>
101− </p>
102 <preformat>sub status {
79 <preformat>sub status {
103 print &quot;working&quot;;
80 print &quot;working&quot;;
104}</preformat>
81}</preformat>
105− <p>
106− A list:
82+ <p>A list:</p>
107− </p>
108 <list list-type="order">
83 <list list-type="order">
109 <list-item>
84 <list-item>
110− <p>
111− item one
85+ <p>item one</p>
112− </p>
113 </list-item>
86 </list-item>
114 <list-item>
87 <list-item>
115− <p>
116− item two
88+ <p>item two</p>
117− </p>
118 </list-item>
89 </list-item>
119 </list>
90 </list>
120− <p>
121− Nested block quotes:
91+ <p>Nested block quotes:</p>
122− </p>
123 <disp-quote>
92 <disp-quote>
124− <p>
125− nested
93+ <p>nested</p>
126− </p>
127 </disp-quote>
94 </disp-quote>
128 <disp-quote>
95 <disp-quote>
129− <p>
130− nested
96+ <p>nested</p>
131− </p>
132 </disp-quote>
97 </disp-quote>
133 </disp-quote>
98 </disp-quote>
134− <p>
135− This should not be a block quote: 2 &gt; 1.
99+ <p>This should not be a block quote: 2 &gt; 1.</p>
136− </p>
137− <p>
138− Box-style:
100+ <p>Box-style:</p>
139− </p>
140 <disp-quote>
101 <disp-quote>
141− <p>
142− Example:
102+ <p>Example:</p>
143− </p>
144 <preformat>sub status {
103 <preformat>sub status {
145 print &quot;working&quot;;
104 print &quot;working&quot;;
146}</preformat>
105}</preformat>
@@ -148,39 +107,25 @@
148 <disp-quote>
107 <disp-quote>
149 <list list-type="order">
108 <list list-type="order">
150 <list-item>
109 <list-item>
151− <p>
152− do laundry
110+ <p>do laundry</p>
153− </p>
154 </list-item>
111 </list-item>
155 <list-item>
112 <list-item>
156− <p>
157− take out the trash
113+ <p>take out the trash</p>
158− </p>
159 </list-item>
114 </list-item>
160 </list>
115 </list>
161 </disp-quote>
116 </disp-quote>
162− <p>
163− Here's a nested one:
117+ <p>Here's a nested one:</p>
164− </p>
165 <disp-quote>
118 <disp-quote>
166− <p>
167− Joe said:
119+ <p>Joe said:</p>
168− </p>
169 <disp-quote>
120 <disp-quote>
170− <p>
171− Don't quote me.
121+ <p>Don't quote me.</p>
172− </p>
173 </disp-quote>
122 </disp-quote>
174 </disp-quote>
123 </disp-quote>
175− <p>
176− And a following paragraph.
124+ <p>And a following paragraph.</p>
177− </p>
178</sec>
125</sec>
179<sec id="code-blocks">
126<sec id="code-blocks">
180 <title>Code Blocks</title>
127 <title>Code Blocks</title>
181− <p>
182− Code:
128+ <p>Code:</p>
183− </p>
184 <preformat>---- (should be four hyphens)
129 <preformat>---- (should be four hyphens)
185
130
186sub status {
131sub status {
@@ -188,9 +133,7 @@ sub status {
188}
133}
189
134
190this code block is indented by one tab</preformat>
135this code block is indented by one tab</preformat>
191− <p>
192− And:
136+ <p>And:</p>
193− </p>
194 <preformat> this code block is indented by two tabs
137 <preformat> this code block is indented by two tabs
195
138
196These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
139These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
@@ -199,236 +142,144 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
199 <title>Lists</title>
142 <title>Lists</title>
200 <sec id="unordered">
143 <sec id="unordered">
201 <title>Unordered</title>
144 <title>Unordered</title>
202− <p>
203− Asterisks tight:
145+ <p>Asterisks tight:</p>
204− </p>
205 <list list-type="bullet">
146 <list list-type="bullet">
206 <list-item>
147 <list-item>
207− <p>
208− asterisk 1
148+ <p>asterisk 1</p>
209− </p>
210 </list-item>
149 </list-item>
211 <list-item>
150 <list-item>
212− <p>
213− asterisk 2
151+ <p>asterisk 2</p>
214− </p>
215 </list-item>
152 </list-item>
216 <list-item>
153 <list-item>
217− <p>
218− asterisk 3
154+ <p>asterisk 3</p>
219− </p>
220 </list-item>
155 </list-item>
221 </list>
156 </list>
222− <p>
223− Asterisks loose:
157+ <p>Asterisks loose:</p>
224− </p>
225 <list list-type="bullet">
158 <list list-type="bullet">
226 <list-item>
159 <list-item>
227− <p>
228− asterisk 1
160+ <p>asterisk 1</p>
229− </p>
230 </list-item>
161 </list-item>
231 <list-item>
162 <list-item>
232− <p>
233− asterisk 2
163+ <p>asterisk 2</p>
234− </p>
235 </list-item>
164 </list-item>
236 <list-item>
165 <list-item>
237− <p>
238− asterisk 3
166+ <p>asterisk 3</p>
239− </p>
240 </list-item>
167 </list-item>
241 </list>
168 </list>
242− <p>
243− Pluses tight:
169+ <p>Pluses tight:</p>
244− </p>
245 <list list-type="bullet">
170 <list list-type="bullet">
246 <list-item>
171 <list-item>
247− <p>
248− Plus 1
172+ <p>Plus 1</p>
249− </p>
250 </list-item>
173 </list-item>
251 <list-item>
174 <list-item>
252− <p>
253− Plus 2
175+ <p>Plus 2</p>
254− </p>
255 </list-item>
176 </list-item>
256 <list-item>
177 <list-item>
257− <p>
258− Plus 3
178+ <p>Plus 3</p>
259− </p>
260 </list-item>
179 </list-item>
261 </list>
180 </list>
262− <p>
263− Pluses loose:
181+ <p>Pluses loose:</p>
264− </p>
265 <list list-type="bullet">
182 <list list-type="bullet">
266 <list-item>
183 <list-item>
267− <p>
268− Plus 1
184+ <p>Plus 1</p>
269− </p>
270 </list-item>
185 </list-item>
271 <list-item>
186 <list-item>
272− <p>
273− Plus 2
187+ <p>Plus 2</p>
274− </p>
275 </list-item>
188 </list-item>
276 <list-item>
189 <list-item>
277− <p>
278− Plus 3
190+ <p>Plus 3</p>
279− </p>
280 </list-item>
191 </list-item>
281 </list>
192 </list>
282− <p>
283− Minuses tight:
193+ <p>Minuses tight:</p>
284− </p>
285 <list list-type="bullet">
194 <list list-type="bullet">
286 <list-item>
195 <list-item>
287− <p>
288− Minus 1
196+ <p>Minus 1</p>
289− </p>
290 </list-item>
197 </list-item>
291 <list-item>
198 <list-item>
292− <p>
293− Minus 2
199+ <p>Minus 2</p>
294− </p>
295 </list-item>
200 </list-item>
296 <list-item>
201 <list-item>
297− <p>
298− Minus 3
202+ <p>Minus 3</p>
299− </p>
300 </list-item>
203 </list-item>
301 </list>
204 </list>
302− <p>
303− Minuses loose:
205+ <p>Minuses loose:</p>
304− </p>
305 <list list-type="bullet">
206 <list list-type="bullet">
306 <list-item>
207 <list-item>
307− <p>
308− Minus 1
208+ <p>Minus 1</p>
309− </p>
310 </list-item>
209 </list-item>
311 <list-item>
210 <list-item>
312− <p>
313− Minus 2
211+ <p>Minus 2</p>
314− </p>
315 </list-item>
212 </list-item>
316 <list-item>
213 <list-item>
317− <p>
318− Minus 3
214+ <p>Minus 3</p>
319− </p>
320 </list-item>
215 </list-item>
321 </list>
216 </list>
322 </sec>
217 </sec>
323 <sec id="ordered">
218 <sec id="ordered">
324 <title>Ordered</title>
219 <title>Ordered</title>
325− <p>
326− Tight:
220+ <p>Tight:</p>
327− </p>
328 <list list-type="order">
221 <list list-type="order">
329 <list-item>
222 <list-item>
330− <p>
331− First
223+ <p>First</p>
332− </p>
333 </list-item>
224 </list-item>
334 <list-item>
225 <list-item>
335− <p>
336− Second
226+ <p>Second</p>
337− </p>
338 </list-item>
227 </list-item>
339 <list-item>
228 <list-item>
340− <p>
341− Third
229+ <p>Third</p>
342− </p>
343 </list-item>
230 </list-item>
344 </list>
231 </list>
345− <p>
346− and:
232+ <p>and:</p>
347− </p>
348 <list list-type="order">
233 <list list-type="order">
349 <list-item>
234 <list-item>
350− <p>
351− One
235+ <p>One</p>
352− </p>
353 </list-item>
236 </list-item>
354 <list-item>
237 <list-item>
355− <p>
356− Two
238+ <p>Two</p>
357− </p>
358 </list-item>
239 </list-item>
359 <list-item>
240 <list-item>
360− <p>
361− Three
241+ <p>Three</p>
362− </p>
363 </list-item>
242 </list-item>
364 </list>
243 </list>
365− <p>
366− Loose using tabs:
244+ <p>Loose using tabs:</p>
367− </p>
368 <list list-type="order">
245 <list list-type="order">
369 <list-item>
246 <list-item>
370− <p>
371− First
247+ <p>First</p>
372− </p>
373 </list-item>
248 </list-item>
374 <list-item>
249 <list-item>
375− <p>
376− Second
250+ <p>Second</p>
377− </p>
378 </list-item>
251 </list-item>
379 <list-item>
252 <list-item>
380− <p>
381− Third
253+ <p>Third</p>
382− </p>
383 </list-item>
254 </list-item>
384 </list>
255 </list>
385− <p>
386− and using spaces:
256+ <p>and using spaces:</p>
387− </p>
388 <list list-type="order">
257 <list list-type="order">
389 <list-item>
258 <list-item>
390− <p>
391− One
259+ <p>One</p>
392− </p>
393 </list-item>
260 </list-item>
394 <list-item>
261 <list-item>
395− <p>
396− Two
262+ <p>Two</p>
397− </p>
398 </list-item>
263 </list-item>
399 <list-item>
264 <list-item>
400− <p>
401− Three
265+ <p>Three</p>
402− </p>
403 </list-item>
266 </list-item>
404 </list>
267 </list>
405− <p>
406− Multiple paragraphs:
268+ <p>Multiple paragraphs:</p>
407− </p>
408 <list list-type="order">
269 <list list-type="order">
409 <list-item>
270 <list-item>
410− <p>
411− Item 1, graf one.
271+ <p>Item 1, graf one.</p>
412− </p>
413− <p>
414− Item 1. graf two. The quick brown fox jumped over the lazy
272+ <p>Item 1. graf two. The quick brown fox jumped over the lazy
415− dog's back.
273+ dog's back.</p>
416− </p>
417 </list-item>
274 </list-item>
418 <list-item>
275 <list-item>
419− <p>
420− Item 2.
276+ <p>Item 2.</p>
421− </p>
422 </list-item>
277 </list-item>
423 <list-item>
278 <list-item>
424− <p>
425− Item 3.
279+ <p>Item 3.</p>
426− </p>
427 </list-item>
280 </list-item>
428 </list>
281 </list>
429− <p>
430− List styles:
282+ <p>List styles:</p>
431− </p>
432 <list list-type="order"></list>
283 <list list-type="order"></list>
433 <list list-type="roman-lower"></list>
284 <list list-type="roman-lower"></list>
434 </sec>
285 </sec>
@@ -436,97 +287,63 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
436 <title>Nested</title>
287 <title>Nested</title>
437 <list list-type="bullet">
288 <list list-type="bullet">
438 <list-item>
289 <list-item>
439− <p>
440− Tab
290+ <p>Tab</p>
441− </p>
442 <list list-type="bullet">
291 <list list-type="bullet">
443 <list-item>
292 <list-item>
444− <p>
445− Tab
293+ <p>Tab</p>
446− </p>
447 <list list-type="bullet">
294 <list list-type="bullet">
448 <list-item>
295 <list-item>
449− <p>
450− Tab
296+ <p>Tab</p>
451− </p>
452 </list-item>
297 </list-item>
453 </list>
298 </list>
454 </list-item>
299 </list-item>
455 </list>
300 </list>
456 </list-item>
301 </list-item>
457 </list>
302 </list>
458− <p>
459− Here's another:
303+ <p>Here's another:</p>
460− </p>
461 <list list-type="order">
304 <list list-type="order">
462 <list-item>
305 <list-item>
463− <p>
464− First
306+ <p>First</p>
465− </p>
466 </list-item>
307 </list-item>
467 <list-item>
308 <list-item>
468− <p>
469− Second:
309+ <p>Second:</p>
470− </p>
471 <list list-type="bullet">
310 <list list-type="bullet">
472 <list-item>
311 <list-item>
473− <p>
474− Fee
312+ <p>Fee</p>
475− </p>
476 </list-item>
313 </list-item>
477 <list-item>
314 <list-item>
478− <p>
479− Fie
315+ <p>Fie</p>
480− </p>
481 </list-item>
316 </list-item>
482 <list-item>
317 <list-item>
483− <p>
484− Foe
318+ <p>Foe</p>
485− </p>
486 </list-item>
319 </list-item>
487 </list>
320 </list>
488 </list-item>
321 </list-item>
489 <list-item>
322 <list-item>
490− <p>
491− Third
323+ <p>Third</p>
492− </p>
493 </list-item>
324 </list-item>
494 </list>
325 </list>
495− <p>
496− Same thing but with paragraphs:
326+ <p>Same thing but with paragraphs:</p>
497− </p>
498 <list list-type="order">
327 <list list-type="order">
499 <list-item>
328 <list-item>
500− <p>
501− First
329+ <p>First</p>
502− </p>
503 </list-item>
330 </list-item>
504 <list-item>
331 <list-item>
505− <p>
506− Second:
332+ <p>Second:</p>
507− </p>
508 <list list-type="bullet">
333 <list list-type="bullet">
509 <list-item>
334 <list-item>
510− <p>
511− Fee
335+ <p>Fee</p>
512− </p>
513 </list-item>
336 </list-item>
514 <list-item>
337 <list-item>
515− <p>
516− Fie
338+ <p>Fie</p>
517− </p>
518 </list-item>
339 </list-item>
519 <list-item>
340 <list-item>
520− <p>
521− Foe
341+ <p>Foe</p>
522− </p>
523 </list-item>
342 </list-item>
524 </list>
343 </list>
525 </list-item>
344 </list-item>
526 <list-item>
345 <list-item>
527− <p>
528− Third
346+ <p>Third</p>
529− </p>
530 </list-item>
347 </list-item>
531 </list>
348 </list>
532 </sec>
349 </sec>
@@ -534,24 +351,16 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
534 <title>Tabs and spaces</title>
351 <title>Tabs and spaces</title>
535 <list list-type="bullet">
352 <list list-type="bullet">
536 <list-item>
353 <list-item>
537− <p>
538− this is a list item indented with tabs
354+ <p>this is a list item indented with tabs</p>
539− </p>
540 </list-item>
355 </list-item>
541 <list-item>
356 <list-item>
542− <p>
543− this is a list item indented with spaces
357+ <p>this is a list item indented with spaces</p>
544− </p>
545 <list list-type="bullet">
358 <list list-type="bullet">
546 <list-item>
359 <list-item>
547− <p>
548− this is an example list item indented with tabs
360+ <p>this is an example list item indented with tabs</p>
549− </p>
550 </list-item>
361 </list-item>
551 <list-item>
362 <list-item>
552− <p>
553− this is an example list item indented with spaces
363+ <p>this is an example list item indented with spaces</p>
554− </p>
555 </list-item>
364 </list-item>
556 </list>
365 </list>
557 </list-item>
366 </list-item>
@@ -559,24 +368,16 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
559 </sec>
368 </sec>
560 <sec id="fancy-list-markers">
369 <sec id="fancy-list-markers">
561 <title>Fancy list markers</title>
370 <title>Fancy list markers</title>
562− <p>
563− Autonumbering:
371+ <p>Autonumbering:</p>
564− </p>
565 <list list-type="order">
372 <list list-type="order">
566 <list-item>
373 <list-item>
567− <p>
568− Autonumber.
374+ <p>Autonumber.</p>
569− </p>
570 </list-item>
375 </list-item>
571 <list-item>
376 <list-item>
572− <p>
573− More.
377+ <p>More.</p>
574− </p>
575 <list list-type="order">
378 <list list-type="order">
576 <list-item>
379 <list-item>
577− <p>
578− Nested.
380+ <p>Nested.</p>
579− </p>
580 </list-item>
381 </list-item>
581 </list>
382 </list>
582 </list-item>
383 </list-item>
@@ -590,12 +391,8 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
590 Violin
391 Violin
591 </term>
392 </term>
592 <def>
393 <def>
593− <p>
594− Stringed musical instrument.
394+ <p>Stringed musical instrument.</p>
595− </p>
596− <p>
597− Torture device.
395+ <p>Torture device.</p>
598− </p>
599 </def>
396 </def>
600 </def-item>
397 </def-item>
601 <def-item>
398 <def-item>
@@ -603,9 +400,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
603 Cello<break />Violoncello
400 Cello<break />Violoncello
604 </term>
401 </term>
605 <def>
402 <def>
606− <p>
607− Low-voiced stringed instrument.
403+ <p>Low-voiced stringed instrument.</p>
608− </p>
609 </def>
404 </def>
610 </def-item>
405 </def-item>
611 </def-list>
406 </def-list>
@@ -613,452 +408,244 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
613</sec>
408</sec>
614<sec id="inline-markup">
409<sec id="inline-markup">
615 <title>Inline Markup</title>
410 <title>Inline Markup</title>
616− <p>
617− This is <italic>emphasized</italic>, and so <italic>is
411+ <p>This is <italic>emphasized</italic>, and so <italic>is
618− this</italic>.
412+ this</italic>.</p>
619− </p>
620− <p>
621− This is <bold role="strong">strong</bold>, and so
413+ <p>This is <bold role="strong">strong</bold>, and so
622− <bold role="strong">is this</bold>.
414+ <bold role="strong">is this</bold>.</p>
623− </p>
624− <p>
625− Empty <bold role="strong"></bold> and <italic></italic>.
415+ <p>Empty <bold role="strong"></bold> and <italic></italic>.</p>
626− </p>
627− <p>
628− An
416+ <p>An
629 <italic><ext-link ext-link-type="uri" xlink:href="/url">emphasized
417 <italic><ext-link ext-link-type="uri" xlink:href="/url">emphasized
630− link</ext-link></italic>.
418+ link</ext-link></italic>.</p>
631− </p>
632− <p>
633− <bold role="strong"><italic>This is strong and em.</italic></bold>
419+ <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
634− </p>
635− <p>
636− So is <bold role="strong"><italic>this</italic></bold> word.
420+ <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
637− </p>
638− <p>
639− <bold role="strong"><italic>This is strong and em.</italic></bold>
421+ <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
640− </p>
641− <p>
642− So is <bold role="strong"><italic>this</italic></bold> word.
422+ <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
643− </p>
644− <p>
645− This is code: <monospace>&gt;</monospace>, <monospace>$</monospace>,
423+ <p>This is code: <monospace>&gt;</monospace>, <monospace>$</monospace>,
646 <monospace>\</monospace>, <monospace>\$</monospace>,
424 <monospace>\</monospace>, <monospace>\$</monospace>,
647− <monospace>&lt;html&gt;</monospace>.
425+ <monospace>&lt;html&gt;</monospace>.</p>
648− </p>
649− <p>
650− This is <sc role="smallcaps">small caps</sc>.
426+ <p>This is <sc role="smallcaps">small caps</sc>.</p>
651− </p>
652− <p>
653− These are all underlined: foo and bar.
427+ <p>These are all underlined: foo and bar.</p>
654− </p>
655− <p>
656− These are all strikethrough: <strike>foo</strike>,
428+ <p>These are all strikethrough: <strike>foo</strike>,
657− <strike>bar</strike>, and <strike>baz</strike>.
429+ <strike>bar</strike>, and <strike>baz</strike>.</p>
658− </p>
659</sec>
430</sec>
660<sec id="smart-quotes-ellipses-dashes">
431<sec id="smart-quotes-ellipses-dashes">
661 <title>Smart quotes, ellipses, dashes</title>
432 <title>Smart quotes, ellipses, dashes</title>
662− <p>
663− &quot;Hello,&quot; said the spider. &quot;'Shelob' is my name.&quot;
433+ <p>&quot;Hello,&quot; said the spider. &quot;'Shelob' is my name.&quot;</p>
664− </p>
665− <p>
666− 'A', 'B', and 'C' are letters.
434+ <p>'A', 'B', and 'C' are letters.</p>
667− </p>
668− <p>
669− 'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.'
435+ <p>'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.'</p>
670− </p>
671− <p>
672− 'He said, &quot;I want to go.&quot;' Were you alive in the 70's?
436+ <p>'He said, &quot;I want to go.&quot;' Were you alive in the 70's?</p>
673− </p>
674− <p>
675− Here is some quoted '<monospace>code</monospace>' and a
437+ <p>Here is some quoted '<monospace>code</monospace>' and a
676 &quot;<ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">quoted
438 &quot;<ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">quoted
677− link</ext-link>&quot;.
439+ link</ext-link>&quot;.</p>
678− </p>
679− <p>
680− Some dashes: one---two --- three--four -- five.
440+ <p>Some dashes: one---two --- three--four -- five.</p>
681− </p>
682− <p>
683− Dashes between numbers: 5-7, 255-66, 1987-1999.
441+ <p>Dashes between numbers: 5-7, 255-66, 1987-1999.</p>
684− </p>
685− <p>
686− Ellipses...and. . .and . . . .
442+ <p>Ellipses...and. . .and . . . .</p>
687− </p>
688</sec>
443</sec>
689<sec id="latex">
444<sec id="latex">
690 <title>LaTeX</title>
445 <title>LaTeX</title>
691 <list list-type="bullet">
446 <list list-type="bullet">
692 <list-item>
447 <list-item>
693− <p>
694− \cite[22-23]{smith.1899}
448+ <p>\cite[22-23]{smith.1899}</p>
695− </p>
696 </list-item>
449 </list-item>
697 <list-item>
450 <list-item>
698− <p>
699− \doublespacing
451+ <p>\doublespacing</p>
700− </p>
701 </list-item>
452 </list-item>
702 <list-item>
453 <list-item>
703− <p>
704− $2+2=4$
454+ <p>$2+2=4$</p>
705− </p>
706 </list-item>
455 </list-item>
707 <list-item>
456 <list-item>
708− <p>
709− $x \in y$
457+ <p>$x \in y$</p>
710− </p>
711 </list-item>
458 </list-item>
712 <list-item>
459 <list-item>
713− <p>
714− $\alpha \wedge \omega$
460+ <p>$\alpha \wedge \omega$</p>
715− </p>
716 </list-item>
461 </list-item>
717 <list-item>
462 <list-item>
718− <p>
719− $223$
463+ <p>$223$</p>
720− </p>
721 </list-item>
464 </list-item>
722 <list-item>
465 <list-item>
723− <p>
724− $p$-Tree
466+ <p>$p$-Tree</p>
725− </p>
726 </list-item>
467 </list-item>
727 <list-item>
468 <list-item>
728− <p>
729− $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
469+ <p>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</p>
730− </p>
731 </list-item>
470 </list-item>
732 <list-item>
471 <list-item>
733− <p>
734− Here's one that has a line break in it: $\alpha + \omega \times
472+ <p>Here's one that has a line break in it: $\alpha + \omega \times
735− x^2$.
473+ x^2$.</p>
736− </p>
737 </list-item>
474 </list-item>
738 </list>
475 </list>
739− <p>
740− These shouldn't be math:
476+ <p>These shouldn't be math:</p>
741− </p>
742 <list list-type="bullet">
477 <list list-type="bullet">
743 <list-item>
478 <list-item>
744− <p>
745− To get the famous equation, write
479+ <p>To get the famous equation, write
746− <monospace>$e = mc^2$</monospace>.
480+ <monospace>$e = mc^2$</monospace>.</p>
747− </p>
748 </list-item>
481 </list-item>
749 <list-item>
482 <list-item>
750− <p>
751− $22,000 is a <italic>lot</italic> of money. So is $34,000. (It
483+ <p>$22,000 is a <italic>lot</italic> of money. So is $34,000. (It
752− worked if &quot;lot&quot; is emphasized.)
484+ worked if &quot;lot&quot; is emphasized.)</p>
753− </p>
754 </list-item>
485 </list-item>
755 <list-item>
486 <list-item>
756− <p>
757− Escaped <monospace>$</monospace>: $73 <italic>this should be
487+ <p>Escaped <monospace>$</monospace>: $73 <italic>this should be
758− emphasized</italic> 23$.
488+ emphasized</italic> 23$.</p>
759− </p>
760 </list-item>
489 </list-item>
761 </list>
490 </list>
762− <p>
763− Here's a LaTeX table:
491+ <p>Here's a LaTeX table:</p>
764− </p>
765− <p>
766− \begin{tabular}{|l|l|}\hline Animal &amp; Number \\ \hline Dog &amp;
492+ <p>\begin{tabular}{|l|l|}\hline Animal &amp; Number \\ \hline Dog &amp;
767− 2 \\ Cat &amp; 1 \\ \hline \end{tabular}
493+ 2 \\ Cat &amp; 1 \\ \hline \end{tabular}</p>
768− </p>
769</sec>
494</sec>
770<sec id="special-characters">
495<sec id="special-characters">
771 <title>Special Characters</title>
496 <title>Special Characters</title>
772− <p>
773− Here is some unicode:
497+ <p>Here is some unicode:</p>
774− </p>
775 <list list-type="bullet">
498 <list list-type="bullet">
776 <list-item>
499 <list-item>
777− <p>
778− I hat: Î
500+ <p>I hat: Î</p>
779− </p>
780 </list-item>
501 </list-item>
781 <list-item>
502 <list-item>
782− <p>
783− o umlaut: ö
503+ <p>o umlaut: ö</p>
784− </p>
785 </list-item>
504 </list-item>
786 <list-item>
505 <list-item>
787− <p>
788− section: §
506+ <p>section: §</p>
789− </p>
790 </list-item>
507 </list-item>
791 <list-item>
508 <list-item>
792− <p>
793− set membership: elem
509+ <p>set membership: elem</p>
794− </p>
795 </list-item>
510 </list-item>
796 <list-item>
511 <list-item>
797− <p>
798− copyright: ©
512+ <p>copyright: ©</p>
799− </p>
800 </list-item>
513 </list-item>
801 </list>
514 </list>
802− <p>
803− AT&amp;T has an ampersand in their name.
515+ <p>AT&amp;T has an ampersand in their name.</p>
804− </p>
805− <p>
806− AT&amp;T is another way to write it.
516+ <p>AT&amp;T is another way to write it.</p>
807− </p>
808− <p>
809− This &amp; that.
517+ <p>This &amp; that.</p>
810− </p>
811− <p>
812− 4 &lt; 5.
518+ <p>4 &lt; 5.</p>
813− </p>
814− <p>
815− 6 &gt; 5.
519+ <p>6 &gt; 5.</p>
816− </p>
817− <p>
818− Backslash: \
520+ <p>Backslash: \</p>
819− </p>
820− <p>
821− Backtick: `
521+ <p>Backtick: `</p>
822− </p>
823− <p>
824− Asterisk: *
522+ <p>Asterisk: *</p>
825− </p>
826− <p>
827− Underscore: _
523+ <p>Underscore: _</p>
828− </p>
829− <p>
830− Left brace: {
524+ <p>Left brace: {</p>
831− </p>
832− <p>
833− Right brace: }
525+ <p>Right brace: }</p>
834− </p>
835− <p>
836− Left bracket: [
526+ <p>Left bracket: [</p>
837− </p>
838− <p>
839− Right bracket: ]
527+ <p>Right bracket: ]</p>
840− </p>
841− <p>
842− Left paren: (
528+ <p>Left paren: (</p>
843− </p>
844− <p>
845− Right paren: )
529+ <p>Right paren: )</p>
846− </p>
847− <p>
848− Greater-than: &gt;
530+ <p>Greater-than: &gt;</p>
849− </p>
850− <p>
851− Hash: #
531+ <p>Hash: #</p>
852− </p>
853− <p>
854− Period: .
532+ <p>Period: .</p>
855− </p>
856− <p>
857− Bang: !
533+ <p>Bang: !</p>
858− </p>
859− <p>
860− Plus: +
534+ <p>Plus: +</p>
861− </p>
862− <p>
863− Minus: -
535+ <p>Minus: -</p>
864− </p>
865</sec>
536</sec>
866<sec id="links">
537<sec id="links">
867 <title>Links</title>
538 <title>Links</title>
868 <sec id="explicit">
539 <sec id="explicit">
869 <title>Explicit</title>
540 <title>Explicit</title>
870− <p>
871− Just a
541+ <p>Just a
872− <ext-link ext-link-type="uri" xlink:href="/url/">URL</ext-link>.
542+ <ext-link ext-link-type="uri" xlink:href="/url/">URL</ext-link>.</p>
873− </p>
874− <p>
875− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title">URL
543+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title">URL
876− and title</ext-link>.
544+ and title</ext-link>.</p>
877− </p>
878− <p>
879− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by two spaces">URL
545+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by two spaces">URL
880− and title</ext-link>.
546+ and title</ext-link>.</p>
881− </p>
882− <p>
883− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by a tab">URL
547+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by a tab">URL
884− and title</ext-link>.
548+ and title</ext-link>.</p>
885− </p>
886− <p>
887− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with &quot;quotes&quot; in it">URL
549+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with &quot;quotes&quot; in it">URL
888− and title</ext-link>
550+ and title</ext-link></p>
889− </p>
890− <p>
891− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with single quotes">URL
551+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with single quotes">URL
892− and title</ext-link>
552+ and title</ext-link></p>
893− </p>
894− <p>
895− Email link (nobody [at] nowhere.net)
553+ <p>Email link (nobody [at] nowhere.net)</p>
896− </p>
897− <p>
898− <ext-link ext-link-type="uri" xlink:href="">Empty</ext-link>.
554+ <p><ext-link ext-link-type="uri" xlink:href="">Empty</ext-link>.</p>
899− </p>
900 </sec>
555 </sec>
901 <sec id="reference">
556 <sec id="reference">
902 <title>Reference</title>
557 <title>Reference</title>
903− <p>
904− Foo
558+ <p>Foo
905− <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.
559+ <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.</p>
906− </p>
907− <p>
908− Foo
560+ <p>Foo
909− <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.
561+ <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.</p>
910− </p>
911− <p>
912− Foo
562+ <p>Foo
913− <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.
563+ <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.</p>
914− </p>
915− <p>
916− With <ext-link ext-link-type="uri" xlink:href="/url/">embedded
564+ <p>With <ext-link ext-link-type="uri" xlink:href="/url/">embedded
917− [brackets]</ext-link>.
565+ [brackets]</ext-link>.</p>
918− </p>
919− <p>
920− <ext-link ext-link-type="uri" xlink:href="/url/">b</ext-link> by
566+ <p><ext-link ext-link-type="uri" xlink:href="/url/">b</ext-link> by
921− itself should be a link.
567+ itself should be a link.</p>
922− </p>
923− <p>
924− Indented
568+ <p>Indented
925− <ext-link ext-link-type="uri" xlink:href="/url">once</ext-link>.
569+ <ext-link ext-link-type="uri" xlink:href="/url">once</ext-link>.</p>
926− </p>
927− <p>
928− Indented
570+ <p>Indented
929− <ext-link ext-link-type="uri" xlink:href="/url">twice</ext-link>.
571+ <ext-link ext-link-type="uri" xlink:href="/url">twice</ext-link>.</p>
930− </p>
931− <p>
932− Indented
572+ <p>Indented
933− <ext-link ext-link-type="uri" xlink:href="/url">thrice</ext-link>.
573+ <ext-link ext-link-type="uri" xlink:href="/url">thrice</ext-link>.</p>
934− </p>
935− <p>
936− This should [not] be a link.
574+ <p>This should [not] be a link.</p>
937− </p>
938 <preformat>[not]: /url</preformat>
575 <preformat>[not]: /url</preformat>
939− <p>
940− Foo
576+ <p>Foo
941− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quotes&quot; inside">bar</ext-link>.
577+ <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quotes&quot; inside">bar</ext-link>.</p>
942− </p>
943− <p>
944− Foo
578+ <p>Foo
945− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quote&quot; inside">biz</ext-link>.
579+ <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quote&quot; inside">biz</ext-link>.</p>
946− </p>
947 </sec>
580 </sec>
948 <sec id="with-ampersands">
581 <sec id="with-ampersands">
949 <title>With ampersands</title>
582 <title>With ampersands</title>
950− <p>
951− Here's a
583+ <p>Here's a
952 <ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">link
584 <ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">link
953− with an ampersand in the URL</ext-link>.
585+ with an ampersand in the URL</ext-link>.</p>
954− </p>
955− <p>
956− Here's a link with an amersand in the link text:
586+ <p>Here's a link with an amersand in the link text:
957− <ext-link ext-link-type="uri" xlink:href="http://att.com/" xlink:title="AT&amp;T">AT&amp;T</ext-link>.
587+ <ext-link ext-link-type="uri" xlink:href="http://att.com/" xlink:title="AT&amp;T">AT&amp;T</ext-link>.</p>
958− </p>
959− <p>
960− Here's an
588+ <p>Here's an
961 <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
589 <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
962− link</ext-link>.
590+ link</ext-link>.</p>
963− </p>
964− <p>
965− Here's an
591+ <p>Here's an
966 <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
592 <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
967− link in pointy braces</ext-link>.
593+ link in pointy braces</ext-link>.</p>
968− </p>
969 </sec>
594 </sec>
970 <sec id="autolinks">
595 <sec id="autolinks">
971 <title>Autolinks</title>
596 <title>Autolinks</title>
972− <p>
973− With an ampersand:
597+ <p>With an ampersand:
974− <ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</ext-link>
598+ <ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</ext-link></p>
975− </p>
976 <list list-type="bullet">
599 <list list-type="bullet">
977 <list-item>
600 <list-item>
978− <p>
979− In a list?
601+ <p>In a list?</p>
980− </p>
981 </list-item>
602 </list-item>
982 <list-item>
603 <list-item>
983− <p>
984− <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link>
604+ <p><ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link></p>
985− </p>
986 </list-item>
605 </list-item>
987 <list-item>
606 <list-item>
988− <p>
989− It should.
607+ <p>It should.</p>
990− </p>
991 </list-item>
608 </list-item>
992 </list>
609 </list>
993− <p>
994− An e-mail address: nobody [at] nowhere.net
610+ <p>An e-mail address: nobody [at] nowhere.net</p>
995− </p>
996 <disp-quote>
611 <disp-quote>
997− <p>
998− Blockquoted:
612+ <p>Blockquoted:
999− <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link>
613+ <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link></p>
1000− </p>
1001 </disp-quote>
614 </disp-quote>
1002− <p>
1003− Auto-links should not occur here:
615+ <p>Auto-links should not occur here:
1004− <monospace>&lt;http://example.com/&gt;</monospace>
616+ <monospace>&lt;http://example.com/&gt;</monospace></p>
1005− </p>
1006 <preformat>or here: &lt;http://example.com/&gt;</preformat>
617 <preformat>or here: &lt;http://example.com/&gt;</preformat>
1007 </sec>
618 </sec>
1008</sec>
619</sec>
1009<sec id="images">
620<sec id="images">
1010 <title>Images</title>
621 <title>Images</title>
1011− <p>
1012− From &quot;Voyage dans la Lune&quot; by Georges Melies (1902):
622+ <p>From &quot;Voyage dans la Lune&quot; by Georges Melies (1902):</p>
1013− </p>
1014− <p>
1015− <inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="lalune.jpg" xlink:title="Voyage dans la Lune" />
623+ <p><inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="lalune.jpg" xlink:title="Voyage dans la Lune" /></p>
1016− </p>
1017− <p>
1018− Here is a movie
624+ <p>Here is a movie
1019 <inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="movie.jpg" />
625 <inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="movie.jpg" />
1020− icon.
626+ icon.</p>
1021− </p>
1022</sec>
627</sec>
1023<sec id="footnotes">
628<sec id="footnotes">
1024 <title>Footnotes</title>
629 <title>Footnotes</title>
1025− <p>
1026− Here is a footnote reference<xref alt="(1)" rid="note_1">(1)</xref>,
630+ <p>Here is a footnote reference<xref alt="(1)" rid="note_1">(1)</xref>,
1027 and
631 and
1028 another<xref alt="(longnote)" rid="note_longnote">(longnote)</xref>.
632 another<xref alt="(longnote)" rid="note_longnote">(longnote)</xref>.
1029 This should <italic>not</italic> be a footnote reference, because it
633 This should <italic>not</italic> be a footnote reference, because it
1030− contains a space^(my note).
634+ contains a space^(my note).</p>
1031− </p>
1032− <p>
1033− <xref alt="(1)" rid="ref_1">(1)</xref> Here is the footnote. It can
635+ <p><xref alt="(1)" rid="ref_1">(1)</xref> Here is the footnote. It can
1034− go anywhere in the document, not just at the end.
636+ go anywhere in the document, not just at the end.</p>
1035− </p>
1036− <p>
1037− <xref alt="(longnote)" rid="ref_longnote">(longnote)</xref> Here's
637+ <p><xref alt="(longnote)" rid="ref_longnote">(longnote)</xref> Here's
1038− the other note. This one contains multiple blocks.
638+ the other note. This one contains multiple blocks.</p>
1039− </p>
1040− <p>
1041− Caret characters are used to indicate that the blocks all belong to
639+ <p>Caret characters are used to indicate that the blocks all belong to
1042− a single footnote (as with block quotes).
640+ a single footnote (as with block quotes).</p>
1043− </p>
1044 <preformat> { &lt;code&gt; }</preformat>
641 <preformat> { &lt;code&gt; }</preformat>
1045− <p>
1046− If you want, you can use a caret at the beginning of every line, as
642+ <p>If you want, you can use a caret at the beginning of every line, as
1047 with blockquotes, but all that you need is a caret at the beginning
643 with blockquotes, but all that you need is a caret at the beginning
1048− of the first line of the block and any preceding blank lines.
644+ of the first line of the block and any preceding blank lines.</p>
1049− </p>
1050− <p>
1051− text <italic>Leading space</italic>
645+ <p>text <italic>Leading space</italic></p>
1052− </p>
1053− <p>
1054− <italic>Trailing space</italic> text
646+ <p><italic>Trailing space</italic> text</p>
1055− </p>
1056− <p>
1057− text <italic>Leading spaces</italic>
647+ <p>text <italic>Leading spaces</italic></p>
1058− </p>
1059− <p>
1060− <italic>Trailing spaces</italic> text
648+ <p><italic>Trailing spaces</italic> text</p>
1061− </p>
1062</sec>
649</sec>
1063<sec id="tables">
650<sec id="tables">
1064 <title>Tables</title>
651 <title>Tables</title>
@@ -1071,55 +658,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1071 <thead>
658 <thead>
1072 <tr>
659 <tr>
1073 <th>
660 <th>
1074− <p>
661+ <p>X</p>
1075− X
1076− </p>
1077 </th>
662 </th>
1078 <th>
663 <th>
1079− <p>
664+ <p>Y</p>
1080− Y
1081− </p>
1082 </th>
665 </th>
1083 <th>
666 <th>
1084− <p>
667+ <p>Z</p>
1085− Z
1086− </p>
1087 </th>
668 </th>
1088 </tr>
669 </tr>
1089 </thead>
670 </thead>
1090 <tbody>
671 <tbody>
1091 <tr>
672 <tr>
1092 <td>
673 <td>
1093− <p>
674+ <p>1</p>
1094− 1
1095− </p>
1096 </td>
675 </td>
1097 <td>
676 <td>
1098− <p>
677+ <p>2</p>
1099− 2
1100− </p>
1101 </td>
678 </td>
1102 <td>
679 <td>
1103− <p>
680+ <p>3</p>
1104− 3
1105− </p>
1106 </td>
681 </td>
1107 </tr>
682 </tr>
1108 <tr>
683 <tr>
1109 <td>
684 <td>
1110− <p>
685+ <p>4</p>
1111− 4
1112− </p>
1113 </td>
686 </td>
1114 <td>
687 <td>
1115− <p>
688+ <p>5</p>
1116− 5
1117− </p>
1118 </td>
689 </td>
1119 <td>
690 <td>
1120− <p>
691+ <p>6</p>
1121− 6
1122− </p>
1123 </td>
692 </td>
1124 </tr>
693 </tr>
1125 </tbody>
694 </tbody>
@@ -1131,55 +700,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1131 <thead>
700 <thead>
1132 <tr>
701 <tr>
1133 <th>
702 <th>
1134− <p>
703+ <p>X</p>
1135− X
1136− </p>
1137 </th>
704 </th>
1138 <th>
705 <th>
1139− <p>
706+ <p>Y</p>
1140− Y
1141− </p>
1142 </th>
707 </th>
1143 <th>
708 <th>
1144− <p>
709+ <p>Z</p>
1145− Z
1146− </p>
1147 </th>
710 </th>
1148 </tr>
711 </tr>
1149 </thead>
712 </thead>
1150 <tbody>
713 <tbody>
1151 <tr>
714 <tr>
1152 <td>
715 <td>
1153− <p>
716+ <p>1</p>
1154− 1
1155− </p>
1156 </td>
717 </td>
1157 <td>
718 <td>
1158− <p>
719+ <p>2</p>
1159− 2
1160− </p>
1161 </td>
720 </td>
1162 <td>
721 <td>
1163− <p>
722+ <p>3</p>
1164− 3
1165− </p>
1166 </td>
723 </td>
1167 </tr>
724 </tr>
1168 <tr>
725 <tr>
1169 <td>
726 <td>
1170− <p>
727+ <p>4</p>
1171− 4
1172− </p>
1173 </td>
728 </td>
1174 <td>
729 <td>
1175− <p>
730+ <p>5</p>
1176− 5
1177− </p>
1178 </td>
731 </td>
1179 <td>
732 <td>
1180− <p>
733+ <p>6</p>
1181− 6
1182− </p>
1183 </td>
734 </td>
1184 </tr>
735 </tr>
1185 </tbody>
736 </tbody>
@@ -1191,55 +742,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1191 <thead>
742 <thead>
1192 <tr>
743 <tr>
1193 <th>
744 <th>
1194− <p>
745+ <p>X</p>
1195− X
1196− </p>
1197 </th>
746 </th>
1198 <th>
747 <th>
1199− <p>
748+ <p>Y</p>
1200− Y
1201− </p>
1202 </th>
749 </th>
1203 <th>
750 <th>
1204− <p>
751+ <p>Z</p>
1205− Z
1206− </p>
1207 </th>
752 </th>
1208 </tr>
753 </tr>
1209 </thead>
754 </thead>
1210 <tbody>
755 <tbody>
1211 <tr>
756 <tr>
1212 <td>
757 <td>
1213− <p>
758+ <p>1</p>
1214− 1
1215− </p>
1216 </td>
759 </td>
1217 <td>
760 <td>
1218− <p>
761+ <p>2</p>
1219− 2
1220− </p>
1221 </td>
762 </td>
1222 <td>
763 <td>
1223− <p>
764+ <p>3</p>
1224− 3
1225− </p>
1226 </td>
765 </td>
1227 </tr>
766 </tr>
1228 <tr>
767 <tr>
1229 <td>
768 <td>
1230− <p>
769+ <p>4</p>
1231− 4
1232− </p>
1233 </td>
770 </td>
1234 <td>
771 <td>
1235− <p>
772+ <p>5</p>
1236− 5
1237− </p>
1238 </td>
773 </td>
1239 <td>
774 <td>
1240− <p>
775+ <p>6</p>
1241− 6
1242− </p>
1243 </td>
776 </td>
1244 </tr>
777 </tr>
1245 </tbody>
778 </tbody>
@@ -1251,55 +784,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1251 <thead>
784 <thead>
1252 <tr>
785 <tr>
1253 <th>
786 <th>
1254− <p>
787+ <p>X</p>
1255− X
1256− </p>
1257 </th>
788 </th>
1258 <th>
789 <th>
1259− <p>
790+ <p>Y</p>
1260− Y
1261− </p>
1262 </th>
791 </th>
1263 <th>
792 <th>
1264− <p>
793+ <p>Z</p>
1265− Z
1266− </p>
1267 </th>
794 </th>
1268 </tr>
795 </tr>
1269 </thead>
796 </thead>
1270 <tbody>
797 <tbody>
1271 <tr>
798 <tr>
1272 <td>
799 <td>
1273− <p>
800+ <p>1</p>
1274− 1
1275− </p>
1276 </td>
801 </td>
1277 <td>
802 <td>
1278− <p>
803+ <p>2</p>
1279− 2
1280− </p>
1281 </td>
804 </td>
1282 <td>
805 <td>
1283− <p>
806+ <p>3</p>
1284− 3
1285− </p>
1286 </td>
807 </td>
1287 </tr>
808 </tr>
1288 <tr>
809 <tr>
1289 <td>
810 <td>
1290− <p>
811+ <p>4</p>
1291− 4
1292− </p>
1293 </td>
812 </td>
1294 <td>
813 <td>
1295− <p>
814+ <p>5</p>
1296− 5
1297− </p>
1298 </td>
815 </td>
1299 <td>
816 <td>
1300− <p>
817+ <p>6</p>
1301− 6
1302− </p>
1303 </td>
818 </td>
1304 </tr>
819 </tr>
1305 </tbody>
820 </tbody>
@@ -1311,55 +826,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1311 <thead>
826 <thead>
1312 <tr>
827 <tr>
1313 <th>
828 <th>
1314− <p>
829+ <p>X</p>
1315− X
1316− </p>
1317 </th>
830 </th>
1318 <th>
831 <th>
1319− <p>
832+ <p>Y</p>
1320− Y
1321− </p>
1322 </th>
833 </th>
1323 <th>
834 <th>
1324− <p>
835+ <p>Z</p>
1325− Z
1326− </p>
1327 </th>
836 </th>
1328 </tr>
837 </tr>
1329 </thead>
838 </thead>
1330 <tbody>
839 <tbody>
1331 <tr>
840 <tr>
1332 <td>
841 <td>
1333− <p>
842+ <p>1</p>
1334− 1
1335− </p>
1336 </td>
843 </td>
1337 <td>
844 <td>
1338− <p>
845+ <p>2</p>
1339− 2
1340− </p>
1341 </td>
846 </td>
1342 <td>
847 <td>
1343− <p>
848+ <p>3</p>
1344− 3
1345− </p>
1346 </td>
849 </td>
1347 </tr>
850 </tr>
1348 <tr>
851 <tr>
1349 <td>
852 <td>
1350− <p>
853+ <p>4</p>
1351− 4
1352− </p>
1353 </td>
854 </td>
1354 <td>
855 <td>
1355− <p>
856+ <p>5</p>
1356− 5
1357− </p>
1358 </td>
857 </td>
1359 <td>
858 <td>
1360− <p>
859+ <p>6</p>
1361− 6
1362− </p>
1363 </td>
860 </td>
1364 </tr>
861 </tr>
1365 </tbody>
862 </tbody>
@@ -1371,55 +868,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1371 <thead>
868 <thead>
1372 <tr>
869 <tr>
1373 <th>
870 <th>
1374− <p>
871+ <p>X</p>
1375− X
1376− </p>
1377 </th>
872 </th>
1378 <th>
873 <th>
1379− <p>
874+ <p>Y</p>
1380− Y
1381− </p>
1382 </th>
875 </th>
1383 <th>
876 <th>
1384− <p>
877+ <p>Z</p>
1385− Z
1386− </p>
1387 </th>
878 </th>
1388 </tr>
879 </tr>
1389 </thead>
880 </thead>
1390 <tbody>
881 <tbody>
1391 <tr>
882 <tr>
1392 <td>
883 <td>
1393− <p>
884+ <p>1</p>
1394− 1
1395− </p>
1396 </td>
885 </td>
1397 <td>
886 <td>
1398− <p>
887+ <p>2</p>
1399− 2
1400− </p>
1401 </td>
888 </td>
1402 <td>
889 <td>
1403− <p>
890+ <p>3</p>
1404− 3
1405− </p>
1406 </td>
891 </td>
1407 </tr>
892 </tr>
1408 <tr>
893 <tr>
1409 <td>
894 <td>
1410− <p>
895+ <p>4</p>
1411− 4
1412− </p>
1413 </td>
896 </td>
1414 <td>
897 <td>
1415− <p>
898+ <p>5</p>
1416− 5
1417− </p>
1418 </td>
899 </td>
1419 <td>
900 <td>
1420− <p>
901+ <p>6</p>
1421− 6
1422− </p>
1423 </td>
902 </td>
1424 </tr>
903 </tr>
1425 </tbody>
904 </tbody>
@@ -1431,55 +910,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1431 <thead>
910 <thead>
1432 <tr>
911 <tr>
1433 <th>
912 <th>
1434− <p>
913+ <p>X</p>
1435− X
1436− </p>
1437 </th>
914 </th>
1438 <th>
915 <th>
1439− <p>
916+ <p>Y</p>
1440− Y
1441− </p>
1442 </th>
917 </th>
1443 <th>
918 <th>
1444− <p>
919+ <p>Z</p>
1445− Z
1446− </p>
1447 </th>
920 </th>
1448 </tr>
921 </tr>
1449 </thead>
922 </thead>
1450 <tbody>
923 <tbody>
1451 <tr>
924 <tr>
1452 <td>
925 <td>
1453− <p>
926+ <p>1</p>
1454− 1
1455− </p>
1456 </td>
927 </td>
1457 <td>
928 <td>
1458− <p>
929+ <p>2</p>
1459− 2
1460− </p>
1461 </td>
930 </td>
1462 <td>
931 <td>
1463− <p>
932+ <p>3</p>
1464− 3
1465− </p>
1466 </td>
933 </td>
1467 </tr>
934 </tr>
1468 <tr>
935 <tr>
1469 <td>
936 <td>
1470− <p>
937+ <p>4</p>
1471− 4
1472− </p>
1473 </td>
938 </td>
1474 <td>
939 <td>
1475− <p>
940+ <p>5</p>
1476− 5
1477− </p>
1478 </td>
941 </td>
1479 <td>
942 <td>
1480− <p>
943+ <p>6</p>
1481− 6
1482− </p>
1483 </td>
944 </td>
1484 </tr>
945 </tr>
1485 </tbody>
946 </tbody>
@@ -1491,55 +952,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1491 <thead>
952 <thead>
1492 <tr>
953 <tr>
1493 <th>
954 <th>
1494− <p>
955+ <p>X</p>
1495− X
1496− </p>
1497 </th>
956 </th>
1498 <th>
957 <th>
1499− <p>
958+ <p>Y</p>
1500− Y
1501− </p>
1502 </th>
959 </th>
1503 <th>
960 <th>
1504− <p>
961+ <p>Z</p>
1505− Z
1506− </p>
1507 </th>
962 </th>
1508 </tr>
963 </tr>
1509 </thead>
964 </thead>
1510 <tbody>
965 <tbody>
1511 <tr>
966 <tr>
1512 <td>
967 <td>
1513− <p>
968+ <p>1</p>
1514− 1
1515− </p>
1516 </td>
969 </td>
1517 <td>
970 <td>
1518− <p>
971+ <p>2</p>
1519− 2
1520− </p>
1521 </td>
972 </td>
1522 <td>
973 <td>
1523− <p>
974+ <p>3</p>
1524− 3
1525− </p>
1526 </td>
975 </td>
1527 </tr>
976 </tr>
1528 <tr>
977 <tr>
1529 <td>
978 <td>
1530− <p>
979+ <p>4</p>
1531− 4
1532− </p>
1533 </td>
980 </td>
1534 <td>
981 <td>
1535− <p>
982+ <p>5</p>
1536− 5
1537− </p>
1538 </td>
983 </td>
1539 <td>
984 <td>
1540− <p>
985+ <p>6</p>
1541− 6
1542− </p>
1543 </td>
986 </td>
1544 </tr>
987 </tr>
1545 </tbody>
988 </tbody>
@@ -1551,55 +994,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1551 <thead>
994 <thead>
1552 <tr>
995 <tr>
1553 <th>
996 <th>
1554− <p>
997+ <p>X</p>
1555− X
1556− </p>
1557 </th>
998 </th>
1558 <th>
999 <th>
1559− <p>
1000+ <p>Y</p>
1560− Y
1561− </p>
1562 </th>
1001 </th>
1563 <th>
1002 <th>
1564− <p>
1003+ <p>Z</p>
1565− Z
1566− </p>
1567 </th>
1004 </th>
1568 </tr>
1005 </tr>
1569 </thead>
1006 </thead>
1570 <tbody>
1007 <tbody>
1571 <tr>
1008 <tr>
1572 <td>
1009 <td>
1573− <p>
1010+ <p>1</p>
1574− 1
1575− </p>
1576 </td>
1011 </td>
1577 <td>
1012 <td>
1578− <p>
1013+ <p>2</p>
1579− 2
1580− </p>
1581 </td>
1014 </td>
1582 <td>
1015 <td>
1583− <p>
1016+ <p>3</p>
1584− 3
1585− </p>
1586 </td>
1017 </td>
1587 </tr>
1018 </tr>
1588 <tr>
1019 <tr>
1589 <td>
1020 <td>
1590− <p>
1021+ <p>4</p>
1591− 4
1592− </p>
1593 </td>
1022 </td>
1594 <td>
1023 <td>
1595− <p>
1024+ <p>5</p>
1596− 5
1597− </p>
1598 </td>
1025 </td>
1599 <td>
1026 <td>
1600− <p>
1027+ <p>6</p>
1601− 6
1602− </p>
1603 </td>
1028 </td>
1604 </tr>
1029 </tr>
1605 </tbody>
1030 </tbody>
@@ -1614,36 +1039,24 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1614 <tbody>
1039 <tbody>
1615 <tr>
1040 <tr>
1616 <td>
1041 <td>
1617− <p>
1042+ <p>1</p>
1618− 1
1619− </p>
1620 </td>
1043 </td>
1621 <td>
1044 <td>
1622− <p>
1045+ <p>2</p>
1623− 2
1624− </p>
1625 </td>
1046 </td>
1626 <td>
1047 <td>
1627− <p>
1048+ <p>3</p>
1628− 3
1629− </p>
1630 </td>
1049 </td>
1631 </tr>
1050 </tr>
1632 <tr>
1051 <tr>
1633 <td>
1052 <td>
1634− <p>
1053+ <p>4</p>
1635− 4
1636− </p>
1637 </td>
1054 </td>
1638 <td>
1055 <td>
1639− <p>
1056+ <p>5</p>
1640− 5
1641− </p>
1642 </td>
1057 </td>
1643 <td>
1058 <td>
1644− <p>
1059+ <p>6</p>
1645− 6
1646− </p>
1647 </td>
1060 </td>
1648 </tr>
1061 </tr>
1649 </tbody>
1062 </tbody>
@@ -1655,36 +1068,24 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1655 <tbody>
1068 <tbody>
1656 <tr>
1069 <tr>
1657 <td>
1070 <td>
1658− <p>
1071+ <p>1</p>
1659− 1
1660− </p>
1661 </td>
1072 </td>
1662 <td>
1073 <td>
1663− <p>
1074+ <p>2</p>
1664− 2
1665− </p>
1666 </td>
1075 </td>
1667 <td>
1076 <td>
1668− <p>
1077+ <p>3</p>
1669− 3
1670− </p>
1671 </td>
1078 </td>
1672 </tr>
1079 </tr>
1673 <tr>
1080 <tr>
1674 <td>
1081 <td>
1675− <p>
1082+ <p>4</p>
1676− 4
1677− </p>
1678 </td>
1083 </td>
1679 <td>
1084 <td>
1680− <p>
1085+ <p>5</p>
1681− 5
1682− </p>
1683 </td>
1086 </td>
1684 <td>
1087 <td>
1685− <p>
1088+ <p>6</p>
1686− 6
1687− </p>
1688 </td>
1089 </td>
1689 </tr>
1090 </tr>
1690 </tbody>
1091 </tbody>
@@ -1696,36 +1097,24 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1696 <tbody>
1097 <tbody>
1697 <tr>
1098 <tr>
1698 <td>
1099 <td>
1699− <p>
1100+ <p>1</p>
1700− 1
1701− </p>
1702 </td>
1101 </td>
1703 <td>
1102 <td>
1704− <p>
1103+ <p>2</p>
1705− 2
1706− </p>
1707 </td>
1104 </td>
1708 <td>
1105 <td>
1709− <p>
1106+ <p>3</p>
1710− 3
1711− </p>
1712 </td>
1107 </td>
1713 </tr>
1108 </tr>
1714 <tr>
1109 <tr>
1715 <td>
1110 <td>
1716− <p>
1111+ <p>4</p>
1717− 4
1718− </p>
1719 </td>
1112 </td>
1720 <td>
1113 <td>
1721− <p>
1114+ <p>5</p>
1722− 5
1723− </p>
1724 </td>
1115 </td>
1725 <td>
1116 <td>
1726− <p>
1117+ <p>6</p>
1727− 6
1728− </p>
1729 </td>
1118 </td>
1730 </tr>
1119 </tr>
1731 </tbody>
1120 </tbody>
@@ -1737,36 +1126,24 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1737 <tbody>
1126 <tbody>
1738 <tr>
1127 <tr>
1739 <td>
1128 <td>
1740− <p>
1129+ <p>1</p>
1741− 1
1742− </p>
1743 </td>
1130 </td>
1744 <td>
1131 <td>
1745− <p>
1132+ <p>2</p>
1746− 2
1747− </p>
1748 </td>
1133 </td>
1749 <td>
1134 <td>
1750− <p>
1135+ <p>3</p>
1751− 3
1752− </p>
1753 </td>
1136 </td>
1754 </tr>
1137 </tr>
1755 <tr>
1138 <tr>
1756 <td>
1139 <td>
1757− <p>
1140+ <p>4</p>
1758− 4
1759− </p>
1760 </td>
1141 </td>
1761 <td>
1142 <td>
1762− <p>
1143+ <p>5</p>
1763− 5
1764− </p>
1765 </td>
1144 </td>
1766 <td>
1145 <td>
1767− <p>
1146+ <p>6</p>
1768− 6
1769− </p>
1770 </td>
1147 </td>
1771 </tr>
1148 </tr>
1772 </tbody>
1149 </tbody>
@@ -1774,9 +1151,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1774 </sec>
1151 </sec>
1775 <sec id="empty-tables">
1152 <sec id="empty-tables">
1776 <title>Empty Tables</title>
1153 <title>Empty Tables</title>
1777− <p>
1778− This section should be empty.
1154+ <p>This section should be empty.</p>
1779− </p>
1780 </sec>
1155 </sec>
1781</sec>
1156</sec>
1782</body>
1157</body>
test/tables.jats+102−306
@@ -1,11 +1,7 @@
1−<p>
2− Simple table with caption:
1+<p>Simple table with caption:</p>
3−</p>
4<table-wrap>
2<table-wrap>
5 <caption>
3 <caption>
6− <p>
7− Demonstration of simple table syntax.
4+ <p>Demonstration of simple table syntax.</p>
8− </p>
9 </caption>
5 </caption>
10 <table>
6 <table>
11 <col align="right" />
7 <col align="right" />
@@ -14,69 +10,35 @@
14 <col align="left" />
10 <col align="left" />
15 <thead>
11 <thead>
16 <tr>
12 <tr>
17− <th>
18− Right
13+ <th>Right</th>
19− </th>
20− <th>
21− Left
14+ <th>Left</th>
22− </th>
23− <th>
24− Center
15+ <th>Center</th>
25− </th>
26− <th>
27− Default
16+ <th>Default</th>
28− </th>
29 </tr>
17 </tr>
30 </thead>
18 </thead>
31 <tbody>
19 <tbody>
32 <tr>
20 <tr>
33− <td>
21+ <td>12</td>
34− 12
35− </td>
36− <td>
22+ <td>12</td>
37− 12
38− </td>
39− <td>
23+ <td>12</td>
40− 12
41− </td>
42− <td>
24+ <td>12</td>
43− 12
44− </td>
45 </tr>
25 </tr>
46 <tr>
26 <tr>
47− <td>
48− 123
27+ <td>123</td>
49− </td>
50− <td>
51− 123
28+ <td>123</td>
52− </td>
53− <td>
54− 123
29+ <td>123</td>
55− </td>
56− <td>
57− 123
30+ <td>123</td>
58− </td>
59 </tr>
31 </tr>
60 <tr>
32 <tr>
61− <td>
33+ <td>1</td>
62− 1
63− </td>
64− <td>
34+ <td>1</td>
65− 1
66− </td>
67− <td>
35+ <td>1</td>
68− 1
69− </td>
70− <td>
36+ <td>1</td>
71− 1
72− </td>
73 </tr>
37 </tr>
74 </tbody>
38 </tbody>
75 </table>
39 </table>
76</table-wrap>
40</table-wrap>
77−<p>
78− Simple table without caption:
41+<p>Simple table without caption:</p>
79−</p>
80<table>
42<table>
81 <col align="right" />
43 <col align="right" />
82 <col align="left" />
44 <col align="left" />
@@ -84,73 +46,37 @@
84 <col align="left" />
46 <col align="left" />
85 <thead>
47 <thead>
86 <tr>
48 <tr>
87− <th>
88− Right
49+ <th>Right</th>
89− </th>
90− <th>
91− Left
50+ <th>Left</th>
92− </th>
93− <th>
94− Center
51+ <th>Center</th>
95− </th>
96− <th>
97− Default
52+ <th>Default</th>
98− </th>
99 </tr>
53 </tr>
100 </thead>
54 </thead>
101 <tbody>
55 <tbody>
102 <tr>
56 <tr>
103− <td>
57+ <td>12</td>
104− 12
105− </td>
106− <td>
58+ <td>12</td>
107− 12
108− </td>
109− <td>
59+ <td>12</td>
110− 12
111− </td>
112− <td>
60+ <td>12</td>
113− 12
114− </td>
115 </tr>
61 </tr>
116 <tr>
62 <tr>
117− <td>
118− 123
63+ <td>123</td>
119− </td>
120− <td>
121− 123
64+ <td>123</td>
122− </td>
123− <td>
124− 123
65+ <td>123</td>
125− </td>
126− <td>
127− 123
66+ <td>123</td>
128− </td>
129 </tr>
67 </tr>
130 <tr>
68 <tr>
131− <td>
69+ <td>1</td>
132− 1
133− </td>
134− <td>
70+ <td>1</td>
135− 1
136− </td>
137− <td>
71+ <td>1</td>
138− 1
139− </td>
140− <td>
72+ <td>1</td>
141− 1
142− </td>
143 </tr>
73 </tr>
144 </tbody>
74 </tbody>
145</table>
75</table>
146−<p>
147− Simple table indented two spaces:
76+<p>Simple table indented two spaces:</p>
148−</p>
149<table-wrap>
77<table-wrap>
150 <caption>
78 <caption>
151− <p>
152− Demonstration of simple table syntax.
79+ <p>Demonstration of simple table syntax.</p>
153− </p>
154 </caption>
80 </caption>
155 <table>
81 <table>
156 <col align="right" />
82 <col align="right" />
@@ -159,74 +85,38 @@
159 <col align="left" />
85 <col align="left" />
160 <thead>
86 <thead>
161 <tr>
87 <tr>
162− <th>
163− Right
88+ <th>Right</th>
164− </th>
165− <th>
166− Left
89+ <th>Left</th>
167− </th>
168− <th>
169− Center
90+ <th>Center</th>
170− </th>
171− <th>
172− Default
91+ <th>Default</th>
173− </th>
174 </tr>
92 </tr>
175 </thead>
93 </thead>
176 <tbody>
94 <tbody>
177 <tr>
95 <tr>
178− <td>
96+ <td>12</td>
179− 12
180− </td>
181− <td>
97+ <td>12</td>
182− 12
183− </td>
184− <td>
98+ <td>12</td>
185− 12
186− </td>
187− <td>
99+ <td>12</td>
188− 12
189− </td>
190 </tr>
100 </tr>
191 <tr>
101 <tr>
192− <td>
193− 123
102+ <td>123</td>
194− </td>
195− <td>
196− 123
103+ <td>123</td>
197− </td>
198− <td>
199− 123
104+ <td>123</td>
200− </td>
201− <td>
202− 123
105+ <td>123</td>
203− </td>
204 </tr>
106 </tr>
205 <tr>
107 <tr>
206− <td>
108+ <td>1</td>
207− 1
208− </td>
209− <td>
109+ <td>1</td>
210− 1
211− </td>
212− <td>
110+ <td>1</td>
213− 1
214− </td>
215− <td>
111+ <td>1</td>
216− 1
217− </td>
218 </tr>
112 </tr>
219 </tbody>
113 </tbody>
220 </table>
114 </table>
221</table-wrap>
115</table-wrap>
222−<p>
223− Multiline table with caption:
116+<p>Multiline table with caption:</p>
224−</p>
225<table-wrap>
117<table-wrap>
226 <caption>
118 <caption>
227− <p>
228− Here’s the caption. It may span multiple lines.
119+ <p>Here’s the caption. It may span multiple lines.</p>
229− </p>
230 </caption>
120 </caption>
231 <table>
121 <table>
232 <col width="15*" align="center" />
122 <col width="15*" align="center" />
@@ -235,55 +125,29 @@
235 <col width="33*" align="left" />
125 <col width="33*" align="left" />
236 <thead>
126 <thead>
237 <tr>
127 <tr>
238− <th>
239− Centered Header
128+ <th>Centered Header</th>
240− </th>
241− <th>
242− Left Aligned
129+ <th>Left Aligned</th>
243− </th>
244− <th>
245− Right Aligned
130+ <th>Right Aligned</th>
246− </th>
247− <th>
248− Default aligned
131+ <th>Default aligned</th>
249− </th>
250 </tr>
132 </tr>
251 </thead>
133 </thead>
252 <tbody>
134 <tbody>
253 <tr>
135 <tr>
254− <td>
255− First
136+ <td>First</td>
256− </td>
257− <td>
258− row
137+ <td>row</td>
259− </td>
260− <td>
261− 12.0
138+ <td>12.0</td>
262− </td>
263− <td>
264− Example of a row that spans multiple lines.
139+ <td>Example of a row that spans multiple lines.</td>
265− </td>
266 </tr>
140 </tr>
267 <tr>
141 <tr>
268− <td>
269− Second
142+ <td>Second</td>
270− </td>
271− <td>
272− row
143+ <td>row</td>
273− </td>
274− <td>
144+ <td>5.0</td>
275− 5.0
276− </td>
277− <td>
278− Here’s another one. Note the blank line between rows.
145+ <td>Here’s another one. Note the blank line between rows.</td>
279− </td>
280 </tr>
146 </tr>
281 </tbody>
147 </tbody>
282 </table>
148 </table>
283</table-wrap>
149</table-wrap>
284−<p>
285− Multiline table without caption:
150+<p>Multiline table without caption:</p>
286−</p>
287<table>
151<table>
288 <col width="15*" align="center" />
152 <col width="15*" align="center" />
289 <col width="13*" align="left" />
153 <col width="13*" align="left" />
@@ -291,54 +155,28 @@
291 <col width="33*" align="left" />
155 <col width="33*" align="left" />
292 <thead>
156 <thead>
293 <tr>
157 <tr>
294− <th>
295− Centered Header
158+ <th>Centered Header</th>
296− </th>
297− <th>
298− Left Aligned
159+ <th>Left Aligned</th>
299− </th>
300− <th>
301− Right Aligned
160+ <th>Right Aligned</th>
302− </th>
303− <th>
304− Default aligned
161+ <th>Default aligned</th>
305− </th>
306 </tr>
162 </tr>
307 </thead>
163 </thead>
308 <tbody>
164 <tbody>
309 <tr>
165 <tr>
310− <td>
311− First
166+ <td>First</td>
312− </td>
313− <td>
314− row
167+ <td>row</td>
315− </td>
316− <td>
317− 12.0
168+ <td>12.0</td>
318− </td>
319− <td>
320− Example of a row that spans multiple lines.
169+ <td>Example of a row that spans multiple lines.</td>
321− </td>
322 </tr>
170 </tr>
323 <tr>
171 <tr>
324− <td>
325− Second
172+ <td>Second</td>
326− </td>
327− <td>
328− row
173+ <td>row</td>
329− </td>
330− <td>
174+ <td>5.0</td>
331− 5.0
332− </td>
333− <td>
334− Here’s another one. Note the blank line between rows.
175+ <td>Here’s another one. Note the blank line between rows.</td>
335− </td>
336 </tr>
176 </tr>
337 </tbody>
177 </tbody>
338</table>
178</table>
339−<p>
340− Table without column headers:
179+<p>Table without column headers:</p>
341−</p>
342<table>
180<table>
343 <col align="right" />
181 <col align="right" />
344 <col align="left" />
182 <col align="left" />
@@ -346,52 +184,26 @@
346 <col align="right" />
184 <col align="right" />
347 <tbody>
185 <tbody>
348 <tr>
186 <tr>
349− <td>
187+ <td>12</td>
350− 12
351− </td>
352− <td>
188+ <td>12</td>
353− 12
354− </td>
355− <td>
189+ <td>12</td>
356− 12
357− </td>
358− <td>
190+ <td>12</td>
359− 12
360− </td>
361 </tr>
191 </tr>
362 <tr>
192 <tr>
363− <td>
364− 123
193+ <td>123</td>
365− </td>
366− <td>
367− 123
194+ <td>123</td>
368− </td>
369− <td>
370− 123
195+ <td>123</td>
371− </td>
372− <td>
373− 123
196+ <td>123</td>
374− </td>
375 </tr>
197 </tr>
376 <tr>
198 <tr>
377− <td>
199+ <td>1</td>
378− 1
379− </td>
380− <td>
200+ <td>1</td>
381− 1
382− </td>
383− <td>
201+ <td>1</td>
384− 1
385− </td>
386− <td>
202+ <td>1</td>
387− 1
388− </td>
389 </tr>
203 </tr>
390 </tbody>
204 </tbody>
391</table>
205</table>
392−<p>
393− Multiline table without column headers:
206+<p>Multiline table without column headers:</p>
394−</p>
395<table>
207<table>
396 <col width="15*" align="center" />
208 <col width="15*" align="center" />
397 <col width="13*" align="left" />
209 <col width="13*" align="left" />
@@ -399,32 +211,16 @@
399 <col width="33*" align="left" />
211 <col width="33*" align="left" />
400 <tbody>
212 <tbody>
401 <tr>
213 <tr>
402− <td>
403− First
214+ <td>First</td>
404− </td>
405− <td>
406− row
215+ <td>row</td>
407− </td>
408− <td>
409− 12.0
216+ <td>12.0</td>
410− </td>
411− <td>
412− Example of a row that spans multiple lines.
217+ <td>Example of a row that spans multiple lines.</td>
413− </td>
414 </tr>
218 </tr>
415 <tr>
219 <tr>
416− <td>
417− Second
220+ <td>Second</td>
418− </td>
419− <td>
420− row
221+ <td>row</td>
421− </td>
422− <td>
222+ <td>5.0</td>
423− 5.0
424− </td>
425− <td>
426− Here’s another one. Note the blank line between rows.
223+ <td>Here’s another one. Note the blank line between rows.</td>
427− </td>
428 </tr>
224 </tr>
429 </tbody>
225 </tbody>
430</table>
226</table>
test/writer.jats+357−923
@@ -32,10 +32,8 @@
32</article-meta>
32</article-meta>
33</front>
33</front>
34<body>
34<body>
35−<p>
36− This is a set of tests for pandoc. Most of them are adapted from John
35+<p>This is a set of tests for pandoc. Most of them are adapted from John
37− Gruber’s markdown test suite.
36+Gruber’s markdown test suite.</p>
38−</p>
39<sec id="headers">
37<sec id="headers">
40 <title>Headers</title>
38 <title>Headers</title>
41 <sec id="level-2-with-an-embedded-link">
39 <sec id="level-2-with-an-embedded-link">
@@ -59,93 +57,57 @@
59 <title>Level 2 with <italic>emphasis</italic></title>
57 <title>Level 2 with <italic>emphasis</italic></title>
60 <sec id="level-3">
58 <sec id="level-3">
61 <title>Level 3</title>
59 <title>Level 3</title>
62− <p>
63− with no blank line
60+ <p>with no blank line</p>
64− </p>
65 </sec>
61 </sec>
66 </sec>
62 </sec>
67 <sec id="level-2">
63 <sec id="level-2">
68 <title>Level 2</title>
64 <title>Level 2</title>
69− <p>
70− with no blank line
65+ <p>with no blank line</p>
71− </p>
72 </sec>
66 </sec>
73</sec>
67</sec>
74<sec id="paragraphs">
68<sec id="paragraphs">
75 <title>Paragraphs</title>
69 <title>Paragraphs</title>
76− <p>
77− Here’s a regular paragraph.
70+ <p>Here’s a regular paragraph.</p>
78− </p>
79− <p>
80− In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
71+ <p>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
81− item. Because a hard-wrapped line in the middle of a paragraph looked like
72+ item. Because a hard-wrapped line in the middle of a paragraph looked like a
82− a list item.
73+ list item.</p>
83− </p>
84− <p>
85− Here’s one with a bullet. * criminey.
74+ <p>Here’s one with a bullet. * criminey.</p>
86− </p>
87− <p>
88− There should be a hard line break<break />here.
75+ <p>There should be a hard line break<break />here.</p>
89− </p>
90</sec>
76</sec>
91<sec id="block-quotes">
77<sec id="block-quotes">
92 <title>Block Quotes</title>
78 <title>Block Quotes</title>
93− <p>
94− E-mail style:
79+ <p>E-mail style:</p>
95− </p>
96 <disp-quote>
80 <disp-quote>
97− <p>
98− This is a block quote. It is pretty short.
81+ <p>This is a block quote. It is pretty short.</p>
99− </p>
100 </disp-quote>
82 </disp-quote>
101 <disp-quote>
83 <disp-quote>
102− <p>
103− Code in a block quote:
84+ <p>Code in a block quote:</p>
104− </p>
105 <preformat>sub status {
85 <preformat>sub status {
106 print &quot;working&quot;;
86 print &quot;working&quot;;
107}</preformat>
87}</preformat>
108− <p>
109− A list:
88+ <p>A list:</p>
110− </p>
111 <list list-type="order">
89 <list list-type="order">
112 <list-item>
90 <list-item>
113− <p>
114− item one
91+ <p>item one</p>
115− </p>
116 </list-item>
92 </list-item>
117 <list-item>
93 <list-item>
118− <p>
119− item two
94+ <p>item two</p>
120− </p>
121 </list-item>
95 </list-item>
122 </list>
96 </list>
123− <p>
124− Nested block quotes:
97+ <p>Nested block quotes:</p>
125− </p>
126 <disp-quote>
98 <disp-quote>
127− <p>
128− nested
99+ <p>nested</p>
129− </p>
130 </disp-quote>
100 </disp-quote>
131 <disp-quote>
101 <disp-quote>
132− <p>
133− nested
102+ <p>nested</p>
134− </p>
135 </disp-quote>
103 </disp-quote>
136 </disp-quote>
104 </disp-quote>
137− <p>
138− This should not be a block quote: 2 &gt; 1.
105+ <p>This should not be a block quote: 2 &gt; 1.</p>
139− </p>
140− <p>
141− And a following paragraph.
106+ <p>And a following paragraph.</p>
142− </p>
143</sec>
107</sec>
144<sec id="code-blocks">
108<sec id="code-blocks">
145 <title>Code Blocks</title>
109 <title>Code Blocks</title>
146− <p>
147− Code:
110+ <p>Code:</p>
148− </p>
149 <preformat>---- (should be four hyphens)
111 <preformat>---- (should be four hyphens)
150
112
151sub status {
113sub status {
@@ -153,9 +115,7 @@ sub status {
153}
115}
154
116
155this code block is indented by one tab</preformat>
117this code block is indented by one tab</preformat>
156− <p>
157− And:
118+ <p>And:</p>
158− </p>
159 <preformat> this code block is indented by two tabs
119 <preformat> this code block is indented by two tabs
160
120
161These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
121These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
@@ -164,231 +124,141 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
164 <title>Lists</title>
124 <title>Lists</title>
165 <sec id="unordered">
125 <sec id="unordered">
166 <title>Unordered</title>
126 <title>Unordered</title>
167− <p>
168− Asterisks tight:
127+ <p>Asterisks tight:</p>
169− </p>
170 <list list-type="bullet">
128 <list list-type="bullet">
171 <list-item>
129 <list-item>
172− <p>
173− asterisk 1
130+ <p>asterisk 1</p>
174− </p>
175 </list-item>
131 </list-item>
176 <list-item>
132 <list-item>
177− <p>
178− asterisk 2
133+ <p>asterisk 2</p>
179− </p>
180 </list-item>
134 </list-item>
181 <list-item>
135 <list-item>
182− <p>
183− asterisk 3
136+ <p>asterisk 3</p>
184− </p>
185 </list-item>
137 </list-item>
186 </list>
138 </list>
187− <p>
188− Asterisks loose:
139+ <p>Asterisks loose:</p>
189− </p>
190 <list list-type="bullet">
140 <list list-type="bullet">
191 <list-item>
141 <list-item>
192− <p>
193− asterisk 1
142+ <p>asterisk 1</p>
194− </p>
195 </list-item>
143 </list-item>
196 <list-item>
144 <list-item>
197− <p>
198− asterisk 2
145+ <p>asterisk 2</p>
199− </p>
200 </list-item>
146 </list-item>
201 <list-item>
147 <list-item>
202− <p>
203− asterisk 3
148+ <p>asterisk 3</p>
204− </p>
205 </list-item>
149 </list-item>
206 </list>
150 </list>
207− <p>
208− Pluses tight:
151+ <p>Pluses tight:</p>
209− </p>
210 <list list-type="bullet">
152 <list list-type="bullet">
211 <list-item>
153 <list-item>
212− <p>
213− Plus 1
154+ <p>Plus 1</p>
214− </p>
215 </list-item>
155 </list-item>
216 <list-item>
156 <list-item>
217− <p>
218− Plus 2
157+ <p>Plus 2</p>
219− </p>
220 </list-item>
158 </list-item>
221 <list-item>
159 <list-item>
222− <p>
223− Plus 3
160+ <p>Plus 3</p>
224− </p>
225 </list-item>
161 </list-item>
226 </list>
162 </list>
227− <p>
228− Pluses loose:
163+ <p>Pluses loose:</p>
229− </p>
230 <list list-type="bullet">
164 <list list-type="bullet">
231 <list-item>
165 <list-item>
232− <p>
233− Plus 1
166+ <p>Plus 1</p>
234− </p>
235 </list-item>
167 </list-item>
236 <list-item>
168 <list-item>
237− <p>
238− Plus 2
169+ <p>Plus 2</p>
239− </p>
240 </list-item>
170 </list-item>
241 <list-item>
171 <list-item>
242− <p>
243− Plus 3
172+ <p>Plus 3</p>
244− </p>
245 </list-item>
173 </list-item>
246 </list>
174 </list>
247− <p>
248− Minuses tight:
175+ <p>Minuses tight:</p>
249− </p>
250 <list list-type="bullet">
176 <list list-type="bullet">
251 <list-item>
177 <list-item>
252− <p>
253− Minus 1
178+ <p>Minus 1</p>
254− </p>
255 </list-item>
179 </list-item>
256 <list-item>
180 <list-item>
257− <p>
258− Minus 2
181+ <p>Minus 2</p>
259− </p>
260 </list-item>
182 </list-item>
261 <list-item>
183 <list-item>
262− <p>
263− Minus 3
184+ <p>Minus 3</p>
264− </p>
265 </list-item>
185 </list-item>
266 </list>
186 </list>
267− <p>
268− Minuses loose:
187+ <p>Minuses loose:</p>
269− </p>
270 <list list-type="bullet">
188 <list list-type="bullet">
271 <list-item>
189 <list-item>
272− <p>
273− Minus 1
190+ <p>Minus 1</p>
274− </p>
275 </list-item>
191 </list-item>
276 <list-item>
192 <list-item>
277− <p>
278− Minus 2
193+ <p>Minus 2</p>
279− </p>
280 </list-item>
194 </list-item>
281 <list-item>
195 <list-item>
282− <p>
283− Minus 3
196+ <p>Minus 3</p>
284− </p>
285 </list-item>
197 </list-item>
286 </list>
198 </list>
287 </sec>
199 </sec>
288 <sec id="ordered">
200 <sec id="ordered">
289 <title>Ordered</title>
201 <title>Ordered</title>
290− <p>
291− Tight:
202+ <p>Tight:</p>
292− </p>
293 <list list-type="order">
203 <list list-type="order">
294 <list-item>
204 <list-item>
295− <p>
296− First
205+ <p>First</p>
297− </p>
298 </list-item>
206 </list-item>
299 <list-item>
207 <list-item>
300− <p>
301− Second
208+ <p>Second</p>
302− </p>
303 </list-item>
209 </list-item>
304 <list-item>
210 <list-item>
305− <p>
306− Third
211+ <p>Third</p>
307− </p>
308 </list-item>
212 </list-item>
309 </list>
213 </list>
310− <p>
311− and:
214+ <p>and:</p>
312− </p>
313 <list list-type="order">
215 <list list-type="order">
314 <list-item>
216 <list-item>
315− <p>
316− One
217+ <p>One</p>
317− </p>
318 </list-item>
218 </list-item>
319 <list-item>
219 <list-item>
320− <p>
321− Two
220+ <p>Two</p>
322− </p>
323 </list-item>
221 </list-item>
324 <list-item>
222 <list-item>
325− <p>
326− Three
223+ <p>Three</p>
327− </p>
328 </list-item>
224 </list-item>
329 </list>
225 </list>
330− <p>
331− Loose using tabs:
226+ <p>Loose using tabs:</p>
332− </p>
333 <list list-type="order">
227 <list list-type="order">
334 <list-item>
228 <list-item>
335− <p>
336− First
229+ <p>First</p>
337− </p>
338 </list-item>
230 </list-item>
339 <list-item>
231 <list-item>
340− <p>
341− Second
232+ <p>Second</p>
342− </p>
343 </list-item>
233 </list-item>
344 <list-item>
234 <list-item>
345− <p>
346− Third
235+ <p>Third</p>
347− </p>
348 </list-item>
236 </list-item>
349 </list>
237 </list>
350− <p>
351− and using spaces:
238+ <p>and using spaces:</p>
352− </p>
353 <list list-type="order">
239 <list list-type="order">
354 <list-item>
240 <list-item>
355− <p>
356− One
241+ <p>One</p>
357− </p>
358 </list-item>
242 </list-item>
359 <list-item>
243 <list-item>
360− <p>
361− Two
244+ <p>Two</p>
362− </p>
363 </list-item>
245 </list-item>
364 <list-item>
246 <list-item>
365− <p>
366− Three
247+ <p>Three</p>
367− </p>
368 </list-item>
248 </list-item>
369 </list>
249 </list>
370− <p>
371− Multiple paragraphs:
250+ <p>Multiple paragraphs:</p>
372− </p>
373 <list list-type="order">
251 <list list-type="order">
374 <list-item>
252 <list-item>
375− <p>
376− Item 1, graf one.
253+ <p>Item 1, graf one.</p>
377− </p>
378− <p>
379− Item 1. graf two. The quick brown fox jumped over the lazy dog’s
254+ <p>Item 1. graf two. The quick brown fox jumped over the lazy dog’s
380− back.
255+ back.</p>
381− </p>
382 </list-item>
256 </list-item>
383 <list-item>
257 <list-item>
384− <p>
385− Item 2.
258+ <p>Item 2.</p>
386− </p>
387 </list-item>
259 </list-item>
388 <list-item>
260 <list-item>
389− <p>
390− Item 3.
261+ <p>Item 3.</p>
391− </p>
392 </list-item>
262 </list-item>
393 </list>
263 </list>
394 </sec>
264 </sec>
@@ -396,97 +266,63 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
396 <title>Nested</title>
266 <title>Nested</title>
397 <list list-type="bullet">
267 <list list-type="bullet">
398 <list-item>
268 <list-item>
399− <p>
400− Tab
269+ <p>Tab</p>
401− </p>
402 <list list-type="bullet">
270 <list list-type="bullet">
403 <list-item>
271 <list-item>
404− <p>
405− Tab
272+ <p>Tab</p>
406− </p>
407 <list list-type="bullet">
273 <list list-type="bullet">
408 <list-item>
274 <list-item>
409− <p>
410− Tab
275+ <p>Tab</p>
411− </p>
412 </list-item>
276 </list-item>
413 </list>
277 </list>
414 </list-item>
278 </list-item>
415 </list>
279 </list>
416 </list-item>
280 </list-item>
417 </list>
281 </list>
418− <p>
419− Here’s another:
282+ <p>Here’s another:</p>
420− </p>
421 <list list-type="order">
283 <list list-type="order">
422 <list-item>
284 <list-item>
423− <p>
424− First
285+ <p>First</p>
425− </p>
426 </list-item>
286 </list-item>
427 <list-item>
287 <list-item>
428− <p>
429− Second:
288+ <p>Second:</p>
430− </p>
431 <list list-type="bullet">
289 <list list-type="bullet">
432 <list-item>
290 <list-item>
433− <p>
434− Fee
291+ <p>Fee</p>
435− </p>
436 </list-item>
292 </list-item>
437 <list-item>
293 <list-item>
438− <p>
439− Fie
294+ <p>Fie</p>
440− </p>
441 </list-item>
295 </list-item>
442 <list-item>
296 <list-item>
443− <p>
444− Foe
297+ <p>Foe</p>
445− </p>
446 </list-item>
298 </list-item>
447 </list>
299 </list>
448 </list-item>
300 </list-item>
449 <list-item>
301 <list-item>
450− <p>
451− Third
302+ <p>Third</p>
452− </p>
453 </list-item>
303 </list-item>
454 </list>
304 </list>
455− <p>
456− Same thing but with paragraphs:
305+ <p>Same thing but with paragraphs:</p>
457− </p>
458 <list list-type="order">
306 <list list-type="order">
459 <list-item>
307 <list-item>
460− <p>
461− First
308+ <p>First</p>
462− </p>
463 </list-item>
309 </list-item>
464 <list-item>
310 <list-item>
465− <p>
466− Second:
311+ <p>Second:</p>
467− </p>
468 <list list-type="bullet">
312 <list list-type="bullet">
469 <list-item>
313 <list-item>
470− <p>
471− Fee
314+ <p>Fee</p>
472− </p>
473 </list-item>
315 </list-item>
474 <list-item>
316 <list-item>
475− <p>
476− Fie
317+ <p>Fie</p>
477− </p>
478 </list-item>
318 </list-item>
479 <list-item>
319 <list-item>
480− <p>
481− Foe
320+ <p>Foe</p>
482− </p>
483 </list-item>
321 </list-item>
484 </list>
322 </list>
485 </list-item>
323 </list-item>
486 <list-item>
324 <list-item>
487− <p>
488− Third
325+ <p>Third</p>
489− </p>
490 </list-item>
326 </list-item>
491 </list>
327 </list>
492 </sec>
328 </sec>
@@ -494,24 +330,16 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
494 <title>Tabs and spaces</title>
330 <title>Tabs and spaces</title>
495 <list list-type="bullet">
331 <list list-type="bullet">
496 <list-item>
332 <list-item>
497− <p>
498− this is a list item indented with tabs
333+ <p>this is a list item indented with tabs</p>
499− </p>
500 </list-item>
334 </list-item>
501 <list-item>
335 <list-item>
502− <p>
503− this is a list item indented with spaces
336+ <p>this is a list item indented with spaces</p>
504− </p>
505 <list list-type="bullet">
337 <list list-type="bullet">
506 <list-item>
338 <list-item>
507− <p>
508− this is an example list item indented with tabs
339+ <p>this is an example list item indented with tabs</p>
509− </p>
510 </list-item>
340 </list-item>
511 <list-item>
341 <list-item>
512− <p>
513− this is an example list item indented with spaces
342+ <p>this is an example list item indented with spaces</p>
514− </p>
515 </list-item>
343 </list-item>
516 </list>
344 </list>
517 </list-item>
345 </list-item>
@@ -521,90 +349,50 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
521 <title>Fancy list markers</title>
349 <title>Fancy list markers</title>
522 <list list-type="order">
350 <list list-type="order">
523 <list-item>
351 <list-item>
524− <label>
352+ <label>(2)</label>
525− (2)
526− </label>
527− <p>
528− begins with 2
353+ <p>begins with 2</p>
529− </p>
530 </list-item>
354 </list-item>
531 <list-item>
355 <list-item>
532− <label>
356+ <label>(3)</label>
533− (3)
534− </label>
535− <p>
536− and now 3
357+ <p>and now 3</p>
537− </p>
538− <p>
539− with a continuation
358+ <p>with a continuation</p>
540− </p>
541 <list list-type="roman-lower">
359 <list list-type="roman-lower">
542 <list-item>
360 <list-item>
543− <label>
361+ <label>iv.</label>
544− iv.
545− </label>
546− <p>
547− sublist with roman numerals, starting with 4
362+ <p>sublist with roman numerals, starting with 4</p>
548− </p>
549 </list-item>
363 </list-item>
550 <list-item>
364 <list-item>
551− <label>
365+ <label>v.</label>
552− v.
553− </label>
554− <p>
555− more items
366+ <p>more items</p>
556− </p>
557 <list list-type="alpha-upper">
367 <list list-type="alpha-upper">
558 <list-item>
368 <list-item>
559− <label>
369+ <label>(A)</label>
560− (A)
561− </label>
562− <p>
563− a subsublist
370+ <p>a subsublist</p>
564− </p>
565 </list-item>
371 </list-item>
566 <list-item>
372 <list-item>
567− <label>
373+ <label>(B)</label>
568− (B)
569− </label>
570− <p>
571− a subsublist
374+ <p>a subsublist</p>
572− </p>
573 </list-item>
375 </list-item>
574 </list>
376 </list>
575 </list-item>
377 </list-item>
576 </list>
378 </list>
577 </list-item>
379 </list-item>
578 </list>
380 </list>
579− <p>
580− Nesting:
381+ <p>Nesting:</p>
581− </p>
582 <list list-type="alpha-upper">
382 <list list-type="alpha-upper">
583 <list-item>
383 <list-item>
584− <p>
585− Upper Alpha
384+ <p>Upper Alpha</p>
586− </p>
587 <list list-type="roman-upper">
385 <list list-type="roman-upper">
588 <list-item>
386 <list-item>
589− <p>
590− Upper Roman.
387+ <p>Upper Roman.</p>
591− </p>
592 <list list-type="order">
388 <list list-type="order">
593 <list-item>
389 <list-item>
594− <label>
390+ <label>(6)</label>
595− (6)
596− </label>
597− <p>
598− Decimal start with 6
391+ <p>Decimal start with 6</p>
599− </p>
600 <list list-type="alpha-lower">
392 <list list-type="alpha-lower">
601 <list-item>
393 <list-item>
602− <label>
394+ <label>c)</label>
603− c)
604− </label>
605− <p>
606− Lower alpha with paren
395+ <p>Lower alpha with paren</p>
607− </p>
608 </list-item>
396 </list-item>
609 </list>
397 </list>
610 </list-item>
398 </list-item>
@@ -613,277 +401,163 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
613 </list>
401 </list>
614 </list-item>
402 </list-item>
615 </list>
403 </list>
616− <p>
617− Autonumbering:
404+ <p>Autonumbering:</p>
618− </p>
619 <list list-type="order">
405 <list list-type="order">
620 <list-item>
406 <list-item>
621− <p>
622− Autonumber.
407+ <p>Autonumber.</p>
623− </p>
624 </list-item>
408 </list-item>
625 <list-item>
409 <list-item>
626− <p>
627− More.
410+ <p>More.</p>
628− </p>
629 <list list-type="order">
411 <list list-type="order">
630 <list-item>
412 <list-item>
631− <p>
632− Nested.
413+ <p>Nested.</p>
633− </p>
634 </list-item>
414 </list-item>
635 </list>
415 </list>
636 </list-item>
416 </list-item>
637 </list>
417 </list>
638− <p>
639− Should not be a list item:
418+ <p>Should not be a list item:</p>
640− </p>
641− <p>
642− M.A. 2007
419+ <p>M.A. 2007</p>
643− </p>
644− <p>
645− B. Williams
420+ <p>B. Williams</p>
646− </p>
647 </sec>
421 </sec>
648</sec>
422</sec>
649<sec id="definition-lists">
423<sec id="definition-lists">
650 <title>Definition Lists</title>
424 <title>Definition Lists</title>
651− <p>
652− Tight using spaces:
425+ <p>Tight using spaces:</p>
653− </p>
654 <def-list>
426 <def-list>
655 <def-item>
427 <def-item>
656− <term>
657− apple
428+ <term>apple</term>
658− </term>
659 <def>
429 <def>
660− <p>
661− red fruit
430+ <p>red fruit</p>
662− </p>
663 </def>
431 </def>
664 </def-item>
432 </def-item>
665 <def-item>
433 <def-item>
666− <term>
667− orange
434+ <term>orange</term>
668− </term>
669 <def>
435 <def>
670− <p>
671− orange fruit
436+ <p>orange fruit</p>
672− </p>
673 </def>
437 </def>
674 </def-item>
438 </def-item>
675 <def-item>
439 <def-item>
676− <term>
677− banana
440+ <term>banana</term>
678− </term>
679 <def>
441 <def>
680− <p>
681− yellow fruit
442+ <p>yellow fruit</p>
682− </p>
683 </def>
443 </def>
684 </def-item>
444 </def-item>
685 </def-list>
445 </def-list>
686− <p>
687− Tight using tabs:
446+ <p>Tight using tabs:</p>
688− </p>
689 <def-list>
447 <def-list>
690 <def-item>
448 <def-item>
691− <term>
692− apple
449+ <term>apple</term>
693− </term>
694 <def>
450 <def>
695− <p>
696− red fruit
451+ <p>red fruit</p>
697− </p>
698 </def>
452 </def>
699 </def-item>
453 </def-item>
700 <def-item>
454 <def-item>
701− <term>
702− orange
455+ <term>orange</term>
703− </term>
704 <def>
456 <def>
705− <p>
706− orange fruit
457+ <p>orange fruit</p>
707− </p>
708 </def>
458 </def>
709 </def-item>
459 </def-item>
710 <def-item>
460 <def-item>
711− <term>
712− banana
461+ <term>banana</term>
713− </term>
714 <def>
462 <def>
715− <p>
716− yellow fruit
463+ <p>yellow fruit</p>
717− </p>
718 </def>
464 </def>
719 </def-item>
465 </def-item>
720 </def-list>
466 </def-list>
721− <p>
722− Loose:
467+ <p>Loose:</p>
723− </p>
724 <def-list>
468 <def-list>
725 <def-item>
469 <def-item>
726− <term>
727− apple
470+ <term>apple</term>
728− </term>
729 <def>
471 <def>
730− <p>
731− red fruit
472+ <p>red fruit</p>
732− </p>
733 </def>
473 </def>
734 </def-item>
474 </def-item>
735 <def-item>
475 <def-item>
736− <term>
737− orange
476+ <term>orange</term>
738− </term>
739 <def>
477 <def>
740− <p>
741− orange fruit
478+ <p>orange fruit</p>
742− </p>
743 </def>
479 </def>
744 </def-item>
480 </def-item>
745 <def-item>
481 <def-item>
746− <term>
747− banana
482+ <term>banana</term>
748− </term>
749 <def>
483 <def>
750− <p>
751− yellow fruit
484+ <p>yellow fruit</p>
752− </p>
753 </def>
485 </def>
754 </def-item>
486 </def-item>
755 </def-list>
487 </def-list>
756− <p>
757− Multiple blocks with italics:
488+ <p>Multiple blocks with italics:</p>
758− </p>
759 <def-list>
489 <def-list>
760 <def-item>
490 <def-item>
761− <term>
762− <italic>apple</italic>
491+ <term><italic>apple</italic></term>
763− </term>
764 <def>
492 <def>
765− <p>
766− red fruit
493+ <p>red fruit</p>
767− </p>
768− <p>
769− contains seeds, crisp, pleasant to taste
494+ <p>contains seeds, crisp, pleasant to taste</p>
770− </p>
771 </def>
495 </def>
772 </def-item>
496 </def-item>
773 <def-item>
497 <def-item>
774− <term>
775− <italic>orange</italic>
498+ <term><italic>orange</italic></term>
776− </term>
777 <def>
499 <def>
778− <p>
779− orange fruit
500+ <p>orange fruit</p>
780− </p>
781 <preformat>{ orange code block }</preformat>
501 <preformat>{ orange code block }</preformat>
782 <disp-quote>
502 <disp-quote>
783− <p>
784− orange block quote
503+ <p>orange block quote</p>
785− </p>
786 </disp-quote>
504 </disp-quote>
787 </def>
505 </def>
788 </def-item>
506 </def-item>
789 </def-list>
507 </def-list>
790− <p>
791− Multiple definitions, tight:
508+ <p>Multiple definitions, tight:</p>
792− </p>
793 <def-list>
509 <def-list>
794 <def-item>
510 <def-item>
795− <term>
796− apple
511+ <term>apple</term>
797− </term>
798 <def>
512 <def>
799− <p>
800− red fruit
513+ <p>red fruit</p>
801− </p>
802− <p>
803− computer
514+ <p>computer</p>
804− </p>
805 </def>
515 </def>
806 </def-item>
516 </def-item>
807 <def-item>
517 <def-item>
808− <term>
809− orange
518+ <term>orange</term>
810− </term>
811 <def>
519 <def>
812− <p>
813− orange fruit
520+ <p>orange fruit</p>
814− </p>
815− <p>
816− bank
521+ <p>bank</p>
817− </p>
818 </def>
522 </def>
819 </def-item>
523 </def-item>
820 </def-list>
524 </def-list>
821− <p>
822− Multiple definitions, loose:
525+ <p>Multiple definitions, loose:</p>
823− </p>
824 <def-list>
526 <def-list>
825 <def-item>
527 <def-item>
826− <term>
827− apple
528+ <term>apple</term>
828− </term>
829 <def>
529 <def>
830− <p>
831− red fruit
530+ <p>red fruit</p>
832− </p>
833− <p>
834− computer
531+ <p>computer</p>
835− </p>
836 </def>
532 </def>
837 </def-item>
533 </def-item>
838 <def-item>
534 <def-item>
839− <term>
840− orange
535+ <term>orange</term>
841− </term>
842 <def>
536 <def>
843− <p>
844− orange fruit
537+ <p>orange fruit</p>
845− </p>
846− <p>
847− bank
538+ <p>bank</p>
848− </p>
849 </def>
539 </def>
850 </def-item>
540 </def-item>
851 </def-list>
541 </def-list>
852− <p>
853− Blank line after term, indented marker, alternate markers:
542+ <p>Blank line after term, indented marker, alternate markers:</p>
854− </p>
855 <def-list>
543 <def-list>
856 <def-item>
544 <def-item>
857− <term>
858− apple
545+ <term>apple</term>
859− </term>
860 <def>
546 <def>
861− <p>
862− red fruit
547+ <p>red fruit</p>
863− </p>
864− <p>
865− computer
548+ <p>computer</p>
866− </p>
867 </def>
549 </def>
868 </def-item>
550 </def-item>
869 <def-item>
551 <def-item>
870− <term>
871− orange
552+ <term>orange</term>
872− </term>
873 <def>
553 <def>
874− <p>
875− orange fruit
554+ <p>orange fruit</p>
876− </p>
877 <list list-type="order">
555 <list list-type="order">
878 <list-item>
556 <list-item>
879− <p>
880− sublist
557+ <p>sublist</p>
881− </p>
882 </list-item>
558 </list-item>
883 <list-item>
559 <list-item>
884− <p>
885− sublist
560+ <p>sublist</p>
886− </p>
887 </list-item>
561 </list-item>
888 </list>
562 </list>
889 </def>
563 </def>
@@ -892,555 +566,315 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
892</sec>
566</sec>
893<sec id="html-blocks">
567<sec id="html-blocks">
894 <title>HTML Blocks</title>
568 <title>HTML Blocks</title>
895− <p>
896− Simple block on one line:
569+ <p>Simple block on one line:</p>
897− </p>
898 <boxed-text>
570 <boxed-text>
899− <p>
900− foo
571+ <p>foo</p>
901− </p>
902 </boxed-text>
572 </boxed-text>
903− <p>
904− And nested without indentation:
573+ <p>And nested without indentation:</p>
905− </p>
906 <boxed-text>
574 <boxed-text>
907 <boxed-text>
575 <boxed-text>
908 <boxed-text>
576 <boxed-text>
909− <p>
910− foo
577+ <p>foo</p>
911− </p>
912 </boxed-text>
578 </boxed-text>
913 </boxed-text>
579 </boxed-text>
914 <boxed-text>
580 <boxed-text>
915− <p>
916− bar
581+ <p>bar</p>
917− </p>
918 </boxed-text>
582 </boxed-text>
919 </boxed-text>
583 </boxed-text>
920− <p>
921− Interpreted markdown in a table:
584+ <p>Interpreted markdown in a table:</p>
922− </p>
923− <p>
924− This is <italic>emphasized</italic>
585+ <p>This is <italic>emphasized</italic></p>
925− </p>
926− <p>
927− And this is <bold role="strong">strong</bold>
586+ <p>And this is <bold role="strong">strong</bold></p>
928− </p>
929− <p>
930− Here’s a simple block:
587+ <p>Here’s a simple block:</p>
931− </p>
932 <boxed-text>
588 <boxed-text>
933− <p>
934− foo
589+ <p>foo</p>
935− </p>
936 </boxed-text>
590 </boxed-text>
937− <p>
938− This should be a code block, though:
591+ <p>This should be a code block, though:</p>
939− </p>
940 <preformat>&lt;div&gt;
592 <preformat>&lt;div&gt;
941 foo
593 foo
942&lt;/div&gt;</preformat>
594&lt;/div&gt;</preformat>
943− <p>
944− As should this:
595+ <p>As should this:</p>
945− </p>
946 <preformat>&lt;div&gt;foo&lt;/div&gt;</preformat>
596 <preformat>&lt;div&gt;foo&lt;/div&gt;</preformat>
947− <p>
948− Now, nested:
597+ <p>Now, nested:</p>
949− </p>
950 <boxed-text>
598 <boxed-text>
951 <boxed-text>
599 <boxed-text>
952 <boxed-text>
600 <boxed-text>
953− <p>
954− foo
601+ <p>foo</p>
955− </p>
956 </boxed-text>
602 </boxed-text>
957 </boxed-text>
603 </boxed-text>
958 </boxed-text>
604 </boxed-text>
959− <p>
960− This should just be an HTML comment:
605+ <p>This should just be an HTML comment:</p>
961− </p>
962− <p>
963− Multiline:
606+ <p>Multiline:</p>
964− </p>
965− <p>
966− Code block:
607+ <p>Code block:</p>
967− </p>
968 <preformat>&lt;!-- Comment --&gt;</preformat>
608 <preformat>&lt;!-- Comment --&gt;</preformat>
969− <p>
970− Just plain comment, with trailing spaces on the line:
609+ <p>Just plain comment, with trailing spaces on the line:</p>
971− </p>
972− <p>
973− Code:
610+ <p>Code:</p>
974− </p>
975 <preformat>&lt;hr /&gt;</preformat>
611 <preformat>&lt;hr /&gt;</preformat>
976− <p>
977− Hr’s:
612+ <p>Hr’s:</p>
978− </p>
979</sec>
613</sec>
980<sec id="inline-markup">
614<sec id="inline-markup">
981 <title>Inline Markup</title>
615 <title>Inline Markup</title>
982− <p>
983− This is <italic>emphasized</italic>, and so <italic>is this</italic>.
616+ <p>This is <italic>emphasized</italic>, and so <italic>is this</italic>.</p>
984− </p>
985− <p>
986− This is <bold role="strong">strong</bold>, and so <bold role="strong">is
617+ <p>This is <bold role="strong">strong</bold>, and so <bold role="strong">is
987− this</bold>.
618+ this</bold>.</p>
988− </p>
989− <p>
990− An <italic><ext-link ext-link-type="uri" xlink:href="/url">emphasized
619+ <p>An <italic><ext-link ext-link-type="uri" xlink:href="/url">emphasized
991− link</ext-link></italic>.
620+ link</ext-link></italic>.</p>
992− </p>
993− <p>
994− <bold role="strong"><italic>This is strong and em.</italic></bold>
621+ <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
995− </p>
996− <p>
997− So is <bold role="strong"><italic>this</italic></bold> word.
622+ <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
998− </p>
999− <p>
1000− <bold role="strong"><italic>This is strong and em.</italic></bold>
623+ <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
1001− </p>
1002− <p>
1003− So is <bold role="strong"><italic>this</italic></bold> word.
624+ <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
1004− </p>
1005− <p>
1006− This is code: <monospace>&gt;</monospace>, <monospace>$</monospace>,
625+ <p>This is code: <monospace>&gt;</monospace>, <monospace>$</monospace>,
1007− <monospace>\</monospace>, <monospace>\$</monospace>,
626+ <monospace>\</monospace>, <monospace>\$</monospace>,
1008− <monospace>&lt;html&gt;</monospace>.
627+ <monospace>&lt;html&gt;</monospace>.</p>
1009− </p>
1010− <p>
1011− <strike>This is <italic>strikeout</italic>.</strike>
628+ <p><strike>This is <italic>strikeout</italic>.</strike></p>
1012− </p>
1013− <p>
1014− Superscripts: a<sup>bc</sup>d a<sup><italic>hello</italic></sup>
629+ <p>Superscripts: a<sup>bc</sup>d a<sup><italic>hello</italic></sup>
1015− a<sup>hello there</sup>.
630+ a<sup>hello there</sup>.</p>
1016− </p>
1017− <p>
1018− Subscripts: H<sub>2</sub>O, H<sub>23</sub>O, H<sub>many of them</sub>O.
631+ <p>Subscripts: H<sub>2</sub>O, H<sub>23</sub>O,
1019− </p>
632+ H<sub>many of them</sub>O.</p>
1020− <p>
1021− These should not be superscripts or subscripts, because of the unescaped
633+ <p>These should not be superscripts or subscripts, because of the unescaped
1022− spaces: a^b c^d, a~b c~d.
634+ spaces: a^b c^d, a~b c~d.</p>
1023− </p>
1024</sec>
635</sec>
1025<sec id="smart-quotes-ellipses-dashes">
636<sec id="smart-quotes-ellipses-dashes">
1026 <title>Smart quotes, ellipses, dashes</title>
637 <title>Smart quotes, ellipses, dashes</title>
1027− <p>
1028− “Hello,” said the spider. “‘Shelob’ is my name.”
638+ <p>“Hello,” said the spider. “‘Shelob’ is my name.”</p>
1029− </p>
1030− <p>
1031− ‘A’, ‘B’, and ‘C’ are letters.
639+ <p>‘A’, ‘B’, and ‘C’ are letters.</p>
1032− </p>
1033− <p>
1034− ‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’
640+ <p>‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’</p>
1035− </p>
1036− <p>
1037− ‘He said, “I want to go.”’ Were you alive in the 70’s?
641+ <p>‘He said, “I want to go.”’ Were you alive in the 70’s?</p>
1038− </p>
1039− <p>
1040− Here is some quoted ‘<monospace>code</monospace>’ and a
642+ <p>Here is some quoted ‘<monospace>code</monospace>’ and a
1041− “<ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">quoted
643+ “<ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">quoted
1042− link</ext-link>”.
644+ link</ext-link>”.</p>
1043− </p>
1044− <p>
1045− Some dashes: one—two — three—four — five.
645+ <p>Some dashes: one—two — three—four — five.</p>
1046− </p>
1047− <p>
1048− Dashes between numbers: 5–7, 255–66, 1987–1999.
646+ <p>Dashes between numbers: 5–7, 255–66, 1987–1999.</p>
1049− </p>
1050− <p>
1051− Ellipses…and…and….
647+ <p>Ellipses…and…and….</p>
1052− </p>
1053</sec>
648</sec>
1054<sec id="latex">
649<sec id="latex">
1055 <title>LaTeX</title>
650 <title>LaTeX</title>
1056 <list list-type="bullet">
651 <list list-type="bullet">
1057 <list-item>
652 <list-item>
1058− <p>
653+ <p></p>
1059− </p>
1060 </list-item>
654 </list-item>
1061 <list-item>
655 <list-item>
1062− <p>
1063− <inline-formula><alternatives>
656+ <p><inline-formula><alternatives>
1064− <tex-math><![CDATA[2+2=4]]></tex-math>
657+ <tex-math><![CDATA[2+2=4]]></tex-math>
1065− <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mn>2</mml:mn><mml:mo>+</mml:mo><mml:mn>2</mml:mn><mml:mo>=</mml:mo><mml:mn>4</mml:mn></mml:mrow></mml:math></alternatives></inline-formula>
658+ <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mn>2</mml:mn><mml:mo>+</mml:mo><mml:mn>2</mml:mn><mml:mo>=</mml:mo><mml:mn>4</mml:mn></mml:mrow></mml:math></alternatives></inline-formula></p>
1066− </p>
1067 </list-item>
659 </list-item>
1068 <list-item>
660 <list-item>
1069− <p>
1070− <inline-formula><alternatives>
661+ <p><inline-formula><alternatives>
1071− <tex-math><![CDATA[x \in y]]></tex-math>
662+ <tex-math><![CDATA[x \in y]]></tex-math>
1072− <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mi>x</mml:mi><mml:mo>∈</mml:mo><mml:mi>y</mml:mi></mml:mrow></mml:math></alternatives></inline-formula>
663+ <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mi>x</mml:mi><mml:mo>∈</mml:mo><mml:mi>y</mml:mi></mml:mrow></mml:math></alternatives></inline-formula></p>
1073− </p>
1074 </list-item>
664 </list-item>
1075 <list-item>
665 <list-item>
1076− <p>
1077− <inline-formula><alternatives>
666+ <p><inline-formula><alternatives>
1078− <tex-math><![CDATA[\alpha \wedge \omega]]></tex-math>
667+ <tex-math><![CDATA[\alpha \wedge \omega]]></tex-math>
1079− <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mi>α</mml:mi><mml:mo>∧</mml:mo><mml:mi>ω</mml:mi></mml:mrow></mml:math></alternatives></inline-formula>
668+ <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mi>α</mml:mi><mml:mo>∧</mml:mo><mml:mi>ω</mml:mi></mml:mrow></mml:math></alternatives></inline-formula></p>
1080− </p>
1081 </list-item>
669 </list-item>
1082 <list-item>
670 <list-item>
1083− <p>
1084− <inline-formula><alternatives>
671+ <p><inline-formula><alternatives>
1085− <tex-math><![CDATA[223]]></tex-math>
672+ <tex-math><![CDATA[223]]></tex-math>
1086− <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mn>223</mml:mn></mml:math></alternatives></inline-formula>
673+ <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mn>223</mml:mn></mml:math></alternatives></inline-formula></p>
1087− </p>
1088 </list-item>
674 </list-item>
1089 <list-item>
675 <list-item>
1090− <p>
1091− <inline-formula><alternatives>
676+ <p><inline-formula><alternatives>
1092− <tex-math><![CDATA[p]]></tex-math>
677+ <tex-math><![CDATA[p]]></tex-math>
1093− <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mi>p</mml:mi></mml:math></alternatives></inline-formula>-Tree
678+ <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mi>p</mml:mi></mml:math></alternatives></inline-formula>-Tree</p>
1094− </p>
1095 </list-item>
679 </list-item>
1096 <list-item>
680 <list-item>
1097− <p>
1098− Here’s some display math: <disp-formula><alternatives>
681+ <p>Here’s some display math: <disp-formula><alternatives>
1099− <tex-math><![CDATA[\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}]]></tex-math>
682+ <tex-math><![CDATA[\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}]]></tex-math>
1100− <mml:math display="block" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mfrac><mml:mi>d</mml:mi><mml:mrow><mml:mi>d</mml:mi><mml:mi>x</mml:mi></mml:mrow></mml:mfrac><mml:mi>f</mml:mi><mml:mo stretchy="false" form="prefix">(</mml:mo><mml:mi>x</mml:mi><mml:mo stretchy="false" form="postfix">)</mml:mo><mml:mo>=</mml:mo><mml:munder><mml:mo>lim</mml:mo><mml:mrow><mml:mi>h</mml:mi><mml:mo>→</mml:mo><mml:mn>0</mml:mn></mml:mrow></mml:munder><mml:mfrac><mml:mrow><mml:mi>f</mml:mi><mml:mo stretchy="false" form="prefix">(</mml:mo><mml:mi>x</mml:mi><mml:mo>+</mml:mo><mml:mi>h</mml:mi><mml:mo stretchy="false" form="postfix">)</mml:mo><mml:mo>−</mml:mo><mml:mi>f</mml:mi><mml:mo stretchy="false" form="prefix">(</mml:mo><mml:mi>x</mml:mi><mml:mo stretchy="false" form="postfix">)</mml:mo></mml:mrow><mml:mi>h</mml:mi></mml:mfrac></mml:mrow></mml:math></alternatives></disp-formula>
683+ <mml:math display="block" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mfrac><mml:mi>d</mml:mi><mml:mrow><mml:mi>d</mml:mi><mml:mi>x</mml:mi></mml:mrow></mml:mfrac><mml:mi>f</mml:mi><mml:mo stretchy="false" form="prefix">(</mml:mo><mml:mi>x</mml:mi><mml:mo stretchy="false" form="postfix">)</mml:mo><mml:mo>=</mml:mo><mml:munder><mml:mo>lim</mml:mo><mml:mrow><mml:mi>h</mml:mi><mml:mo>→</mml:mo><mml:mn>0</mml:mn></mml:mrow></mml:munder><mml:mfrac><mml:mrow><mml:mi>f</mml:mi><mml:mo stretchy="false" form="prefix">(</mml:mo><mml:mi>x</mml:mi><mml:mo>+</mml:mo><mml:mi>h</mml:mi><mml:mo stretchy="false" form="postfix">)</mml:mo><mml:mo>−</mml:mo><mml:mi>f</mml:mi><mml:mo stretchy="false" form="prefix">(</mml:mo><mml:mi>x</mml:mi><mml:mo stretchy="false" form="postfix">)</mml:mo></mml:mrow><mml:mi>h</mml:mi></mml:mfrac></mml:mrow></mml:math></alternatives></disp-formula></p>
1101− </p>
1102 </list-item>
684 </list-item>
1103 <list-item>
685 <list-item>
1104− <p>
1105− Here’s one that has a line break in it: <inline-formula><alternatives>
686+ <p>Here’s one that has a line break in it:
687+ <inline-formula><alternatives>
1106− <tex-math><![CDATA[\alpha + \omega \times x^2]]></tex-math>
688+ <tex-math><![CDATA[\alpha + \omega \times x^2]]></tex-math>
1107− <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mi>α</mml:mi><mml:mo>+</mml:mo><mml:mi>ω</mml:mi><mml:mo>×</mml:mo><mml:msup><mml:mi>x</mml:mi><mml:mn>2</mml:mn></mml:msup></mml:mrow></mml:math></alternatives></inline-formula>.
689+ <mml:math display="inline" xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mrow><mml:mi>α</mml:mi><mml:mo>+</mml:mo><mml:mi>ω</mml:mi><mml:mo>×</mml:mo><mml:msup><mml:mi>x</mml:mi><mml:mn>2</mml:mn></mml:msup></mml:mrow></mml:math></alternatives></inline-formula>.</p>
1108− </p>
1109 </list-item>
690 </list-item>
1110 </list>
691 </list>
1111− <p>
1112− These shouldn’t be math:
692+ <p>These shouldn’t be math:</p>
1113− </p>
1114 <list list-type="bullet">
693 <list list-type="bullet">
1115 <list-item>
694 <list-item>
1116− <p>
1117− To get the famous equation, write <monospace>$e = mc^2$</monospace>.
695+ <p>To get the famous equation, write
1118− </p>
696+ <monospace>$e = mc^2$</monospace>.</p>
1119 </list-item>
697 </list-item>
1120 <list-item>
698 <list-item>
1121− <p>
1122− $22,000 is a <italic>lot</italic> of money. So is $34,000. (It worked
699+ <p>$22,000 is a <italic>lot</italic> of money. So is $34,000. (It worked
1123− if “lot” is emphasized.)
700+ if “lot” is emphasized.)</p>
1124− </p>
1125 </list-item>
701 </list-item>
1126 <list-item>
702 <list-item>
1127− <p>
1128− Shoes ($20) and socks ($5).
703+ <p>Shoes ($20) and socks ($5).</p>
1129− </p>
1130 </list-item>
704 </list-item>
1131 <list-item>
705 <list-item>
1132− <p>
1133− Escaped <monospace>$</monospace>: $73 <italic>this should be
706+ <p>Escaped <monospace>$</monospace>: $73 <italic>this should be
1134− emphasized</italic> 23$.
707+ emphasized</italic> 23$.</p>
1135− </p>
1136 </list-item>
708 </list-item>
1137 </list>
709 </list>
1138− <p>
1139− Here’s a LaTeX table:
710+ <p>Here’s a LaTeX table:</p>
1140− </p>
1141</sec>
711</sec>
1142<sec id="special-characters">
712<sec id="special-characters">
1143 <title>Special Characters</title>
713 <title>Special Characters</title>
1144− <p>
1145− Here is some unicode:
714+ <p>Here is some unicode:</p>
1146− </p>
1147 <list list-type="bullet">
715 <list list-type="bullet">
1148 <list-item>
716 <list-item>
1149− <p>
1150− I hat: Î
717+ <p>I hat: Î</p>
1151− </p>
1152 </list-item>
718 </list-item>
1153 <list-item>
719 <list-item>
1154− <p>
1155− o umlaut: ö
720+ <p>o umlaut: ö</p>
1156− </p>
1157 </list-item>
721 </list-item>
1158 <list-item>
722 <list-item>
1159− <p>
1160− section: §
723+ <p>section: §</p>
1161− </p>
1162 </list-item>
724 </list-item>
1163 <list-item>
725 <list-item>
1164− <p>
1165− set membership: ∈
726+ <p>set membership: ∈</p>
1166− </p>
1167 </list-item>
727 </list-item>
1168 <list-item>
728 <list-item>
1169− <p>
1170− copyright: ©
729+ <p>copyright: ©</p>
1171− </p>
1172 </list-item>
730 </list-item>
1173 </list>
731 </list>
1174− <p>
1175− AT&amp;T has an ampersand in their name.
732+ <p>AT&amp;T has an ampersand in their name.</p>
1176− </p>
1177− <p>
1178− AT&amp;T is another way to write it.
733+ <p>AT&amp;T is another way to write it.</p>
1179− </p>
1180− <p>
1181− This &amp; that.
734+ <p>This &amp; that.</p>
1182− </p>
1183− <p>
1184− 4 &lt; 5.
735+ <p>4 &lt; 5.</p>
1185− </p>
1186− <p>
1187− 6 &gt; 5.
736+ <p>6 &gt; 5.</p>
1188− </p>
1189− <p>
1190− Backslash: \
737+ <p>Backslash: \</p>
1191− </p>
1192− <p>
1193− Backtick: `
738+ <p>Backtick: `</p>
1194− </p>
1195− <p>
1196− Asterisk: *
739+ <p>Asterisk: *</p>
1197− </p>
1198− <p>
1199− Underscore: _
740+ <p>Underscore: _</p>
1200− </p>
1201− <p>
1202− Left brace: {
741+ <p>Left brace: {</p>
1203− </p>
1204− <p>
1205− Right brace: }
742+ <p>Right brace: }</p>
1206− </p>
1207− <p>
1208− Left bracket: [
743+ <p>Left bracket: [</p>
1209− </p>
1210− <p>
1211− Right bracket: ]
744+ <p>Right bracket: ]</p>
1212− </p>
1213− <p>
1214− Left paren: (
745+ <p>Left paren: (</p>
1215− </p>
1216− <p>
1217− Right paren: )
746+ <p>Right paren: )</p>
1218− </p>
1219− <p>
1220− Greater-than: &gt;
747+ <p>Greater-than: &gt;</p>
1221− </p>
1222− <p>
1223− Hash: #
748+ <p>Hash: #</p>
1224− </p>
1225− <p>
1226− Period: .
749+ <p>Period: .</p>
1227− </p>
1228− <p>
1229− Bang: !
750+ <p>Bang: !</p>
1230− </p>
1231− <p>
1232− Plus: +
751+ <p>Plus: +</p>
1233− </p>
1234− <p>
1235− Minus: -
752+ <p>Minus: -</p>
1236− </p>
1237</sec>
753</sec>
1238<sec id="links">
754<sec id="links">
1239 <title>Links</title>
755 <title>Links</title>
1240 <sec id="explicit">
756 <sec id="explicit">
1241 <title>Explicit</title>
757 <title>Explicit</title>
1242− <p>
758+ <p>Just a
1243− Just a <ext-link ext-link-type="uri" xlink:href="/url/">URL</ext-link>.
759+ <ext-link ext-link-type="uri" xlink:href="/url/">URL</ext-link>.</p>
1244− </p>
1245− <p>
1246− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title">URL
760+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title">URL
1247− and title</ext-link>.
761+ and title</ext-link>.</p>
1248− </p>
1249− <p>
1250− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by two spaces">URL
762+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by two spaces">URL
1251− and title</ext-link>.
763+ and title</ext-link>.</p>
1252− </p>
1253− <p>
1254− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by a tab">URL
764+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by a tab">URL
1255− and title</ext-link>.
765+ and title</ext-link>.</p>
1256− </p>
1257− <p>
1258− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with &quot;quotes&quot; in it">URL
766+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with &quot;quotes&quot; in it">URL
1259− and title</ext-link>
767+ and title</ext-link></p>
1260− </p>
1261− <p>
1262− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with single quotes">URL
768+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with single quotes">URL
1263− and title</ext-link>
769+ and title</ext-link></p>
1264− </p>
1265− <p>
1266− <ext-link ext-link-type="uri" xlink:href="/url/with_underscore">with_underscore</ext-link>
770+ <p><ext-link ext-link-type="uri" xlink:href="/url/with_underscore">with_underscore</ext-link></p>
1267− </p>
1268− <p>
1269− <ext-link ext-link-type="uri" xlink:href="mailto:nobody@nowhere.net">Email
771+ <p><ext-link ext-link-type="uri" xlink:href="mailto:nobody@nowhere.net">Email
1270− link</ext-link>
772+ link</ext-link></p>
1271− </p>
1272− <p>
1273− <ext-link ext-link-type="uri" xlink:href="">Empty</ext-link>.
773+ <p><ext-link ext-link-type="uri" xlink:href="">Empty</ext-link>.</p>
1274− </p>
1275 </sec>
774 </sec>
1276 <sec id="reference">
775 <sec id="reference">
1277 <title>Reference</title>
776 <title>Reference</title>
1278− <p>
777+ <p>Foo
1279− Foo <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.
778+ <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.</p>
1280− </p>
1281− <p>
1282− With <ext-link ext-link-type="uri" xlink:href="/url/">embedded
779+ <p>With <ext-link ext-link-type="uri" xlink:href="/url/">embedded
1283− [brackets]</ext-link>.
780+ [brackets]</ext-link>.</p>
1284− </p>
1285− <p>
1286− <ext-link ext-link-type="uri" xlink:href="/url/">b</ext-link> by itself
781+ <p><ext-link ext-link-type="uri" xlink:href="/url/">b</ext-link> by itself
1287− should be a link.
782+ should be a link.</p>
1288− </p>
1289− <p>
1290− Indented
783+ <p>Indented
1291− <ext-link ext-link-type="uri" xlink:href="/url">once</ext-link>.
784+ <ext-link ext-link-type="uri" xlink:href="/url">once</ext-link>.</p>
1292− </p>
1293− <p>
1294− Indented
785+ <p>Indented
1295− <ext-link ext-link-type="uri" xlink:href="/url">twice</ext-link>.
786+ <ext-link ext-link-type="uri" xlink:href="/url">twice</ext-link>.</p>
1296− </p>
1297− <p>
1298− Indented
787+ <p>Indented
1299− <ext-link ext-link-type="uri" xlink:href="/url">thrice</ext-link>.
788+ <ext-link ext-link-type="uri" xlink:href="/url">thrice</ext-link>.</p>
1300− </p>
1301− <p>
1302− This should [not][] be a link.
789+ <p>This should [not][] be a link.</p>
1303− </p>
1304 <preformat>[not]: /url</preformat>
790 <preformat>[not]: /url</preformat>
1305− <p>
1306− Foo
791+ <p>Foo
1307− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quotes&quot; inside">bar</ext-link>.
792+ <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quotes&quot; inside">bar</ext-link>.</p>
1308− </p>
1309− <p>
1310− Foo
793+ <p>Foo
1311− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quote&quot; inside">biz</ext-link>.
794+ <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quote&quot; inside">biz</ext-link>.</p>
1312− </p>
1313 </sec>
795 </sec>
1314 <sec id="with-ampersands">
796 <sec id="with-ampersands">
1315 <title>With ampersands</title>
797 <title>With ampersands</title>
1316− <p>
1317− Here’s a
798+ <p>Here’s a
1318− <ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">link
799+ <ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">link
1319− with an ampersand in the URL</ext-link>.
800+ with an ampersand in the URL</ext-link>.</p>
1320− </p>
1321− <p>
1322− Here’s a link with an amersand in the link text:
801+ <p>Here’s a link with an amersand in the link text:
1323− <ext-link ext-link-type="uri" xlink:href="http://att.com/" xlink:title="AT&amp;T">AT&amp;T</ext-link>.
802+ <ext-link ext-link-type="uri" xlink:href="http://att.com/" xlink:title="AT&amp;T">AT&amp;T</ext-link>.</p>
1324− </p>
1325− <p>
1326− Here’s an
803+ <p>Here’s an
1327− <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
804+ <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
1328− link</ext-link>.
805+ link</ext-link>.</p>
1329− </p>
1330− <p>
1331− Here’s an
806+ <p>Here’s an
1332− <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
807+ <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
1333− link in pointy braces</ext-link>.
808+ link in pointy braces</ext-link>.</p>
1334− </p>
1335 </sec>
809 </sec>
1336 <sec id="autolinks">
810 <sec id="autolinks">
1337 <title>Autolinks</title>
811 <title>Autolinks</title>
1338− <p>
1339− With an ampersand:
812+ <p>With an ampersand:
1340− <ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</ext-link>
813+ <ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</ext-link></p>
1341− </p>
1342 <list list-type="bullet">
814 <list list-type="bullet">
1343 <list-item>
815 <list-item>
1344− <p>
1345− In a list?
816+ <p>In a list?</p>
1346− </p>
1347 </list-item>
817 </list-item>
1348 <list-item>
818 <list-item>
1349− <p>
1350− <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link>
819+ <p><ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link></p>
1351− </p>
1352 </list-item>
820 </list-item>
1353 <list-item>
821 <list-item>
1354− <p>
1355− It should.
822+ <p>It should.</p>
1356− </p>
1357 </list-item>
823 </list-item>
1358 </list>
824 </list>
1359− <p>
1360− An e-mail address: <email>nobody@nowhere.net</email>
825+ <p>An e-mail address: <email>nobody@nowhere.net</email></p>
1361− </p>
1362 <disp-quote>
826 <disp-quote>
1363− <p>
1364− Blockquoted:
827+ <p>Blockquoted:
1365− <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link>
828+ <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link></p>
1366− </p>
1367 </disp-quote>
829 </disp-quote>
1368− <p>
1369− Auto-links should not occur here:
830+ <p>Auto-links should not occur here:
1370− <monospace>&lt;http://example.com/&gt;</monospace>
831+ <monospace>&lt;http://example.com/&gt;</monospace></p>
1371− </p>
1372 <preformat>or here: &lt;http://example.com/&gt;</preformat>
832 <preformat>or here: &lt;http://example.com/&gt;</preformat>
1373 </sec>
833 </sec>
1374</sec>
834</sec>
1375<sec id="images">
835<sec id="images">
1376 <title>Images</title>
836 <title>Images</title>
1377− <p>
1378− From “Voyage dans la Lune” by Georges Melies (1902):
837+ <p>From “Voyage dans la Lune” by Georges Melies (1902):</p>
1379− </p>
1380 <fig>
838 <fig>
1381 <caption>lalune</caption>
839 <caption>lalune</caption>
1382 <graphic mimetype="image" mime-subtype="jpeg" xlink:href="lalune.jpg" xlink:title="Voyage dans la Lune" />
840 <graphic mimetype="image" mime-subtype="jpeg" xlink:href="lalune.jpg" xlink:title="Voyage dans la Lune" />
1383 </fig>
841 </fig>
1384− <p>
1385− Here is a movie
842+ <p>Here is a movie
1386− <inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="movie.jpg" />
843+ <inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="movie.jpg" />
1387− icon.
844+ icon.</p>
1388− </p>
1389</sec>
845</sec>
1390<sec id="footnotes">
846<sec id="footnotes">
1391 <title>Footnotes</title>
847 <title>Footnotes</title>
1392− <p>
1393− Here is a footnote reference,<fn>
848+ <p>Here is a footnote reference,<fn>
1394− <p>
1395− Here is the footnote. It can go anywhere after the footnote reference.
849+ <p>Here is the footnote. It can go anywhere after the footnote reference.
1396− It need not be placed at the end of the document.
850+ It need not be placed at the end of the document.</p>
1397− </p>
1398− </fn> and another.<fn>
851+ </fn> and another.<fn>
1399− <p>
1400− Here’s the long note. This one contains multiple blocks.
852+ <p>Here’s the long note. This one contains multiple blocks.</p>
1401− </p>
1402− <p>
1403− Subsequent blocks are indented to show that they belong to the
853+ <p>Subsequent blocks are indented to show that they belong to the footnote
1404− footnote (as with list items).
854+ (as with list items).</p>
1405− </p>
1406− <preformat> { &lt;code&gt; }</preformat>
855+ <preformat> { &lt;code&gt; }</preformat>
1407− <p>
1408− If you want, you can indent every line, but you can also be lazy and
856+ <p>If you want, you can indent every line, but you can also be lazy and
1409− just indent the first line of each block.
857+ just indent the first line of each block.</p>
1410− </p>
1411− </fn> This should <italic>not</italic> be a footnote reference, because it
858+ </fn> This should <italic>not</italic> be a footnote reference, because it
1412− contains a space.[^my note] Here is an inline note.<fn>
859+ contains a space.[^my note] Here is an inline note.<fn>
1413− <p>
1414− This is <italic>easier</italic> to type. Inline notes may contain
860+ <p>This is <italic>easier</italic> to type. Inline notes may contain
1415− <ext-link ext-link-type="uri" xlink:href="http://google.com">links</ext-link>
861+ <ext-link ext-link-type="uri" xlink:href="http://google.com">links</ext-link>
1416− and <monospace>]</monospace> verbatim characters, as well as
862+ and <monospace>]</monospace> verbatim characters, as well as [bracketed
1417− [bracketed text].
863+ text].</p>
1418− </p>
1419− </fn>
1420− </p>
864+ </fn></p>
1421 <disp-quote>
865 <disp-quote>
1422− <p>
1423− Notes can go in quotes.<fn>
866+ <p>Notes can go in quotes.<fn>
1424− <p>
1425− In quote.
867+ <p>In quote.</p>
1426− </p>
1427− </fn>
1428− </p>
868+ </fn></p>
1429 </disp-quote>
869 </disp-quote>
1430 <list list-type="order">
870 <list list-type="order">
1431 <list-item>
871 <list-item>
1432− <p>
1433− And in list items.<fn>
872+ <p>And in list items.<fn>
1434− <p>
1435− In list.
873+ <p>In list.</p>
1436− </p>
1437− </fn>
1438− </p>
874+ </fn></p>
1439 </list-item>
875 </list-item>
1440 </list>
876 </list>
1441− <p>
1442− This paragraph should not be part of the note, as it is not indented.
877+ <p>This paragraph should not be part of the note, as it is not indented.</p>
1443− </p>
1444</sec>
878</sec>
1445</body>
879</body>
1446<back>
880<back>