From e67f4c58f2cbe0a0fc5f73d2e726e6c0a403bbea Mon Sep 17 00:00:00 2001 From: Jeroen de Haas Date: Fri, 14 Jun 2019 17:42:06 +0200 Subject: Powerpoint code formatting is now context dependent (#5573) This commit alters the way in which the Powerpoint writer treats inline code and code blocks. - Inline code is now formatted at the same size as the surrounding text. - Code blocks are now given a margin and font size according to their level. - Furthermore this commit allows changing the font with which code is formatted via the `monofont` option. Tested in - PowerPoint 365 for Windows - 1808 (Build 10730.20344 Click-to-Run) - PowerPoint 365 for Mac - 16.26 (19060901) --- test/pptx/code-custom.pptx | Bin 0 -> 28230 bytes test/pptx/code-custom_templated.pptx | Bin 0 -> 395524 bytes test/pptx/code.native | 21 +++++++++++++++++++++ test/pptx/code.pptx | Bin 0 -> 28229 bytes test/pptx/code_templated.pptx | Bin 0 -> 395522 bytes 5 files changed, 21 insertions(+) create mode 100644 test/pptx/code-custom.pptx create mode 100644 test/pptx/code-custom_templated.pptx create mode 100644 test/pptx/code.native create mode 100644 test/pptx/code.pptx create mode 100644 test/pptx/code_templated.pptx (limited to 'test/pptx') diff --git a/test/pptx/code-custom.pptx b/test/pptx/code-custom.pptx new file mode 100644 index 000000000..aa9b7692a Binary files /dev/null and b/test/pptx/code-custom.pptx differ diff --git a/test/pptx/code-custom_templated.pptx b/test/pptx/code-custom_templated.pptx new file mode 100644 index 000000000..9aaef4cb5 Binary files /dev/null and b/test/pptx/code-custom_templated.pptx differ diff --git a/test/pptx/code.native b/test/pptx/code.native new file mode 100644 index 000000000..be7f512f7 --- /dev/null +++ b/test/pptx/code.native @@ -0,0 +1,21 @@ +[Header 1 ("header-with-inline-code",[],[]) [Str "Header",Space,Str "with",Space,Code ("",[],[]) "inline code"] +,CodeBlock ("",[],[]) "Code at level 0" +,BulletList + [[Para [Str "Bullet",Space,Str "item",Space,Str "with",Space,Code ("",[],[]) "inline code"] + ,CodeBlock ("",[],[]) "Code block at level 1" + ,BulletList + [[Para [Str "with",Space,Code ("",[],[]) "nested"] + ,CodeBlock ("",[],[]) "lvl2\nlvl2\nlvl2" + ,Header 2 ("second-heading-level-with-code",[],[]) [Str "Second",Space,Str "heading",Space,Str "level",Space,Str "with",Space,Code ("",[],[]) "code"]]]]] +,Header 1 ("syntax-highlighting",[],[]) [Str "Syntax",Space,Str "highlighting"] +,CodeBlock ("",["haskell"],[]) "id :: a -> a\nid x = x" +,BulletList + [[Para [Str "Nested"] + ,CodeBlock ("",["haskell"],[]) "g :: Int -> Int\ng x = x * 3"]] +,Header 1 ("two-column-slide",[],[]) [Str "Two",Space,Str "column",Space,Str "slide"] +,Div ("",["columns"],[]) + [Div ("",["column"],[("width","50%")]) + [BulletList + [[Plain [Str "A",Space,Str "total",Space,Str "alternative",Space,Str "for",Space,Code ("",[],[]) "head"]]]] + ,Div ("",["column"],[("width","50%")]) + [CodeBlock ("",[],[]) "safeHead :: [a] -> Maybe a\nsafeHead [] = Nothing\nsafeHead (x:_) = Just x"]]] diff --git a/test/pptx/code.pptx b/test/pptx/code.pptx new file mode 100644 index 000000000..1737ec757 Binary files /dev/null and b/test/pptx/code.pptx differ diff --git a/test/pptx/code_templated.pptx b/test/pptx/code_templated.pptx new file mode 100644 index 000000000..87fb560ef Binary files /dev/null and b/test/pptx/code_templated.pptx differ -- cgit v1.2.3