e67f4c5 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Powerpoint code formatting is now context dependent (#5573)

e67f4c5Jeroen de Haas7 years ago

MANUAL.txt+9

compare with master

unifiedsplit

@@ -1557,6 +1557,15 @@ These variables change the appearance of PDF slides using [`beamer`].

1557`titlegraphic`

1558: image for title slide

1559

1560+Variables for PowerPoint slide shows

1561+--------------------------------------

1562+

1563+These variables control the visual aspects of a slide show that are not easily

1564+controled via templates.

1565+

1566+`monofont`

1567+: font to use for code.

1568+

1560Variables for LaTeX

1569Variables for LaTeX

1561-------------------

1570-------------------

1562

1571

src/Text/Pandoc/Writers/Powerpoint/Output.hs+29−9

@@ -48,6 +48,14 @@ import Text.Pandoc.Writers.Math (convertMath)

48import Text.Pandoc.Writers.Powerpoint.Presentation

49import Skylighting (fromColor)

51+-- |The 'EMU' type is used to specify sizes in English Metric Units.

52+type EMU = Integer

53+

54+-- |The 'pixelsToEmu' function converts a size in pixels to one

55+-- in English Metric Units. It assumes a DPI of 72.

56+pixelsToEmu :: Pixels -> EMU

57+pixelsToEmu = (12700 *)

58+

51-- This populates the global ids map with images already in the

59-- This populates the global ids map with images already in the

52-- template, so the ids won't be used by images introduced by the

60-- template, so the ids won't be used by images introduced by the

53-- user.

61-- user.

@@ -148,6 +156,18 @@ runP env st p = evalStateT (runReaderT p env) st

148

156

149--------------------------------------------------------------------

157--------------------------------------------------------------------

150

158

159+monospaceFont :: Monad m => P m String

160+monospaceFont = do

161+ vars <- writerVariables <$> asks envOpts

162+ case lookup "monofont" vars of

163+ Just s -> return s

164+ Nothing -> return "Courier"

165+

166+fontSizeAttributes :: Monad m => RunProps -> P m [(String, String)]

167+fontSizeAttributes RunProps { rPropForceSize = Just sz } =

168+ return [("sz", (show $ sz * 100))]

169+fontSizeAttributes _ = return []

170+

151copyFileToArchive :: PandocMonad m => Archive -> FilePath -> P m Archive

171copyFileToArchive :: PandocMonad m => Archive -> FilePath -> P m Archive

152copyFileToArchive arch fp = do

172copyFileToArchive arch fp = do

153 refArchive <- asks envRefArchive

173 refArchive <- asks envRefArchive

@@ -721,13 +741,8 @@ makePicElements layout picProps mInfo alt = do

721paraElemToElements :: PandocMonad m => ParaElem -> P m [Element]

741paraElemToElements :: PandocMonad m => ParaElem -> P m [Element]

722paraElemToElements Break = return [mknode "a:br" [] ()]

742paraElemToElements Break = return [mknode "a:br" [] ()]

723paraElemToElements (Run rpr s) = do

743paraElemToElements (Run rpr s) = do

724− let sizeAttrs = case rPropForceSize rpr of

744+ sizeAttrs <- fontSizeAttributes rpr

725− Just n -> [("sz", (show $ n * 100))]

726− Nothing -> if rPropCode rpr

727− -- hardcoded size for code for now

728− then [("sz", "1800")]

729− else []

730− attrs = sizeAttrs ++

745+ let attrs = sizeAttrs ++

731 (if rPropBold rpr then [("b", "1")] else []) ++

746 (if rPropBold rpr then [("b", "1")] else []) ++

732 (if rPropItalics rpr then [("i", "1")] else []) ++

747 (if rPropItalics rpr then [("i", "1")] else []) ++

733 (if rPropUnderline rpr then [("u", "sng")] else []) ++

748 (if rPropUnderline rpr then [("u", "sng")] else []) ++

@@ -773,8 +788,9 @@ paraElemToElements (Run rpr s) = do

773 ]

788 ]

774 _ -> []

789 _ -> []

775 Nothing -> []

790 Nothing -> []

791+ codeFont <- monospaceFont

776 let codeContents = if rPropCode rpr

792 let codeContents = if rPropCode rpr

777− then [mknode "a:latin" [("typeface", "Courier")] ()]

793+ then [mknode "a:latin" [("typeface", codeFont)] ()]

778 else []

794 else []

779 let propContents = linkProps ++ colorContents ++ codeContents

795 let propContents = linkProps ++ colorContents ++ codeContents

780 return [mknode "a:r" [] [ mknode "a:rPr" attrs $ propContents

796 return [mknode "a:r" [] [ mknode "a:rPr" attrs $ propContents

@@ -821,7 +837,11 @@ paragraphToElement par = do

821 let

837 let

822 attrs = [("lvl", show $ pPropLevel $ paraProps par)] ++

838 attrs = [("lvl", show $ pPropLevel $ paraProps par)] ++

823 (case pPropMarginLeft (paraProps par) of

839 (case pPropMarginLeft (paraProps par) of

824− Just px -> [("marL", show $ 12700 * px), ("indent", "0")]

840+ Just px -> [("marL", show $ pixelsToEmu px)]

841+ Nothing -> []

842+ ) ++

843+ (case pPropIndent (paraProps par) of

844+ Just px -> [("indent", show $ pixelsToEmu px)]

825 Nothing -> []

845 Nothing -> []

826 ) ++

846 ) ++

827 (case pPropAlign (paraProps par) of

847 (case pPropAlign (paraProps par) of

src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+24−12

@@ -33,6 +33,7 @@ module Text.Pandoc.Writers.Powerpoint.Presentation ( documentToPresentation

33 , TableProps(..)

34 , Strikethrough(..)

35 , Capitals(..)

36+ , Pixels

36 , PicProps(..)

37 , PicProps(..)

37 , URL

38 , URL

38 , TeXString(..)

39 , TeXString(..)

@@ -226,6 +227,7 @@ data ParaProps = ParaProps { pPropMarginLeft :: Maybe Pixels

226 , pPropBullet :: Maybe BulletType

227 , pPropBullet :: Maybe BulletType

227 , pPropAlign :: Maybe Algnment

228 , pPropAlign :: Maybe Algnment

228 , pPropSpaceBefore :: Maybe Pixels

229 , pPropSpaceBefore :: Maybe Pixels

230+ , pPropIndent :: Maybe Pixels

229 } deriving (Show, Eq)

231 } deriving (Show, Eq)

230

232

231instance Default ParaProps where

233instance Default ParaProps where

@@ -235,6 +237,7 @@ instance Default ParaProps where

235 , pPropBullet = Nothing

237 , pPropBullet = Nothing

236 , pPropAlign = Nothing

238 , pPropAlign = Nothing

237 , pPropSpaceBefore = Nothing

239 , pPropSpaceBefore = Nothing

240+ , pPropIndent = Just 0

238 }

241 }

239

242

240newtype TeXString = TeXString {unTeXString :: String}

243newtype TeXString = TeXString {unTeXString :: String}

@@ -411,18 +414,23 @@ blockToParagraphs (LineBlock ilsList) = do

411 pProps <- asks envParaProps

414 pProps <- asks envParaProps

412 return [Paragraph pProps parElems]

415 return [Paragraph pProps parElems]

413-- TODO: work out the attributes

416-- TODO: work out the attributes

414−blockToParagraphs (CodeBlock attr str) =

417+blockToParagraphs (CodeBlock attr str) = do

418+ pProps <- asks envParaProps

415− local (\r -> r{ envParaProps = def{pPropMarginLeft = Just 100}

419+ local (\r -> r{ envParaProps = def{ pPropMarginLeft = Nothing

420+ , pPropBullet = Nothing

421+ , pPropLevel = pPropLevel pProps

422+ , pPropIndent = Just 0

423+ }

416 , envRunProps = (envRunProps r){rPropCode = True}}) $ do

424 , envRunProps = (envRunProps r){rPropCode = True}}) $ do

417− mbSty <- writerHighlightStyle <$> asks envOpts

425+ mbSty <- writerHighlightStyle <$> asks envOpts

418− synMap <- writerSyntaxMap <$> asks envOpts

426+ synMap <- writerSyntaxMap <$> asks envOpts

419− case mbSty of

427+ case mbSty of

420− Just sty ->

428+ Just sty ->

421− case highlight synMap (formatSourceLines sty) attr str of

429+ case highlight synMap (formatSourceLines sty) attr str of

422− Right pElems -> do pProps <- asks envParaProps

430+ Right pElems -> do pPropsNew <- asks envParaProps

423− return [Paragraph pProps pElems]

431+ return [Paragraph pPropsNew pElems]

424− Left _ -> blockToParagraphs $ Para [Str str]

432+ Left _ -> blockToParagraphs $ Para [Str str]

425− Nothing -> blockToParagraphs $ Para [Str str]

433+ Nothing -> blockToParagraphs $ Para [Str str]

426-- We can't yet do incremental lists, but we should render a

434-- We can't yet do incremental lists, but we should render a

427-- (BlockQuote List) as a list to maintain compatibility with other

435-- (BlockQuote List) as a list to maintain compatibility with other

428-- formats.

436-- formats.

@@ -431,7 +439,9 @@ blockToParagraphs (BlockQuote (blk : blks)) | isListType blk = do

431 ps' <- blockToParagraphs $ BlockQuote blks

439 ps' <- blockToParagraphs $ BlockQuote blks

432 return $ ps ++ ps'

440 return $ ps ++ ps'

433blockToParagraphs (BlockQuote blks) =

441blockToParagraphs (BlockQuote blks) =

434− local (\r -> r{ envParaProps = (envParaProps r){pPropMarginLeft = Just 100}

442+ local (\r -> r{ envParaProps = (envParaProps r){ pPropMarginLeft = Just 100

443+ , pPropIndent = Just 0

444+ }

435 , envRunProps = (envRunProps r){rPropForceSize = Just blockQuoteSize}})$

445 , envRunProps = (envRunProps r){rPropForceSize = Just blockQuoteSize}})$

436 concatMapM blockToParagraphs blks

446 concatMapM blockToParagraphs blks

437-- TODO: work out the format

447-- TODO: work out the format

@@ -455,6 +465,7 @@ blockToParagraphs (BulletList blksLst) = do

455 , envParaProps = pProps{ pPropLevel = lvl + 1

465 , envParaProps = pProps{ pPropLevel = lvl + 1

456 , pPropBullet = Just Bullet

466 , pPropBullet = Just Bullet

457 , pPropMarginLeft = Nothing

467 , pPropMarginLeft = Nothing

468+ , pPropIndent = Nothing

458 }}) $

469 }}) $

459 concatMapM multiParBullet blksLst

470 concatMapM multiParBullet blksLst

460blockToParagraphs (OrderedList listAttr blksLst) = do

471blockToParagraphs (OrderedList listAttr blksLst) = do

@@ -464,6 +475,7 @@ blockToParagraphs (OrderedList listAttr blksLst) = do

464 , envParaProps = pProps{ pPropLevel = lvl + 1

475 , envParaProps = pProps{ pPropLevel = lvl + 1

465 , pPropBullet = Just (AutoNumbering listAttr)

476 , pPropBullet = Just (AutoNumbering listAttr)

466 , pPropMarginLeft = Nothing

477 , pPropMarginLeft = Nothing

478+ , pPropIndent = Nothing

467 }}) $

479 }}) $

468 concatMapM multiParBullet blksLst

480 concatMapM multiParBullet blksLst

469blockToParagraphs (DefinitionList entries) = do

481blockToParagraphs (DefinitionList entries) = do

test/Tests/Writers/Powerpoint.hs+8

@@ -115,4 +115,12 @@ tests = groupPptxTests [ pptxTests "Inline formatting"

115 def

116 "pptx/document-properties-short-desc.native"

117 "pptx/document-properties-short-desc.pptx"

118+ , pptxTests "inline code and code blocks"

119+ def

120+ "pptx/code.native"

121+ "pptx/code.pptx"

122+ , pptxTests "inline code and code blocks, custom formatting"

123+ def { writerVariables = [("monofont", "Consolas")] }

124+ "pptx/code.native"

125+ "pptx/code-custom.pptx"

118 ]

126 ]

test/pptx/code-custom.pptxnew file

Binary file not shown.

test/pptx/code-custom_templated.pptxnew file

Binary file not shown.

test/pptx/code.nativenew file+21

@@ -0,0 +1,21 @@

1+[Header 1 ("header-with-inline-code",[],[]) [Str "Header",Space,Str "with",Space,Code ("",[],[]) "inline code"]

2+,CodeBlock ("",[],[]) "Code at level 0"

3+,BulletList

4+ [[Para [Str "Bullet",Space,Str "item",Space,Str "with",Space,Code ("",[],[]) "inline code"]

5+ ,CodeBlock ("",[],[]) "Code block at level 1"

6+ ,BulletList

7+ [[Para [Str "with",Space,Code ("",[],[]) "nested"]

8+ ,CodeBlock ("",[],[]) "lvl2\nlvl2\nlvl2"

9+ ,Header 2 ("second-heading-level-with-code",[],[]) [Str "Second",Space,Str "heading",Space,Str "level",Space,Str "with",Space,Code ("",[],[]) "code"]]]]]

10+,Header 1 ("syntax-highlighting",[],[]) [Str "Syntax",Space,Str "highlighting"]

11+,CodeBlock ("",["haskell"],[]) "id :: a -> a\nid x = x"

12+,BulletList

13+ [[Para [Str "Nested"]

14+ ,CodeBlock ("",["haskell"],[]) "g :: Int -> Int\ng x = x * 3"]]

15+,Header 1 ("two-column-slide",[],[]) [Str "Two",Space,Str "column",Space,Str "slide"]

16+,Div ("",["columns"],[])

17+ [Div ("",["column"],[("width","50%")])

18+ [BulletList

19+ [[Plain [Str "A",Space,Str "total",Space,Str "alternative",Space,Str "for",Space,Code ("",[],[]) "head"]]]]

20+ ,Div ("",["column"],[("width","50%")])

21+ [CodeBlock ("",[],[]) "safeHead :: [a] -> Maybe a\nsafeHead [] = Nothing\nsafeHead (x:_) = Just x"]]]

test/pptx/code.pptxnew file

Binary file not shown.

test/pptx/code_templated.pptxnew file

Binary file not shown.