diff options
| author | Ian <iandol@users.noreply.github.com> | 2017-05-19 04:34:13 +0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-05-18 22:34:13 +0200 |
| commit | b9185b02162ea56ee685594e1c5cfb816e796754 (patch) | |
| tree | 1003c5e9f4d971149d0e3246b96f9890d991548b | |
| parent | 0f6458c0c13380969ccac82d54a0e68a3ec76200 (diff) | |
Docx writer: Change FigureWithCaption to CaptionedFigure (#3658)
Edit styles.xml as part of the fix for #3656
| -rw-r--r-- | data/docx/word/styles.xml | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/Docx.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/docx/word/styles.xml b/data/docx/word/styles.xml index 5d09a67b0..67d336db1 100644 --- a/data/docx/word/styles.xml +++ b/data/docx/word/styles.xml @@ -400,8 +400,8 @@ <w:name w:val="Figure" /> <w:basedOn w:val="Normal" /> </w:style> - <w:style w:type="paragraph" w:customStyle="1" w:styleId="FigureWithCaption"> - <w:name w:val="Figure with Caption" /> + <w:style w:type="paragraph" w:customStyle="1" w:styleId="CaptionedFigure"> + <w:name w:val="Captioned Figure" /> <w:basedOn w:val="Figure" /> <w:pPr> <w:keepNext /> diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index b58c983a1..2282a5c58 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -875,7 +875,7 @@ blockToOpenXML' opts (Para [Image attr alt (src,'f':'i':'g':':':tit)]) = do let prop = pCustomStyle $ if null alt then "Figure" - else "FigureWithCaption" + else "CaptionedFigure" paraProps <- local (\env -> env { envParaProperties = prop : envParaProperties env }) (getParaProps False) contents <- inlinesToOpenXML opts [Image attr alt (src,tit)] captionNode <- withParaProp (pCustomStyle "ImageCaption") |