diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Tests/Readers/Docx.hs | 8 | ||||
| -rw-r--r-- | tests/docx/dummy_item_after_list_item.docx | bin | 0 -> 70197 bytes | |||
| -rw-r--r-- | tests/docx/dummy_item_after_list_item.native | 3 | ||||
| -rw-r--r-- | tests/docx/dummy_item_after_paragraph.docx | bin | 0 -> 70234 bytes | |||
| -rw-r--r-- | tests/docx/dummy_item_after_paragraph.native | 3 | ||||
| -rw-r--r-- | tests/writer.icml | 68 |
6 files changed, 73 insertions, 9 deletions
diff --git a/tests/Tests/Readers/Docx.hs b/tests/Tests/Readers/Docx.hs index 127dfd73c..086d3f964 100644 --- a/tests/Tests/Readers/Docx.hs +++ b/tests/Tests/Readers/Docx.hs @@ -185,6 +185,14 @@ tests = [ testGroup "inlines" "docx/german_styled_lists.docx" "docx/german_styled_lists.native" , testCompare + "user deletes bullet after list item (=> part of item par)" + "docx/dummy_item_after_list_item.docx" + "docx/dummy_item_after_list_item.native" + , testCompare + "user deletes bullet after par (=> new par)" + "docx/dummy_item_after_paragraph.docx" + "docx/dummy_item_after_paragraph.native" + , testCompare "footnotes and endnotes" "docx/notes.docx" "docx/notes.native" diff --git a/tests/docx/dummy_item_after_list_item.docx b/tests/docx/dummy_item_after_list_item.docx Binary files differnew file mode 100644 index 000000000..5e29b993c --- /dev/null +++ b/tests/docx/dummy_item_after_list_item.docx diff --git a/tests/docx/dummy_item_after_list_item.native b/tests/docx/dummy_item_after_list_item.native new file mode 100644 index 000000000..3f6231932 --- /dev/null +++ b/tests/docx/dummy_item_after_list_item.native @@ -0,0 +1,3 @@ +[OrderedList (1,Decimal,Period) + [[Para [Str "One"] + ,Para [Str "Two",LineBreak,LineBreak,Str "Three"]]]] diff --git a/tests/docx/dummy_item_after_paragraph.docx b/tests/docx/dummy_item_after_paragraph.docx Binary files differnew file mode 100644 index 000000000..b0aee8843 --- /dev/null +++ b/tests/docx/dummy_item_after_paragraph.docx diff --git a/tests/docx/dummy_item_after_paragraph.native b/tests/docx/dummy_item_after_paragraph.native new file mode 100644 index 000000000..2e9b831c4 --- /dev/null +++ b/tests/docx/dummy_item_after_paragraph.native @@ -0,0 +1,3 @@ +[Para [Str "First",Space,Str "bullet",Space,Str "point",Space,Str "created",Space,Str "and",Space,Str "then",Space,Str "deleted"] +,Para [Str "A",Space,Str "normal",Space,Str "paragraph"] +,Para [Str "First",Space,Str "bullet",Space,Str "point",Space,Str "created",Space,Str "and",Space,Str "then",Space,Str "deleted",Space,Str "after",Space,Str "the",Space,Str "normal",Space,Str "paragraph"]] diff --git a/tests/writer.icml b/tests/writer.icml index b6f5b5e32..cd71fa86b 100644 --- a/tests/writer.icml +++ b/tests/writer.icml @@ -1864,17 +1864,49 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content>2+2=4</Content> + <Content>2</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content>+</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content>2</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content>=</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content>4</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content>x \in y</Content> + <CharacterStyleRange AppliedCharacterStyle="CharacterStyle/Italic"> + <Content>x</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content>∈</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="CharacterStyle/Italic"> + <Content>y</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content>\alpha \wedge \omega</Content> + <CharacterStyleRange AppliedCharacterStyle="CharacterStyle/Italic"> + <Content>α</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content>∧</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="CharacterStyle/Italic"> + <Content>ω</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList"> @@ -1883,7 +1915,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <CharacterStyleRange AppliedCharacterStyle="CharacterStyle/Italic"> <Content>p</Content> </CharacterStyleRange> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> @@ -1895,15 +1927,33 @@ These should not be escaped: \$ \\ \> \[ \{</Content> <Content>Here’s some display math: </Content> </CharacterStyleRange> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content>\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}</Content> + <Content>$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Here’s one that has a line break in it: </Content> </CharacterStyleRange> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content>\alpha + \omega \times x^2</Content> + <CharacterStyleRange AppliedCharacterStyle="CharacterStyle/Italic"> + <Content>α</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content>+</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="CharacterStyle/Italic"> + <Content>ω</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content>×</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> + <Content> </Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="CharacterStyle/Italic"> + <Content>x</Content> + </CharacterStyleRange><CharacterStyleRange AppliedCharacterStyle="CharacterStyle/Superscript"> + <Content>2</Content> </CharacterStyleRange> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>.</Content> |