aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2021-12-28 16:06:25 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2021-12-28 16:06:25 -0800
commit7d56650e0137daf504fdd79187811f091d4eee37 (patch)
tree68c24291a945542e2b1cdfef0f085fad247d9feb
parent8bd22270c8ac5d4f76164f8c5854ba26e901e161 (diff)
downloadpandoc-7d56650e0137daf504fdd79187811f091d4eee37.tar.gz
OpenDocument writer: fix vertical align bug with display math.
Previously some displayed formulas would be floated above a preceding text line. This is fixed by setting vertical-rel to 'text' rather than 'paragraph-content'. Closes #7777.
-rw-r--r--src/Text/Pandoc/Writers/OpenDocument.hs2
-rw-r--r--test/command/6792.md2
-rw-r--r--test/writer.opendocument2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs
index a42c5df64..8af64969b 100644
--- a/src/Text/Pandoc/Writers/OpenDocument.hs
+++ b/src/Text/Pandoc/Writers/OpenDocument.hs
@@ -192,7 +192,7 @@ formulaStyle mt = inTags False "style:style"
,("style:vertical-rel", "text")]
else
[("style:vertical-pos", "middle")
- ,("style:vertical-rel", "paragraph-content")
+ ,("style:vertical-rel", "text")
,("style:horizontal-pos", "center")
,("style:horizontal-rel", "paragraph-content")
,("style:wrap", "none")]
diff --git a/test/command/6792.md b/test/command/6792.md
index 3d31942fe..253009d46 100644
--- a/test/command/6792.md
+++ b/test/command/6792.md
@@ -22,7 +22,7 @@
<style:font-face style:name="Courier New" style:font-family-generic="modern" style:font-pitch="fixed" svg:font-family="'Courier New'" />
</office:font-face-decls>
<office:automatic-styles>
- <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Formula"><style:graphic-properties style:vertical-pos="middle" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" style:wrap="none" /></style:style>
+ <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Formula"><style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" style:wrap="none" /></style:style>
<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Formula"><style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text" /></style:style>
<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents">
<style:paragraph-properties fo:text-align="center" style:justify-single-word="false" />
diff --git a/test/writer.opendocument b/test/writer.opendocument
index 9e6ef336e..3095cef41 100644
--- a/test/writer.opendocument
+++ b/test/writer.opendocument
@@ -1017,7 +1017,7 @@
<style:style style:name="T6" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>
<style:style style:name="T7" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" style:text-position="super 58%" /></style:style>
<style:style style:name="T8" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style>
- <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Formula"><style:graphic-properties style:vertical-pos="middle" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" style:wrap="none" /></style:style>
+ <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Formula"><style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" style:wrap="none" /></style:style>
<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Formula"><style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text" /></style:style>
<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Quotations">
<style:paragraph-properties fo:margin-left="0.5in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" />