From 9c2b659eeb196145f62d8eae0072c279a7c2d751 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Tue, 28 Apr 2020 22:53:06 +0800 Subject: Support new Underline element in readers and writers (#6277) Deprecate `underlineSpan` in Shared in favor of `Text.Pandoc.Builder.underline`. --- test/docx/alternate_document_path.native | 3 ++- test/docx/golden/inline_formatting.docx | Bin 9987 -> 9989 bytes test/docx/inline_formatting.native | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'test/docx') diff --git a/test/docx/alternate_document_path.native b/test/docx/alternate_document_path.native index 5e34fa4bc..73366faea 100644 --- a/test/docx/alternate_document_path.native +++ b/test/docx/alternate_document_path.native @@ -1,2 +1,3 @@ +Pandoc (Meta {unMeta = fromList []}) [Header 1 ("test",[],[]) [Str "Test"] -,Para [Str "This",Space,Str "is",Space,Emph [Str "italic"],Str ",",Space,Strong [Str "bold"],Str ",",Space,Span ("",["underline"],[]) [Str "underlined"],Str ",",Space,Emph [Span ("",["underline"],[]) [Str "italic",Space,Str "underlined"]],Str ",",Space,Strong [Span ("",["underline"],[]) [Str "bold",Space,Str "underlined"]],Str ",",Space,Emph [Strong [Span ("",["underline"],[]) [Str "bold",Space,Str "italic",Space,Str "underlined"]]],Str "."]] +,Para [Str "This",Space,Str "is",Space,Emph [Str "italic"],Str ",",Space,Strong [Str "bold"],Str ",",Space,Underline [Str "underlined"],Str ",",Space,Emph [Underline [Str "italic",Space,Str "underlined"]],Str ",",Space,Strong [Underline [Str "bold",Space,Str "underlined"]],Str ",",Space,Emph [Strong [Underline [Str "bold",Space,Str "italic",Space,Str "underlined"]]],Str "."]] diff --git a/test/docx/golden/inline_formatting.docx b/test/docx/golden/inline_formatting.docx index 7e0aee6d5..416a91ec0 100644 Binary files a/test/docx/golden/inline_formatting.docx and b/test/docx/golden/inline_formatting.docx differ diff --git a/test/docx/inline_formatting.native b/test/docx/inline_formatting.native index a7aaf9999..000896df9 100644 --- a/test/docx/inline_formatting.native +++ b/test/docx/inline_formatting.native @@ -1,5 +1,6 @@ +Pandoc (Meta {unMeta = fromList []}) [Para [Str "Regular",Space,Str "text",Space,Emph [Str "italics"],Space,Strong [Str "bold",Space,Emph [Str "bold",Space,Str "italics"]],Str "."] ,Para [Str "This",Space,Str "is",Space,SmallCaps [Str "Small",Space,Str "Caps"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "strikethrough"],Str "."] -,Para [Str "Some",Space,Str "people",Space,Str "use",Space,Span ("",["underline"],[]) [Str "single",Space,Str "underlines",Space,Str "for",Space,Emph [Str "emphasis"]],Str "."] +,Para [Str "Some",Space,Str "people",Space,Str "use",Space,Underline [Str "single",Space,Str "underlines",Space,Str "for",Space],Emph [Underline [Str "emphasis"]],Str "."] ,Para [Str "Above",Space,Str "the",Space,Str "line",Space,Str "is",Space,Superscript [Str "superscript"],Space,Str "and",Space,Str "below",Space,Str "the",Space,Str "line",Space,Str "is",Space,Subscript [Str "subscript"],Str "."] ,Para [Str "A",Space,Str "line",LineBreak,Str "break."]] -- cgit v1.2.3