diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/OpenDocument.hs | 20 | ||||
| -rw-r--r-- | tests/tables.opendocument | 36 | ||||
| -rw-r--r-- | tests/writer.opendocument | 398 |
3 files changed, 314 insertions, 140 deletions
diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs index 0e8a8bf8b..3dc3bd974 100644 --- a/src/Text/Pandoc/Writers/OpenDocument.hs +++ b/src/Text/Pandoc/Writers/OpenDocument.hs @@ -35,7 +35,7 @@ import Text.Pandoc.Shared import Text.Pandoc.XML import Text.Pandoc.Templates (renderTemplate) import Text.Pandoc.Readers.TeXMath -import Text.PrettyPrint.HughesPJ hiding ( Str ) +import Text.Pandoc.Pretty import Text.Printf ( printf ) import Control.Applicative ( (<$>) ) import Control.Arrow ( (***), (>>>) ) @@ -169,7 +169,11 @@ writeOpenDocument opts (Pandoc (Meta title authors date) blocks) = date'' <- inlinesToOpenDocument opts date doc'' <- blocksToOpenDocument opts blocks return (doc'', title'', authors'', date'') - body' = render doc + colwidth = if writerWrapText opts + then Just $ writerColumns opts + else Nothing + render' = render colwidth + body' = render' doc styles = stTableStyles s ++ stParaStyles s ++ stTextStyles s listStyle (n,l) = inTags True "text:list-style" [("style:name", "L" ++ show n)] (vcat l) @@ -178,10 +182,10 @@ writeOpenDocument opts (Pandoc (Meta title authors date) blocks) = reverse $ styles ++ listStyles context = writerVariables opts ++ [ ("body", body') - , ("automatic-styles", render automaticStyles) - , ("title", render title') - , ("date", render date') ] ++ - [ ("author", render a) | a <- authors' ] + , ("automatic-styles", render' automaticStyles) + , ("title", render' title') + , ("date", render' date') ] ++ + [ ("author", render' a) | a <- authors' ] in if writerStandalone opts then renderTemplate context $ writerTemplate opts else body' @@ -288,7 +292,7 @@ blockToOpenDocument o bs r <- vcat <$> mapM (deflistItemToOpenDocument o) b setInDefinitionList False return r - preformatted s = vcat <$> mapM (inPreformattedTags . escapeStringForXML) (lines s) + preformatted s = (flush . vcat) <$> mapM (inPreformattedTags . escapeStringForXML) (lines s) mkBlockQuote b = do increaseIndent i <- paraStyle "Quotations" [] inBlockQuote o i (map plainToPara b) @@ -348,7 +352,7 @@ inlineToOpenDocument o ils | EmDash <- ils = inTextStyle $ text "—" | EnDash <- ils = inTextStyle $ text "–" | Apostrophe <- ils = inTextStyle $ text "’" - | Space <- ils = inTextStyle $ char ' ' + | Space <- ils = inTextStyle space | LineBreak <- ils = return $ selfClosingTag "text:line-break" [] | Str s <- ils = inTextStyle $ handleSpaces $ escapeStringForXML s | Emph l <- ils = withTextStyle Italic $ inlinesToOpenDocument o l diff --git a/tests/tables.opendocument b/tests/tables.opendocument index c071e526d..ef6176e91 100644 --- a/tests/tables.opendocument +++ b/tests/tables.opendocument @@ -63,7 +63,8 @@ </table:table-cell> </table:table-row> </table:table> -<text:p text:style-name="Caption">Demonstration of simple table syntax.</text:p> +<text:p text:style-name="Caption">Demonstration of simple table +syntax.</text:p> <text:p text:style-name="Text_20_body">Simple table without caption:</text:p> <table:table table:name="Table2" table:style-name="Table2"> <table:table-column table:style-name="Table2.A" /> @@ -129,7 +130,8 @@ </table:table-cell> </table:table-row> </table:table> -<text:p text:style-name="Text_20_body">Simple table indented two spaces:</text:p> +<text:p text:style-name="Text_20_body">Simple table indented two +spaces:</text:p> <table:table table:name="Table3" table:style-name="Table3"> <table:table-column table:style-name="Table3.A" /> <table:table-column table:style-name="Table3.B" /> @@ -194,7 +196,8 @@ </table:table-cell> </table:table-row> </table:table> -<text:p text:style-name="Caption">Demonstration of simple table syntax.</text:p> +<text:p text:style-name="Caption">Demonstration of simple table +syntax.</text:p> <text:p text:style-name="Text_20_body">Multiline table with caption:</text:p> <table:table table:name="Table4" table:style-name="Table4"> <table:table-column table:style-name="Table4.A" /> @@ -228,7 +231,8 @@ <text:p text:style-name="P16">12.0</text:p> </table:table-cell> <table:table-cell table:style-name="Table4.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Example of a row that spans multiple lines.</text:p> + <text:p text:style-name="Table_20_Contents">Example of a row that spans + multiple lines.</text:p> </table:table-cell> </table:table-row> <table:table-row> @@ -242,12 +246,15 @@ <text:p text:style-name="P16">5.0</text:p> </table:table-cell> <table:table-cell table:style-name="Table4.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Here's another one. Note the blank line between rows.</text:p> + <text:p text:style-name="Table_20_Contents">Here's another one. Note the + blank line between rows.</text:p> </table:table-cell> </table:table-row> </table:table> -<text:p text:style-name="Caption">Here's the caption. It may span multiple lines.</text:p> -<text:p text:style-name="Text_20_body">Multiline table without caption:</text:p> +<text:p text:style-name="Caption">Here's the caption. It may span multiple +lines.</text:p> +<text:p text:style-name="Text_20_body">Multiline table without +caption:</text:p> <table:table table:name="Table5" table:style-name="Table5"> <table:table-column table:style-name="Table5.A" /> <table:table-column table:style-name="Table5.B" /> @@ -280,7 +287,8 @@ <text:p text:style-name="P20">12.0</text:p> </table:table-cell> <table:table-cell table:style-name="Table5.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Example of a row that spans multiple lines.</text:p> + <text:p text:style-name="Table_20_Contents">Example of a row that spans + multiple lines.</text:p> </table:table-cell> </table:table-row> <table:table-row> @@ -294,7 +302,8 @@ <text:p text:style-name="P20">5.0</text:p> </table:table-cell> <table:table-cell table:style-name="Table5.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Here's another one. Note the blank line between rows.</text:p> + <text:p text:style-name="Table_20_Contents">Here's another one. Note the + blank line between rows.</text:p> </table:table-cell> </table:table-row> </table:table> @@ -347,7 +356,8 @@ </table:table-cell> </table:table-row> </table:table> -<text:p text:style-name="Text_20_body">Multiline table without column headers:</text:p> +<text:p text:style-name="Text_20_body">Multiline table without column +headers:</text:p> <table:table table:name="Table7" table:style-name="Table7"> <table:table-column table:style-name="Table7.A" /> <table:table-column table:style-name="Table7.B" /> @@ -364,7 +374,8 @@ <text:p text:style-name="P30">12.0</text:p> </table:table-cell> <table:table-cell table:style-name="Table7.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Example of a row that spans multiple lines.</text:p> + <text:p text:style-name="Table_20_Contents">Example of a row that spans + multiple lines.</text:p> </table:table-cell> </table:table-row> <table:table-row> @@ -378,7 +389,8 @@ <text:p text:style-name="P30">5.0</text:p> </table:table-cell> <table:table-cell table:style-name="Table7.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Here's another one. Note the blank line between rows.</text:p> + <text:p text:style-name="Table_20_Contents">Here's another one. Note the + blank line between rows.</text:p> </table:table-cell> </table:table-row> </table:table>
\ No newline at end of file diff --git a/tests/writer.opendocument b/tests/writer.opendocument index 179d29ac9..05d45792a 100644 --- a/tests/writer.opendocument +++ b/tests/writer.opendocument @@ -859,29 +859,41 @@ <text:p text:style-name="Author">John MacFarlane</text:p> <text:p text:style-name="Author">Anonymous</text:p> <text:p text:style-name="Date">July 17, 2006</text:p> -<text:p text:style-name="Text_20_body">This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite.</text:p> +<text:p text:style-name="Text_20_body">This is a set of tests for pandoc. Most +of them are adapted from John Gruber’s markdown test suite.</text:p> <text:p text:style-name="Horizontal_20_Line" /> <text:h text:style-name="Heading_20_1" text:outline-level="1">Headers</text:h> -<text:h text:style-name="Heading_20_2" text:outline-level="2">Level 2 with an <text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition">embedded link</text:span></text:a></text:h> -<text:h text:style-name="Heading_20_3" text:outline-level="3">Level 3 with <text:span text:style-name="T1">emphasis</text:span></text:h> +<text:h text:style-name="Heading_20_2" text:outline-level="2">Level 2 with an +<text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition">embedded +link</text:span></text:a></text:h> +<text:h text:style-name="Heading_20_3" text:outline-level="3">Level 3 with +<text:span text:style-name="T1">emphasis</text:span></text:h> <text:h text:style-name="Heading_20_4" text:outline-level="4">Level 4</text:h> <text:h text:style-name="Heading_20_5" text:outline-level="5">Level 5</text:h> <text:h text:style-name="Heading_20_1" text:outline-level="1">Level 1</text:h> -<text:h text:style-name="Heading_20_2" text:outline-level="2">Level 2 with <text:span text:style-name="T2">emphasis</text:span></text:h> +<text:h text:style-name="Heading_20_2" text:outline-level="2">Level 2 with +<text:span text:style-name="T2">emphasis</text:span></text:h> <text:h text:style-name="Heading_20_3" text:outline-level="3">Level 3</text:h> <text:p text:style-name="Text_20_body">with no blank line</text:p> <text:h text:style-name="Heading_20_2" text:outline-level="2">Level 2</text:h> <text:p text:style-name="Text_20_body">with no blank line</text:p> <text:p text:style-name="Horizontal_20_Line" /> <text:h text:style-name="Heading_20_1" text:outline-level="1">Paragraphs</text:h> -<text:p text:style-name="Text_20_body">Here’s a regular paragraph.</text:p> -<text:p text:style-name="Text_20_body">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.</text:p> -<text:p text:style-name="Text_20_body">Here’s one with a bullet. * criminey.</text:p> -<text:p text:style-name="Text_20_body">There should be a hard line break<text:line-break />here.</text:p> +<text:p text:style-name="Text_20_body">Here’s a regular +paragraph.</text:p> +<text:p text:style-name="Text_20_body">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.</text:p> +<text:p text:style-name="Text_20_body">Here’s one with a bullet. * +criminey.</text:p> +<text:p text:style-name="Text_20_body">There should be a hard line +break<text:line-break />here.</text:p> <text:p text:style-name="Horizontal_20_Line" /> -<text:h text:style-name="Heading_20_1" text:outline-level="1">Block Quotes</text:h> +<text:h text:style-name="Heading_20_1" text:outline-level="1">Block +Quotes</text:h> <text:p text:style-name="Text_20_body">E-mail style:</text:p> -<text:p text:style-name="P1">This is a block quote. It is pretty short.</text:p> +<text:p text:style-name="P1">This is a block quote. It is pretty +short.</text:p> <text:p text:style-name="P2">Code in a block quote:</text:p> <text:p text:style-name="P3">sub status {</text:p> <text:p text:style-name="P4"><text:s text:c="4" />print "working";</text:p> @@ -898,10 +910,12 @@ <text:p text:style-name="P2">Nested block quotes:</text:p> <text:p text:style-name="P7">nested</text:p> <text:p text:style-name="P8">nested</text:p> -<text:p text:style-name="Text_20_body">This should not be a block quote: 2 > 1.</text:p> +<text:p text:style-name="Text_20_body">This should not be a block quote: 2 +> 1.</text:p> <text:p text:style-name="Text_20_body">And a following paragraph.</text:p> <text:p text:style-name="Horizontal_20_Line" /> -<text:h text:style-name="Heading_20_1" text:outline-level="1">Code Blocks</text:h> +<text:h text:style-name="Heading_20_1" text:outline-level="1">Code +Blocks</text:h> <text:p text:style-name="Text_20_body">Code:</text:p> <text:p text:style-name="P9">---- (should be four hyphens)</text:p> <text:p text:style-name="P10"></text:p> @@ -1042,7 +1056,8 @@ <text:list text:style-name="L12"> <text:list-item> <text:p text:style-name="P29">Item 1, graf one.</text:p> - <text:p text:style-name="P29">Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.</text:p> + <text:p text:style-name="P29">Item 1. graf two. The quick brown fox jumped + over the lazy dog’s back.</text:p> </text:list-item> <text:list-item> <text:p text:style-name="P29">Item 2.</text:p> @@ -1055,14 +1070,14 @@ <text:list text:style-name="L13"> <text:list-item> <text:p text:style-name="P30">Tab</text:p><text:list text:style-name="L14"> - <text:list-item> - <text:p text:style-name="P31">Tab</text:p><text:list text:style-name="L15"> - <text:list-item> - <text:p text:style-name="P32">Tab</text:p> - </text:list-item> - </text:list> - </text:list-item> - </text:list> + <text:list-item> + <text:p text:style-name="P31">Tab</text:p><text:list text:style-name="L15"> + <text:list-item> + <text:p text:style-name="P32">Tab</text:p> + </text:list-item> + </text:list> + </text:list-item> + </text:list> </text:list-item> </text:list> <text:p text:style-name="Text_20_body">Here’s another:</text:p> @@ -1088,7 +1103,8 @@ <text:p text:style-name="P33">Third</text:p> </text:list-item> </text:list> -<text:p text:style-name="Text_20_body">Same thing but with paragraphs:</text:p> +<text:p text:style-name="Text_20_body">Same thing but with +paragraphs:</text:p> <text:list text:style-name="L18"> <text:list-item> <text:p text:style-name="P35">First</text:p> @@ -1111,23 +1127,29 @@ <text:p text:style-name="P35">Third</text:p> </text:list-item> </text:list> -<text:h text:style-name="Heading_20_2" text:outline-level="2">Tabs and spaces</text:h> +<text:h text:style-name="Heading_20_2" text:outline-level="2">Tabs and +spaces</text:h> <text:list text:style-name="L20"> <text:list-item> - <text:p text:style-name="P37">this is a list item indented with tabs</text:p> + <text:p text:style-name="P37">this is a list item indented with + tabs</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P37">this is a list item indented with spaces</text:p><text:list text:style-name="L21"> - <text:list-item> - <text:p text:style-name="P38">this is an example list item indented with tabs</text:p> - </text:list-item> - <text:list-item> - <text:p text:style-name="P38">this is an example list item indented with spaces</text:p> - </text:list-item> - </text:list> + <text:p text:style-name="P37">this is a list item indented with + spaces</text:p><text:list text:style-name="L21"> + <text:list-item> + <text:p text:style-name="P38">this is an example list item indented + with tabs</text:p> + </text:list-item> + <text:list-item> + <text:p text:style-name="P38">this is an example list item indented + with spaces</text:p> + </text:list-item> + </text:list> </text:list-item> </text:list> -<text:h text:style-name="Heading_20_2" text:outline-level="2">Fancy list markers</text:h> +<text:h text:style-name="Heading_20_2" text:outline-level="2">Fancy list +markers</text:h> <text:list text:style-name="L22"> <text:list-item> <text:p text:style-name="P39">begins with 2</text:p> @@ -1137,7 +1159,8 @@ <text:p text:style-name="P39">with a continuation</text:p> <text:list> <text:list-item> - <text:p text:style-name="P39">sublist with roman numerals, starting with 4</text:p> + <text:p text:style-name="P39">sublist with roman numerals, starting + with 4</text:p> </text:list-item> <text:list-item> <text:p text:style-name="P39">more items</text:p> @@ -1192,21 +1215,26 @@ <text:p text:style-name="Text_20_body">M.A. 2007</text:p> <text:p text:style-name="Text_20_body">B. Williams</text:p> <text:p text:style-name="Horizontal_20_Line" /> -<text:h text:style-name="Heading_20_1" text:outline-level="1">Definition Lists</text:h> +<text:h text:style-name="Heading_20_1" text:outline-level="1">Definition +Lists</text:h> <text:p text:style-name="Text_20_body">Tight using spaces:</text:p> <text:p text:style-name="Definition_20_Term_20_Tight">apple</text:p> <text:p text:style-name="Definition_20_Definition_20_Tight">red fruit</text:p> <text:p text:style-name="Definition_20_Term_20_Tight">orange</text:p> -<text:p text:style-name="Definition_20_Definition_20_Tight">orange fruit</text:p> +<text:p text:style-name="Definition_20_Definition_20_Tight">orange +fruit</text:p> <text:p text:style-name="Definition_20_Term_20_Tight">banana</text:p> -<text:p text:style-name="Definition_20_Definition_20_Tight">yellow fruit</text:p> +<text:p text:style-name="Definition_20_Definition_20_Tight">yellow +fruit</text:p> <text:p text:style-name="Text_20_body">Tight using tabs:</text:p> <text:p text:style-name="Definition_20_Term_20_Tight">apple</text:p> <text:p text:style-name="Definition_20_Definition_20_Tight">red fruit</text:p> <text:p text:style-name="Definition_20_Term_20_Tight">orange</text:p> -<text:p text:style-name="Definition_20_Definition_20_Tight">orange fruit</text:p> +<text:p text:style-name="Definition_20_Definition_20_Tight">orange +fruit</text:p> <text:p text:style-name="Definition_20_Term_20_Tight">banana</text:p> -<text:p text:style-name="Definition_20_Definition_20_Tight">yellow fruit</text:p> +<text:p text:style-name="Definition_20_Definition_20_Tight">yellow +fruit</text:p> <text:p text:style-name="Text_20_body">Loose:</text:p> <text:p text:style-name="Definition_20_Term">apple</text:p> <text:p text:style-name="Definition_20_Definition">red fruit</text:p> @@ -1216,15 +1244,19 @@ <text:p text:style-name="Definition_20_Definition">yellow fruit</text:p> <text:p text:style-name="Text_20_body">Multiple blocks with italics:</text:p> <text:p text:style-name="Definition_20_Term"><text:span text:style-name="T3">apple</text:span></text:p> -<text:p text:style-name="Definition_20_Definition">red fruit</text:p><text:p text:style-name="Definition_20_Definition">contains seeds, crisp, pleasant to taste</text:p> +<text:p text:style-name="Definition_20_Definition">red +fruit</text:p><text:p text:style-name="Definition_20_Definition">contains +seeds, crisp, pleasant to taste</text:p> <text:p text:style-name="Definition_20_Term"><text:span text:style-name="T4">orange</text:span></text:p> -<text:p text:style-name="Definition_20_Definition">orange fruit</text:p><text:p text:style-name="P42">{ orange code block }</text:p><text:p text:style-name="P43">orange block quote</text:p> +<text:p text:style-name="Definition_20_Definition">orange fruit</text:p><text:p text:style-name="P42">{ orange code block }</text:p><text:p text:style-name="P43">orange +block quote</text:p> <text:p text:style-name="Text_20_body">Multiple definitions, tight:</text:p> <text:p text:style-name="Definition_20_Term_20_Tight">apple</text:p> <text:p text:style-name="Definition_20_Definition_20_Tight">red fruit</text:p> <text:p text:style-name="Definition_20_Definition_20_Tight">computer</text:p> <text:p text:style-name="Definition_20_Term_20_Tight">orange</text:p> -<text:p text:style-name="Definition_20_Definition_20_Tight">orange fruit</text:p> +<text:p text:style-name="Definition_20_Definition_20_Tight">orange +fruit</text:p> <text:p text:style-name="Definition_20_Definition_20_Tight">bank</text:p> <text:p text:style-name="Text_20_body">Multiple definitions, loose:</text:p> <text:p text:style-name="Definition_20_Term">apple</text:p> @@ -1233,31 +1265,39 @@ <text:p text:style-name="Definition_20_Term">orange</text:p> <text:p text:style-name="Definition_20_Definition">orange fruit</text:p> <text:p text:style-name="Definition_20_Definition">bank</text:p> -<text:p text:style-name="Text_20_body">Blank line after term, indented marker, alternate markers:</text:p> +<text:p text:style-name="Text_20_body">Blank line after term, indented marker, +alternate markers:</text:p> <text:p text:style-name="Definition_20_Term">apple</text:p> <text:p text:style-name="Definition_20_Definition">red fruit</text:p> <text:p text:style-name="Definition_20_Definition">computer</text:p> <text:p text:style-name="Definition_20_Term">orange</text:p> -<text:p text:style-name="Definition_20_Definition">orange fruit</text:p><text:list text:style-name="L25"> - <text:list-item> - <text:p text:style-name="P44">sublist</text:p> - </text:list-item> - <text:list-item> - <text:p text:style-name="P44">sublist</text:p> - </text:list-item> - </text:list> -<text:h text:style-name="Heading_20_1" text:outline-level="1">HTML Blocks</text:h> +<text:p text:style-name="Definition_20_Definition">orange +fruit</text:p><text:list text:style-name="L25"> + <text:list-item> + <text:p text:style-name="P44">sublist</text:p> + </text:list-item> + <text:list-item> + <text:p text:style-name="P44">sublist</text:p> + </text:list-item> +</text:list> +<text:h text:style-name="Heading_20_1" text:outline-level="1">HTML +Blocks</text:h> <text:p text:style-name="Text_20_body">Simple block on one line:</text:p> <text:p text:style-name="Text_20_body">foo</text:p> -<text:p text:style-name="Text_20_body">And nested without indentation:</text:p> +<text:p text:style-name="Text_20_body">And nested without +indentation:</text:p> <text:p text:style-name="Text_20_body">foo</text:p> <text:p text:style-name="Text_20_body">bar</text:p> -<text:p text:style-name="Text_20_body">Interpreted markdown in a table:</text:p> -<text:p text:style-name="Text_20_body">This is <text:span text:style-name="T5">emphasized</text:span></text:p> -<text:p text:style-name="Text_20_body">And this is <text:span text:style-name="T6">strong</text:span></text:p> +<text:p text:style-name="Text_20_body">Interpreted markdown in a +table:</text:p> +<text:p text:style-name="Text_20_body">This is +<text:span text:style-name="T5">emphasized</text:span></text:p> +<text:p text:style-name="Text_20_body">And this is +<text:span text:style-name="T6">strong</text:span></text:p> <text:p text:style-name="Text_20_body">Here’s a simple block:</text:p> <text:p text:style-name="Text_20_body">foo</text:p> -<text:p text:style-name="Text_20_body">This should be a code block, though:</text:p> +<text:p text:style-name="Text_20_body">This should be a code block, +though:</text:p> <text:p text:style-name="P45"><div></text:p> <text:p text:style-name="P46"><text:s text:c="4" />foo</text:p> <text:p text:style-name="P47"></div></text:p> @@ -1265,37 +1305,82 @@ <text:p text:style-name="P48"><div>foo</div></text:p> <text:p text:style-name="Text_20_body">Now, nested:</text:p> <text:p text:style-name="Text_20_body">foo</text:p> -<text:p text:style-name="Text_20_body">This should just be an HTML comment:</text:p> +<text:p text:style-name="Text_20_body">This should just be an HTML +comment:</text:p> <text:p text:style-name="Text_20_body">Multiline:</text:p> <text:p text:style-name="Text_20_body">Code block:</text:p> <text:p text:style-name="P49"><!-- Comment --></text:p> -<text:p text:style-name="Text_20_body">Just plain comment, with trailing spaces on the line:</text:p> +<text:p text:style-name="Text_20_body">Just plain comment, with trailing +spaces on the line:</text:p> <text:p text:style-name="Text_20_body">Code:</text:p> <text:p text:style-name="P50"><hr /></text:p> <text:p text:style-name="Text_20_body">Hr’s:</text:p> <text:p text:style-name="Horizontal_20_Line" /> -<text:h text:style-name="Heading_20_1" text:outline-level="1">Inline Markup</text:h> -<text:p text:style-name="Text_20_body">This is <text:span text:style-name="T7">emphasized</text:span>, and so <text:span text:style-name="T8">is</text:span><text:span text:style-name="T9"> </text:span><text:span text:style-name="T10">this</text:span>.</text:p> -<text:p text:style-name="Text_20_body">This is <text:span text:style-name="T11">strong</text:span>, and so <text:span text:style-name="T12">is</text:span><text:span text:style-name="T13"> </text:span><text:span text:style-name="T14">this</text:span>.</text:p> -<text:p text:style-name="Text_20_body">An <text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="T15">emphasized</text:span><text:span text:style-name="T16"> </text:span><text:span text:style-name="T17">link</text:span></text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body"><text:span text:style-name="T18">This</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T20">is</text:span><text:span text:style-name="T21"> </text:span><text:span text:style-name="T22">strong</text:span><text:span text:style-name="T23"> </text:span><text:span text:style-name="T24">and</text:span><text:span text:style-name="T25"> </text:span><text:span text:style-name="T26">em</text:span><text:span text:style-name="T27">.</text:span></text:p> -<text:p text:style-name="Text_20_body">So is <text:span text:style-name="T28">this</text:span> word.</text:p> -<text:p text:style-name="Text_20_body"><text:span text:style-name="T29">This</text:span><text:span text:style-name="T30"> </text:span><text:span text:style-name="T31">is</text:span><text:span text:style-name="T32"> </text:span><text:span text:style-name="T33">strong</text:span><text:span text:style-name="T34"> </text:span><text:span text:style-name="T35">and</text:span><text:span text:style-name="T36"> </text:span><text:span text:style-name="T37">em</text:span><text:span text:style-name="T38">.</text:span></text:p> -<text:p text:style-name="Text_20_body">So is <text:span text:style-name="T39">this</text:span> word.</text:p> -<text:p text:style-name="Text_20_body">This is code: <text:span text:style-name="Teletype">></text:span>, <text:span text:style-name="Teletype">$</text:span>, <text:span text:style-name="Teletype">\</text:span>, <text:span text:style-name="Teletype">\$</text:span>, <text:span text:style-name="Teletype"><html></text:span>.</text:p> -<text:p text:style-name="Text_20_body"><text:span text:style-name="T40">This</text:span><text:span text:style-name="T41"> </text:span><text:span text:style-name="T42">is</text:span><text:span text:style-name="T43"> </text:span><text:span text:style-name="T44">strikeout</text:span><text:span text:style-name="T45">.</text:span></text:p> -<text:p text:style-name="Text_20_body">Superscripts: a<text:span text:style-name="T46">bc</text:span>d a<text:span text:style-name="T47">hello</text:span> a<text:span text:style-name="T48">hello</text:span><text:span text:style-name="T49"> </text:span><text:span text:style-name="T50">there</text:span>.</text:p> -<text:p text:style-name="Text_20_body">Subscripts: H<text:span text:style-name="T51">2</text:span>O, H<text:span text:style-name="T52">23</text:span>O, H<text:span text:style-name="T53">many</text:span><text:span text:style-name="T54"> </text:span><text:span text:style-name="T55">of</text:span><text:span text:style-name="T56"> </text:span><text:span text:style-name="T57">them</text:span>O.</text:p> -<text:p text:style-name="Text_20_body">These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.</text:p> +<text:h text:style-name="Heading_20_1" text:outline-level="1">Inline +Markup</text:h> +<text:p text:style-name="Text_20_body">This is +<text:span text:style-name="T7">emphasized</text:span>, and so +<text:span text:style-name="T8">is</text:span><text:span text:style-name="T9"> +</text:span><text:span text:style-name="T10">this</text:span>.</text:p> +<text:p text:style-name="Text_20_body">This is +<text:span text:style-name="T11">strong</text:span>, and so +<text:span text:style-name="T12">is</text:span><text:span text:style-name="T13"> +</text:span><text:span text:style-name="T14">this</text:span>.</text:p> +<text:p text:style-name="Text_20_body">An +<text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="T15">emphasized</text:span><text:span text:style-name="T16"> +</text:span><text:span text:style-name="T17">link</text:span></text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body"><text:span text:style-name="T18">This</text:span><text:span text:style-name="T19"> +</text:span><text:span text:style-name="T20">is</text:span><text:span text:style-name="T21"> +</text:span><text:span text:style-name="T22">strong</text:span><text:span text:style-name="T23"> +</text:span><text:span text:style-name="T24">and</text:span><text:span text:style-name="T25"> +</text:span><text:span text:style-name="T26">em</text:span><text:span text:style-name="T27">.</text:span></text:p> +<text:p text:style-name="Text_20_body">So is +<text:span text:style-name="T28">this</text:span> word.</text:p> +<text:p text:style-name="Text_20_body"><text:span text:style-name="T29">This</text:span><text:span text:style-name="T30"> +</text:span><text:span text:style-name="T31">is</text:span><text:span text:style-name="T32"> +</text:span><text:span text:style-name="T33">strong</text:span><text:span text:style-name="T34"> +</text:span><text:span text:style-name="T35">and</text:span><text:span text:style-name="T36"> +</text:span><text:span text:style-name="T37">em</text:span><text:span text:style-name="T38">.</text:span></text:p> +<text:p text:style-name="Text_20_body">So is +<text:span text:style-name="T39">this</text:span> word.</text:p> +<text:p text:style-name="Text_20_body">This is code: +<text:span text:style-name="Teletype">></text:span>, +<text:span text:style-name="Teletype">$</text:span>, +<text:span text:style-name="Teletype">\</text:span>, +<text:span text:style-name="Teletype">\$</text:span>, +<text:span text:style-name="Teletype"><html></text:span>.</text:p> +<text:p text:style-name="Text_20_body"><text:span text:style-name="T40">This</text:span><text:span text:style-name="T41"> +</text:span><text:span text:style-name="T42">is</text:span><text:span text:style-name="T43"> +</text:span><text:span text:style-name="T44">strikeout</text:span><text:span text:style-name="T45">.</text:span></text:p> +<text:p text:style-name="Text_20_body">Superscripts: +a<text:span text:style-name="T46">bc</text:span>d +a<text:span text:style-name="T47">hello</text:span> +a<text:span text:style-name="T48">hello</text:span><text:span text:style-name="T49"> </text:span><text:span text:style-name="T50">there</text:span>.</text:p> +<text:p text:style-name="Text_20_body">Subscripts: +H<text:span text:style-name="T51">2</text:span>O, +H<text:span text:style-name="T52">23</text:span>O, +H<text:span text:style-name="T53">many</text:span><text:span text:style-name="T54"> </text:span><text:span text:style-name="T55">of</text:span><text:span text:style-name="T56"> </text:span><text:span text:style-name="T57">them</text:span>O.</text:p> +<text:p text:style-name="Text_20_body">These should not be superscripts or +subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.</text:p> <text:p text:style-name="Horizontal_20_Line" /> -<text:h text:style-name="Heading_20_1" text:outline-level="1">Smart quotes, ellipses, dashes</text:h> -<text:p text:style-name="Text_20_body">“Hello,” said the spider. “‘Shelob’ is my name.”</text:p> -<text:p text:style-name="Text_20_body">‘A’, ‘B’, and ‘C’ are letters.</text:p> -<text:p text:style-name="Text_20_body">‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’</text:p> -<text:p text:style-name="Text_20_body">‘He said, “I want to go.”’ Were you alive in the 70’s?</text:p> -<text:p text:style-name="Text_20_body">Here is some quoted ‘<text:span text:style-name="Teletype">code</text:span>’ and a “<text:a xlink:type="simple" xlink:href="http://example.com/?foo=1&bar=2" office:name=""><text:span text:style-name="Definition">quoted link</text:span></text:a>”.</text:p> -<text:p text:style-name="Text_20_body">Some dashes: one—two — three—four — five.</text:p> -<text:p text:style-name="Text_20_body">Dashes between numbers: 5–7, 255–66, 1987–1999.</text:p> +<text:h text:style-name="Heading_20_1" text:outline-level="1">Smart quotes, +ellipses, dashes</text:h> +<text:p text:style-name="Text_20_body">“Hello,” said the spider. +“‘Shelob’ is my name.”</text:p> +<text:p text:style-name="Text_20_body">‘A’, ‘B’, and +‘C’ are letters.</text:p> +<text:p text:style-name="Text_20_body">‘Oak,’ ‘elm,’ +and ‘beech’ are names of trees. So is ‘pine.’</text:p> +<text:p text:style-name="Text_20_body">‘He said, “I want to +go.”’ Were you alive in the 70’s?</text:p> +<text:p text:style-name="Text_20_body">Here is some quoted +‘<text:span text:style-name="Teletype">code</text:span>’ and a +“<text:a xlink:type="simple" xlink:href="http://example.com/?foo=1&bar=2" office:name=""><text:span text:style-name="Definition">quoted +link</text:span></text:a>”.</text:p> +<text:p text:style-name="Text_20_body">Some dashes: one—two — +three—four — five.</text:p> +<text:p text:style-name="Text_20_body">Dashes between numbers: 5–7, +255–66, 1987–1999.</text:p> <text:p text:style-name="Text_20_body">Ellipses…and…and….</text:p> <text:p text:style-name="Horizontal_20_Line" /> <text:h text:style-name="Heading_20_1" text:outline-level="1">LaTeX</text:h> @@ -1319,30 +1404,43 @@ <text:p text:style-name="P51"><text:span text:style-name="T60">p</text:span>-Tree</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">Here’s some display math: $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</text:p> + <text:p text:style-name="P51">Here’s some display math: + $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">Here’s one that has a line break in it: α + ω × <text:span text:style-name="T61">x</text:span><text:span text:style-name="T62">2</text:span>.</text:p> + <text:p text:style-name="P51">Here’s one that has a line break in + it: + α + ω × <text:span text:style-name="T61">x</text:span><text:span text:style-name="T62">2</text:span>.</text:p> </text:list-item> </text:list> <text:p text:style-name="Text_20_body">These shouldn’t be math:</text:p> <text:list text:style-name="L27"> <text:list-item> - <text:p text:style-name="P52">To get the famous equation, write <text:span text:style-name="Teletype">$e = mc^2$</text:span>.</text:p> + <text:p text:style-name="P52">To get the famous equation, write + <text:span text:style-name="Teletype">$e = mc^2$</text:span>.</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P52">$22,000 is a <text:span text:style-name="T63">lot</text:span> of money. So is $34,000. (It worked if “lot” is emphasized.)</text:p> + <text:p text:style-name="P52">$22,000 is a + <text:span text:style-name="T63">lot</text:span> of money. So is $34,000. + (It worked if “lot” is emphasized.)</text:p> </text:list-item> <text:list-item> <text:p text:style-name="P52">Shoes ($20) and socks ($5).</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P52">Escaped <text:span text:style-name="Teletype">$</text:span>: $73 <text:span text:style-name="T64">this</text:span><text:span text:style-name="T65"> </text:span><text:span text:style-name="T66">should</text:span><text:span text:style-name="T67"> </text:span><text:span text:style-name="T68">be</text:span><text:span text:style-name="T69"> </text:span><text:span text:style-name="T70">emphasized</text:span> 23$.</text:p> + <text:p text:style-name="P52">Escaped + <text:span text:style-name="Teletype">$</text:span>: $73 + <text:span text:style-name="T64">this</text:span><text:span text:style-name="T65"> + </text:span><text:span text:style-name="T66">should</text:span><text:span text:style-name="T67"> + </text:span><text:span text:style-name="T68">be</text:span><text:span text:style-name="T69"> + </text:span><text:span text:style-name="T70">emphasized</text:span> + 23$.</text:p> </text:list-item> </text:list> <text:p text:style-name="Text_20_body">Here’s a LaTeX table:</text:p> <text:p text:style-name="Horizontal_20_Line" /> -<text:h text:style-name="Heading_20_1" text:outline-level="1">Special Characters</text:h> +<text:h text:style-name="Heading_20_1" text:outline-level="1">Special +Characters</text:h> <text:p text:style-name="Text_20_body">Here is some unicode:</text:p> <text:list text:style-name="L28"> <text:list-item> @@ -1361,8 +1459,10 @@ <text:p text:style-name="P53">copyright: ©</text:p> </text:list-item> </text:list> -<text:p text:style-name="Text_20_body">AT&T has an ampersand in their name.</text:p> -<text:p text:style-name="Text_20_body">AT&T is another way to write it.</text:p> +<text:p text:style-name="Text_20_body">AT&T has an ampersand in their +name.</text:p> +<text:p text:style-name="Text_20_body">AT&T is another way to write +it.</text:p> <text:p text:style-name="Text_20_body">This & that.</text:p> <text:p text:style-name="Text_20_body">4 < 5.</text:p> <text:p text:style-name="Text_20_body">6 > 5.</text:p> @@ -1385,35 +1485,63 @@ <text:p text:style-name="Horizontal_20_Line" /> <text:h text:style-name="Heading_20_1" text:outline-level="1">Links</text:h> <text:h text:style-name="Heading_20_2" text:outline-level="2">Explicit</text:h> -<text:p text:style-name="Text_20_body">Just a <text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">URL</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title"><text:span text:style-name="Definition">URL and title</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title preceded by two spaces"><text:span text:style-name="Definition">URL and title</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title preceded by a tab"><text:span text:style-name="Definition">URL and title</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title with "quotes" in it"><text:span text:style-name="Definition">URL and title</text:span></text:a></text:p> -<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title with single quotes"><text:span text:style-name="Definition">URL and title</text:span></text:a></text:p> +<text:p text:style-name="Text_20_body">Just a +<text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">URL</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title"><text:span text:style-name="Definition">URL +and title</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title preceded by two spaces"><text:span text:style-name="Definition">URL +and title</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title preceded by a tab"><text:span text:style-name="Definition">URL +and title</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title with "quotes" in it"><text:span text:style-name="Definition">URL +and title</text:span></text:a></text:p> +<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name="title with single quotes"><text:span text:style-name="Definition">URL +and title</text:span></text:a></text:p> <text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/with_underscore" office:name=""><text:span text:style-name="Definition">with_underscore</text:span></text:a></text:p> -<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="mailto:nobody@nowhere.net" office:name=""><text:span text:style-name="Definition">Email link</text:span></text:a></text:p> +<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="mailto:nobody@nowhere.net" office:name=""><text:span text:style-name="Definition">Email +link</text:span></text:a></text:p> <text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="" office:name=""><text:span text:style-name="Definition">Empty</text:span></text:a>.</text:p> <text:h text:style-name="Heading_20_2" text:outline-level="2">Reference</text:h> -<text:p text:style-name="Text_20_body">Foo <text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">bar</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body">Foo <text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">bar</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body">Foo <text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">bar</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body">With <text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">embedded [brackets]</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">b</text:span></text:a> by itself should be a link.</text:p> -<text:p text:style-name="Text_20_body">Indented <text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition">once</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body">Indented <text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition">twice</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body">Indented <text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition">thrice</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Foo +<text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">bar</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Foo +<text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">bar</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Foo +<text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">bar</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">With +<text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">embedded +[brackets]</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body"><text:a xlink:type="simple" xlink:href="/url/" office:name=""><text:span text:style-name="Definition">b</text:span></text:a> +by itself should be a link.</text:p> +<text:p text:style-name="Text_20_body">Indented +<text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition">once</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Indented +<text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition">twice</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Indented +<text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition">thrice</text:span></text:a>.</text:p> <text:p text:style-name="Text_20_body">This should [not][] be a link.</text:p> <text:p text:style-name="P54">[not]: /url</text:p> -<text:p text:style-name="Text_20_body">Foo <text:a xlink:type="simple" xlink:href="/url/" office:name="Title with "quotes" inside"><text:span text:style-name="Definition">bar</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body">Foo <text:a xlink:type="simple" xlink:href="/url/" office:name="Title with "quote" inside"><text:span text:style-name="Definition">biz</text:span></text:a>.</text:p> -<text:h text:style-name="Heading_20_2" text:outline-level="2">With ampersands</text:h> -<text:p text:style-name="Text_20_body">Here’s a <text:a xlink:type="simple" xlink:href="http://example.com/?foo=1&bar=2" office:name=""><text:span text:style-name="Definition">link with an ampersand in the URL</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body">Here’s a link with an amersand in the link text: <text:a xlink:type="simple" xlink:href="http://att.com/" office:name="AT&T"><text:span text:style-name="Definition">AT&T</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body">Here’s an <text:a xlink:type="simple" xlink:href="/script?foo=1&bar=2" office:name=""><text:span text:style-name="Definition">inline link</text:span></text:a>.</text:p> -<text:p text:style-name="Text_20_body">Here’s an <text:a xlink:type="simple" xlink:href="/script?foo=1&bar=2" office:name=""><text:span text:style-name="Definition">inline link in pointy braces</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Foo +<text:a xlink:type="simple" xlink:href="/url/" office:name="Title with "quotes" inside"><text:span text:style-name="Definition">bar</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Foo +<text:a xlink:type="simple" xlink:href="/url/" office:name="Title with "quote" inside"><text:span text:style-name="Definition">biz</text:span></text:a>.</text:p> +<text:h text:style-name="Heading_20_2" text:outline-level="2">With +ampersands</text:h> +<text:p text:style-name="Text_20_body">Here’s a +<text:a xlink:type="simple" xlink:href="http://example.com/?foo=1&bar=2" office:name=""><text:span text:style-name="Definition">link +with an ampersand in the URL</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Here’s a link with an amersand in +the link text: +<text:a xlink:type="simple" xlink:href="http://att.com/" office:name="AT&T"><text:span text:style-name="Definition">AT&T</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Here’s an +<text:a xlink:type="simple" xlink:href="/script?foo=1&bar=2" office:name=""><text:span text:style-name="Definition">inline +link</text:span></text:a>.</text:p> +<text:p text:style-name="Text_20_body">Here’s an +<text:a xlink:type="simple" xlink:href="/script?foo=1&bar=2" office:name=""><text:span text:style-name="Definition">inline +link in pointy braces</text:span></text:a>.</text:p> <text:h text:style-name="Heading_20_2" text:outline-level="2">Autolinks</text:h> -<text:p text:style-name="Text_20_body">With an ampersand: <text:a xlink:type="simple" xlink:href="http://example.com/?foo=1&bar=2" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="Teletype">http://example.com/?foo=1&bar=2</text:span></text:span></text:a></text:p> +<text:p text:style-name="Text_20_body">With an ampersand: +<text:a xlink:type="simple" xlink:href="http://example.com/?foo=1&bar=2" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="Teletype">http://example.com/?foo=1&bar=2</text:span></text:span></text:a></text:p> <text:list text:style-name="L29"> <text:list-item> <text:p text:style-name="P55">In a list?</text:p> @@ -1425,25 +1553,55 @@ <text:p text:style-name="P55">It should.</text:p> </text:list-item> </text:list> -<text:p text:style-name="Text_20_body">An e-mail address: <text:a xlink:type="simple" xlink:href="mailto:nobody@nowhere.net" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="Teletype">nobody@nowhere.net</text:span></text:span></text:a></text:p> -<text:p text:style-name="P56">Blockquoted: <text:a xlink:type="simple" xlink:href="http://example.com/" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="Teletype">http://example.com/</text:span></text:span></text:a></text:p> -<text:p text:style-name="Text_20_body">Auto-links should not occur here: <text:span text:style-name="Teletype"><http://example.com/></text:span></text:p> +<text:p text:style-name="Text_20_body">An e-mail address: +<text:a xlink:type="simple" xlink:href="mailto:nobody@nowhere.net" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="Teletype">nobody@nowhere.net</text:span></text:span></text:a></text:p> +<text:p text:style-name="P56">Blockquoted: +<text:a xlink:type="simple" xlink:href="http://example.com/" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="Teletype">http://example.com/</text:span></text:span></text:a></text:p> +<text:p text:style-name="Text_20_body">Auto-links should not occur here: +<text:span text:style-name="Teletype"><http://example.com/></text:span></text:p> <text:p text:style-name="P57">or here: <http://example.com/></text:p> <text:p text:style-name="Horizontal_20_Line" /> <text:h text:style-name="Heading_20_1" text:outline-level="1">Images</text:h> -<text:p text:style-name="Text_20_body">From “Voyage dans la Lune” by Georges Melies (1902):</text:p> +<text:p text:style-name="Text_20_body">From “Voyage dans la Lune” +by Georges Melies (1902):</text:p> <text:p text:style-name="Text_20_body"><draw:frame><draw:image xlink:href="lalune.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" /></draw:frame></text:p> -<text:p text:style-name="Text_20_body">Here is a movie <draw:frame><draw:image xlink:href="movie.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" /></draw:frame> icon.</text:p> +<text:p text:style-name="Text_20_body">Here is a movie +<draw:frame><draw:image xlink:href="movie.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" /></draw:frame> +icon.</text:p> <text:p text:style-name="Horizontal_20_Line" /> <text:h text:style-name="Heading_20_1" text:outline-level="1">Footnotes</text:h> -<text:p text:style-name="Text_20_body">Here is a footnote reference,<text:note text:id="ftn0" text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.</text:p></text:note-body></text:note> and another.<text:note text:id="ftn1" text:note-class="footnote"><text:note-citation>2</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here’s the long note. This one contains multiple blocks.</text:p><text:p text:style-name="Footnote">Subsequent blocks are indented to show that they belong to the footnote (as with list items).</text:p><text:p text:style-name="P58"><text:s text:c="2" />{ <code> }</text:p><text:p text:style-name="Footnote">If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.</text:p></text:note-body></text:note> This should <text:span text:style-name="T71">not</text:span> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<text:note text:id="ftn2" text:note-class="footnote"><text:note-citation>3</text:note-citation><text:note-body><text:p text:style-name="Footnote">This is <text:span text:style-name="T72">easier</text:span> to type. Inline notes may contain <text:a xlink:type="simple" xlink:href="http://google.com" office:name=""><text:span text:style-name="Definition">links</text:span></text:a> and <text:span text:style-name="Teletype">]</text:span> verbatim characters, as well as [bracketed text].</text:p></text:note-body></text:note></text:p> -<text:p text:style-name="P59">Notes can go in quotes.<text:note text:id="ftn3" text:note-class="footnote"><text:note-citation>4</text:note-citation><text:note-body><text:p text:style-name="Footnote">In quote.</text:p></text:note-body></text:note></text:p> +<text:p text:style-name="Text_20_body">Here is a footnote +reference,<text:note text:id="ftn0" text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here +is the footnote. It can go anywhere after the footnote reference. It need not +be placed at the end of the document.</text:p></text:note-body></text:note> +and +another.<text:note text:id="ftn1" text:note-class="footnote"><text:note-citation>2</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here’s +the long note. This one contains multiple +blocks.</text:p><text:p text:style-name="Footnote">Subsequent blocks are +indented to show that they belong to the footnote (as with list +items).</text:p><text:p text:style-name="P58"><text:s text:c="2" />{ <code> }</text:p><text:p text:style-name="Footnote">If +you want, you can indent every line, but you can also be lazy and just indent +the first line of each block.</text:p></text:note-body></text:note> This +should <text:span text:style-name="T71">not</text:span> be a footnote +reference, because it contains a space.[^my note] Here is an inline +note.<text:note text:id="ftn2" text:note-class="footnote"><text:note-citation>3</text:note-citation><text:note-body><text:p text:style-name="Footnote">This +is <text:span text:style-name="T72">easier</text:span> to type. Inline notes +may contain +<text:a xlink:type="simple" xlink:href="http://google.com" office:name=""><text:span text:style-name="Definition">links</text:span></text:a> +and <text:span text:style-name="Teletype">]</text:span> verbatim characters, +as well as [bracketed text].</text:p></text:note-body></text:note></text:p> +<text:p text:style-name="P59">Notes can go in +quotes.<text:note text:id="ftn3" text:note-class="footnote"><text:note-citation>4</text:note-citation><text:note-body><text:p text:style-name="Footnote">In +quote.</text:p></text:note-body></text:note></text:p> <text:list text:style-name="L30"> <text:list-item> - <text:p text:style-name="P60">And in list items.<text:note text:id="ftn4" text:note-class="footnote"><text:note-citation>5</text:note-citation><text:note-body><text:p text:style-name="Footnote">In list.</text:p></text:note-body></text:note></text:p> + <text:p text:style-name="P60">And in list + items.<text:note text:id="ftn4" text:note-class="footnote"><text:note-citation>5</text:note-citation><text:note-body><text:p text:style-name="Footnote">In + list.</text:p></text:note-body></text:note></text:p> </text:list-item> </text:list> -<text:p text:style-name="Text_20_body">This paragraph should not be part of the note, as it is not indented.</text:p> +<text:p text:style-name="Text_20_body">This paragraph should not be part of +the note, as it is not indented.</text:p> </office:text> </office:body> </office:document-content> |