lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-09-29 02:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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 21:39:40 -04:00
parent e98be61a38
commit acf352331c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Text/Pandoc/Writers/Docx.hs
+5 -5
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