From 41f4476aabe4eacec06e47c5d6dba2503b1eb1f0 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 23 Jan 2017 15:18:34 +0100 Subject: OpenDocument writer: don't profilerate text styles unnecessarily. This change makes the writer create only as many temporary text styles as are absolutely necessary. It also consolidates adjacent nodes with the same style. Closes #3371. --- tests/writer.opendocument | 152 ++++++++++++---------------------------------- 1 file changed, 40 insertions(+), 112 deletions(-) (limited to 'tests') diff --git a/tests/writer.opendocument b/tests/writer.opendocument index 6c84ae31b..d613ab5b8 100644 --- a/tests/writer.opendocument +++ b/tests/writer.opendocument @@ -632,73 +632,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -871,7 +811,7 @@ link Level 5 Level 1 Level 2 with -emphasis +emphasis Level 3 with no blank line Level 2 @@ -1244,11 +1184,11 @@ fruit yellow fruit Multiple blocks with italics: -apple +apple red fruitcontains seeds, crisp, pleasant to taste -orange +orange orange fruit{ orange code block }orange block quote Multiple definitions, @@ -1295,9 +1235,9 @@ indentation: Interpreted markdown in a table: This is -emphasized +emphasized And this is -strong +strong Here’s a simple block: foo This should be a code block, @@ -1323,47 +1263,38 @@ spaces on the line: Inline Markup This is -emphasized, and so -is -this. +emphasized, and so +is this. This is -strong, and so -is -this. +strong, and so +is this. An -emphasized -link. -This -is -strong -and -em. +emphasized +link. +This is +strong and em. So is -this word. -This -is -strong -and -em. +this word. +This is +strong and em. So is -this word. +this word. This is code: >, $, \, \$, <html>. -This -is -strikeout. +This is +strikeout. Superscripts: -abcd -ahello -ahello there. +abcd +ahello +ahello there. Subscripts: -H2O, -H23O, -Hmany of themO. +H2O, +H23O, +Hmany of themO. These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d. @@ -1395,16 +1326,16 @@ five. 2 + 2 = 4 - x ∈ y + x ∈ y - α ∧ ω + α ∧ ω 223 - p-Tree + p-Tree Here’s some display math: @@ -1412,7 +1343,7 @@ five. Here’s one that has a line break in it: - α + ω × x2. + α + ω × x2. These shouldn’t be math: @@ -1423,7 +1354,7 @@ five. $22,000 is a - lot of money. So is $34,000. + lot of money. So is $34,000. (It worked if “lot” is emphasized.) @@ -1432,10 +1363,7 @@ five. Escaped $: $73 - this - should - be - emphasized + this should be emphasized 23$. @@ -1585,10 +1513,10 @@ indented to show that they belong to the footnote (as with list items).{ <code> }If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. This -should not be a footnote +should not be a footnote reference, because it contains a space.[^my note] Here is an inline note.3This -is easier to type. Inline notes +is easier to type. Inline notes may contain links and ] verbatim -- cgit v1.2.3