fdfc961 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Merge pull request #2419 from mb21/bidi

fdfc961John MacFarlane11 years ago

README+19

compare with master

unifiedsplit

@@ -959,6 +959,25 @@ as `title`, `author`, and `date`) as well as the following:

959 Currently only used by XeTeX through the generated

960 `polyglossia-otherlangs` variable.

961

962+`dir`

963+: the base direction of the document, either `rtl` (right-to-left)

964+ or `ltr` (left-to-right).

965+

966+ For bidirectional documents, native pandoc `span`s and `div`s

967+ with the `dir` attribute (value `rtl` or `ltr`) can be used to

968+ override the base direction in some output formats.

969+ This may not always be necessary if the final renderer

970+ (e.g. the browser, when generating HTML) supports the

971+ [Unicode Bidirectional Algorithm][uba-basics].

972+

973+ When using LaTeX for bidi documents, only the XeLaTeX engine

974+ is fully supported (see `--latex-engine`).

975+ Setting the `dir` variable enables bidirectional text

976+ handling in LaTeX and ConTeXt, thus even if the base direction

977+ is the default left-to-right, you should set `dir: ltr` for

978+ documents that also contain some right-to-left script.

979+

980+

962`slidy-url`

981`slidy-url`

963: base URL for Slidy documents (defaults to

982: base URL for Slidy documents (defaults to

964 `http://www.w3.org/Talks/Tools/Slidy2`)

983 `http://www.w3.org/Talks/Tools/Slidy2`)

src/Text/Pandoc/Writers/ConTeXt.hs+24−9

@@ -83,13 +83,18 @@ pandocToConTeXt options (Pandoc meta blocks) = do

83 $ metadata

84 let context' = defField "context-lang" (maybe "" (fromBcp47 . splitBy (=='-')) $

85 getField "lang" context)

86+ $ defField "context-dir" (toContextDir $ getField "dir" context)

86− context

87+ $ context

87 return $ if writerStandalone options

88 return $ if writerStandalone options

88 then renderTemplate' (writerTemplate options) context'

89 then renderTemplate' (writerTemplate options) context'

89 else main

90 else main

91−-- escape things as needed for ConTeXt

92+toContextDir :: Maybe String -> String

93+toContextDir (Just "rtl") = "r2l"

94+toContextDir (Just "ltr") = "l2r"

95+toContextDir _ = ""

97+-- | escape things as needed for ConTeXt

93escapeCharForConTeXt :: WriterOptions -> Char -> String

98escapeCharForConTeXt :: WriterOptions -> Char -> String

94escapeCharForConTeXt opts ch =

99escapeCharForConTeXt opts ch =

95 let ligatures = writerTeXLigatures opts in

100 let ligatures = writerTeXLigatures opts in

@@ -151,13 +156,18 @@ blockToConTeXt (CodeBlock _ str) =

151 -- blankline because \stoptyping can't have anything after it, inc. '}'

156 -- blankline because \stoptyping can't have anything after it, inc. '}'

152blockToConTeXt (RawBlock "context" str) = return $ text str <> blankline

157blockToConTeXt (RawBlock "context" str) = return $ text str <> blankline

153blockToConTeXt (RawBlock _ _ ) = return empty

158blockToConTeXt (RawBlock _ _ ) = return empty

154−blockToConTeXt (Div (ident,_,_) bs) = do

159+blockToConTeXt (Div (ident,_,kvs) bs) = do

155 contents <- blockListToConTeXt bs

160 contents <- blockListToConTeXt bs

156− if null ident

161+ let contents' = if null ident

157− then return contents

162+ then contents

158− else return $

159− ("\\reference" <> brackets (text $ toLabel ident) <> braces empty <>

163+ else ("\\reference" <> brackets (text $ toLabel ident) <>

160− "%") $$ contents

164+ braces empty <> "%") $$ contents

165+ let align dir = blankline <> "\\startalignment[" <> dir <> "]"

166+ $$ contents' $$ "\\stopalignment" <> blankline

167+ return $ case lookup "dir" kvs of

168+ Just "rtl" -> align "righttoleft"

169+ Just "ltr" -> align "lefttoright"

170+ _ -> contents'

161blockToConTeXt (BulletList lst) = do

171blockToConTeXt (BulletList lst) = do

162 contents <- mapM listItemToConTeXt lst

172 contents <- mapM listItemToConTeXt lst

163 return $ ("\\startitemize" <> if isTightList lst

173 return $ ("\\startitemize" <> if isTightList lst

@@ -335,7 +345,12 @@ inlineToConTeXt (Note contents) = do

335 then text "\\footnote{" <> nest 2 contents' <> char '}'

345 then text "\\footnote{" <> nest 2 contents' <> char '}'

336 else text "\\startbuffer " <> nest 2 contents' <>

346 else text "\\startbuffer " <> nest 2 contents' <>

337 text "\\stopbuffer\\footnote{\\getbuffer}"

347 text "\\stopbuffer\\footnote{\\getbuffer}"

338−inlineToConTeXt (Span _ ils) = inlineListToConTeXt ils

348+inlineToConTeXt (Span (_,_,kvs) ils) = do

349+ contents <- inlineListToConTeXt ils

350+ return $ case lookup "dir" kvs of

351+ Just "rtl" -> braces $ "\\righttoleft " <> contents

352+ Just "ltr" -> braces $ "\\lefttoright " <> contents

353+ _ -> contents

339

354

340-- | Craft the section header, inserting the secton reference, if supplied.

355-- | Craft the section header, inserting the secton reference, if supplied.

341sectionHeader :: Attr

356sectionHeader :: Attr

src/Text/Pandoc/Writers/LaTeX.hs+16−4

@@ -187,6 +187,9 @@ pandocToLaTeX options (Pandoc meta blocks) = do

187 $ defField "polyglossia-otherlangs"

188 (maybe [] (map $ fst . toPolyglossia . splitBy (=='-')) $

189 getField "otherlangs" context)

190+ $ defField "latex-dir-rtl" (case (getField "dir" context)::Maybe String of

191+ Just "rtl" -> True

192+ _ -> False)

190 $ context

193 $ context

191 return $ if writerStandalone options

194 return $ if writerStandalone options

192 then renderTemplate' template context'

195 then renderTemplate' template context'

@@ -323,14 +326,19 @@ isLineBreakOrSpace _ = False

323blockToLaTeX :: Block -- ^ Block to convert

326blockToLaTeX :: Block -- ^ Block to convert

324 -> State WriterState Doc

327 -> State WriterState Doc

325blockToLaTeX Null = return empty

328blockToLaTeX Null = return empty

326−blockToLaTeX (Div (identifier,classes,_) bs) = do

329+blockToLaTeX (Div (identifier,classes,kvs) bs) = do

327 beamer <- writerBeamer `fmap` gets stOptions

330 beamer <- writerBeamer `fmap` gets stOptions

328 ref <- toLabel identifier

331 ref <- toLabel identifier

329 let linkAnchor = if null identifier

332 let linkAnchor = if null identifier

330 then empty

333 then empty

331 else "\\hyperdef{}" <> braces (text ref) <>

334 else "\\hyperdef{}" <> braces (text ref) <>

332 braces ("\\label" <> braces (text ref))

335 braces ("\\label" <> braces (text ref))

333− contents <- blockListToLaTeX bs

336+ contents' <- blockListToLaTeX bs

337+ let align dir = inCmd "begin" dir $$ contents' $$ inCmd "end" dir

338+ let contents = case lookup "dir" kvs of

339+ Just "rtl" -> align "RTL"

340+ Just "ltr" -> align "LTR"

341+ _ -> contents'

334 if beamer && "notes" `elem` classes -- speaker notes

342 if beamer && "notes" `elem` classes -- speaker notes

335 then return $ "\\note" <> braces contents

343 then return $ "\\note" <> braces contents

336 else return (linkAnchor $$ contents)

344 else return (linkAnchor $$ contents)

@@ -727,10 +735,12 @@ isQuoted _ = False

727-- | Convert inline element to LaTeX

735-- | Convert inline element to LaTeX

728inlineToLaTeX :: Inline -- ^ Inline to convert

736inlineToLaTeX :: Inline -- ^ Inline to convert

729 -> State WriterState Doc

737 -> State WriterState Doc

730−inlineToLaTeX (Span (id',classes,_) ils) = do

738+inlineToLaTeX (Span (id',classes,kvs) ils) = do

731 let noEmph = "csl-no-emph" `elem` classes

739 let noEmph = "csl-no-emph" `elem` classes

732 let noStrong = "csl-no-strong" `elem` classes

740 let noStrong = "csl-no-strong" `elem` classes

733 let noSmallCaps = "csl-no-smallcaps" `elem` classes

741 let noSmallCaps = "csl-no-smallcaps" `elem` classes

742+ let rtl = ("dir","rtl") `elem` kvs

743+ let ltr = ("dir","ltr") `elem` kvs

734 ref <- toLabel id'

744 ref <- toLabel id'

735 let linkAnchor = if null id'

745 let linkAnchor = if null id'

736 then empty

746 then empty

@@ -740,7 +750,9 @@ inlineToLaTeX (Span (id',classes,_) ils) = do

740 ((if noEmph then inCmd "textup" else id) .

750 ((if noEmph then inCmd "textup" else id) .

741 (if noStrong then inCmd "textnormal" else id) .

751 (if noStrong then inCmd "textnormal" else id) .

742 (if noSmallCaps then inCmd "textnormal" else id) .

752 (if noSmallCaps then inCmd "textnormal" else id) .

753+ (if rtl then inCmd "RL" else id) .

754+ (if ltr then inCmd "LR" else id) .

743− (if not (noEmph || noStrong || noSmallCaps)

755+ (if not (noEmph || noStrong || noSmallCaps || rtl || ltr)

744 then braces

756 then braces

745 else id)) `fmap` inlineListToLaTeX ils

757 else id)) `fmap` inlineListToLaTeX ils

746inlineToLaTeX (Emph lst) =

758inlineToLaTeX (Emph lst) =