git.iko.soy/typeable/pandoc
on master help sign in
Inline code when text has a special style

When a piece of text has a text 'Source_Text' then we assume that this is a piece of the document that represents a code that needs to be inlined. Addapted an odt writer to also reflect that change; previously it was just writing a 'preformatted' text using a non-distinguishable font style. Code blocks are still not recognized by the ODT reader. That's a separate issue.

commit13bc573e7f9e0602404dd37fec2c7cd14b5c56ee authorHubert Plociniczak <hubert.plociniczak@gmail.com> dateWed 26 Oct 2016, 15:53 (10 years ago) parenteced02d
7 files changed+85−69
compare with master
unifiedsplit
data/odt/styles.xml+8 src/Text/Pandoc/Readers/Odt/ContentReader.hs+20−6 src/Text/Pandoc/Writers/OpenDocument.hs+2−1 tests/Tests/Readers/Odt.hs+1 tests/odt/native/inlinedCode.native+1 tests/odt/odt/inlinedCode.odt tests/writer.opendocument+53−62
data/odt/styles.xml+8
@@ -237,6 +237,13 @@ xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2">
237237 style:font-name-complex="Courier New"
238238 style:font-size-complex="10pt" />
239239 </style:style>
240+ <style:style style:name="Source_Text" style:family="text">
241+ <style:text-properties style:font-name="Courier New"
242+ fo:font-size="10pt" style:font-name-asian="Courier New"
243+ style:font-size-asian="10pt"
244+ style:font-name-complex="Courier New"
245+ style:font-size-complex="10pt" />
246+ </style:style>
240247 <style:style style:name="Definition_20_Term"
241248 style:display-name="Definition Term" style:family="paragraph"
242249 style:parent-style-name="Standard"
@@ -381,6 +388,7 @@ xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2">
381388 style:font-name-asian="Courier New"
382389 style:font-name-complex="Courier New" />
383390 </style:style>
391+
384392 <style:style style:name="Internet_20_link"
385393 style:display-name="Internet link" style:family="text">
386394 <style:text-properties fo:color="#000080"
src/Text/Pandoc/Readers/Odt/ContentReader.hs+20−6
@@ -44,7 +44,7 @@ import Control.Applicative hiding ( liftA, liftA2, liftA3 )
4444
4545import qualified Data.ByteString.Lazy as B
4646import qualified Data.Map as M
47−import Data.List ( find )
47+import Data.List ( find, intercalate )
4848import Data.Maybe
4949
5050import qualified Text.XML.Light as XML
@@ -263,8 +263,13 @@ getHeaderAnchor = proc title -> do
263263--------------------------------------------------------------------------------
264264
265265--
266−readStyleByName :: OdtReader _x Style
267−readStyleByName = findAttr NsText "style-name" >>? getStyleByName
266+readStyleByName :: OdtReader _x (StyleName, Style)
267+readStyleByName =
268+ findAttr NsText "style-name" >>? keepingTheValue getStyleByName >>^ liftE
269+ where
270+ liftE :: (StyleName, Fallible Style) -> Fallible (StyleName, Style)
271+ liftE (name, Right v) = Right (name, v)
272+ liftE (_, Left v) = Left v
268273
269274--
270275isStyleToTrace :: OdtReader Style Bool
@@ -275,7 +280,10 @@ withNewStyle :: OdtReaderSafe x Inlines -> OdtReaderSafe x Inlines
275280withNewStyle a = proc x -> do
276281 fStyle <- readStyleByName -< ()
277282 case fStyle of
278− Right style -> do
283+ Right (styleName, _) | isCodeStyle styleName -> do
284+ inlines <- a -< x
285+ arr inlineCode -<< inlines
286+ Right (_, style) -> do
279287 mFamily <- arr styleFamily -< style
280288 fTextProps <- arr ( maybeToChoice
281289 . textProperties
@@ -301,7 +309,13 @@ withNewStyle a = proc x -> do
301309 Left _ -> a -< x
302310 Left _ -> a -< x
303311 Left _ -> a -< x
312+ where
313+ isCodeStyle :: StyleName -> Bool
314+ isCodeStyle "Source_Text" = True
315+ isCodeStyle _ = False
304316
317+ inlineCode :: Inlines -> Inlines
318+ inlineCode = code . intercalate "" . map stringify . toList
305319
306320type PropertyTriple = (ReaderState, TextProperties, Maybe StyleFamily)
307321type InlineModifier = Inlines -> Inlines
@@ -327,7 +341,7 @@ modifierFromStyleDiff propertyTriple =
327341 let getVPos = Just . verticalPosition
328342 in case lookupPreviousValueM getVPos triple of
329343 Nothing -> ignore
330− Just oldVPos -> getVPosModifier' (oldVPos,verticalPosition textProps)
344+ Just oldVPos -> getVPosModifier' (oldVPos, verticalPosition textProps)
331345
332346 getVPosModifier' (oldVPos , newVPos ) | oldVPos == newVPos = ignore
333347 getVPosModifier' ( _ , VPosSub ) = subscript
@@ -401,7 +415,7 @@ constructPara reader = proc blocks -> do
401415 fStyle <- readStyleByName -< blocks
402416 case fStyle of
403417 Left _ -> reader -< blocks
404− Right style -> do
418+ Right (_, style) -> do
405419 let modifier = getParaModifier style
406420 blocks' <- reader -< blocks
407421 arr modifier -<< blocks'
src/Text/Pandoc/Writers/OpenDocument.hs+2−1
@@ -392,7 +392,7 @@ inlineToOpenDocument o ils
392392 Subscript l -> withTextStyle Sub $ inlinesToOpenDocument o l
393393 SmallCaps l -> withTextStyle SmallC $ inlinesToOpenDocument o l
394394 Quoted t l -> inQuotes t <$> inlinesToOpenDocument o l
395− Code _ s -> withTextStyle Pre $ inTextStyle $ preformatted s
395+ Code _ s -> inlinedCode $ preformatted s
396396 Math t s -> inlinesToOpenDocument o (texMathToInlines t s)
397397 Cite _ l -> inlinesToOpenDocument o l
398398 RawInline f s -> if f == Format "opendocument"
@@ -403,6 +403,7 @@ inlineToOpenDocument o ils
403403 Note l -> mkNote l
404404 where
405405 preformatted s = handleSpaces $ escapeStringForXML s
406+ inlinedCode s = return $ inTags False "text:span" [("text:style-name", "Source_Text")] s
406407 mkLink s t = inTags False "text:a" [ ("xlink:type" , "simple")
407408 , ("xlink:href" , s )
408409 , ("office:name", t )
tests/Tests/Readers/Odt.hs+1
@@ -149,6 +149,7 @@ namesOfTestsComparingToNative = [ "blockquote"
149149 , "image"
150150 , "imageIndex"
151151 , "imageWithCaption"
152+ , "inlinedCode"
152153 , "orderedListMixed"
153154 , "orderedListRoman"
154155 , "orderedListSimple"
tests/odt/native/inlinedCode.nativenew file+1
@@ -0,0 +1 @@
1+[Para [Str "Here",Space,Str "comes",Space,Code ("",[],[]) "inlined code",Space,Str "text",Space,Str "and",Space,Code ("",[],[]) "an another",Space,Str "one."]]
tests/odt/odt/inlinedCode.odtnew file

Binary file not shown.

tests/writer.opendocument+53−62
@@ -668,47 +668,37 @@
668668 <style:style style:name="T35" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" /></style:style>
669669 <style:style style:name="T36" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" /></style:style>
670670 <style:style style:name="T37" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" /></style:style>
671− <style:style style:name="T38" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
672− <style:style style:name="T39" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
673− <style:style style:name="T40" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
674− <style:style style:name="T41" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
675− <style:style style:name="T42" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
671+ <style:style style:name="T38" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
672+ <style:style style:name="T39" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
673+ <style:style style:name="T40" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
674+ <style:style style:name="T41" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
675+ <style:style style:name="T42" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" style:text-line-through-style="solid" /></style:style>
676676 <style:style style:name="T43" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
677− <style:style style:name="T44" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
678− <style:style style:name="T45" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
679− <style:style style:name="T46" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
680− <style:style style:name="T47" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" style:text-line-through-style="solid" /></style:style>
681− <style:style style:name="T48" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
682− <style:style style:name="T49" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>
683− <style:style style:name="T50" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" style:text-position="super 58%" /></style:style>
684− <style:style style:name="T51" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>
685− <style:style style:name="T52" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style>
686− <style:style style:name="T53" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style>
687− <style:style style:name="T54" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style>
688− <style:style style:name="T55" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
677+ <style:style style:name="T44" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>
678+ <style:style style:name="T45" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" style:text-position="super 58%" /></style:style>
679+ <style:style style:name="T46" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>
680+ <style:style style:name="T47" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style>
681+ <style:style style:name="T48" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style>
682+ <style:style style:name="T49" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style>
683+ <style:style style:name="T50" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
684+ <style:style style:name="T51" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
685+ <style:style style:name="T52" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
686+ <style:style style:name="T53" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
687+ <style:style style:name="T54" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
688+ <style:style style:name="T55" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
689689 <style:style style:name="T56" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
690690 <style:style style:name="T57" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
691− <style:style style:name="T58" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
691+ <style:style style:name="T58" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>
692692 <style:style style:name="T59" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
693693 <style:style style:name="T60" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
694694 <style:style style:name="T61" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
695695 <style:style style:name="T62" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
696696 <style:style style:name="T63" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
697− <style:style style:name="T64" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>
698− <style:style style:name="T65" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
697+ <style:style style:name="T64" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
698+ <style:style style:name="T65" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
699699 <style:style style:name="T66" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
700− <style:style style:name="T67" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
700+ <style:style style:name="T67" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
701701 <style:style style:name="T68" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
702− <style:style style:name="T69" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
703− <style:style style:name="T70" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
704− <style:style style:name="T71" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
705− <style:style style:name="T72" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
706− <style:style style:name="T73" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
707− <style:style style:name="T74" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
708− <style:style style:name="T75" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
709− <style:style style:name="T76" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
710− <style:style style:name="T77" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
711− <style:style style:name="T78" style:family="text"><style:text-properties style:font-name="Courier New" style:font-name-asian="Courier New" style:font-name-complex="Courier New" /></style:style>
712702 <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Quotations">
713703 <style:paragraph-properties fo:margin-left="0.5in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" />
714704 </style:style>
@@ -1358,22 +1348,22 @@ Markup</text:h>
13581348<text:p text:style-name="Text_20_body">So is
13591349<text:span text:style-name="T37">this</text:span> word.</text:p>
13601350<text:p text:style-name="Text_20_body">This is code:
1361−<text:span text:style-name="T38">&gt;</text:span>,
1362−<text:span text:style-name="T39">$</text:span>,
1363−<text:span text:style-name="T40">\</text:span>,
1364−<text:span text:style-name="T41">\$</text:span>,
1365−<text:span text:style-name="T42">&lt;html&gt;</text:span>.</text:p>
1366−<text:p text:style-name="Text_20_body"><text:span text:style-name="T43">This</text:span><text:span text:style-name="T44">
1367−</text:span><text:span text:style-name="T45">is</text:span><text:span text:style-name="T46">
1368−</text:span><text:span text:style-name="T47">strikeout</text:span><text:span text:style-name="T48">.</text:span></text:p>
1351+<text:span text:style-name="Source_Text">&gt;</text:span>,
1352+<text:span text:style-name="Source_Text">$</text:span>,
1353+<text:span text:style-name="Source_Text">\</text:span>,
1354+<text:span text:style-name="Source_Text">\$</text:span>,
1355+<text:span text:style-name="Source_Text">&lt;html&gt;</text:span>.</text:p>
1356+<text:p text:style-name="Text_20_body"><text:span text:style-name="T38">This</text:span><text:span text:style-name="T39">
1357+</text:span><text:span text:style-name="T40">is</text:span><text:span text:style-name="T41">
1358+</text:span><text:span text:style-name="T42">strikeout</text:span><text:span text:style-name="T43">.</text:span></text:p>
13691359<text:p text:style-name="Text_20_body">Superscripts:
1370−a<text:span text:style-name="T49">bc</text:span>d
1371−a<text:span text:style-name="T50">hello</text:span>
1372−a<text:span text:style-name="T51">hello there</text:span>.</text:p>
1360+a<text:span text:style-name="T44">bc</text:span>d
1361+a<text:span text:style-name="T45">hello</text:span>
1362+a<text:span text:style-name="T46">hello there</text:span>.</text:p>
13731363<text:p text:style-name="Text_20_body">Subscripts:
1374−H<text:span text:style-name="T52">2</text:span>O,
1375−H<text:span text:style-name="T53">23</text:span>O,
1376−H<text:span text:style-name="T54">many of them</text:span>O.</text:p>
1364+H<text:span text:style-name="T47">2</text:span>O,
1365+H<text:span text:style-name="T48">23</text:span>O,
1366+H<text:span text:style-name="T49">many of them</text:span>O.</text:p>
13771367<text:p text:style-name="Text_20_body">These should not be superscripts or
13781368subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.</text:p>
13791369<text:p text:style-name="Horizontal_20_Line" />
@@ -1387,7 +1377,7 @@ trees. So is ‘pine.’</text:p>
13871377<text:p text:style-name="Text_20_body">‘He said, “I want to go.”’ Were you
13881378alive in the 70’s?</text:p>
13891379<text:p text:style-name="Text_20_body">Here is some quoted
1390−‘<text:span text:style-name="T55">code</text:span>’ and a
1380+‘<text:span text:style-name="Source_Text">code</text:span>’ and a
13911381“<text:a xlink:type="simple" xlink:href="http://example.com/?foo=1&amp;bar=2" office:name=""><text:span text:style-name="Definition">quoted
13921382link</text:span></text:a>”.</text:p>
13931383<text:p text:style-name="Text_20_body">Some dashes: one—two — three—four —
@@ -1405,16 +1395,16 @@ five.</text:p>
14051395 <text:p text:style-name="P51">2 + 2 = 4</text:p>
14061396 </text:list-item>
14071397 <text:list-item>
1408− <text:p text:style-name="P51"><text:span text:style-name="T56">x</text:span> ∈ <text:span text:style-name="T57">y</text:span></text:p>
1398+ <text:p text:style-name="P51"><text:span text:style-name="T50">x</text:span> ∈ <text:span text:style-name="T51">y</text:span></text:p>
14091399 </text:list-item>
14101400 <text:list-item>
1411− <text:p text:style-name="P51"><text:span text:style-name="T58">α</text:span> ∧ <text:span text:style-name="T59">ω</text:span></text:p>
1401+ <text:p text:style-name="P51"><text:span text:style-name="T52">α</text:span> ∧ <text:span text:style-name="T53">ω</text:span></text:p>
14121402 </text:list-item>
14131403 <text:list-item>
14141404 <text:p text:style-name="P51">223</text:p>
14151405 </text:list-item>
14161406 <text:list-item>
1417− <text:p text:style-name="P51"><text:span text:style-name="T60">p</text:span>-Tree</text:p>
1407+ <text:p text:style-name="P51"><text:span text:style-name="T54">p</text:span>-Tree</text:p>
14181408 </text:list-item>
14191409 <text:list-item>
14201410 <text:p text:style-name="P51">Here’s some display math:
@@ -1422,18 +1412,18 @@ five.</text:p>
14221412 </text:list-item>
14231413 <text:list-item>
14241414 <text:p text:style-name="P51">Here’s one that has a line break in it:
1425− <text:span text:style-name="T61">α</text:span> + <text:span text:style-name="T62">ω</text:span> × <text:span text:style-name="T63">x</text:span><text:span text:style-name="T64">2</text:span>.</text:p>
1415+ <text:span text:style-name="T55">α</text:span> + <text:span text:style-name="T56">ω</text:span> × <text:span text:style-name="T57">x</text:span><text:span text:style-name="T58">2</text:span>.</text:p>
14261416 </text:list-item>
14271417</text:list>
14281418<text:p text:style-name="First_20_paragraph">These shouldn’t be math:</text:p>
14291419<text:list text:style-name="L27">
14301420 <text:list-item>
14311421 <text:p text:style-name="P52">To get the famous equation, write
1432− <text:span text:style-name="T65">$e = mc^2$</text:span>.</text:p>
1422+ <text:span text:style-name="Source_Text">$e = mc^2$</text:span>.</text:p>
14331423 </text:list-item>
14341424 <text:list-item>
14351425 <text:p text:style-name="P52">$22,000 is a
1436− <text:span text:style-name="T66">lot</text:span> of money. So is $34,000.
1426+ <text:span text:style-name="T59">lot</text:span> of money. So is $34,000.
14371427 (It worked if “lot” is emphasized.)</text:p>
14381428 </text:list-item>
14391429 <text:list-item>
@@ -1441,11 +1431,11 @@ five.</text:p>
14411431 </text:list-item>
14421432 <text:list-item>
14431433 <text:p text:style-name="P52">Escaped
1444− <text:span text:style-name="T67">$</text:span>: $73
1445− <text:span text:style-name="T68">this</text:span><text:span text:style-name="T69">
1446− </text:span><text:span text:style-name="T70">should</text:span><text:span text:style-name="T71">
1447− </text:span><text:span text:style-name="T72">be</text:span><text:span text:style-name="T73">
1448− </text:span><text:span text:style-name="T74">emphasized</text:span>
1434+ <text:span text:style-name="Source_Text">$</text:span>: $73
1435+ <text:span text:style-name="T60">this</text:span><text:span text:style-name="T61">
1436+ </text:span><text:span text:style-name="T62">should</text:span><text:span text:style-name="T63">
1437+ </text:span><text:span text:style-name="T64">be</text:span><text:span text:style-name="T65">
1438+ </text:span><text:span text:style-name="T66">emphasized</text:span>
14491439 23$.</text:p>
14501440 </text:list-item>
14511441</text:list>
@@ -1570,7 +1560,7 @@ link in pointy braces</text:span></text:a>.</text:p>
15701560<text:p text:style-name="P56">Blockquoted:
15711561<text:a xlink:type="simple" xlink:href="http://example.com/" office:name=""><text:span text:style-name="Definition">http://example.com/</text:span></text:a></text:p>
15721562<text:p text:style-name="First_20_paragraph">Auto-links should not occur here:
1573−<text:span text:style-name="T75">&lt;http://example.com/&gt;</text:span></text:p>
1563+<text:span text:style-name="Source_Text">&lt;http://example.com/&gt;</text:span></text:p>
15741564<text:p text:style-name="P57">or here: &lt;http://example.com/&gt;</text:p>
15751565<text:p text:style-name="Horizontal_20_Line" />
15761566<text:h text:style-name="Heading_20_1" text:outline-level="1">Images</text:h>
@@ -1595,14 +1585,15 @@ indented to show that they belong to the footnote (as with list
15951585items).</text:p><text:p text:style-name="P58"><text:s text:c="2" />{ &lt;code&gt; }</text:p><text:p text:style-name="Footnote">If
15961586you want, you can indent every line, but you can also be lazy and just indent
15971587the first line of each block.</text:p></text:note-body></text:note> This
1598−should <text:span text:style-name="T76">not</text:span> be a footnote
1588+should <text:span text:style-name="T67">not</text:span> be a footnote
15991589reference, because it contains a space.[^my note] Here is an inline
16001590note.<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
1601−is <text:span text:style-name="T77">easier</text:span> to type. Inline notes
1591+is <text:span text:style-name="T68">easier</text:span> to type. Inline notes
16021592may contain
16031593<text:a xlink:type="simple" xlink:href="http://google.com" office:name=""><text:span text:style-name="Definition">links</text:span></text:a>
1604−and <text:span text:style-name="T78">]</text:span> verbatim characters, as
1605−well as [bracketed text].</text:p></text:note-body></text:note></text:p>
1594+and <text:span text:style-name="Source_Text">]</text:span> verbatim
1595+characters, as well as [bracketed
1596+text].</text:p></text:note-body></text:note></text:p>
16061597<text:p text:style-name="P59">Notes can go in
16071598quotes.<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
16081599quote.</text:p></text:note-body></text:note></text:p>