git.iko.soy/typeable/pandoc
on master help sign in
Remove extraneous, significant whitespace in JATS writer output (#4335)

This patch fixes some cases where the JATS writer was introducing semantically significant whitespace by indenting and wrapping tags. Note that the JATS spec has a content model for `<p>` tags of `(#PCDATA | ...`. Any tag where `#PCDATA` children are possible should not have any indentation. The same is true for `<th>`, `<td>`, `<term>`, `<label>`.

commit7d193b2aadfed75b4c85a97f24ba5b36a3961fa9 authorNokome Bentley <me@noko.me> dateTue 6 Mar 2018, 06:44 (9 years ago) parent475f46f
6 files changed+831−2240
compare with master
unifiedsplit
src/Text/Pandoc/Writers/JATS.hs+6−6 test/Tests/Writers/JATS.hs+12−26 test/jats-reader.native+2−2 test/jats-reader.xml+352−977 test/tables.jats+102−306 test/writer.jats+357−923
src/Text/Pandoc/Writers/JATS.hs+6−6
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2828
2929Conversion of 'Pandoc' documents to JATS XML.
3030Reference:
31−https://jats.nlm.nih.gov/publishing/tag-library/1.1d3/element/mml-math.html
31+https://jats.nlm.nih.gov/publishing/tag-library
3232-}
3333module Text.Pandoc.Writers.JATS ( writeJATS ) where
3434import Control.Monad.Reader
@@ -139,7 +139,7 @@ deflistItemToJATS opts term defs = do
139139 term' <- inlinesToJATS opts term
140140 def' <- blocksToJATS opts $ concatMap (map plainToPara) defs
141141 return $ inTagsIndented "def-item" $
142− inTagsIndented "term" term' $$
142+ inTagsSimple "term" term' $$
143143 inTagsIndented "def" def'
144144
145145-- | Convert a list of lists of blocks to a list of JATS list items.
@@ -156,7 +156,7 @@ listItemToJATS :: PandocMonad m
156156listItemToJATS opts mbmarker item = do
157157 contents <- blocksToJATS opts item
158158 return $ inTagsIndented "list-item" $
159− maybe empty (\lbl -> inTagsIndented "label" (text lbl)) mbmarker
159+ maybe empty (\lbl -> inTagsSimple "label" (text lbl)) mbmarker
160160 $$ contents
161161
162162imageMimeType :: String -> [(String, String)] -> (String, String)
@@ -250,7 +250,7 @@ blockToJATS _ (Para [Image (ident,_,kvs) _ (src, tit)]) = do
250250 "xlink:type"]]
251251 return $ selfClosingTag "graphic" attr
252252blockToJATS opts (Para lst) =
253− inTagsIndented "p" <$> inlinesToJATS opts lst
253+ inTagsSimple "p" <$> inlinesToJATS opts lst
254254blockToJATS opts (LineBlock lns) =
255255 blockToJATS opts $ linesToPara lns
256256blockToJATS opts (BlockQuote blocks) =
@@ -326,10 +326,10 @@ tableItemToJATS :: PandocMonad m
326326 -> [Block]
327327 -> JATS m Doc
328328tableItemToJATS opts isHeader [Plain item] =
329− inTags True (if isHeader then "th" else "td") [] <$>
329+ inTags False (if isHeader then "th" else "td") [] <$>
330330 inlinesToJATS opts item
331331tableItemToJATS opts isHeader item =
332− (inTags True (if isHeader then "th" else "td") [] . vcat) <$>
332+ (inTags False (if isHeader then "th" else "td") [] . vcat) <$>
333333 mapM (blockToJATS opts) item
334334
335335-- | Convert a list of inline elements to JATS.
test/Tests/Writers/JATS.hs+12−26
@@ -30,8 +30,8 @@ infix 4 =:
3030
3131tests :: [TestTree]
3232tests = [ testGroup "inline code"
33− [ "basic" =: code "@&" =?> "<p>\n <monospace>@&amp;</monospace>\n</p>"
34− , "lang" =: codeWith ("", ["c"], []) "@&" =?> "<p>\n <code language=\"c\">@&amp;</code>\n</p>"
33+ [ "basic" =: code "@&" =?> "<p><monospace>@&amp;</monospace></p>"
34+ , "lang" =: codeWith ("", ["c"], []) "@&" =?> "<p><code language=\"c\">@&amp;</code></p>"
3535 ]
3636 , testGroup "block code"
3737 [ "basic" =: codeBlock "@&" =?> "<preformat>@&amp;</preformat>"
@@ -44,7 +44,7 @@ tests = [ testGroup "inline code"
4444 ]
4545 , testGroup "inlines"
4646 [ "Emphasis" =: emph "emphasized"
47− =?> "<p>\n <italic>emphasized</italic>\n</p>"
47+ =?> "<p><italic>emphasized</italic></p>"
4848 ]
4949 , "bullet list" =: bulletList [ plain $ text "first"
5050 , plain $ text "second"
@@ -52,19 +52,13 @@ tests = [ testGroup "inline code"
5252 ]
5353 =?> "<list list-type=\"bullet\">\n\
5454 \ <list-item>\n\
55− \ <p>\n\
56− \ first\n\
57− \ </p>\n\
55+ \ <p>first</p>\n\
5856 \ </list-item>\n\
5957 \ <list-item>\n\
60− \ <p>\n\
61− \ second\n\
62− \ </p>\n\
58+ \ <p>second</p>\n\
6359 \ </list-item>\n\
6460 \ <list-item>\n\
65− \ <p>\n\
66− \ third\n\
67− \ </p>\n\
61+ \ <p>third</p>\n\
6862 \ </list-item>\n\
6963 \</list>"
7064 , testGroup "definition lists"
@@ -72,24 +66,18 @@ tests = [ testGroup "inline code"
7266 [plain (text "hi there")])] =?>
7367 "<def-list>\n\
7468 \ <def-item>\n\
75− \ <term>\n\
76− \ <xref alt=\"testing\" rid=\"go\">testing</xref>\n\
77− \ </term>\n\
69+ \ <term><xref alt=\"testing\" rid=\"go\">testing</xref></term>\n\
7870 \ <def>\n\
79− \ <p>\n\
80− \ hi there\n\
81− \ </p>\n\
71+ \ <p>hi there</p>\n\
8272 \ </def>\n\
8373 \ </def-item>\n\
8474 \</def-list>"
8575 ]
8676 , testGroup "math"
8777 [ "escape |" =: para (math "\\sigma|_{\\{x\\}}") =?>
88− "<p>\n\
89− \ <inline-formula><alternatives>\n\
90− \ <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\
92− \</p>"
78+ "<p><inline-formula><alternatives>\n\
79+ \<tex-math><![CDATA[\\sigma|_{\\{x\\}}]]></tex-math>\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>"
9381 ]
9482 , testGroup "headers"
9583 [ "unnumbered header" =:
@@ -97,9 +85,7 @@ tests = [ testGroup "inline code"
9785 (text "Header 1" <> note (plain $ text "note")) =?>
9886 "<sec id=\"foo\">\n\
9987 \ <title>Header 1<fn>\n\
100− \ <p>\n\
101− \ note\n\
102− \ </p>\n\
88+ \ <p>note</p>\n\
10389 \ </fn></title>\n\
10490 \</sec>"
10591 , "unnumbered sub header" =:
test/jats-reader.native+2−2
@@ -1,5 +1,5 @@
11Pandoc (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."]
33,Header 1 ("headers",[],[]) [Str "Headers"]
44,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","")]
55,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
1313,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
1414,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
1515,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."]
1717,Para [Str "Here's",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",Space,Str "*",Space,Str "criminey."]
1818,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
1919,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
test/jats-reader.xml+352−977
@@ -29,10 +29,7 @@
2929</article-meta>
3030</front>
3131<body>
32−<p>
33− This is a set of tests for pandoc. Most of them are adapted from John
34− Gruber's markdown test suite.
35−</p>
32+<p>This is a set of tests for pandoc. Most of them are adapted from John Gruber's markdown test suite.</p>
3633<sec id="headers">
3734 <title>Headers</title>
3835 <sec id="level-2-with-an-embedded-link">
@@ -56,91 +53,53 @@
5653 <title>Level 2 with <italic>emphasis</italic></title>
5754 <sec id="level-3">
5855 <title>Level 3</title>
59− <p>
60− with no blank line
61− </p>
56+ <p>with no blank line</p>
6257 </sec>
6358 </sec>
6459 <sec id="level-2">
6560 <title>Level 2</title>
66− <p>
67− with no blank line
68− </p>
61+ <p>with no blank line</p>
6962 </sec>
7063</sec>
7164<sec id="paragraphs">
7265 <title>Paragraphs</title>
73− <p>
74− Here's a regular paragraph.
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
79− looked like a list item.
80− </p>
81− <p>
82− Here's one with a bullet. * criminey.
83− </p>
84− <p>
85− There should be a hard line break<break />here.
86− </p>
66+ <p>Here's a regular paragraph.</p>
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>
68+ <p>Here's one with a bullet. * criminey.</p>
69+ <p>There should be a hard line break<break />here.</p>
8770</sec>
8871<sec id="block-quotes">
8972 <title>Block Quotes</title>
90− <p>
91− E-mail style:
92− </p>
73+ <p>E-mail style:</p>
9374 <disp-quote>
94− <p>
95− This is a block quote. It is pretty short.
96− </p>
75+ <p>This is a block quote. It is pretty short.</p>
9776 </disp-quote>
9877 <disp-quote>
99− <p>
100− Code in a block quote:
101− </p>
78+ <p>Code in a block quote:</p>
10279 <preformat>sub status {
10380 print &quot;working&quot;;
10481}</preformat>
105− <p>
106− A list:
107− </p>
82+ <p>A list:</p>
10883 <list list-type="order">
10984 <list-item>
110− <p>
111− item one
112− </p>
85+ <p>item one</p>
11386 </list-item>
11487 <list-item>
115− <p>
116− item two
117− </p>
88+ <p>item two</p>
11889 </list-item>
11990 </list>
120− <p>
121− Nested block quotes:
122− </p>
91+ <p>Nested block quotes:</p>
12392 <disp-quote>
124− <p>
125− nested
126− </p>
93+ <p>nested</p>
12794 </disp-quote>
12895 <disp-quote>
129− <p>
130− nested
131− </p>
96+ <p>nested</p>
13297 </disp-quote>
13398 </disp-quote>
134− <p>
135− This should not be a block quote: 2 &gt; 1.
136− </p>
137− <p>
138− Box-style:
139− </p>
99+ <p>This should not be a block quote: 2 &gt; 1.</p>
100+ <p>Box-style:</p>
140101 <disp-quote>
141− <p>
142− Example:
143− </p>
102+ <p>Example:</p>
144103 <preformat>sub status {
145104 print &quot;working&quot;;
146105}</preformat>
@@ -148,39 +107,25 @@
148107 <disp-quote>
149108 <list list-type="order">
150109 <list-item>
151− <p>
152− do laundry
153− </p>
110+ <p>do laundry</p>
154111 </list-item>
155112 <list-item>
156− <p>
157− take out the trash
158− </p>
113+ <p>take out the trash</p>
159114 </list-item>
160115 </list>
161116 </disp-quote>
162− <p>
163− Here's a nested one:
164− </p>
117+ <p>Here's a nested one:</p>
165118 <disp-quote>
166− <p>
167− Joe said:
168− </p>
119+ <p>Joe said:</p>
169120 <disp-quote>
170− <p>
171− Don't quote me.
172− </p>
121+ <p>Don't quote me.</p>
173122 </disp-quote>
174123 </disp-quote>
175− <p>
176− And a following paragraph.
177− </p>
124+ <p>And a following paragraph.</p>
178125</sec>
179126<sec id="code-blocks">
180127 <title>Code Blocks</title>
181− <p>
182− Code:
183− </p>
128+ <p>Code:</p>
184129 <preformat>---- (should be four hyphens)
185130
186131sub status {
@@ -188,9 +133,7 @@ sub status {
188133}
189134
190135this code block is indented by one tab</preformat>
191− <p>
192− And:
193− </p>
136+ <p>And:</p>
194137 <preformat> this code block is indented by two tabs
195138
196139These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
@@ -199,236 +142,144 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
199142 <title>Lists</title>
200143 <sec id="unordered">
201144 <title>Unordered</title>
202− <p>
203− Asterisks tight:
204− </p>
145+ <p>Asterisks tight:</p>
205146 <list list-type="bullet">
206147 <list-item>
207− <p>
208− asterisk 1
209− </p>
148+ <p>asterisk 1</p>
210149 </list-item>
211150 <list-item>
212− <p>
213− asterisk 2
214− </p>
151+ <p>asterisk 2</p>
215152 </list-item>
216153 <list-item>
217− <p>
218− asterisk 3
219− </p>
154+ <p>asterisk 3</p>
220155 </list-item>
221156 </list>
222− <p>
223− Asterisks loose:
224− </p>
157+ <p>Asterisks loose:</p>
225158 <list list-type="bullet">
226159 <list-item>
227− <p>
228− asterisk 1
229− </p>
160+ <p>asterisk 1</p>
230161 </list-item>
231162 <list-item>
232− <p>
233− asterisk 2
234− </p>
163+ <p>asterisk 2</p>
235164 </list-item>
236165 <list-item>
237− <p>
238− asterisk 3
239− </p>
166+ <p>asterisk 3</p>
240167 </list-item>
241168 </list>
242− <p>
243− Pluses tight:
244− </p>
169+ <p>Pluses tight:</p>
245170 <list list-type="bullet">
246171 <list-item>
247− <p>
248− Plus 1
249− </p>
172+ <p>Plus 1</p>
250173 </list-item>
251174 <list-item>
252− <p>
253− Plus 2
254− </p>
175+ <p>Plus 2</p>
255176 </list-item>
256177 <list-item>
257− <p>
258− Plus 3
259− </p>
178+ <p>Plus 3</p>
260179 </list-item>
261180 </list>
262− <p>
263− Pluses loose:
264− </p>
181+ <p>Pluses loose:</p>
265182 <list list-type="bullet">
266183 <list-item>
267− <p>
268− Plus 1
269− </p>
184+ <p>Plus 1</p>
270185 </list-item>
271186 <list-item>
272− <p>
273− Plus 2
274− </p>
187+ <p>Plus 2</p>
275188 </list-item>
276189 <list-item>
277− <p>
278− Plus 3
279− </p>
190+ <p>Plus 3</p>
280191 </list-item>
281192 </list>
282− <p>
283− Minuses tight:
284− </p>
193+ <p>Minuses tight:</p>
285194 <list list-type="bullet">
286195 <list-item>
287− <p>
288− Minus 1
289− </p>
196+ <p>Minus 1</p>
290197 </list-item>
291198 <list-item>
292− <p>
293− Minus 2
294− </p>
199+ <p>Minus 2</p>
295200 </list-item>
296201 <list-item>
297− <p>
298− Minus 3
299− </p>
202+ <p>Minus 3</p>
300203 </list-item>
301204 </list>
302− <p>
303− Minuses loose:
304− </p>
205+ <p>Minuses loose:</p>
305206 <list list-type="bullet">
306207 <list-item>
307− <p>
308− Minus 1
309− </p>
208+ <p>Minus 1</p>
310209 </list-item>
311210 <list-item>
312− <p>
313− Minus 2
314− </p>
211+ <p>Minus 2</p>
315212 </list-item>
316213 <list-item>
317− <p>
318− Minus 3
319− </p>
214+ <p>Minus 3</p>
320215 </list-item>
321216 </list>
322217 </sec>
323218 <sec id="ordered">
324219 <title>Ordered</title>
325− <p>
326− Tight:
327− </p>
220+ <p>Tight:</p>
328221 <list list-type="order">
329222 <list-item>
330− <p>
331− First
332− </p>
223+ <p>First</p>
333224 </list-item>
334225 <list-item>
335− <p>
336− Second
337− </p>
226+ <p>Second</p>
338227 </list-item>
339228 <list-item>
340− <p>
341− Third
342− </p>
229+ <p>Third</p>
343230 </list-item>
344231 </list>
345− <p>
346− and:
347− </p>
232+ <p>and:</p>
348233 <list list-type="order">
349234 <list-item>
350− <p>
351− One
352− </p>
235+ <p>One</p>
353236 </list-item>
354237 <list-item>
355− <p>
356− Two
357− </p>
238+ <p>Two</p>
358239 </list-item>
359240 <list-item>
360− <p>
361− Three
362− </p>
241+ <p>Three</p>
363242 </list-item>
364243 </list>
365− <p>
366− Loose using tabs:
367− </p>
244+ <p>Loose using tabs:</p>
368245 <list list-type="order">
369246 <list-item>
370− <p>
371− First
372− </p>
247+ <p>First</p>
373248 </list-item>
374249 <list-item>
375− <p>
376− Second
377− </p>
250+ <p>Second</p>
378251 </list-item>
379252 <list-item>
380− <p>
381− Third
382− </p>
253+ <p>Third</p>
383254 </list-item>
384255 </list>
385− <p>
386− and using spaces:
387− </p>
256+ <p>and using spaces:</p>
388257 <list list-type="order">
389258 <list-item>
390− <p>
391− One
392− </p>
259+ <p>One</p>
393260 </list-item>
394261 <list-item>
395− <p>
396− Two
397− </p>
262+ <p>Two</p>
398263 </list-item>
399264 <list-item>
400− <p>
401− Three
402− </p>
265+ <p>Three</p>
403266 </list-item>
404267 </list>
405− <p>
406− Multiple paragraphs:
407− </p>
268+ <p>Multiple paragraphs:</p>
408269 <list list-type="order">
409270 <list-item>
410− <p>
411− Item 1, graf one.
412− </p>
413− <p>
414− Item 1. graf two. The quick brown fox jumped over the lazy
415− dog's back.
416− </p>
271+ <p>Item 1, graf one.</p>
272+ <p>Item 1. graf two. The quick brown fox jumped over the lazy
273+ dog's back.</p>
417274 </list-item>
418275 <list-item>
419− <p>
420− Item 2.
421− </p>
276+ <p>Item 2.</p>
422277 </list-item>
423278 <list-item>
424− <p>
425− Item 3.
426− </p>
279+ <p>Item 3.</p>
427280 </list-item>
428281 </list>
429− <p>
430− List styles:
431− </p>
282+ <p>List styles:</p>
432283 <list list-type="order"></list>
433284 <list list-type="roman-lower"></list>
434285 </sec>
@@ -436,97 +287,63 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
436287 <title>Nested</title>
437288 <list list-type="bullet">
438289 <list-item>
439− <p>
440− Tab
441− </p>
290+ <p>Tab</p>
442291 <list list-type="bullet">
443292 <list-item>
444− <p>
445− Tab
446− </p>
293+ <p>Tab</p>
447294 <list list-type="bullet">
448295 <list-item>
449− <p>
450− Tab
451− </p>
296+ <p>Tab</p>
452297 </list-item>
453298 </list>
454299 </list-item>
455300 </list>
456301 </list-item>
457302 </list>
458− <p>
459− Here's another:
460− </p>
303+ <p>Here's another:</p>
461304 <list list-type="order">
462305 <list-item>
463− <p>
464− First
465− </p>
306+ <p>First</p>
466307 </list-item>
467308 <list-item>
468− <p>
469− Second:
470− </p>
309+ <p>Second:</p>
471310 <list list-type="bullet">
472311 <list-item>
473− <p>
474− Fee
475− </p>
312+ <p>Fee</p>
476313 </list-item>
477314 <list-item>
478− <p>
479− Fie
480− </p>
315+ <p>Fie</p>
481316 </list-item>
482317 <list-item>
483− <p>
484− Foe
485− </p>
318+ <p>Foe</p>
486319 </list-item>
487320 </list>
488321 </list-item>
489322 <list-item>
490− <p>
491− Third
492− </p>
323+ <p>Third</p>
493324 </list-item>
494325 </list>
495− <p>
496− Same thing but with paragraphs:
497− </p>
326+ <p>Same thing but with paragraphs:</p>
498327 <list list-type="order">
499328 <list-item>
500− <p>
501− First
502− </p>
329+ <p>First</p>
503330 </list-item>
504331 <list-item>
505− <p>
506− Second:
507− </p>
332+ <p>Second:</p>
508333 <list list-type="bullet">
509334 <list-item>
510− <p>
511− Fee
512− </p>
335+ <p>Fee</p>
513336 </list-item>
514337 <list-item>
515− <p>
516− Fie
517− </p>
338+ <p>Fie</p>
518339 </list-item>
519340 <list-item>
520− <p>
521− Foe
522− </p>
341+ <p>Foe</p>
523342 </list-item>
524343 </list>
525344 </list-item>
526345 <list-item>
527− <p>
528− Third
529− </p>
346+ <p>Third</p>
530347 </list-item>
531348 </list>
532349 </sec>
@@ -534,24 +351,16 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
534351 <title>Tabs and spaces</title>
535352 <list list-type="bullet">
536353 <list-item>
537− <p>
538− this is a list item indented with tabs
539− </p>
354+ <p>this is a list item indented with tabs</p>
540355 </list-item>
541356 <list-item>
542− <p>
543− this is a list item indented with spaces
544− </p>
357+ <p>this is a list item indented with spaces</p>
545358 <list list-type="bullet">
546359 <list-item>
547− <p>
548− this is an example list item indented with tabs
549− </p>
360+ <p>this is an example list item indented with tabs</p>
550361 </list-item>
551362 <list-item>
552− <p>
553− this is an example list item indented with spaces
554− </p>
363+ <p>this is an example list item indented with spaces</p>
555364 </list-item>
556365 </list>
557366 </list-item>
@@ -559,24 +368,16 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
559368 </sec>
560369 <sec id="fancy-list-markers">
561370 <title>Fancy list markers</title>
562− <p>
563− Autonumbering:
564− </p>
371+ <p>Autonumbering:</p>
565372 <list list-type="order">
566373 <list-item>
567− <p>
568− Autonumber.
569− </p>
374+ <p>Autonumber.</p>
570375 </list-item>
571376 <list-item>
572− <p>
573− More.
574− </p>
377+ <p>More.</p>
575378 <list list-type="order">
576379 <list-item>
577− <p>
578− Nested.
579− </p>
380+ <p>Nested.</p>
580381 </list-item>
581382 </list>
582383 </list-item>
@@ -590,12 +391,8 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
590391 Violin
591392 </term>
592393 <def>
593− <p>
594− Stringed musical instrument.
595− </p>
596− <p>
597− Torture device.
598− </p>
394+ <p>Stringed musical instrument.</p>
395+ <p>Torture device.</p>
599396 </def>
600397 </def-item>
601398 <def-item>
@@ -603,9 +400,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
603400 Cello<break />Violoncello
604401 </term>
605402 <def>
606− <p>
607− Low-voiced stringed instrument.
608− </p>
403+ <p>Low-voiced stringed instrument.</p>
609404 </def>
610405 </def-item>
611406 </def-list>
@@ -613,452 +408,244 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
613408</sec>
614409<sec id="inline-markup">
615410 <title>Inline Markup</title>
616− <p>
617− This is <italic>emphasized</italic>, and so <italic>is
618− this</italic>.
619− </p>
620− <p>
621− This is <bold role="strong">strong</bold>, and so
622− <bold role="strong">is this</bold>.
623− </p>
624− <p>
625− Empty <bold role="strong"></bold> and <italic></italic>.
626− </p>
627− <p>
628− An
411+ <p>This is <italic>emphasized</italic>, and so <italic>is
412+ this</italic>.</p>
413+ <p>This is <bold role="strong">strong</bold>, and so
414+ <bold role="strong">is this</bold>.</p>
415+ <p>Empty <bold role="strong"></bold> and <italic></italic>.</p>
416+ <p>An
629417 <italic><ext-link ext-link-type="uri" xlink:href="/url">emphasized
630− link</ext-link></italic>.
631− </p>
632− <p>
633− <bold role="strong"><italic>This is strong and em.</italic></bold>
634− </p>
635− <p>
636− So is <bold role="strong"><italic>this</italic></bold> word.
637− </p>
638− <p>
639− <bold role="strong"><italic>This is strong and em.</italic></bold>
640− </p>
641− <p>
642− So is <bold role="strong"><italic>this</italic></bold> word.
643− </p>
644− <p>
645− This is code: <monospace>&gt;</monospace>, <monospace>$</monospace>,
418+ link</ext-link></italic>.</p>
419+ <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
420+ <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
421+ <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
422+ <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
423+ <p>This is code: <monospace>&gt;</monospace>, <monospace>$</monospace>,
646424 <monospace>\</monospace>, <monospace>\$</monospace>,
647− <monospace>&lt;html&gt;</monospace>.
648− </p>
649− <p>
650− This is <sc role="smallcaps">small caps</sc>.
651− </p>
652− <p>
653− These are all underlined: foo and bar.
654− </p>
655− <p>
656− These are all strikethrough: <strike>foo</strike>,
657− <strike>bar</strike>, and <strike>baz</strike>.
658− </p>
425+ <monospace>&lt;html&gt;</monospace>.</p>
426+ <p>This is <sc role="smallcaps">small caps</sc>.</p>
427+ <p>These are all underlined: foo and bar.</p>
428+ <p>These are all strikethrough: <strike>foo</strike>,
429+ <strike>bar</strike>, and <strike>baz</strike>.</p>
659430</sec>
660431<sec id="smart-quotes-ellipses-dashes">
661432 <title>Smart quotes, ellipses, dashes</title>
662− <p>
663− &quot;Hello,&quot; said the spider. &quot;'Shelob' is my name.&quot;
664− </p>
665− <p>
666− 'A', 'B', and 'C' are letters.
667− </p>
668− <p>
669− 'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.'
670− </p>
671− <p>
672− 'He said, &quot;I want to go.&quot;' Were you alive in the 70's?
673− </p>
674− <p>
675− Here is some quoted '<monospace>code</monospace>' and a
433+ <p>&quot;Hello,&quot; said the spider. &quot;'Shelob' is my name.&quot;</p>
434+ <p>'A', 'B', and 'C' are letters.</p>
435+ <p>'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.'</p>
436+ <p>'He said, &quot;I want to go.&quot;' Were you alive in the 70's?</p>
437+ <p>Here is some quoted '<monospace>code</monospace>' and a
676438 &quot;<ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">quoted
677− link</ext-link>&quot;.
678− </p>
679− <p>
680− Some dashes: one---two --- three--four -- five.
681− </p>
682− <p>
683− Dashes between numbers: 5-7, 255-66, 1987-1999.
684− </p>
685− <p>
686− Ellipses...and. . .and . . . .
687− </p>
439+ link</ext-link>&quot;.</p>
440+ <p>Some dashes: one---two --- three--four -- five.</p>
441+ <p>Dashes between numbers: 5-7, 255-66, 1987-1999.</p>
442+ <p>Ellipses...and. . .and . . . .</p>
688443</sec>
689444<sec id="latex">
690445 <title>LaTeX</title>
691446 <list list-type="bullet">
692447 <list-item>
693− <p>
694− \cite[22-23]{smith.1899}
695− </p>
448+ <p>\cite[22-23]{smith.1899}</p>
696449 </list-item>
697450 <list-item>
698− <p>
699− \doublespacing
700− </p>
451+ <p>\doublespacing</p>
701452 </list-item>
702453 <list-item>
703− <p>
704− $2+2=4$
705− </p>
454+ <p>$2+2=4$</p>
706455 </list-item>
707456 <list-item>
708− <p>
709− $x \in y$
710− </p>
457+ <p>$x \in y$</p>
711458 </list-item>
712459 <list-item>
713− <p>
714− $\alpha \wedge \omega$
715− </p>
460+ <p>$\alpha \wedge \omega$</p>
716461 </list-item>
717462 <list-item>
718− <p>
719− $223$
720− </p>
463+ <p>$223$</p>
721464 </list-item>
722465 <list-item>
723− <p>
724− $p$-Tree
725− </p>
466+ <p>$p$-Tree</p>
726467 </list-item>
727468 <list-item>
728− <p>
729− $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
730− </p>
469+ <p>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</p>
731470 </list-item>
732471 <list-item>
733− <p>
734− Here's one that has a line break in it: $\alpha + \omega \times
735− x^2$.
736− </p>
472+ <p>Here's one that has a line break in it: $\alpha + \omega \times
473+ x^2$.</p>
737474 </list-item>
738475 </list>
739− <p>
740− These shouldn't be math:
741− </p>
476+ <p>These shouldn't be math:</p>
742477 <list list-type="bullet">
743478 <list-item>
744− <p>
745− To get the famous equation, write
746− <monospace>$e = mc^2$</monospace>.
747− </p>
479+ <p>To get the famous equation, write
480+ <monospace>$e = mc^2$</monospace>.</p>
748481 </list-item>
749482 <list-item>
750− <p>
751− $22,000 is a <italic>lot</italic> of money. So is $34,000. (It
752− worked if &quot;lot&quot; is emphasized.)
753− </p>
483+ <p>$22,000 is a <italic>lot</italic> of money. So is $34,000. (It
484+ worked if &quot;lot&quot; is emphasized.)</p>
754485 </list-item>
755486 <list-item>
756− <p>
757− Escaped <monospace>$</monospace>: $73 <italic>this should be
758− emphasized</italic> 23$.
759− </p>
487+ <p>Escaped <monospace>$</monospace>: $73 <italic>this should be
488+ emphasized</italic> 23$.</p>
760489 </list-item>
761490 </list>
762− <p>
763− Here's a LaTeX table:
764− </p>
765− <p>
766− \begin{tabular}{|l|l|}\hline Animal &amp; Number \\ \hline Dog &amp;
767− 2 \\ Cat &amp; 1 \\ \hline \end{tabular}
768− </p>
491+ <p>Here's a LaTeX table:</p>
492+ <p>\begin{tabular}{|l|l|}\hline Animal &amp; Number \\ \hline Dog &amp;
493+ 2 \\ Cat &amp; 1 \\ \hline \end{tabular}</p>
769494</sec>
770495<sec id="special-characters">
771496 <title>Special Characters</title>
772− <p>
773− Here is some unicode:
774− </p>
497+ <p>Here is some unicode:</p>
775498 <list list-type="bullet">
776499 <list-item>
777− <p>
778− I hat: Î
779− </p>
500+ <p>I hat: Î</p>
780501 </list-item>
781502 <list-item>
782− <p>
783− o umlaut: ö
784− </p>
503+ <p>o umlaut: ö</p>
785504 </list-item>
786505 <list-item>
787− <p>
788− section: §
789− </p>
506+ <p>section: §</p>
790507 </list-item>
791508 <list-item>
792− <p>
793− set membership: elem
794− </p>
509+ <p>set membership: elem</p>
795510 </list-item>
796511 <list-item>
797− <p>
798− copyright: ©
799− </p>
512+ <p>copyright: ©</p>
800513 </list-item>
801514 </list>
802− <p>
803− AT&amp;T has an ampersand in their name.
804− </p>
805− <p>
806− AT&amp;T is another way to write it.
807− </p>
808− <p>
809− This &amp; that.
810− </p>
811− <p>
812− 4 &lt; 5.
813− </p>
814− <p>
815− 6 &gt; 5.
816− </p>
817− <p>
818− Backslash: \
819− </p>
820− <p>
821− Backtick: `
822− </p>
823− <p>
824− Asterisk: *
825− </p>
826− <p>
827− Underscore: _
828− </p>
829− <p>
830− Left brace: {
831− </p>
832− <p>
833− Right brace: }
834− </p>
835− <p>
836− Left bracket: [
837− </p>
838− <p>
839− Right bracket: ]
840− </p>
841− <p>
842− Left paren: (
843− </p>
844− <p>
845− Right paren: )
846− </p>
847− <p>
848− Greater-than: &gt;
849− </p>
850− <p>
851− Hash: #
852− </p>
853− <p>
854− Period: .
855− </p>
856− <p>
857− Bang: !
858− </p>
859− <p>
860− Plus: +
861− </p>
862− <p>
863− Minus: -
864− </p>
515+ <p>AT&amp;T has an ampersand in their name.</p>
516+ <p>AT&amp;T is another way to write it.</p>
517+ <p>This &amp; that.</p>
518+ <p>4 &lt; 5.</p>
519+ <p>6 &gt; 5.</p>
520+ <p>Backslash: \</p>
521+ <p>Backtick: `</p>
522+ <p>Asterisk: *</p>
523+ <p>Underscore: _</p>
524+ <p>Left brace: {</p>
525+ <p>Right brace: }</p>
526+ <p>Left bracket: [</p>
527+ <p>Right bracket: ]</p>
528+ <p>Left paren: (</p>
529+ <p>Right paren: )</p>
530+ <p>Greater-than: &gt;</p>
531+ <p>Hash: #</p>
532+ <p>Period: .</p>
533+ <p>Bang: !</p>
534+ <p>Plus: +</p>
535+ <p>Minus: -</p>
865536</sec>
866537<sec id="links">
867538 <title>Links</title>
868539 <sec id="explicit">
869540 <title>Explicit</title>
870− <p>
871− Just a
872− <ext-link ext-link-type="uri" xlink:href="/url/">URL</ext-link>.
873− </p>
874− <p>
875− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title">URL
876− and title</ext-link>.
877− </p>
878− <p>
879− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by two spaces">URL
880− and title</ext-link>.
881− </p>
882− <p>
883− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by a tab">URL
884− and title</ext-link>.
885− </p>
886− <p>
887− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with &quot;quotes&quot; in it">URL
888− and title</ext-link>
889− </p>
890− <p>
891− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with single quotes">URL
892− and title</ext-link>
893− </p>
894− <p>
895− Email link (nobody [at] nowhere.net)
896− </p>
897− <p>
898− <ext-link ext-link-type="uri" xlink:href="">Empty</ext-link>.
899− </p>
541+ <p>Just a
542+ <ext-link ext-link-type="uri" xlink:href="/url/">URL</ext-link>.</p>
543+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title">URL
544+ and title</ext-link>.</p>
545+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by two spaces">URL
546+ and title</ext-link>.</p>
547+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by a tab">URL
548+ and title</ext-link>.</p>
549+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with &quot;quotes&quot; in it">URL
550+ and title</ext-link></p>
551+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with single quotes">URL
552+ and title</ext-link></p>
553+ <p>Email link (nobody [at] nowhere.net)</p>
554+ <p><ext-link ext-link-type="uri" xlink:href="">Empty</ext-link>.</p>
900555 </sec>
901556 <sec id="reference">
902557 <title>Reference</title>
903− <p>
904− Foo
905− <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.
906− </p>
907− <p>
908− Foo
909− <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.
910− </p>
911− <p>
912− Foo
913− <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.
914− </p>
915− <p>
916− With <ext-link ext-link-type="uri" xlink:href="/url/">embedded
917− [brackets]</ext-link>.
918− </p>
919− <p>
920− <ext-link ext-link-type="uri" xlink:href="/url/">b</ext-link> by
921− itself should be a link.
922− </p>
923− <p>
924− Indented
925− <ext-link ext-link-type="uri" xlink:href="/url">once</ext-link>.
926− </p>
927− <p>
928− Indented
929− <ext-link ext-link-type="uri" xlink:href="/url">twice</ext-link>.
930− </p>
931− <p>
932− Indented
933− <ext-link ext-link-type="uri" xlink:href="/url">thrice</ext-link>.
934− </p>
935− <p>
936− This should [not] be a link.
937− </p>
558+ <p>Foo
559+ <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.</p>
560+ <p>Foo
561+ <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.</p>
562+ <p>Foo
563+ <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.</p>
564+ <p>With <ext-link ext-link-type="uri" xlink:href="/url/">embedded
565+ [brackets]</ext-link>.</p>
566+ <p><ext-link ext-link-type="uri" xlink:href="/url/">b</ext-link> by
567+ itself should be a link.</p>
568+ <p>Indented
569+ <ext-link ext-link-type="uri" xlink:href="/url">once</ext-link>.</p>
570+ <p>Indented
571+ <ext-link ext-link-type="uri" xlink:href="/url">twice</ext-link>.</p>
572+ <p>Indented
573+ <ext-link ext-link-type="uri" xlink:href="/url">thrice</ext-link>.</p>
574+ <p>This should [not] be a link.</p>
938575 <preformat>[not]: /url</preformat>
939− <p>
940− Foo
941− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quotes&quot; inside">bar</ext-link>.
942− </p>
943− <p>
944− Foo
945− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quote&quot; inside">biz</ext-link>.
946− </p>
576+ <p>Foo
577+ <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quotes&quot; inside">bar</ext-link>.</p>
578+ <p>Foo
579+ <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quote&quot; inside">biz</ext-link>.</p>
947580 </sec>
948581 <sec id="with-ampersands">
949582 <title>With ampersands</title>
950− <p>
951− Here's a
583+ <p>Here's a
952584 <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>.
954− </p>
955− <p>
956− 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>.
958− </p>
959− <p>
960− Here's an
585+ with an ampersand in the URL</ext-link>.</p>
586+ <p>Here's a link with an amersand in the link text:
587+ <ext-link ext-link-type="uri" xlink:href="http://att.com/" xlink:title="AT&amp;T">AT&amp;T</ext-link>.</p>
588+ <p>Here's an
961589 <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
962− link</ext-link>.
963− </p>
964− <p>
965− Here's an
590+ link</ext-link>.</p>
591+ <p>Here's an
966592 <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
967− link in pointy braces</ext-link>.
968− </p>
593+ link in pointy braces</ext-link>.</p>
969594 </sec>
970595 <sec id="autolinks">
971596 <title>Autolinks</title>
972− <p>
973− 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>
975− </p>
597+ <p>With an ampersand:
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>
976599 <list list-type="bullet">
977600 <list-item>
978− <p>
979− In a list?
980− </p>
601+ <p>In a list?</p>
981602 </list-item>
982603 <list-item>
983− <p>
984− <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link>
985− </p>
604+ <p><ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link></p>
986605 </list-item>
987606 <list-item>
988− <p>
989− It should.
990− </p>
607+ <p>It should.</p>
991608 </list-item>
992609 </list>
993− <p>
994− An e-mail address: nobody [at] nowhere.net
995− </p>
610+ <p>An e-mail address: nobody [at] nowhere.net</p>
996611 <disp-quote>
997− <p>
998− Blockquoted:
999− <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link>
1000− </p>
612+ <p>Blockquoted:
613+ <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link></p>
1001614 </disp-quote>
1002− <p>
1003− Auto-links should not occur here:
1004− <monospace>&lt;http://example.com/&gt;</monospace>
1005− </p>
615+ <p>Auto-links should not occur here:
616+ <monospace>&lt;http://example.com/&gt;</monospace></p>
1006617 <preformat>or here: &lt;http://example.com/&gt;</preformat>
1007618 </sec>
1008619</sec>
1009620<sec id="images">
1010621 <title>Images</title>
1011− <p>
1012− From &quot;Voyage dans la Lune&quot; by Georges Melies (1902):
1013− </p>
1014− <p>
1015− <inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="lalune.jpg" xlink:title="Voyage dans la Lune" />
1016− </p>
1017− <p>
1018− Here is a movie
622+ <p>From &quot;Voyage dans la Lune&quot; by Georges Melies (1902):</p>
623+ <p><inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="lalune.jpg" xlink:title="Voyage dans la Lune" /></p>
624+ <p>Here is a movie
1019625 <inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="movie.jpg" />
1020− icon.
1021− </p>
626+ icon.</p>
1022627</sec>
1023628<sec id="footnotes">
1024629 <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>,
1027631 and
1028632 another<xref alt="(longnote)" rid="note_longnote">(longnote)</xref>.
1029633 This should <italic>not</italic> be a footnote reference, because it
1030− contains a space^(my note).
1031− </p>
1032− <p>
1033− <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.
1035− </p>
1036− <p>
1037− <xref alt="(longnote)" rid="ref_longnote">(longnote)</xref> Here's
1038− the other note. This one contains multiple blocks.
1039− </p>
1040− <p>
1041− Caret characters are used to indicate that the blocks all belong to
1042− a single footnote (as with block quotes).
1043− </p>
634+ contains a space^(my note).</p>
635+ <p><xref alt="(1)" rid="ref_1">(1)</xref> Here is the footnote. It can
636+ go anywhere in the document, not just at the end.</p>
637+ <p><xref alt="(longnote)" rid="ref_longnote">(longnote)</xref> Here's
638+ the other note. This one contains multiple blocks.</p>
639+ <p>Caret characters are used to indicate that the blocks all belong to
640+ a single footnote (as with block quotes).</p>
1044641 <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
1047643 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.
1049− </p>
1050− <p>
1051− text <italic>Leading space</italic>
1052− </p>
1053− <p>
1054− <italic>Trailing space</italic> text
1055− </p>
1056− <p>
1057− text <italic>Leading spaces</italic>
1058− </p>
1059− <p>
1060− <italic>Trailing spaces</italic> text
1061− </p>
644+ of the first line of the block and any preceding blank lines.</p>
645+ <p>text <italic>Leading space</italic></p>
646+ <p><italic>Trailing space</italic> text</p>
647+ <p>text <italic>Leading spaces</italic></p>
648+ <p><italic>Trailing spaces</italic> text</p>
1062649</sec>
1063650<sec id="tables">
1064651 <title>Tables</title>
@@ -1071,55 +658,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1071658 <thead>
1072659 <tr>
1073660 <th>
1074− <p>
1075− X
1076− </p>
661+ <p>X</p>
1077662 </th>
1078663 <th>
1079− <p>
1080− Y
1081− </p>
664+ <p>Y</p>
1082665 </th>
1083666 <th>
1084− <p>
1085− Z
1086− </p>
667+ <p>Z</p>
1087668 </th>
1088669 </tr>
1089670 </thead>
1090671 <tbody>
1091672 <tr>
1092673 <td>
1093− <p>
1094− 1
1095− </p>
674+ <p>1</p>
1096675 </td>
1097676 <td>
1098− <p>
1099− 2
1100− </p>
677+ <p>2</p>
1101678 </td>
1102679 <td>
1103− <p>
1104− 3
1105− </p>
680+ <p>3</p>
1106681 </td>
1107682 </tr>
1108683 <tr>
1109684 <td>
1110− <p>
1111− 4
1112− </p>
685+ <p>4</p>
1113686 </td>
1114687 <td>
1115− <p>
1116− 5
1117− </p>
688+ <p>5</p>
1118689 </td>
1119690 <td>
1120− <p>
1121− 6
1122− </p>
691+ <p>6</p>
1123692 </td>
1124693 </tr>
1125694 </tbody>
@@ -1131,55 +700,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1131700 <thead>
1132701 <tr>
1133702 <th>
1134− <p>
1135− X
1136− </p>
703+ <p>X</p>
1137704 </th>
1138705 <th>
1139− <p>
1140− Y
1141− </p>
706+ <p>Y</p>
1142707 </th>
1143708 <th>
1144− <p>
1145− Z
1146− </p>
709+ <p>Z</p>
1147710 </th>
1148711 </tr>
1149712 </thead>
1150713 <tbody>
1151714 <tr>
1152715 <td>
1153− <p>
1154− 1
1155− </p>
716+ <p>1</p>
1156717 </td>
1157718 <td>
1158− <p>
1159− 2
1160− </p>
719+ <p>2</p>
1161720 </td>
1162721 <td>
1163− <p>
1164− 3
1165− </p>
722+ <p>3</p>
1166723 </td>
1167724 </tr>
1168725 <tr>
1169726 <td>
1170− <p>
1171− 4
1172− </p>
727+ <p>4</p>
1173728 </td>
1174729 <td>
1175− <p>
1176− 5
1177− </p>
730+ <p>5</p>
1178731 </td>
1179732 <td>
1180− <p>
1181− 6
1182− </p>
733+ <p>6</p>
1183734 </td>
1184735 </tr>
1185736 </tbody>
@@ -1191,55 +742,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1191742 <thead>
1192743 <tr>
1193744 <th>
1194− <p>
1195− X
1196− </p>
745+ <p>X</p>
1197746 </th>
1198747 <th>
1199− <p>
1200− Y
1201− </p>
748+ <p>Y</p>
1202749 </th>
1203750 <th>
1204− <p>
1205− Z
1206− </p>
751+ <p>Z</p>
1207752 </th>
1208753 </tr>
1209754 </thead>
1210755 <tbody>
1211756 <tr>
1212757 <td>
1213− <p>
1214− 1
1215− </p>
758+ <p>1</p>
1216759 </td>
1217760 <td>
1218− <p>
1219− 2
1220− </p>
761+ <p>2</p>
1221762 </td>
1222763 <td>
1223− <p>
1224− 3
1225− </p>
764+ <p>3</p>
1226765 </td>
1227766 </tr>
1228767 <tr>
1229768 <td>
1230− <p>
1231− 4
1232− </p>
769+ <p>4</p>
1233770 </td>
1234771 <td>
1235− <p>
1236− 5
1237− </p>
772+ <p>5</p>
1238773 </td>
1239774 <td>
1240− <p>
1241− 6
1242− </p>
775+ <p>6</p>
1243776 </td>
1244777 </tr>
1245778 </tbody>
@@ -1251,55 +784,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1251784 <thead>
1252785 <tr>
1253786 <th>
1254− <p>
1255− X
1256− </p>
787+ <p>X</p>
1257788 </th>
1258789 <th>
1259− <p>
1260− Y
1261− </p>
790+ <p>Y</p>
1262791 </th>
1263792 <th>
1264− <p>
1265− Z
1266− </p>
793+ <p>Z</p>
1267794 </th>
1268795 </tr>
1269796 </thead>
1270797 <tbody>
1271798 <tr>
1272799 <td>
1273− <p>
1274− 1
1275− </p>
800+ <p>1</p>
1276801 </td>
1277802 <td>
1278− <p>
1279− 2
1280− </p>
803+ <p>2</p>
1281804 </td>
1282805 <td>
1283− <p>
1284− 3
1285− </p>
806+ <p>3</p>
1286807 </td>
1287808 </tr>
1288809 <tr>
1289810 <td>
1290− <p>
1291− 4
1292− </p>
811+ <p>4</p>
1293812 </td>
1294813 <td>
1295− <p>
1296− 5
1297− </p>
814+ <p>5</p>
1298815 </td>
1299816 <td>
1300− <p>
1301− 6
1302− </p>
817+ <p>6</p>
1303818 </td>
1304819 </tr>
1305820 </tbody>
@@ -1311,55 +826,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1311826 <thead>
1312827 <tr>
1313828 <th>
1314− <p>
1315− X
1316− </p>
829+ <p>X</p>
1317830 </th>
1318831 <th>
1319− <p>
1320− Y
1321− </p>
832+ <p>Y</p>
1322833 </th>
1323834 <th>
1324− <p>
1325− Z
1326− </p>
835+ <p>Z</p>
1327836 </th>
1328837 </tr>
1329838 </thead>
1330839 <tbody>
1331840 <tr>
1332841 <td>
1333− <p>
1334− 1
1335− </p>
842+ <p>1</p>
1336843 </td>
1337844 <td>
1338− <p>
1339− 2
1340− </p>
845+ <p>2</p>
1341846 </td>
1342847 <td>
1343− <p>
1344− 3
1345− </p>
848+ <p>3</p>
1346849 </td>
1347850 </tr>
1348851 <tr>
1349852 <td>
1350− <p>
1351− 4
1352− </p>
853+ <p>4</p>
1353854 </td>
1354855 <td>
1355− <p>
1356− 5
1357− </p>
856+ <p>5</p>
1358857 </td>
1359858 <td>
1360− <p>
1361− 6
1362− </p>
859+ <p>6</p>
1363860 </td>
1364861 </tr>
1365862 </tbody>
@@ -1371,55 +868,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1371868 <thead>
1372869 <tr>
1373870 <th>
1374− <p>
1375− X
1376− </p>
871+ <p>X</p>
1377872 </th>
1378873 <th>
1379− <p>
1380− Y
1381− </p>
874+ <p>Y</p>
1382875 </th>
1383876 <th>
1384− <p>
1385− Z
1386− </p>
877+ <p>Z</p>
1387878 </th>
1388879 </tr>
1389880 </thead>
1390881 <tbody>
1391882 <tr>
1392883 <td>
1393− <p>
1394− 1
1395− </p>
884+ <p>1</p>
1396885 </td>
1397886 <td>
1398− <p>
1399− 2
1400− </p>
887+ <p>2</p>
1401888 </td>
1402889 <td>
1403− <p>
1404− 3
1405− </p>
890+ <p>3</p>
1406891 </td>
1407892 </tr>
1408893 <tr>
1409894 <td>
1410− <p>
1411− 4
1412− </p>
895+ <p>4</p>
1413896 </td>
1414897 <td>
1415− <p>
1416− 5
1417− </p>
898+ <p>5</p>
1418899 </td>
1419900 <td>
1420− <p>
1421− 6
1422− </p>
901+ <p>6</p>
1423902 </td>
1424903 </tr>
1425904 </tbody>
@@ -1431,55 +910,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1431910 <thead>
1432911 <tr>
1433912 <th>
1434− <p>
1435− X
1436− </p>
913+ <p>X</p>
1437914 </th>
1438915 <th>
1439− <p>
1440− Y
1441− </p>
916+ <p>Y</p>
1442917 </th>
1443918 <th>
1444− <p>
1445− Z
1446− </p>
919+ <p>Z</p>
1447920 </th>
1448921 </tr>
1449922 </thead>
1450923 <tbody>
1451924 <tr>
1452925 <td>
1453− <p>
1454− 1
1455− </p>
926+ <p>1</p>
1456927 </td>
1457928 <td>
1458− <p>
1459− 2
1460− </p>
929+ <p>2</p>
1461930 </td>
1462931 <td>
1463− <p>
1464− 3
1465− </p>
932+ <p>3</p>
1466933 </td>
1467934 </tr>
1468935 <tr>
1469936 <td>
1470− <p>
1471− 4
1472− </p>
937+ <p>4</p>
1473938 </td>
1474939 <td>
1475− <p>
1476− 5
1477− </p>
940+ <p>5</p>
1478941 </td>
1479942 <td>
1480− <p>
1481− 6
1482− </p>
943+ <p>6</p>
1483944 </td>
1484945 </tr>
1485946 </tbody>
@@ -1491,55 +952,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1491952 <thead>
1492953 <tr>
1493954 <th>
1494− <p>
1495− X
1496− </p>
955+ <p>X</p>
1497956 </th>
1498957 <th>
1499− <p>
1500− Y
1501− </p>
958+ <p>Y</p>
1502959 </th>
1503960 <th>
1504− <p>
1505− Z
1506− </p>
961+ <p>Z</p>
1507962 </th>
1508963 </tr>
1509964 </thead>
1510965 <tbody>
1511966 <tr>
1512967 <td>
1513− <p>
1514− 1
1515− </p>
968+ <p>1</p>
1516969 </td>
1517970 <td>
1518− <p>
1519− 2
1520− </p>
971+ <p>2</p>
1521972 </td>
1522973 <td>
1523− <p>
1524− 3
1525− </p>
974+ <p>3</p>
1526975 </td>
1527976 </tr>
1528977 <tr>
1529978 <td>
1530− <p>
1531− 4
1532− </p>
979+ <p>4</p>
1533980 </td>
1534981 <td>
1535− <p>
1536− 5
1537− </p>
982+ <p>5</p>
1538983 </td>
1539984 <td>
1540− <p>
1541− 6
1542− </p>
985+ <p>6</p>
1543986 </td>
1544987 </tr>
1545988 </tbody>
@@ -1551,55 +994,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
1551994 <thead>
1552995 <tr>
1553996 <th>
1554− <p>
1555− X
1556− </p>
997+ <p>X</p>
1557998 </th>
1558999 <th>
1559− <p>
1560− Y
1561− </p>
1000+ <p>Y</p>
15621001 </th>
15631002 <th>
1564− <p>
1565− Z
1566− </p>
1003+ <p>Z</p>
15671004 </th>
15681005 </tr>
15691006 </thead>
15701007 <tbody>
15711008 <tr>
15721009 <td>
1573− <p>
1574− 1
1575− </p>
1010+ <p>1</p>
15761011 </td>
15771012 <td>
1578− <p>
1579− 2
1580− </p>
1013+ <p>2</p>
15811014 </td>
15821015 <td>
1583− <p>
1584− 3
1585− </p>
1016+ <p>3</p>
15861017 </td>
15871018 </tr>
15881019 <tr>
15891020 <td>
1590− <p>
1591− 4
1592− </p>
1021+ <p>4</p>
15931022 </td>
15941023 <td>
1595− <p>
1596− 5
1597− </p>
1024+ <p>5</p>
15981025 </td>
15991026 <td>
1600− <p>
1601− 6
1602− </p>
1027+ <p>6</p>
16031028 </td>
16041029 </tr>
16051030 </tbody>
@@ -1614,36 +1039,24 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
16141039 <tbody>
16151040 <tr>
16161041 <td>
1617− <p>
1618− 1
1619− </p>
1042+ <p>1</p>
16201043 </td>
16211044 <td>
1622− <p>
1623− 2
1624− </p>
1045+ <p>2</p>
16251046 </td>
16261047 <td>
1627− <p>
1628− 3
1629− </p>
1048+ <p>3</p>
16301049 </td>
16311050 </tr>
16321051 <tr>
16331052 <td>
1634− <p>
1635− 4
1636− </p>
1053+ <p>4</p>
16371054 </td>
16381055 <td>
1639− <p>
1640− 5
1641− </p>
1056+ <p>5</p>
16421057 </td>
16431058 <td>
1644− <p>
1645− 6
1646− </p>
1059+ <p>6</p>
16471060 </td>
16481061 </tr>
16491062 </tbody>
@@ -1655,36 +1068,24 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
16551068 <tbody>
16561069 <tr>
16571070 <td>
1658− <p>
1659− 1
1660− </p>
1071+ <p>1</p>
16611072 </td>
16621073 <td>
1663− <p>
1664− 2
1665− </p>
1074+ <p>2</p>
16661075 </td>
16671076 <td>
1668− <p>
1669− 3
1670− </p>
1077+ <p>3</p>
16711078 </td>
16721079 </tr>
16731080 <tr>
16741081 <td>
1675− <p>
1676− 4
1677− </p>
1082+ <p>4</p>
16781083 </td>
16791084 <td>
1680− <p>
1681− 5
1682− </p>
1085+ <p>5</p>
16831086 </td>
16841087 <td>
1685− <p>
1686− 6
1687− </p>
1088+ <p>6</p>
16881089 </td>
16891090 </tr>
16901091 </tbody>
@@ -1696,36 +1097,24 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
16961097 <tbody>
16971098 <tr>
16981099 <td>
1699− <p>
1700− 1
1701− </p>
1100+ <p>1</p>
17021101 </td>
17031102 <td>
1704− <p>
1705− 2
1706− </p>
1103+ <p>2</p>
17071104 </td>
17081105 <td>
1709− <p>
1710− 3
1711− </p>
1106+ <p>3</p>
17121107 </td>
17131108 </tr>
17141109 <tr>
17151110 <td>
1716− <p>
1717− 4
1718− </p>
1111+ <p>4</p>
17191112 </td>
17201113 <td>
1721− <p>
1722− 5
1723− </p>
1114+ <p>5</p>
17241115 </td>
17251116 <td>
1726− <p>
1727− 6
1728− </p>
1117+ <p>6</p>
17291118 </td>
17301119 </tr>
17311120 </tbody>
@@ -1737,36 +1126,24 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
17371126 <tbody>
17381127 <tr>
17391128 <td>
1740− <p>
1741− 1
1742− </p>
1129+ <p>1</p>
17431130 </td>
17441131 <td>
1745− <p>
1746− 2
1747− </p>
1132+ <p>2</p>
17481133 </td>
17491134 <td>
1750− <p>
1751− 3
1752− </p>
1135+ <p>3</p>
17531136 </td>
17541137 </tr>
17551138 <tr>
17561139 <td>
1757− <p>
1758− 4
1759− </p>
1140+ <p>4</p>
17601141 </td>
17611142 <td>
1762− <p>
1763− 5
1764− </p>
1143+ <p>5</p>
17651144 </td>
17661145 <td>
1767− <p>
1768− 6
1769− </p>
1146+ <p>6</p>
17701147 </td>
17711148 </tr>
17721149 </tbody>
@@ -1774,9 +1151,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
17741151 </sec>
17751152 <sec id="empty-tables">
17761153 <title>Empty Tables</title>
1777− <p>
1778− This section should be empty.
1779− </p>
1154+ <p>This section should be empty.</p>
17801155 </sec>
17811156</sec>
17821157</body>
test/tables.jats+102−306
@@ -1,11 +1,7 @@
1−<p>
2− Simple table with caption:
3−</p>
1+<p>Simple table with caption:</p>
42<table-wrap>
53 <caption>
6− <p>
7− Demonstration of simple table syntax.
8− </p>
4+ <p>Demonstration of simple table syntax.</p>
95 </caption>
106 <table>
117 <col align="right" />
@@ -14,69 +10,35 @@
1410 <col align="left" />
1511 <thead>
1612 <tr>
17− <th>
18− Right
19− </th>
20− <th>
21− Left
22− </th>
23− <th>
24− Center
25− </th>
26− <th>
27− Default
28− </th>
13+ <th>Right</th>
14+ <th>Left</th>
15+ <th>Center</th>
16+ <th>Default</th>
2917 </tr>
3018 </thead>
3119 <tbody>
3220 <tr>
33− <td>
34− 12
35− </td>
36− <td>
37− 12
38− </td>
39− <td>
40− 12
41− </td>
42− <td>
43− 12
44− </td>
21+ <td>12</td>
22+ <td>12</td>
23+ <td>12</td>
24+ <td>12</td>
4525 </tr>
4626 <tr>
47− <td>
48− 123
49− </td>
50− <td>
51− 123
52− </td>
53− <td>
54− 123
55− </td>
56− <td>
57− 123
58− </td>
27+ <td>123</td>
28+ <td>123</td>
29+ <td>123</td>
30+ <td>123</td>
5931 </tr>
6032 <tr>
61− <td>
62− 1
63− </td>
64− <td>
65− 1
66− </td>
67− <td>
68− 1
69− </td>
70− <td>
71− 1
72− </td>
33+ <td>1</td>
34+ <td>1</td>
35+ <td>1</td>
36+ <td>1</td>
7337 </tr>
7438 </tbody>
7539 </table>
7640</table-wrap>
77−<p>
78− Simple table without caption:
79−</p>
41+<p>Simple table without caption:</p>
8042<table>
8143 <col align="right" />
8244 <col align="left" />
@@ -84,73 +46,37 @@
8446 <col align="left" />
8547 <thead>
8648 <tr>
87− <th>
88− Right
89− </th>
90− <th>
91− Left
92− </th>
93− <th>
94− Center
95− </th>
96− <th>
97− Default
98− </th>
49+ <th>Right</th>
50+ <th>Left</th>
51+ <th>Center</th>
52+ <th>Default</th>
9953 </tr>
10054 </thead>
10155 <tbody>
10256 <tr>
103− <td>
104− 12
105− </td>
106− <td>
107− 12
108− </td>
109− <td>
110− 12
111− </td>
112− <td>
113− 12
114− </td>
57+ <td>12</td>
58+ <td>12</td>
59+ <td>12</td>
60+ <td>12</td>
11561 </tr>
11662 <tr>
117− <td>
118− 123
119− </td>
120− <td>
121− 123
122− </td>
123− <td>
124− 123
125− </td>
126− <td>
127− 123
128− </td>
63+ <td>123</td>
64+ <td>123</td>
65+ <td>123</td>
66+ <td>123</td>
12967 </tr>
13068 <tr>
131− <td>
132− 1
133− </td>
134− <td>
135− 1
136− </td>
137− <td>
138− 1
139− </td>
140− <td>
141− 1
142− </td>
69+ <td>1</td>
70+ <td>1</td>
71+ <td>1</td>
72+ <td>1</td>
14373 </tr>
14474 </tbody>
14575</table>
146−<p>
147− Simple table indented two spaces:
148−</p>
76+<p>Simple table indented two spaces:</p>
14977<table-wrap>
15078 <caption>
151− <p>
152− Demonstration of simple table syntax.
153− </p>
79+ <p>Demonstration of simple table syntax.</p>
15480 </caption>
15581 <table>
15682 <col align="right" />
@@ -159,74 +85,38 @@
15985 <col align="left" />
16086 <thead>
16187 <tr>
162− <th>
163− Right
164− </th>
165− <th>
166− Left
167− </th>
168− <th>
169− Center
170− </th>
171− <th>
172− Default
173− </th>
88+ <th>Right</th>
89+ <th>Left</th>
90+ <th>Center</th>
91+ <th>Default</th>
17492 </tr>
17593 </thead>
17694 <tbody>
17795 <tr>
178− <td>
179− 12
180− </td>
181− <td>
182− 12
183− </td>
184− <td>
185− 12
186− </td>
187− <td>
188− 12
189− </td>
96+ <td>12</td>
97+ <td>12</td>
98+ <td>12</td>
99+ <td>12</td>
190100 </tr>
191101 <tr>
192− <td>
193− 123
194− </td>
195− <td>
196− 123
197− </td>
198− <td>
199− 123
200− </td>
201− <td>
202− 123
203− </td>
102+ <td>123</td>
103+ <td>123</td>
104+ <td>123</td>
105+ <td>123</td>
204106 </tr>
205107 <tr>
206− <td>
207− 1
208− </td>
209− <td>
210− 1
211− </td>
212− <td>
213− 1
214− </td>
215− <td>
216− 1
217− </td>
108+ <td>1</td>
109+ <td>1</td>
110+ <td>1</td>
111+ <td>1</td>
218112 </tr>
219113 </tbody>
220114 </table>
221115</table-wrap>
222−<p>
223− Multiline table with caption:
224−</p>
116+<p>Multiline table with caption:</p>
225117<table-wrap>
226118 <caption>
227− <p>
228− Here’s the caption. It may span multiple lines.
229− </p>
119+ <p>Here’s the caption. It may span multiple lines.</p>
230120 </caption>
231121 <table>
232122 <col width="15*" align="center" />
@@ -235,55 +125,29 @@
235125 <col width="33*" align="left" />
236126 <thead>
237127 <tr>
238− <th>
239− Centered Header
240− </th>
241− <th>
242− Left Aligned
243− </th>
244− <th>
245− Right Aligned
246− </th>
247− <th>
248− Default aligned
249− </th>
128+ <th>Centered Header</th>
129+ <th>Left Aligned</th>
130+ <th>Right Aligned</th>
131+ <th>Default aligned</th>
250132 </tr>
251133 </thead>
252134 <tbody>
253135 <tr>
254− <td>
255− First
256− </td>
257− <td>
258− row
259− </td>
260− <td>
261− 12.0
262− </td>
263− <td>
264− Example of a row that spans multiple lines.
265− </td>
136+ <td>First</td>
137+ <td>row</td>
138+ <td>12.0</td>
139+ <td>Example of a row that spans multiple lines.</td>
266140 </tr>
267141 <tr>
268− <td>
269− Second
270− </td>
271− <td>
272− row
273− </td>
274− <td>
275− 5.0
276− </td>
277− <td>
278− Here’s another one. Note the blank line between rows.
279− </td>
142+ <td>Second</td>
143+ <td>row</td>
144+ <td>5.0</td>
145+ <td>Here’s another one. Note the blank line between rows.</td>
280146 </tr>
281147 </tbody>
282148 </table>
283149</table-wrap>
284−<p>
285− Multiline table without caption:
286−</p>
150+<p>Multiline table without caption:</p>
287151<table>
288152 <col width="15*" align="center" />
289153 <col width="13*" align="left" />
@@ -291,54 +155,28 @@
291155 <col width="33*" align="left" />
292156 <thead>
293157 <tr>
294− <th>
295− Centered Header
296− </th>
297− <th>
298− Left Aligned
299− </th>
300− <th>
301− Right Aligned
302− </th>
303− <th>
304− Default aligned
305− </th>
158+ <th>Centered Header</th>
159+ <th>Left Aligned</th>
160+ <th>Right Aligned</th>
161+ <th>Default aligned</th>
306162 </tr>
307163 </thead>
308164 <tbody>
309165 <tr>
310− <td>
311− First
312− </td>
313− <td>
314− row
315− </td>
316− <td>
317− 12.0
318− </td>
319− <td>
320− Example of a row that spans multiple lines.
321− </td>
166+ <td>First</td>
167+ <td>row</td>
168+ <td>12.0</td>
169+ <td>Example of a row that spans multiple lines.</td>
322170 </tr>
323171 <tr>
324− <td>
325− Second
326− </td>
327− <td>
328− row
329− </td>
330− <td>
331− 5.0
332− </td>
333− <td>
334− Here’s another one. Note the blank line between rows.
335− </td>
172+ <td>Second</td>
173+ <td>row</td>
174+ <td>5.0</td>
175+ <td>Here’s another one. Note the blank line between rows.</td>
336176 </tr>
337177 </tbody>
338178</table>
339−<p>
340− Table without column headers:
341−</p>
179+<p>Table without column headers:</p>
342180<table>
343181 <col align="right" />
344182 <col align="left" />
@@ -346,52 +184,26 @@
346184 <col align="right" />
347185 <tbody>
348186 <tr>
349− <td>
350− 12
351− </td>
352− <td>
353− 12
354− </td>
355− <td>
356− 12
357− </td>
358− <td>
359− 12
360− </td>
187+ <td>12</td>
188+ <td>12</td>
189+ <td>12</td>
190+ <td>12</td>
361191 </tr>
362192 <tr>
363− <td>
364− 123
365− </td>
366− <td>
367− 123
368− </td>
369− <td>
370− 123
371− </td>
372− <td>
373− 123
374− </td>
193+ <td>123</td>
194+ <td>123</td>
195+ <td>123</td>
196+ <td>123</td>
375197 </tr>
376198 <tr>
377− <td>
378− 1
379− </td>
380− <td>
381− 1
382− </td>
383− <td>
384− 1
385− </td>
386− <td>
387− 1
388− </td>
199+ <td>1</td>
200+ <td>1</td>
201+ <td>1</td>
202+ <td>1</td>
389203 </tr>
390204 </tbody>
391205</table>
392−<p>
393− Multiline table without column headers:
394−</p>
206+<p>Multiline table without column headers:</p>
395207<table>
396208 <col width="15*" align="center" />
397209 <col width="13*" align="left" />
@@ -399,32 +211,16 @@
399211 <col width="33*" align="left" />
400212 <tbody>
401213 <tr>
402− <td>
403− First
404− </td>
405− <td>
406− row
407− </td>
408− <td>
409− 12.0
410− </td>
411− <td>
412− Example of a row that spans multiple lines.
413− </td>
214+ <td>First</td>
215+ <td>row</td>
216+ <td>12.0</td>
217+ <td>Example of a row that spans multiple lines.</td>
414218 </tr>
415219 <tr>
416− <td>
417− Second
418− </td>
419− <td>
420− row
421− </td>
422− <td>
423− 5.0
424− </td>
425− <td>
426− Here’s another one. Note the blank line between rows.
427− </td>
220+ <td>Second</td>
221+ <td>row</td>
222+ <td>5.0</td>
223+ <td>Here’s another one. Note the blank line between rows.</td>
428224 </tr>
429225 </tbody>
430226</table>
test/writer.jats+357−923
@@ -32,10 +32,8 @@
3232</article-meta>
3333</front>
3434<body>
35−<p>
36− This is a set of tests for pandoc. Most of them are adapted from John
37− Gruber’s markdown test suite.
38−</p>
35+<p>This is a set of tests for pandoc. Most of them are adapted from John
36+Gruber’s markdown test suite.</p>
3937<sec id="headers">
4038 <title>Headers</title>
4139 <sec id="level-2-with-an-embedded-link">
@@ -59,93 +57,57 @@
5957 <title>Level 2 with <italic>emphasis</italic></title>
6058 <sec id="level-3">
6159 <title>Level 3</title>
62− <p>
63− with no blank line
64− </p>
60+ <p>with no blank line</p>
6561 </sec>
6662 </sec>
6763 <sec id="level-2">
6864 <title>Level 2</title>
69− <p>
70− with no blank line
71− </p>
65+ <p>with no blank line</p>
7266 </sec>
7367</sec>
7468<sec id="paragraphs">
7569 <title>Paragraphs</title>
76− <p>
77− Here’s a regular paragraph.
78− </p>
79− <p>
80− 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
82− a list item.
83− </p>
84− <p>
85− Here’s one with a bullet. * criminey.
86− </p>
87− <p>
88− There should be a hard line break<break />here.
89− </p>
70+ <p>Here’s a regular paragraph.</p>
71+ <p>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
72+ item. Because a hard-wrapped line in the middle of a paragraph looked like a
73+ list item.</p>
74+ <p>Here’s one with a bullet. * criminey.</p>
75+ <p>There should be a hard line break<break />here.</p>
9076</sec>
9177<sec id="block-quotes">
9278 <title>Block Quotes</title>
93− <p>
94− E-mail style:
95− </p>
79+ <p>E-mail style:</p>
9680 <disp-quote>
97− <p>
98− This is a block quote. It is pretty short.
99− </p>
81+ <p>This is a block quote. It is pretty short.</p>
10082 </disp-quote>
10183 <disp-quote>
102− <p>
103− Code in a block quote:
104− </p>
84+ <p>Code in a block quote:</p>
10585 <preformat>sub status {
10686 print &quot;working&quot;;
10787}</preformat>
108− <p>
109− A list:
110− </p>
88+ <p>A list:</p>
11189 <list list-type="order">
11290 <list-item>
113− <p>
114− item one
115− </p>
91+ <p>item one</p>
11692 </list-item>
11793 <list-item>
118− <p>
119− item two
120− </p>
94+ <p>item two</p>
12195 </list-item>
12296 </list>
123− <p>
124− Nested block quotes:
125− </p>
97+ <p>Nested block quotes:</p>
12698 <disp-quote>
127− <p>
128− nested
129− </p>
99+ <p>nested</p>
130100 </disp-quote>
131101 <disp-quote>
132− <p>
133− nested
134− </p>
102+ <p>nested</p>
135103 </disp-quote>
136104 </disp-quote>
137− <p>
138− This should not be a block quote: 2 &gt; 1.
139− </p>
140− <p>
141− And a following paragraph.
142− </p>
105+ <p>This should not be a block quote: 2 &gt; 1.</p>
106+ <p>And a following paragraph.</p>
143107</sec>
144108<sec id="code-blocks">
145109 <title>Code Blocks</title>
146− <p>
147− Code:
148− </p>
110+ <p>Code:</p>
149111 <preformat>---- (should be four hyphens)
150112
151113sub status {
@@ -153,9 +115,7 @@ sub status {
153115}
154116
155117this code block is indented by one tab</preformat>
156− <p>
157− And:
158− </p>
118+ <p>And:</p>
159119 <preformat> this code block is indented by two tabs
160120
161121These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
@@ -164,231 +124,141 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
164124 <title>Lists</title>
165125 <sec id="unordered">
166126 <title>Unordered</title>
167− <p>
168− Asterisks tight:
169− </p>
127+ <p>Asterisks tight:</p>
170128 <list list-type="bullet">
171129 <list-item>
172− <p>
173− asterisk 1
174− </p>
130+ <p>asterisk 1</p>
175131 </list-item>
176132 <list-item>
177− <p>
178− asterisk 2
179− </p>
133+ <p>asterisk 2</p>
180134 </list-item>
181135 <list-item>
182− <p>
183− asterisk 3
184− </p>
136+ <p>asterisk 3</p>
185137 </list-item>
186138 </list>
187− <p>
188− Asterisks loose:
189− </p>
139+ <p>Asterisks loose:</p>
190140 <list list-type="bullet">
191141 <list-item>
192− <p>
193− asterisk 1
194− </p>
142+ <p>asterisk 1</p>
195143 </list-item>
196144 <list-item>
197− <p>
198− asterisk 2
199− </p>
145+ <p>asterisk 2</p>
200146 </list-item>
201147 <list-item>
202− <p>
203− asterisk 3
204− </p>
148+ <p>asterisk 3</p>
205149 </list-item>
206150 </list>
207− <p>
208− Pluses tight:
209− </p>
151+ <p>Pluses tight:</p>
210152 <list list-type="bullet">
211153 <list-item>
212− <p>
213− Plus 1
214− </p>
154+ <p>Plus 1</p>
215155 </list-item>
216156 <list-item>
217− <p>
218− Plus 2
219− </p>
157+ <p>Plus 2</p>
220158 </list-item>
221159 <list-item>
222− <p>
223− Plus 3
224− </p>
160+ <p>Plus 3</p>
225161 </list-item>
226162 </list>
227− <p>
228− Pluses loose:
229− </p>
163+ <p>Pluses loose:</p>
230164 <list list-type="bullet">
231165 <list-item>
232− <p>
233− Plus 1
234− </p>
166+ <p>Plus 1</p>
235167 </list-item>
236168 <list-item>
237− <p>
238− Plus 2
239− </p>
169+ <p>Plus 2</p>
240170 </list-item>
241171 <list-item>
242− <p>
243− Plus 3
244− </p>
172+ <p>Plus 3</p>
245173 </list-item>
246174 </list>
247− <p>
248− Minuses tight:
249− </p>
175+ <p>Minuses tight:</p>
250176 <list list-type="bullet">
251177 <list-item>
252− <p>
253− Minus 1
254− </p>
178+ <p>Minus 1</p>
255179 </list-item>
256180 <list-item>
257− <p>
258− Minus 2
259− </p>
181+ <p>Minus 2</p>
260182 </list-item>
261183 <list-item>
262− <p>
263− Minus 3
264− </p>
184+ <p>Minus 3</p>
265185 </list-item>
266186 </list>
267− <p>
268− Minuses loose:
269− </p>
187+ <p>Minuses loose:</p>
270188 <list list-type="bullet">
271189 <list-item>
272− <p>
273− Minus 1
274− </p>
190+ <p>Minus 1</p>
275191 </list-item>
276192 <list-item>
277− <p>
278− Minus 2
279− </p>
193+ <p>Minus 2</p>
280194 </list-item>
281195 <list-item>
282− <p>
283− Minus 3
284− </p>
196+ <p>Minus 3</p>
285197 </list-item>
286198 </list>
287199 </sec>
288200 <sec id="ordered">
289201 <title>Ordered</title>
290− <p>
291− Tight:
292− </p>
202+ <p>Tight:</p>
293203 <list list-type="order">
294204 <list-item>
295− <p>
296− First
297− </p>
205+ <p>First</p>
298206 </list-item>
299207 <list-item>
300− <p>
301− Second
302− </p>
208+ <p>Second</p>
303209 </list-item>
304210 <list-item>
305− <p>
306− Third
307− </p>
211+ <p>Third</p>
308212 </list-item>
309213 </list>
310− <p>
311− and:
312− </p>
214+ <p>and:</p>
313215 <list list-type="order">
314216 <list-item>
315− <p>
316− One
317− </p>
217+ <p>One</p>
318218 </list-item>
319219 <list-item>
320− <p>
321− Two
322− </p>
220+ <p>Two</p>
323221 </list-item>
324222 <list-item>
325− <p>
326− Three
327− </p>
223+ <p>Three</p>
328224 </list-item>
329225 </list>
330− <p>
331− Loose using tabs:
332− </p>
226+ <p>Loose using tabs:</p>
333227 <list list-type="order">
334228 <list-item>
335− <p>
336− First
337− </p>
229+ <p>First</p>
338230 </list-item>
339231 <list-item>
340− <p>
341− Second
342− </p>
232+ <p>Second</p>
343233 </list-item>
344234 <list-item>
345− <p>
346− Third
347− </p>
235+ <p>Third</p>
348236 </list-item>
349237 </list>
350− <p>
351− and using spaces:
352− </p>
238+ <p>and using spaces:</p>
353239 <list list-type="order">
354240 <list-item>
355− <p>
356− One
357− </p>
241+ <p>One</p>
358242 </list-item>
359243 <list-item>
360− <p>
361− Two
362− </p>
244+ <p>Two</p>
363245 </list-item>
364246 <list-item>
365− <p>
366− Three
367− </p>
247+ <p>Three</p>
368248 </list-item>
369249 </list>
370− <p>
371− Multiple paragraphs:
372− </p>
250+ <p>Multiple paragraphs:</p>
373251 <list list-type="order">
374252 <list-item>
375− <p>
376− Item 1, graf one.
377− </p>
378− <p>
379− Item 1. graf two. The quick brown fox jumped over the lazy dog’s
380− back.
381− </p>
253+ <p>Item 1, graf one.</p>
254+ <p>Item 1. graf two. The quick brown fox jumped over the lazy dog’s
255+ back.</p>
382256 </list-item>
383257 <list-item>
384− <p>
385− Item 2.
386− </p>
258+ <p>Item 2.</p>
387259 </list-item>
388260 <list-item>
389− <p>
390− Item 3.
391− </p>
261+ <p>Item 3.</p>
392262 </list-item>
393263 </list>
394264 </sec>
@@ -396,97 +266,63 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
396266 <title>Nested</title>
397267 <list list-type="bullet">
398268 <list-item>
399− <p>
400− Tab
401− </p>
269+ <p>Tab</p>
402270 <list list-type="bullet">
403271 <list-item>
404− <p>
405− Tab
406− </p>
272+ <p>Tab</p>
407273 <list list-type="bullet">
408274 <list-item>
409− <p>
410− Tab
411− </p>
275+ <p>Tab</p>
412276 </list-item>
413277 </list>
414278 </list-item>
415279 </list>
416280 </list-item>
417281 </list>
418− <p>
419− Here’s another:
420− </p>
282+ <p>Here’s another:</p>
421283 <list list-type="order">
422284 <list-item>
423− <p>
424− First
425− </p>
285+ <p>First</p>
426286 </list-item>
427287 <list-item>
428− <p>
429− Second:
430− </p>
288+ <p>Second:</p>
431289 <list list-type="bullet">
432290 <list-item>
433− <p>
434− Fee
435− </p>
291+ <p>Fee</p>
436292 </list-item>
437293 <list-item>
438− <p>
439− Fie
440− </p>
294+ <p>Fie</p>
441295 </list-item>
442296 <list-item>
443− <p>
444− Foe
445− </p>
297+ <p>Foe</p>
446298 </list-item>
447299 </list>
448300 </list-item>
449301 <list-item>
450− <p>
451− Third
452− </p>
302+ <p>Third</p>
453303 </list-item>
454304 </list>
455− <p>
456− Same thing but with paragraphs:
457− </p>
305+ <p>Same thing but with paragraphs:</p>
458306 <list list-type="order">
459307 <list-item>
460− <p>
461− First
462− </p>
308+ <p>First</p>
463309 </list-item>
464310 <list-item>
465− <p>
466− Second:
467− </p>
311+ <p>Second:</p>
468312 <list list-type="bullet">
469313 <list-item>
470− <p>
471− Fee
472− </p>
314+ <p>Fee</p>
473315 </list-item>
474316 <list-item>
475− <p>
476− Fie
477− </p>
317+ <p>Fie</p>
478318 </list-item>
479319 <list-item>
480− <p>
481− Foe
482− </p>
320+ <p>Foe</p>
483321 </list-item>
484322 </list>
485323 </list-item>
486324 <list-item>
487− <p>
488− Third
489− </p>
325+ <p>Third</p>
490326 </list-item>
491327 </list>
492328 </sec>
@@ -494,24 +330,16 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
494330 <title>Tabs and spaces</title>
495331 <list list-type="bullet">
496332 <list-item>
497− <p>
498− this is a list item indented with tabs
499− </p>
333+ <p>this is a list item indented with tabs</p>
500334 </list-item>
501335 <list-item>
502− <p>
503− this is a list item indented with spaces
504− </p>
336+ <p>this is a list item indented with spaces</p>
505337 <list list-type="bullet">
506338 <list-item>
507− <p>
508− this is an example list item indented with tabs
509− </p>
339+ <p>this is an example list item indented with tabs</p>
510340 </list-item>
511341 <list-item>
512− <p>
513− this is an example list item indented with spaces
514− </p>
342+ <p>this is an example list item indented with spaces</p>
515343 </list-item>
516344 </list>
517345 </list-item>
@@ -521,90 +349,50 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
521349 <title>Fancy list markers</title>
522350 <list list-type="order">
523351 <list-item>
524− <label>
525− (2)
526− </label>
527− <p>
528− begins with 2
529− </p>
352+ <label>(2)</label>
353+ <p>begins with 2</p>
530354 </list-item>
531355 <list-item>
532− <label>
533− (3)
534− </label>
535− <p>
536− and now 3
537− </p>
538− <p>
539− with a continuation
540− </p>
356+ <label>(3)</label>
357+ <p>and now 3</p>
358+ <p>with a continuation</p>
541359 <list list-type="roman-lower">
542360 <list-item>
543− <label>
544− iv.
545− </label>
546− <p>
547− sublist with roman numerals, starting with 4
548− </p>
361+ <label>iv.</label>
362+ <p>sublist with roman numerals, starting with 4</p>
549363 </list-item>
550364 <list-item>
551− <label>
552− v.
553− </label>
554− <p>
555− more items
556− </p>
365+ <label>v.</label>
366+ <p>more items</p>
557367 <list list-type="alpha-upper">
558368 <list-item>
559− <label>
560− (A)
561− </label>
562− <p>
563− a subsublist
564− </p>
369+ <label>(A)</label>
370+ <p>a subsublist</p>
565371 </list-item>
566372 <list-item>
567− <label>
568− (B)
569− </label>
570− <p>
571− a subsublist
572− </p>
373+ <label>(B)</label>
374+ <p>a subsublist</p>
573375 </list-item>
574376 </list>
575377 </list-item>
576378 </list>
577379 </list-item>
578380 </list>
579− <p>
580− Nesting:
581− </p>
381+ <p>Nesting:</p>
582382 <list list-type="alpha-upper">
583383 <list-item>
584− <p>
585− Upper Alpha
586− </p>
384+ <p>Upper Alpha</p>
587385 <list list-type="roman-upper">
588386 <list-item>
589− <p>
590− Upper Roman.
591− </p>
387+ <p>Upper Roman.</p>
592388 <list list-type="order">
593389 <list-item>
594− <label>
595− (6)
596− </label>
597− <p>
598− Decimal start with 6
599− </p>
390+ <label>(6)</label>
391+ <p>Decimal start with 6</p>
600392 <list list-type="alpha-lower">
601393 <list-item>
602− <label>
603− c)
604− </label>
605− <p>
606− Lower alpha with paren
607− </p>
394+ <label>c)</label>
395+ <p>Lower alpha with paren</p>
608396 </list-item>
609397 </list>
610398 </list-item>
@@ -613,277 +401,163 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
613401 </list>
614402 </list-item>
615403 </list>
616− <p>
617− Autonumbering:
618− </p>
404+ <p>Autonumbering:</p>
619405 <list list-type="order">
620406 <list-item>
621− <p>
622− Autonumber.
623− </p>
407+ <p>Autonumber.</p>
624408 </list-item>
625409 <list-item>
626− <p>
627− More.
628− </p>
410+ <p>More.</p>
629411 <list list-type="order">
630412 <list-item>
631− <p>
632− Nested.
633− </p>
413+ <p>Nested.</p>
634414 </list-item>
635415 </list>
636416 </list-item>
637417 </list>
638− <p>
639− Should not be a list item:
640− </p>
641− <p>
642− M.A. 2007
643− </p>
644− <p>
645− B. Williams
646− </p>
418+ <p>Should not be a list item:</p>
419+ <p>M.A. 2007</p>
420+ <p>B. Williams</p>
647421 </sec>
648422</sec>
649423<sec id="definition-lists">
650424 <title>Definition Lists</title>
651− <p>
652− Tight using spaces:
653− </p>
425+ <p>Tight using spaces:</p>
654426 <def-list>
655427 <def-item>
656− <term>
657− apple
658− </term>
428+ <term>apple</term>
659429 <def>
660− <p>
661− red fruit
662− </p>
430+ <p>red fruit</p>
663431 </def>
664432 </def-item>
665433 <def-item>
666− <term>
667− orange
668− </term>
434+ <term>orange</term>
669435 <def>
670− <p>
671− orange fruit
672− </p>
436+ <p>orange fruit</p>
673437 </def>
674438 </def-item>
675439 <def-item>
676− <term>
677− banana
678− </term>
440+ <term>banana</term>
679441 <def>
680− <p>
681− yellow fruit
682− </p>
442+ <p>yellow fruit</p>
683443 </def>
684444 </def-item>
685445 </def-list>
686− <p>
687− Tight using tabs:
688− </p>
446+ <p>Tight using tabs:</p>
689447 <def-list>
690448 <def-item>
691− <term>
692− apple
693− </term>
449+ <term>apple</term>
694450 <def>
695− <p>
696− red fruit
697− </p>
451+ <p>red fruit</p>
698452 </def>
699453 </def-item>
700454 <def-item>
701− <term>
702− orange
703− </term>
455+ <term>orange</term>
704456 <def>
705− <p>
706− orange fruit
707− </p>
457+ <p>orange fruit</p>
708458 </def>
709459 </def-item>
710460 <def-item>
711− <term>
712− banana
713− </term>
461+ <term>banana</term>
714462 <def>
715− <p>
716− yellow fruit
717− </p>
463+ <p>yellow fruit</p>
718464 </def>
719465 </def-item>
720466 </def-list>
721− <p>
722− Loose:
723− </p>
467+ <p>Loose:</p>
724468 <def-list>
725469 <def-item>
726− <term>
727− apple
728− </term>
470+ <term>apple</term>
729471 <def>
730− <p>
731− red fruit
732− </p>
472+ <p>red fruit</p>
733473 </def>
734474 </def-item>
735475 <def-item>
736− <term>
737− orange
738− </term>
476+ <term>orange</term>
739477 <def>
740− <p>
741− orange fruit
742− </p>
478+ <p>orange fruit</p>
743479 </def>
744480 </def-item>
745481 <def-item>
746− <term>
747− banana
748− </term>
482+ <term>banana</term>
749483 <def>
750− <p>
751− yellow fruit
752− </p>
484+ <p>yellow fruit</p>
753485 </def>
754486 </def-item>
755487 </def-list>
756− <p>
757− Multiple blocks with italics:
758− </p>
488+ <p>Multiple blocks with italics:</p>
759489 <def-list>
760490 <def-item>
761− <term>
762− <italic>apple</italic>
763− </term>
491+ <term><italic>apple</italic></term>
764492 <def>
765− <p>
766− red fruit
767− </p>
768− <p>
769− contains seeds, crisp, pleasant to taste
770− </p>
493+ <p>red fruit</p>
494+ <p>contains seeds, crisp, pleasant to taste</p>
771495 </def>
772496 </def-item>
773497 <def-item>
774− <term>
775− <italic>orange</italic>
776− </term>
498+ <term><italic>orange</italic></term>
777499 <def>
778− <p>
779− orange fruit
780− </p>
500+ <p>orange fruit</p>
781501 <preformat>{ orange code block }</preformat>
782502 <disp-quote>
783− <p>
784− orange block quote
785− </p>
503+ <p>orange block quote</p>
786504 </disp-quote>
787505 </def>
788506 </def-item>
789507 </def-list>
790− <p>
791− Multiple definitions, tight:
792− </p>
508+ <p>Multiple definitions, tight:</p>
793509 <def-list>
794510 <def-item>
795− <term>
796− apple
797− </term>
511+ <term>apple</term>
798512 <def>
799− <p>
800− red fruit
801− </p>
802− <p>
803− computer
804− </p>
513+ <p>red fruit</p>
514+ <p>computer</p>
805515 </def>
806516 </def-item>
807517 <def-item>
808− <term>
809− orange
810− </term>
518+ <term>orange</term>
811519 <def>
812− <p>
813− orange fruit
814− </p>
815− <p>
816− bank
817− </p>
520+ <p>orange fruit</p>
521+ <p>bank</p>
818522 </def>
819523 </def-item>
820524 </def-list>
821− <p>
822− Multiple definitions, loose:
823− </p>
525+ <p>Multiple definitions, loose:</p>
824526 <def-list>
825527 <def-item>
826− <term>
827− apple
828− </term>
528+ <term>apple</term>
829529 <def>
830− <p>
831− red fruit
832− </p>
833− <p>
834− computer
835− </p>
530+ <p>red fruit</p>
531+ <p>computer</p>
836532 </def>
837533 </def-item>
838534 <def-item>
839− <term>
840− orange
841− </term>
535+ <term>orange</term>
842536 <def>
843− <p>
844− orange fruit
845− </p>
846− <p>
847− bank
848− </p>
537+ <p>orange fruit</p>
538+ <p>bank</p>
849539 </def>
850540 </def-item>
851541 </def-list>
852− <p>
853− Blank line after term, indented marker, alternate markers:
854− </p>
542+ <p>Blank line after term, indented marker, alternate markers:</p>
855543 <def-list>
856544 <def-item>
857− <term>
858− apple
859− </term>
545+ <term>apple</term>
860546 <def>
861− <p>
862− red fruit
863− </p>
864− <p>
865− computer
866− </p>
547+ <p>red fruit</p>
548+ <p>computer</p>
867549 </def>
868550 </def-item>
869551 <def-item>
870− <term>
871− orange
872− </term>
552+ <term>orange</term>
873553 <def>
874− <p>
875− orange fruit
876− </p>
554+ <p>orange fruit</p>
877555 <list list-type="order">
878556 <list-item>
879− <p>
880− sublist
881− </p>
557+ <p>sublist</p>
882558 </list-item>
883559 <list-item>
884− <p>
885− sublist
886− </p>
560+ <p>sublist</p>
887561 </list-item>
888562 </list>
889563 </def>
@@ -892,555 +566,315 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
892566</sec>
893567<sec id="html-blocks">
894568 <title>HTML Blocks</title>
895− <p>
896− Simple block on one line:
897− </p>
569+ <p>Simple block on one line:</p>
898570 <boxed-text>
899− <p>
900− foo
901− </p>
571+ <p>foo</p>
902572 </boxed-text>
903− <p>
904− And nested without indentation:
905− </p>
573+ <p>And nested without indentation:</p>
906574 <boxed-text>
907575 <boxed-text>
908576 <boxed-text>
909− <p>
910− foo
911− </p>
577+ <p>foo</p>
912578 </boxed-text>
913579 </boxed-text>
914580 <boxed-text>
915− <p>
916− bar
917− </p>
581+ <p>bar</p>
918582 </boxed-text>
919583 </boxed-text>
920− <p>
921− Interpreted markdown in a table:
922− </p>
923− <p>
924− This is <italic>emphasized</italic>
925− </p>
926− <p>
927− And this is <bold role="strong">strong</bold>
928− </p>
929− <p>
930− Here’s a simple block:
931− </p>
584+ <p>Interpreted markdown in a table:</p>
585+ <p>This is <italic>emphasized</italic></p>
586+ <p>And this is <bold role="strong">strong</bold></p>
587+ <p>Here’s a simple block:</p>
932588 <boxed-text>
933− <p>
934− foo
935− </p>
589+ <p>foo</p>
936590 </boxed-text>
937− <p>
938− This should be a code block, though:
939− </p>
591+ <p>This should be a code block, though:</p>
940592 <preformat>&lt;div&gt;
941593 foo
942594&lt;/div&gt;</preformat>
943− <p>
944− As should this:
945− </p>
595+ <p>As should this:</p>
946596 <preformat>&lt;div&gt;foo&lt;/div&gt;</preformat>
947− <p>
948− Now, nested:
949− </p>
597+ <p>Now, nested:</p>
950598 <boxed-text>
951599 <boxed-text>
952600 <boxed-text>
953− <p>
954− foo
955− </p>
601+ <p>foo</p>
956602 </boxed-text>
957603 </boxed-text>
958604 </boxed-text>
959− <p>
960− This should just be an HTML comment:
961− </p>
962− <p>
963− Multiline:
964− </p>
965− <p>
966− Code block:
967− </p>
605+ <p>This should just be an HTML comment:</p>
606+ <p>Multiline:</p>
607+ <p>Code block:</p>
968608 <preformat>&lt;!-- Comment --&gt;</preformat>
969− <p>
970− Just plain comment, with trailing spaces on the line:
971− </p>
972− <p>
973− Code:
974− </p>
609+ <p>Just plain comment, with trailing spaces on the line:</p>
610+ <p>Code:</p>
975611 <preformat>&lt;hr /&gt;</preformat>
976− <p>
977− Hr’s:
978− </p>
612+ <p>Hr’s:</p>
979613</sec>
980614<sec id="inline-markup">
981615 <title>Inline Markup</title>
982− <p>
983− This is <italic>emphasized</italic>, and so <italic>is this</italic>.
984− </p>
985− <p>
986− This is <bold role="strong">strong</bold>, and so <bold role="strong">is
987− this</bold>.
988− </p>
989− <p>
990− An <italic><ext-link ext-link-type="uri" xlink:href="/url">emphasized
991− link</ext-link></italic>.
992− </p>
993− <p>
994− <bold role="strong"><italic>This is strong and em.</italic></bold>
995− </p>
996− <p>
997− So is <bold role="strong"><italic>this</italic></bold> word.
998− </p>
999− <p>
1000− <bold role="strong"><italic>This is strong and em.</italic></bold>
1001− </p>
1002− <p>
1003− So is <bold role="strong"><italic>this</italic></bold> word.
1004− </p>
1005− <p>
1006− This is code: <monospace>&gt;</monospace>, <monospace>$</monospace>,
1007− <monospace>\</monospace>, <monospace>\$</monospace>,
1008− <monospace>&lt;html&gt;</monospace>.
1009− </p>
1010− <p>
1011− <strike>This is <italic>strikeout</italic>.</strike>
1012− </p>
1013− <p>
1014− Superscripts: a<sup>bc</sup>d a<sup><italic>hello</italic></sup>
1015− a<sup>hello there</sup>.
1016− </p>
1017− <p>
1018− Subscripts: H<sub>2</sub>O, H<sub>23</sub>O, H<sub>many of them</sub>O.
1019− </p>
1020− <p>
1021− These should not be superscripts or subscripts, because of the unescaped
1022− spaces: a^b c^d, a~b c~d.
1023− </p>
616+ <p>This is <italic>emphasized</italic>, and so <italic>is this</italic>.</p>
617+ <p>This is <bold role="strong">strong</bold>, and so <bold role="strong">is
618+ this</bold>.</p>
619+ <p>An <italic><ext-link ext-link-type="uri" xlink:href="/url">emphasized
620+ link</ext-link></italic>.</p>
621+ <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
622+ <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
623+ <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
624+ <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
625+ <p>This is code: <monospace>&gt;</monospace>, <monospace>$</monospace>,
626+ <monospace>\</monospace>, <monospace>\$</monospace>,
627+ <monospace>&lt;html&gt;</monospace>.</p>
628+ <p><strike>This is <italic>strikeout</italic>.</strike></p>
629+ <p>Superscripts: a<sup>bc</sup>d a<sup><italic>hello</italic></sup>
630+ a<sup>hello there</sup>.</p>
631+ <p>Subscripts: H<sub>2</sub>O, H<sub>23</sub>O,
632+ H<sub>many of them</sub>O.</p>
633+ <p>These should not be superscripts or subscripts, because of the unescaped
634+ spaces: a^b c^d, a~b c~d.</p>
1024635</sec>
1025636<sec id="smart-quotes-ellipses-dashes">
1026637 <title>Smart quotes, ellipses, dashes</title>
1027− <p>
1028− “Hello,” said the spider. “‘Shelob’ is my name.”
1029− </p>
1030− <p>
1031− ‘A’, ‘B’, and ‘C’ are letters.
1032− </p>
1033− <p>
1034− ‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’
1035− </p>
1036− <p>
1037− ‘He said, “I want to go.”’ Were you alive in the 70’s?
1038− </p>
1039− <p>
1040− 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
1042− link</ext-link>”.
1043− </p>
1044− <p>
1045− Some dashes: one—two — three—four — five.
1046− </p>
1047− <p>
1048− Dashes between numbers: 5–7, 255–66, 1987–1999.
1049− </p>
1050− <p>
1051− Ellipses…and…and….
1052− </p>
638+ <p>“Hello,” said the spider. “‘Shelob’ is my name.”</p>
639+ <p>‘A’, ‘B’, and ‘C’ are letters.</p>
640+ <p>‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’</p>
641+ <p>‘He said, “I want to go.”’ Were you alive in the 70’s?</p>
642+ <p>Here is some quoted ‘<monospace>code</monospace>’ and a
643+ “<ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">quoted
644+ link</ext-link>”.</p>
645+ <p>Some dashes: one—two — three—four — five.</p>
646+ <p>Dashes between numbers: 5–7, 255–66, 1987–1999.</p>
647+ <p>Ellipses…and…and….</p>
1053648</sec>
1054649<sec id="latex">
1055650 <title>LaTeX</title>
1056651 <list list-type="bullet">
1057652 <list-item>
1058− <p>
1059− </p>
653+ <p></p>
1060654 </list-item>
1061655 <list-item>
1062− <p>
1063− <inline-formula><alternatives>
1064− <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>
1066− </p>
656+ <p><inline-formula><alternatives>
657+ <tex-math><![CDATA[2+2=4]]></tex-math>
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>
1067659 </list-item>
1068660 <list-item>
1069− <p>
1070− <inline-formula><alternatives>
1071− <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>
1073− </p>
661+ <p><inline-formula><alternatives>
662+ <tex-math><![CDATA[x \in y]]></tex-math>
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>
1074664 </list-item>
1075665 <list-item>
1076− <p>
1077− <inline-formula><alternatives>
1078− <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>
1080− </p>
666+ <p><inline-formula><alternatives>
667+ <tex-math><![CDATA[\alpha \wedge \omega]]></tex-math>
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>
1081669 </list-item>
1082670 <list-item>
1083− <p>
1084− <inline-formula><alternatives>
1085− <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>
1087− </p>
671+ <p><inline-formula><alternatives>
672+ <tex-math><![CDATA[223]]></tex-math>
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>
1088674 </list-item>
1089675 <list-item>
1090− <p>
1091− <inline-formula><alternatives>
1092− <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
1094− </p>
676+ <p><inline-formula><alternatives>
677+ <tex-math><![CDATA[p]]></tex-math>
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>
1095679 </list-item>
1096680 <list-item>
1097− <p>
1098− 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>
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>
1101− </p>
681+ <p>Here’s some display math: <disp-formula><alternatives>
682+ <tex-math><![CDATA[\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}]]></tex-math>
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>
1102684 </list-item>
1103685 <list-item>
1104− <p>
1105− Here’s one that has a line break in it: <inline-formula><alternatives>
1106− <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>.
1108− </p>
686+ <p>Here’s one that has a line break in it:
687+ <inline-formula><alternatives>
688+ <tex-math><![CDATA[\alpha + \omega \times x^2]]></tex-math>
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>
1109690 </list-item>
1110691 </list>
1111− <p>
1112− These shouldn’t be math:
1113− </p>
692+ <p>These shouldn’t be math:</p>
1114693 <list list-type="bullet">
1115694 <list-item>
1116− <p>
1117− To get the famous equation, write <monospace>$e = mc^2$</monospace>.
1118− </p>
695+ <p>To get the famous equation, write
696+ <monospace>$e = mc^2$</monospace>.</p>
1119697 </list-item>
1120698 <list-item>
1121− <p>
1122− $22,000 is a <italic>lot</italic> of money. So is $34,000. (It worked
1123− if “lot” is emphasized.)
1124− </p>
699+ <p>$22,000 is a <italic>lot</italic> of money. So is $34,000. (It worked
700+ if “lot” is emphasized.)</p>
1125701 </list-item>
1126702 <list-item>
1127− <p>
1128− Shoes ($20) and socks ($5).
1129− </p>
703+ <p>Shoes ($20) and socks ($5).</p>
1130704 </list-item>
1131705 <list-item>
1132− <p>
1133− Escaped <monospace>$</monospace>: $73 <italic>this should be
1134− emphasized</italic> 23$.
1135− </p>
706+ <p>Escaped <monospace>$</monospace>: $73 <italic>this should be
707+ emphasized</italic> 23$.</p>
1136708 </list-item>
1137709 </list>
1138− <p>
1139− Here’s a LaTeX table:
1140− </p>
710+ <p>Here’s a LaTeX table:</p>
1141711</sec>
1142712<sec id="special-characters">
1143713 <title>Special Characters</title>
1144− <p>
1145− Here is some unicode:
1146− </p>
714+ <p>Here is some unicode:</p>
1147715 <list list-type="bullet">
1148716 <list-item>
1149− <p>
1150− I hat: Î
1151− </p>
717+ <p>I hat: Î</p>
1152718 </list-item>
1153719 <list-item>
1154− <p>
1155− o umlaut: ö
1156− </p>
720+ <p>o umlaut: ö</p>
1157721 </list-item>
1158722 <list-item>
1159− <p>
1160− section: §
1161− </p>
723+ <p>section: §</p>
1162724 </list-item>
1163725 <list-item>
1164− <p>
1165− set membership: ∈
1166− </p>
726+ <p>set membership: ∈</p>
1167727 </list-item>
1168728 <list-item>
1169− <p>
1170− copyright: ©
1171− </p>
729+ <p>copyright: ©</p>
1172730 </list-item>
1173731 </list>
1174− <p>
1175− AT&amp;T has an ampersand in their name.
1176− </p>
1177− <p>
1178− AT&amp;T is another way to write it.
1179− </p>
1180− <p>
1181− This &amp; that.
1182− </p>
1183− <p>
1184− 4 &lt; 5.
1185− </p>
1186− <p>
1187− 6 &gt; 5.
1188− </p>
1189− <p>
1190− Backslash: \
1191− </p>
1192− <p>
1193− Backtick: `
1194− </p>
1195− <p>
1196− Asterisk: *
1197− </p>
1198− <p>
1199− Underscore: _
1200− </p>
1201− <p>
1202− Left brace: {
1203− </p>
1204− <p>
1205− Right brace: }
1206− </p>
1207− <p>
1208− Left bracket: [
1209− </p>
1210− <p>
1211− Right bracket: ]
1212− </p>
1213− <p>
1214− Left paren: (
1215− </p>
1216− <p>
1217− Right paren: )
1218− </p>
1219− <p>
1220− Greater-than: &gt;
1221− </p>
1222− <p>
1223− Hash: #
1224− </p>
1225− <p>
1226− Period: .
1227− </p>
1228− <p>
1229− Bang: !
1230− </p>
1231− <p>
1232− Plus: +
1233− </p>
1234− <p>
1235− Minus: -
1236− </p>
732+ <p>AT&amp;T has an ampersand in their name.</p>
733+ <p>AT&amp;T is another way to write it.</p>
734+ <p>This &amp; that.</p>
735+ <p>4 &lt; 5.</p>
736+ <p>6 &gt; 5.</p>
737+ <p>Backslash: \</p>
738+ <p>Backtick: `</p>
739+ <p>Asterisk: *</p>
740+ <p>Underscore: _</p>
741+ <p>Left brace: {</p>
742+ <p>Right brace: }</p>
743+ <p>Left bracket: [</p>
744+ <p>Right bracket: ]</p>
745+ <p>Left paren: (</p>
746+ <p>Right paren: )</p>
747+ <p>Greater-than: &gt;</p>
748+ <p>Hash: #</p>
749+ <p>Period: .</p>
750+ <p>Bang: !</p>
751+ <p>Plus: +</p>
752+ <p>Minus: -</p>
1237753</sec>
1238754<sec id="links">
1239755 <title>Links</title>
1240756 <sec id="explicit">
1241757 <title>Explicit</title>
1242− <p>
1243− Just a <ext-link ext-link-type="uri" xlink:href="/url/">URL</ext-link>.
1244− </p>
1245− <p>
1246− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title">URL
1247− and title</ext-link>.
1248− </p>
1249− <p>
1250− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by two spaces">URL
1251− and title</ext-link>.
1252− </p>
1253− <p>
1254− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by a tab">URL
1255− and title</ext-link>.
1256− </p>
1257− <p>
1258− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with &quot;quotes&quot; in it">URL
1259− and title</ext-link>
1260− </p>
1261− <p>
1262− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with single quotes">URL
1263− and title</ext-link>
1264− </p>
1265− <p>
1266− <ext-link ext-link-type="uri" xlink:href="/url/with_underscore">with_underscore</ext-link>
1267− </p>
1268− <p>
1269− <ext-link ext-link-type="uri" xlink:href="mailto:nobody@nowhere.net">Email
1270− link</ext-link>
1271− </p>
1272− <p>
1273− <ext-link ext-link-type="uri" xlink:href="">Empty</ext-link>.
1274− </p>
758+ <p>Just a
759+ <ext-link ext-link-type="uri" xlink:href="/url/">URL</ext-link>.</p>
760+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title">URL
761+ and title</ext-link>.</p>
762+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by two spaces">URL
763+ and title</ext-link>.</p>
764+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title preceded by a tab">URL
765+ and title</ext-link>.</p>
766+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with &quot;quotes&quot; in it">URL
767+ and title</ext-link></p>
768+ <p><ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="title with single quotes">URL
769+ and title</ext-link></p>
770+ <p><ext-link ext-link-type="uri" xlink:href="/url/with_underscore">with_underscore</ext-link></p>
771+ <p><ext-link ext-link-type="uri" xlink:href="mailto:nobody@nowhere.net">Email
772+ link</ext-link></p>
773+ <p><ext-link ext-link-type="uri" xlink:href="">Empty</ext-link>.</p>
1275774 </sec>
1276775 <sec id="reference">
1277776 <title>Reference</title>
1278− <p>
1279− Foo <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.
1280− </p>
1281− <p>
1282− With <ext-link ext-link-type="uri" xlink:href="/url/">embedded
1283− [brackets]</ext-link>.
1284− </p>
1285− <p>
1286− <ext-link ext-link-type="uri" xlink:href="/url/">b</ext-link> by itself
1287− should be a link.
1288− </p>
1289− <p>
1290− Indented
1291− <ext-link ext-link-type="uri" xlink:href="/url">once</ext-link>.
1292− </p>
1293− <p>
1294− Indented
1295− <ext-link ext-link-type="uri" xlink:href="/url">twice</ext-link>.
1296− </p>
1297− <p>
1298− Indented
1299− <ext-link ext-link-type="uri" xlink:href="/url">thrice</ext-link>.
1300− </p>
1301− <p>
1302− This should [not][] be a link.
1303− </p>
777+ <p>Foo
778+ <ext-link ext-link-type="uri" xlink:href="/url/">bar</ext-link>.</p>
779+ <p>With <ext-link ext-link-type="uri" xlink:href="/url/">embedded
780+ [brackets]</ext-link>.</p>
781+ <p><ext-link ext-link-type="uri" xlink:href="/url/">b</ext-link> by itself
782+ should be a link.</p>
783+ <p>Indented
784+ <ext-link ext-link-type="uri" xlink:href="/url">once</ext-link>.</p>
785+ <p>Indented
786+ <ext-link ext-link-type="uri" xlink:href="/url">twice</ext-link>.</p>
787+ <p>Indented
788+ <ext-link ext-link-type="uri" xlink:href="/url">thrice</ext-link>.</p>
789+ <p>This should [not][] be a link.</p>
1304790 <preformat>[not]: /url</preformat>
1305− <p>
1306− Foo
1307− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quotes&quot; inside">bar</ext-link>.
1308− </p>
1309− <p>
1310− Foo
1311− <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quote&quot; inside">biz</ext-link>.
1312− </p>
791+ <p>Foo
792+ <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quotes&quot; inside">bar</ext-link>.</p>
793+ <p>Foo
794+ <ext-link ext-link-type="uri" xlink:href="/url/" xlink:title="Title with &quot;quote&quot; inside">biz</ext-link>.</p>
1313795 </sec>
1314796 <sec id="with-ampersands">
1315797 <title>With ampersands</title>
1316− <p>
1317− Here’s a
1318− <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>.
1320− </p>
1321− <p>
1322− 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>.
1324− </p>
1325− <p>
1326− Here’s an
1327− <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
1328− link</ext-link>.
1329− </p>
1330− <p>
1331− Here’s an
1332− <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
1333− link in pointy braces</ext-link>.
1334− </p>
798+ <p>Here’s a
799+ <ext-link ext-link-type="uri" xlink:href="http://example.com/?foo=1&amp;bar=2">link
800+ with an ampersand in the URL</ext-link>.</p>
801+ <p>Here’s a link with an amersand in the link text:
802+ <ext-link ext-link-type="uri" xlink:href="http://att.com/" xlink:title="AT&amp;T">AT&amp;T</ext-link>.</p>
803+ <p>Here’s an
804+ <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
805+ link</ext-link>.</p>
806+ <p>Here’s an
807+ <ext-link ext-link-type="uri" xlink:href="/script?foo=1&amp;bar=2">inline
808+ link in pointy braces</ext-link>.</p>
1335809 </sec>
1336810 <sec id="autolinks">
1337811 <title>Autolinks</title>
1338− <p>
1339− 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>
1341− </p>
812+ <p>With an ampersand:
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>
1342814 <list list-type="bullet">
1343815 <list-item>
1344− <p>
1345− In a list?
1346− </p>
816+ <p>In a list?</p>
1347817 </list-item>
1348818 <list-item>
1349− <p>
1350− <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link>
1351− </p>
819+ <p><ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link></p>
1352820 </list-item>
1353821 <list-item>
1354− <p>
1355− It should.
1356− </p>
822+ <p>It should.</p>
1357823 </list-item>
1358824 </list>
1359− <p>
1360− An e-mail address: <email>nobody@nowhere.net</email>
1361− </p>
825+ <p>An e-mail address: <email>nobody@nowhere.net</email></p>
1362826 <disp-quote>
1363− <p>
1364− Blockquoted:
1365− <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link>
1366− </p>
827+ <p>Blockquoted:
828+ <ext-link ext-link-type="uri" xlink:href="http://example.com/">http://example.com/</ext-link></p>
1367829 </disp-quote>
1368− <p>
1369− Auto-links should not occur here:
1370− <monospace>&lt;http://example.com/&gt;</monospace>
1371− </p>
830+ <p>Auto-links should not occur here:
831+ <monospace>&lt;http://example.com/&gt;</monospace></p>
1372832 <preformat>or here: &lt;http://example.com/&gt;</preformat>
1373833 </sec>
1374834</sec>
1375835<sec id="images">
1376836 <title>Images</title>
1377− <p>
1378− From “Voyage dans la Lune” by Georges Melies (1902):
1379− </p>
837+ <p>From “Voyage dans la Lune” by Georges Melies (1902):</p>
1380838 <fig>
1381839 <caption>lalune</caption>
1382840 <graphic mimetype="image" mime-subtype="jpeg" xlink:href="lalune.jpg" xlink:title="Voyage dans la Lune" />
1383841 </fig>
1384− <p>
1385− Here is a movie
1386− <inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="movie.jpg" />
1387− icon.
1388− </p>
842+ <p>Here is a movie
843+ <inline-graphic mimetype="image" mime-subtype="jpeg" xlink:href="movie.jpg" />
844+ icon.</p>
1389845</sec>
1390846<sec id="footnotes">
1391847 <title>Footnotes</title>
1392− <p>
1393− Here is a footnote reference,<fn>
1394− <p>
1395− Here is the footnote. It can go anywhere after the footnote reference.
1396− It need not be placed at the end of the document.
1397− </p>
1398− </fn> and another.<fn>
1399− <p>
1400− Here’s the long note. This one contains multiple blocks.
1401− </p>
1402− <p>
1403− Subsequent blocks are indented to show that they belong to the
1404− footnote (as with list items).
1405− </p>
1406− <preformat> { &lt;code&gt; }</preformat>
1407− <p>
1408− If you want, you can indent every line, but you can also be lazy and
1409− just indent the first line of each block.
1410− </p>
1411− </fn> This should <italic>not</italic> be a footnote reference, because it
1412− 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
1415− <ext-link ext-link-type="uri" xlink:href="http://google.com">links</ext-link>
1416− and <monospace>]</monospace> verbatim characters, as well as
1417− [bracketed text].
1418− </p>
1419− </fn>
1420− </p>
848+ <p>Here is a footnote reference,<fn>
849+ <p>Here is the footnote. It can go anywhere after the footnote reference.
850+ It need not be placed at the end of the document.</p>
851+ </fn> and another.<fn>
852+ <p>Here’s the long note. This one contains multiple blocks.</p>
853+ <p>Subsequent blocks are indented to show that they belong to the footnote
854+ (as with list items).</p>
855+ <preformat> { &lt;code&gt; }</preformat>
856+ <p>If you want, you can indent every line, but you can also be lazy and
857+ just indent the first line of each block.</p>
858+ </fn> This should <italic>not</italic> be a footnote reference, because it
859+ contains a space.[^my note] Here is an inline note.<fn>
860+ <p>This is <italic>easier</italic> to type. Inline notes may contain
861+ <ext-link ext-link-type="uri" xlink:href="http://google.com">links</ext-link>
862+ and <monospace>]</monospace> verbatim characters, as well as [bracketed
863+ text].</p>
864+ </fn></p>
1421865 <disp-quote>
1422− <p>
1423− Notes can go in quotes.<fn>
1424− <p>
1425− In quote.
1426− </p>
1427− </fn>
1428− </p>
866+ <p>Notes can go in quotes.<fn>
867+ <p>In quote.</p>
868+ </fn></p>
1429869 </disp-quote>
1430870 <list list-type="order">
1431871 <list-item>
1432− <p>
1433− And in list items.<fn>
1434− <p>
1435− In list.
1436− </p>
1437− </fn>
1438− </p>
872+ <p>And in list items.<fn>
873+ <p>In list.</p>
874+ </fn></p>
1439875 </list-item>
1440876 </list>
1441− <p>
1442− This paragraph should not be part of the note, as it is not indented.
1443− </p>
877+ <p>This paragraph should not be part of the note, as it is not indented.</p>
1444878</sec>
1445879</body>
1446880<back>