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

Add a boolean flag to the setRTL function.

Browse source 
At the toplevel we don't check to see if RTL is already set.
This commit is contained in:
Jesse Rosenthal 2016-10-03 18:29:25 -04:00
parent e98be61a38
commit acf352331c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Text/Pandoc/Writers/Docx.hs
View file

@ -797,7 +797,7 @@ blockToOpenXML opts (Div (ident,classes,kvs) bs)
withParaPropM (pStyleM sty) $ blocksToOpenXML opts bs
| Just "rtl" <- lookup "dir" kvs = do
let kvs' = filter (("dir", "rtl")/=) kvs
setRTL $ blockToOpenXML opts (Div (ident,classes,kvs') bs)
setRTL False $ blockToOpenXML opts (Div (ident,classes,kvs') bs)
| Just "ltr" <- lookup "dir" kvs = do
let kvs' = filter (("dir", "ltr")/=) kvs
setLTR $ blockToOpenXML opts (Div (ident,classes,kvs') bs)
@ -1042,7 +1042,7 @@ inlineToOpenXML opts (Span (ident,classes,kvs) ils)
inlineToOpenXML opts (Span (ident,classes,kvs') ils)
| Just "rtl" <- lookup "dir" kvs = do
let kvs' = filter (("dir", "rtl")/=) kvs
setRTL $ inlineToOpenXML opts (Span (ident,classes,kvs') ils)
setRTL False $ inlineToOpenXML opts (Span (ident,classes,kvs') ils)
| Just "ltr" <- lookup "dir" kvs = do
let kvs' = filter (("dir", "ltr")/=) kvs
setLTR $ inlineToOpenXML opts (Span (ident,classes,kvs') ils)
@ -1275,10 +1275,10 @@ fitToPage (x, y) pageWidth
(pageWidth, floor $ ((fromIntegral pageWidth) / x) * y)
| otherwise = (floor x, floor y)
setRTL :: WS a -> WS a
setRTL x = do
setRTL :: Bool -> WS a -> WS a
setRTL topLevel x = do
isRTL <- asks envRTL
if isRTL
if isRTL && not topLevel
then x
else flip local x $ \env -> env {
envRTL = True