Merge pull request #5095 from pyssling/master

ODT writer: Fix list indentation
This commit is contained in:
John MacFarlane 2018-11-22 21:46:55 -05:00 committed by GitHub
commit 2e1366b3e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 191 additions and 191 deletions

View file

@ -601,7 +601,7 @@ orderedListLevelStyle (s,n, d) (l,ls) =
listLevelStyle :: Int -> Doc listLevelStyle :: Int -> Doc
listLevelStyle i = listLevelStyle i =
let indent = show (0.5 * fromIntegral i :: Double) in let indent = show (0.5 + (0.25 * fromIntegral i :: Double)) in
inTags True "style:list-level-properties" inTags True "style:list-level-properties"
[ ("text:list-level-position-and-space-mode", [ ("text:list-level-position-and-space-mode",
"label-alignment") "label-alignment")
@ -610,7 +610,7 @@ listLevelStyle i =
selfClosingTag "style:list-level-label-alignment" selfClosingTag "style:list-level-label-alignment"
[ ("text:label-followed-by", "listtab") [ ("text:label-followed-by", "listtab")
, ("text:list-tab-stop-position", indent ++ "in") , ("text:list-tab-stop-position", indent ++ "in")
, ("fo:text-indent", "-0.1in") , ("fo:text-indent", "-0.25in")
, ("fo:margin-left", indent ++ "in") , ("fo:margin-left", indent ++ "in")
] ]

File diff suppressed because it is too large Load diff