Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Docx reader: don't let first line indents trigger block quotes.

Browse source 
This fixes a regression introduced in pandoc 2.15 by PR #7606.
Closes #7655.
This commit is contained in:
John MacFarlane 2021-11-02 14:02:24 -07:00
parent 45bcd7d3f1
commit 938d557844
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Text/Pandoc/Readers/Docx/Parse/Styles.hs
View file

@ -310,9 +310,8 @@ getIndentation ns el = do
, rightParIndent = findAttrByName ns "w" "right" indElement <|>
findAttrByName ns "w" "end" indElement >>=
stringToInteger
, hangingParIndent = (findAttrByName ns "w" "hanging" indElement >>= stringToInteger) <|>
fmap negate
(findAttrByName ns "w" "firstLine" indElement >>= stringToInteger)
, hangingParIndent = findAttrByName ns "w" "hanging" indElement >>=
stringToInteger
}
getElementStyleName :: Coercible T.Text a => NameSpaces -> Element -> Maybe a

BIN
test/docx/relative_indentation_blockquotes.docx
View file

Binary file not shown.

2
test/docx/relative_indentation_blockquotes.native
View file

@ -1,4 +1,6 @@
[Header 1 ("indentation-blockquotes",[],[]) [Str "Indentation",Space,Str "blockquotes"]
,Para [Str "Foobar"]
,Para [Str "First",Space,Str "line",Space,Str "indented."]
,Para [Str "Normal",Space,Str "list",Space,Str "paragraph"]
,Para [Str "List",Space,Str "paragraph",Space,Str "with",Space,Str "less",Space,Str "indent"]
,BlockQuote [Para [Str "List",Space,Str "paragraph",Space,Str "with",Space,Str "more",Space,Str "indent"]]]