diff options
| author | John MacFarlane <[email protected]> | 2025-11-05 12:36:03 +0100 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2025-11-05 12:36:03 +0100 |
| commit | f1152c18111889a1ddd376420a717ad9f9b484b0 (patch) | |
| tree | bc545e4ea1c1c75f11db7e254993bf6d900f257e | |
| parent | 018b03638a2fadc624722af8ba9f5d528ab4a8ce (diff) | |
ICML writer: add FirstParagraph and Bibliography styles.
Closes #11268.
| -rw-r--r-- | src/Text/Pandoc/Writers/ICML.hs | 77 | ||||
| -rw-r--r-- | test/command/5541-localLink.md | 12 | ||||
| -rw-r--r-- | test/command/5541-urlLink.md | 10 | ||||
| -rw-r--r-- | test/command/6675.md | 9 | ||||
| -rw-r--r-- | test/command/svg.md | 8 | ||||
| -rw-r--r-- | test/tables.icml | 14 | ||||
| -rw-r--r-- | test/writer.icml | 168 |
7 files changed, 189 insertions, 109 deletions
diff --git a/src/Text/Pandoc/Writers/ICML.hs b/src/Text/Pandoc/Writers/ICML.hs index 1d766ab13..d5a52ec90 100644 --- a/src/Text/Pandoc/Writers/ICML.hs +++ b/src/Text/Pandoc/Writers/ICML.hs @@ -17,9 +17,9 @@ into InDesign with File -> Place. -} module Text.Pandoc.Writers.ICML (writeICML) where import Control.Monad.Except (catchError) -import Control.Monad (liftM2) +import Control.Monad (liftM2, when) import Control.Monad.State.Strict - ( MonadTrans(lift), StateT(runStateT), MonadState(state, get, put) ) + ( MonadTrans(lift), StateT(runStateT), MonadState(state, get, put), gets, modify ) import Data.List (intersperse) import Data.Maybe (fromMaybe, maybeToList) import qualified Data.Set as Set @@ -47,6 +47,7 @@ data WriterState = WriterState{ , links :: Hyperlink , listDepth :: Int , maxListDepth :: Int + , firstPara :: Bool } type WS m = StateT WriterState m @@ -58,8 +59,12 @@ defaultWriterState = WriterState{ , links = [] , listDepth = 1 , maxListDepth = 0 + , firstPara = False } +setFirstPara :: PandocMonad m => WS m () +setFirstPara = modify $ \s -> s { firstPara = True } + -- inline names (appear in InDesign's character styles pane) emphName :: Text underlineName :: Text @@ -82,6 +87,8 @@ linkName = "Link" -- block element names (appear in InDesign's paragraph styles pane) paragraphName :: Text +firstParagraphName :: Text +bibliographyName :: Text figureName :: Text imgCaptionName :: Text codeBlockName :: Text @@ -107,6 +114,8 @@ subListParName :: Text footnoteName :: Text citeName :: Text paragraphName = "Paragraph" +firstParagraphName = "FirstParagraph" +bibliographyName = "Bibliography" figureName = "Figure" imgCaptionName = "Caption" codeBlockName = "CodeBlock" @@ -145,7 +154,8 @@ writeICML opts doc = do (renderBlockMeta blocksToICML) (renderInlineMeta inlinesToICML) meta - (main, st) <- runStateT (blocksToICML opts [] blocks) defaultWriterState + (main, st) <- runStateT (setFirstPara >> blocksToICML opts [] blocks) + defaultWriterState let context = defField "body" main $ defField "charStyles" (charStylesToDoc st) $ defField "parStyles" (parStylesToDoc st) @@ -316,26 +326,48 @@ blocksToICML opts style lst = do -- | Convert a Pandoc block element to ICML. blockToICML :: PandocMonad m => WriterOptions -> Style -> Block -> WS m (Doc Text) blockToICML opts style (Plain lst) = parStyle opts style "" lst -blockToICML opts style (Para lst) = parStyle opts (paragraphName:style) "" lst +blockToICML opts style (Para lst) = do + isfirst <- gets firstPara + modify $ \s -> s{ firstPara = False } + parStyle opts ((if isfirst + then firstParagraphName + else paragraphName):style) "" lst blockToICML opts style (LineBlock lns) = blockToICML opts style $ linesToPara lns -blockToICML opts style (CodeBlock _ str) = parStyle opts (codeBlockName:style) "" [Str str] +blockToICML opts style (CodeBlock _ str) = do + setFirstPara + parStyle opts (codeBlockName:style) "" [Str str] blockToICML _ _ b@(RawBlock f str) | f == Format "icml" = return $ literal str | otherwise = do report $ BlockNotRendered b return empty -blockToICML opts style (BlockQuote blocks) = blocksToICML opts (blockQuoteName:style) blocks -blockToICML opts style (OrderedList attribs lst) = listItemsToICML opts orderedListName style (Just attribs) lst -blockToICML opts style (BulletList lst) = listItemsToICML opts bulletListName style Nothing lst -blockToICML opts style (DefinitionList lst) = intersperseBrs `fmap` mapM (definitionListItemToICML opts style) lst -blockToICML opts style (Header lvl (ident, cls, _) lst) = +blockToICML opts style (BlockQuote blocks) = do + result <- blocksToICML opts (blockQuoteName:style) blocks + setFirstPara + return result +blockToICML opts style (OrderedList attribs lst) = do + result <- listItemsToICML opts orderedListName style (Just attribs) lst + setFirstPara + return result +blockToICML opts style (BulletList lst) = do + result <- listItemsToICML opts bulletListName style Nothing lst + setFirstPara + return result +blockToICML opts style (DefinitionList lst) = do + result <- intersperseBrs `fmap` mapM (definitionListItemToICML opts style) lst + setFirstPara + return result +blockToICML opts style (Header lvl (ident, cls, _) lst) = do let stl = (headerName <> tshow lvl <> unnumbered):style unnumbered = if "unnumbered" `elem` cls then " (unnumbered)" else "" - in parStyle opts stl ident lst -blockToICML _ _ HorizontalRule = return empty -- we could insert a page break instead + setFirstPara + parStyle opts stl ident lst +blockToICML _ _ HorizontalRule = do + setFirstPara + return empty -- we could insert a page break instead blockToICML opts style (Table attr blkCapt specs thead tbody tfoot) = let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot @@ -382,20 +414,24 @@ blockToICML opts style (Table attr blkCapt specs thead tbody tfoot) = , ("BodyRowCount", tshow nrRows) , ("ColumnCount", tshow nrCols) ] (colDescs $$ cells) - liftM2 ($$) tableDoc $ parStyle opts (tableCaptionName:style) "" caption -blockToICML opts style (Div (_ident, _, kvs) lst) = + result <- liftM2 ($$) tableDoc $ parStyle opts (tableCaptionName:style) "" caption + setFirstPara + return result +blockToICML opts style (Div (_ident, cls, kvs) lst) = do let dynamicStyle = maybeToList $ lookup dynamicStyleKey kvs - in blocksToICML opts (dynamicStyle <> style) lst -blockToICML opts style (Figure attr capt@(Caption _ longcapt) body) = - case body of + let bibStyle = [bibliographyName | "csl-entry" `elem` cls] + blocksToICML opts (bibStyle <> dynamicStyle <> style) lst +blockToICML opts style (Figure attr capt@(Caption _ longcapt) body) = do + result <- case body of [Plain [img@(Image {})]] -> do figure <- parStyle opts (figureName:style) "" [img] caption <- parStyle opts (imgCaptionName:style) "" $ blocksToInlines longcapt return $ intersperseBrs [figure, caption] - _ -> -- fallback to rendering the figure as a Div + _ -> do -- fallback to rendering the figure as a Div blockToICML opts style $ figureDiv attr capt body - + setFirstPara + return result -- | Convert a list of lists of blocks to ICML list items. listItemsToICML :: PandocMonad m => WriterOptions -> Text -> Style -> Maybe ListAttributes -> [[Block]] -> WS m (Doc Text) @@ -474,7 +510,8 @@ inlineToICML opts style ident SoftBreak = WrapNone -> charStyle style ident space WrapPreserve -> charStyle style ident cr inlineToICML _ style ident LineBreak = charStyle style ident $ literal lineSeparator -inlineToICML opts style ident (Math mt str) = +inlineToICML opts style ident (Math mt str) = do + when (mt == DisplayMath) setFirstPara lift (texMathToInlines mt str) >>= (fmap mconcat . mapM (inlineToICML opts style ident)) inlineToICML _ _ _ il@(RawInline f str) diff --git a/test/command/5541-localLink.md b/test/command/5541-localLink.md index 077005160..9579dc00e 100644 --- a/test/command/5541-localLink.md +++ b/test/command/5541-localLink.md @@ -40,17 +40,17 @@ if you can read this text, [and it's linked]{#spanner} - all good! </TabList> </Properties> </ParagraphStyle> - <ParagraphStyle Self="ParagraphStyle/Header1" Name="Header1" LeftIndent="0" PointSize="36"> + <ParagraphStyle Self="ParagraphStyle/FirstParagraph" Name="FirstParagraph" LeftIndent="0"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> </ParagraphStyle> - <ParagraphStyle Self="ParagraphStyle/Header2" Name="Header2" LeftIndent="0" PointSize="30"> + <ParagraphStyle Self="ParagraphStyle/Header1" Name="Header1" LeftIndent="0" PointSize="36"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> </ParagraphStyle> - <ParagraphStyle Self="ParagraphStyle/Paragraph" Name="Paragraph" LeftIndent="0"> + <ParagraphStyle Self="ParagraphStyle/Header2" Name="Header2" LeftIndent="0" PointSize="30"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> @@ -77,7 +77,7 @@ if you can read this text, [and it's linked]{#spanner} - all good! </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>this is some text</Content> </CharacterStyleRange> @@ -90,7 +90,7 @@ if you can read this text, [and it's linked]{#spanner} - all good! </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>some more text that </Content> </CharacterStyleRange> @@ -119,7 +119,7 @@ if you can read this text, [and it's linked]{#spanner} - all good! </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>if you can read this text, </Content> </CharacterStyleRange> diff --git a/test/command/5541-urlLink.md b/test/command/5541-urlLink.md index 453653ffc..00fa750f5 100644 --- a/test/command/5541-urlLink.md +++ b/test/command/5541-urlLink.md @@ -36,17 +36,17 @@ some more text that [links to](https://www.pandoc.org) Pandoc. </TabList> </Properties> </ParagraphStyle> - <ParagraphStyle Self="ParagraphStyle/Header1" Name="Header1" LeftIndent="0" PointSize="36"> + <ParagraphStyle Self="ParagraphStyle/FirstParagraph" Name="FirstParagraph" LeftIndent="0"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> </ParagraphStyle> - <ParagraphStyle Self="ParagraphStyle/Header2" Name="Header2" LeftIndent="0" PointSize="30"> + <ParagraphStyle Self="ParagraphStyle/Header1" Name="Header1" LeftIndent="0" PointSize="36"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> </ParagraphStyle> - <ParagraphStyle Self="ParagraphStyle/Paragraph" Name="Paragraph" LeftIndent="0"> + <ParagraphStyle Self="ParagraphStyle/Header2" Name="Header2" LeftIndent="0" PointSize="30"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> @@ -73,7 +73,7 @@ some more text that [links to](https://www.pandoc.org) Pandoc. </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>this is some text</Content> </CharacterStyleRange> @@ -86,7 +86,7 @@ some more text that [links to](https://www.pandoc.org) Pandoc. </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>some more text that </Content> </CharacterStyleRange> diff --git a/test/command/6675.md b/test/command/6675.md index d2984571f..6d4d2207b 100644 --- a/test/command/6675.md +++ b/test/command/6675.md @@ -38,6 +38,11 @@ and some text that [links to](#header-1) the first header </TabList> </Properties> </ParagraphStyle> + <ParagraphStyle Self="ParagraphStyle/FirstParagraph" Name="FirstParagraph" LeftIndent="0"> + <Properties> + <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> + </Properties> + </ParagraphStyle> <ParagraphStyle Self="ParagraphStyle/Header1" Name="Header1" LeftIndent="0" PointSize="36"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> @@ -75,7 +80,7 @@ and some text that [links to](#header-1) the first header </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>this is some text</Content> </CharacterStyleRange> @@ -88,7 +93,7 @@ and some text that [links to](#header-1) the first header </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>some more text that </Content> </CharacterStyleRange> diff --git a/test/command/svg.md b/test/command/svg.md index 74a2a1eed..b4ef3c5aa 100644 --- a/test/command/svg.md +++ b/test/command/svg.md @@ -3,7 +3,7 @@ \includegraphics{command/corrupt.svg} ^D 2> [WARNING] Could not determine image size for command/corrupt.svg: could not determine image type -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100"> <Properties> @@ -36,7 +36,7 @@ % pandoc -f latex -t icml \includegraphics{command/SVG_logo.svg} ^D -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 37.5 -37.5"> <Properties> @@ -69,7 +69,7 @@ % pandoc -f latex -t icml \includegraphics{command/SVG_logo-without-xml-declaration.svg} ^D -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 37.5 -37.5"> <Properties> @@ -103,7 +103,7 @@ % pandoc -f latex -t icml \includegraphics{command/inkscape-cube.svg} ^D -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 54.75 -65.25"> <Properties> diff --git a/test/tables.icml b/test/tables.icml index 10945ef46..5d51100d3 100644 --- a/test/tables.icml +++ b/test/tables.icml @@ -1,4 +1,4 @@ -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Simple table with caption:</Content> </CharacterStyleRange> @@ -128,7 +128,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Simple table without caption:</Content> </CharacterStyleRange> @@ -255,7 +255,7 @@ <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TableCaption"> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Simple table indented two spaces:</Content> </CharacterStyleRange> @@ -385,7 +385,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Multiline table with caption:</Content> </CharacterStyleRange> @@ -487,7 +487,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Multiline table without caption:</Content> </CharacterStyleRange> @@ -586,7 +586,7 @@ <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TableCaption"> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Table without column headers:</Content> </CharacterStyleRange> @@ -685,7 +685,7 @@ <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TableCaption"> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Multiline table without column headers:</Content> </CharacterStyleRange> diff --git a/test/writer.icml b/test/writer.icml index 0601ba494..d6955b131 100644 --- a/test/writer.icml +++ b/test/writer.icml @@ -85,6 +85,11 @@ <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> </ParagraphStyle> + <ParagraphStyle Self="ParagraphStyle/Blockquote > Blockquote > FirstParagraph" Name="Blockquote > Blockquote > FirstParagraph" LeftIndent="30"> + <Properties> + <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> + </Properties> + </ParagraphStyle> <ParagraphStyle Self="ParagraphStyle/Blockquote > Blockquote > Paragraph" Name="Blockquote > Blockquote > Paragraph" LeftIndent="30"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> @@ -96,6 +101,11 @@ <AppliedFont type="string">Courier New</AppliedFont> </Properties> </ParagraphStyle> + <ParagraphStyle Self="ParagraphStyle/Blockquote > FirstParagraph" Name="Blockquote > FirstParagraph" LeftIndent="10"> + <Properties> + <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> + </Properties> + </ParagraphStyle> <ParagraphStyle Self="ParagraphStyle/Blockquote > NumList" Name="Blockquote > NumList" NumberingExpression="^#.^t" NumberingLevel="1" BulletsAndNumberingListType="NumberedList" LeftIndent="20"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> @@ -202,6 +212,19 @@ </TabList> </Properties> </ParagraphStyle> + <ParagraphStyle Self="ParagraphStyle/BulList > first > FirstParagraph" Name="BulList > first > FirstParagraph" BulletsAndNumberingListType="BulletList" LeftIndent="0"> + <Properties> + <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> + <TabList type="list"> + <ListItem type="record"> + <Alignment type="enumeration">LeftAlign</Alignment> + <AlignmentCharacter type="string">.</AlignmentCharacter> + <Leader type="string" /> + <Position type="unit">10</Position> + </ListItem> + </TabList> + </Properties> + </ParagraphStyle> <ParagraphStyle Self="ParagraphStyle/BulList > first > Paragraph" Name="BulList > first > Paragraph" BulletsAndNumberingListType="BulletList" LeftIndent="0"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> @@ -231,7 +254,7 @@ <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> </ParagraphStyle> - <ParagraphStyle Self="ParagraphStyle/DefListDef > Blockquote > Paragraph" Name="DefListDef > Blockquote > Paragraph" LeftIndent="30"> + <ParagraphStyle Self="ParagraphStyle/DefListDef > Blockquote > FirstParagraph" Name="DefListDef > Blockquote > FirstParagraph" LeftIndent="30"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> @@ -267,12 +290,22 @@ <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> </ParagraphStyle> + <ParagraphStyle Self="ParagraphStyle/FirstParagraph" Name="FirstParagraph" LeftIndent="0"> + <Properties> + <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> + </Properties> + </ParagraphStyle> <ParagraphStyle Self="ParagraphStyle/Footnote > CodeBlock" Name="Footnote > CodeBlock" LeftIndent="0"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> <AppliedFont type="string">Courier New</AppliedFont> </Properties> </ParagraphStyle> + <ParagraphStyle Self="ParagraphStyle/Footnote > FirstParagraph" Name="Footnote > FirstParagraph" LeftIndent="0"> + <Properties> + <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> + </Properties> + </ParagraphStyle> <ParagraphStyle Self="ParagraphStyle/Footnote > Paragraph" Name="Footnote > Paragraph" LeftIndent="0"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> @@ -334,6 +367,11 @@ </TabList> </Properties> </ParagraphStyle> + <ParagraphStyle Self="ParagraphStyle/NumList > FirstParagraph" Name="NumList > FirstParagraph" NumberingExpression="^#.^t" NumberingLevel="1" BulletsAndNumberingListType="NumberedList" LeftIndent="0"> + <Properties> + <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> + </Properties> + </ParagraphStyle> <ParagraphStyle Self="ParagraphStyle/NumList > NumList > NumList > NumList > first > beginsWith-3 > lowerAlpha" Name="NumList > NumList > NumList > NumList > first > beginsWith-3 > lowerAlpha" NumberingExpression="^#.^t" NumberingLevel="4" BulletsAndNumberingListType="NumberedList" LeftIndent="30"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> @@ -400,7 +438,7 @@ <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> </ParagraphStyle> - <ParagraphStyle Self="ParagraphStyle/NumList > first > beginsWith-2 > Paragraph" Name="NumList > first > beginsWith-2 > Paragraph" NumberingExpression="^#.^t" NumberingLevel="1" BulletsAndNumberingListType="NumberedList" LeftIndent="0"> + <ParagraphStyle Self="ParagraphStyle/NumList > first > beginsWith-2 > FirstParagraph" Name="NumList > first > beginsWith-2 > FirstParagraph" NumberingExpression="^#.^t" NumberingLevel="1" BulletsAndNumberingListType="NumberedList" LeftIndent="0"> <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> @@ -436,7 +474,7 @@ <StoryPreference OpticalMarginAlignment="true" OpticalMarginSize="12" /> <!-- body needs to be non-indented, otherwise code blocks are indented too far --> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite.</Content> </CharacterStyleRange> @@ -512,7 +550,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>with no blank line</Content> </CharacterStyleRange> @@ -525,7 +563,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>with no blank line</Content> </CharacterStyleRange> @@ -538,7 +576,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Here’s a regular paragraph.</Content> </CharacterStyleRange> @@ -575,7 +613,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>E-mail style:</Content> </CharacterStyleRange> @@ -587,7 +625,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Blockquote > Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Blockquote > FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Code in a block quote:</Content> </CharacterStyleRange> @@ -601,7 +639,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Blockquote > Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Blockquote > FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>A list:</Content> </CharacterStyleRange> @@ -619,7 +657,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Blockquote > Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Blockquote > FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Nested block quotes:</Content> </CharacterStyleRange> @@ -631,13 +669,13 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Blockquote > Blockquote > Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Blockquote > Blockquote > FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>nested</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>This should not be a block quote: 2 > 1.</Content> </CharacterStyleRange> @@ -656,7 +694,7 @@ </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Code:</Content> </CharacterStyleRange> @@ -674,7 +712,7 @@ this code block is indented by one tab</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>And:</Content> </CharacterStyleRange> @@ -702,7 +740,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Asterisks tight:</Content> </CharacterStyleRange> @@ -726,7 +764,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Asterisks loose:</Content> </CharacterStyleRange> @@ -750,7 +788,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Pluses tight:</Content> </CharacterStyleRange> @@ -774,7 +812,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Pluses loose:</Content> </CharacterStyleRange> @@ -798,7 +836,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Minuses tight:</Content> </CharacterStyleRange> @@ -822,7 +860,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Minuses loose:</Content> </CharacterStyleRange> @@ -853,7 +891,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Tight:</Content> </CharacterStyleRange> @@ -877,7 +915,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>and:</Content> </CharacterStyleRange> @@ -901,7 +939,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Loose using tabs:</Content> </CharacterStyleRange> @@ -925,7 +963,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>and using spaces:</Content> </CharacterStyleRange> @@ -949,7 +987,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Multiple paragraphs:</Content> </CharacterStyleRange> @@ -1004,7 +1042,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Here’s another:</Content> </CharacterStyleRange> @@ -1046,7 +1084,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Same thing but with paragraphs:</Content> </CharacterStyleRange> @@ -1082,7 +1120,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/NumList > Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/NumList > FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Third</Content> </CharacterStyleRange> @@ -1095,7 +1133,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList > first > Paragraph" NumberingContinue="false"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList > first > FirstParagraph" NumberingContinue="false"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>this is a list item indented with tabs</Content> </CharacterStyleRange> @@ -1126,7 +1164,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange NumberingStartAt="2" AppliedParagraphStyle="ParagraphStyle/NumList > first > beginsWith-2 > Paragraph" NumberingContinue="false"> +<ParagraphStyleRange NumberingStartAt="2" AppliedParagraphStyle="ParagraphStyle/NumList > first > beginsWith-2 > FirstParagraph" NumberingContinue="false"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>begins with 2</Content> </CharacterStyleRange> @@ -1168,7 +1206,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Nesting:</Content> </CharacterStyleRange> @@ -1198,7 +1236,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Autonumbering:</Content> </CharacterStyleRange> @@ -1222,7 +1260,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Should not be a list item:</Content> </CharacterStyleRange> @@ -1247,7 +1285,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Tight using spaces:</Content> </CharacterStyleRange> @@ -1289,7 +1327,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Tight using tabs:</Content> </CharacterStyleRange> @@ -1331,7 +1369,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Loose:</Content> </CharacterStyleRange> @@ -1373,7 +1411,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Multiple blocks with italics:</Content> </CharacterStyleRange> @@ -1415,13 +1453,13 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/DefListDef > Blockquote > Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/DefListDef > Blockquote > FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>orange block quote</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Multiple definitions, tight:</Content> </CharacterStyleRange> @@ -1463,7 +1501,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Multiple definitions, loose:</Content> </CharacterStyleRange> @@ -1505,7 +1543,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Blank line after term, indented marker, alternate markers:</Content> </CharacterStyleRange> @@ -1560,7 +1598,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Simple block on one line:</Content> </CharacterStyleRange> @@ -1640,7 +1678,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>As should this:</Content> </CharacterStyleRange> @@ -1652,7 +1690,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Now, nested:</Content> </CharacterStyleRange> @@ -1688,7 +1726,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Just plain comment, with trailing spaces on the line:</Content> </CharacterStyleRange> @@ -1706,7 +1744,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Hr’s:</Content> </CharacterStyleRange> @@ -1719,7 +1757,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>This is </Content> </CharacterStyleRange> @@ -1914,7 +1952,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>“Hello,”</Content> </CharacterStyleRange> @@ -2156,7 +2194,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>These shouldn’t be math:</Content> </CharacterStyleRange> @@ -2216,7 +2254,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Here’s a LaTeX table:</Content> </CharacterStyleRange> @@ -2229,7 +2267,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Here is some unicode:</Content> </CharacterStyleRange> @@ -2265,7 +2303,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>AT&T has an ampersand in their name.</Content> </CharacterStyleRange> @@ -2405,7 +2443,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Just a </Content> </CharacterStyleRange> @@ -2502,7 +2540,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Foo </Content> </CharacterStyleRange> @@ -2595,7 +2633,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Foo </Content> </CharacterStyleRange> @@ -2630,7 +2668,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Here’s a </Content> </CharacterStyleRange> @@ -2693,7 +2731,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>With an ampersand: </Content> </CharacterStyleRange> @@ -2724,7 +2762,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>An e-mail address: </Content> </CharacterStyleRange> @@ -2746,7 +2784,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </HyperlinkTextSource> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Auto-links should not occur here: </Content> </CharacterStyleRange> @@ -2768,7 +2806,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>From </Content> </CharacterStyleRange> @@ -2814,7 +2852,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Here is a movie </Content> </CharacterStyleRange> @@ -2855,7 +2893,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Here is a footnote reference,</Content> </CharacterStyleRange> @@ -2901,7 +2939,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> - <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Footnote > Paragraph"> + <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Footnote > FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content> If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.</Content> </CharacterStyleRange> @@ -2984,7 +3022,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> <Content><?ACE 4?></Content> </CharacterStyleRange> </ParagraphStyleRange> - <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Footnote > Paragraph"> + <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Footnote > FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content> In list.</Content> </CharacterStyleRange> @@ -2993,7 +3031,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange> </ParagraphStyleRange> <Br /> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> +<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/FirstParagraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>This paragraph should not be part of the note, as it is not indented.</Content> </CharacterStyleRange> |