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

LaTeX writer: Specially escape non-ascii characters in labels.

Browse source 
Otherwise we can get compile errors and other bugs when
compiled with pdflatex.  Closes #1007.

Thanks to begemotv2718 for the fix.
This commit is contained in:
John MacFarlane 2013-10-17 22:06:39 -07:00
parent 80c1967e75
commit 1f29f4678e
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Text/Pandoc/Writers/LaTeX.hs
View file

@ -39,7 +39,7 @@ import Text.Printf ( printf )
import Network.URI ( isURI, unEscapeString ) import Network.URI ( isURI, unEscapeString )
import Data.List ( (\\), isSuffixOf, isInfixOf, import Data.List ( (\\), isSuffixOf, isInfixOf,
isPrefixOf, intercalate, intersperse ) isPrefixOf, intercalate, intersperse )
import Data.Char ( toLower, isPunctuation ) import Data.Char ( toLower, isPunctuation, isAscii, isLetter, isDigit, ord )
import Control.Applicative ((<|>)) import Control.Applicative ((<|>))
import Control.Monad.State import Control.Monad.State
import Text.Pandoc.Pretty import Text.Pandoc.Pretty
@ -222,6 +222,13 @@ stringToLaTeX ctx (x:xs) = do
'\x2013' | ligatures -> "--" ++ rest '\x2013' | ligatures -> "--" ++ rest
_ -> x : rest _ -> x : rest
toLabel :: String -> String
toLabel [] = ""
toLabel (x:xs)
| (isLetter x || isDigit x) && isAscii x = x:toLabel xs
| elem x "-+=:;." = x:toLabel xs
| otherwise = "ux" ++ printf "%x" (ord x) ++ toLabel xs
-- | Puts contents into LaTeX command. -- | Puts contents into LaTeX command.
inCmd :: String -> Doc -> Doc inCmd :: String -> Doc -> Doc
inCmd cmd contents = char '\\' <> text cmd <> braces contents inCmd cmd contents = char '\\' <> text cmd <> braces contents
@ -329,7 +336,7 @@ blockToLaTeX (CodeBlock (identifier,classes,keyvalAttr) str) = do
| writerListings opts -> listingsCodeBlock | writerListings opts -> listingsCodeBlock
| writerHighlight opts && not (null classes) -> highlightedCodeBlock | writerHighlight opts && not (null classes) -> highlightedCodeBlock
| otherwise -> rawCodeBlock | otherwise -> rawCodeBlock
where ref = text identifier where ref = text $ toLabel identifier
linkAnchor = if null identifier linkAnchor = if null identifier
then empty then empty
else "\\hyperdef{}" <> braces ref <> else "\\hyperdef{}" <> braces ref <>
@ -361,7 +368,7 @@ blockToLaTeX (CodeBlock (identifier,classes,keyvalAttr) str) = do
(key,attr) <- keyvalAttr ] ++ (key,attr) <- keyvalAttr ] ++
(if identifier == "" (if identifier == ""
then [] then []
else [ "label=" ++ identifier ]) else [ "label=" ++ toLabel identifier ])
else [] else []
printParams printParams
@ -537,13 +544,13 @@ sectionHeader unnumbered ref level lst = do
let refLabel x = (if ref `elem` internalLinks let refLabel x = (if ref `elem` internalLinks
then text "\\hyperdef" then text "\\hyperdef"
<> braces empty <> braces empty
<> braces (text ref) <> braces (text $ toLabel ref)
<> braces x <> braces x
else x) else x)
let headerWith x y r = refLabel $ text x <> y <> let headerWith x y r = refLabel $ text x <> y <>
if null r if null r
then empty then empty
else text "\\label" <> braces (text r) else text "\\label" <> braces (text $ toLabel r)
let sectionType = case level' of let sectionType = case level' of
0 | writerBeamer opts -> "part" 0 | writerBeamer opts -> "part"
| otherwise -> "chapter" | otherwise -> "chapter"
@ -664,7 +671,8 @@ inlineToLaTeX Space = return space
inlineToLaTeX (Link txt ('#':ident, _)) = do inlineToLaTeX (Link txt ('#':ident, _)) = do
contents <- inlineListToLaTeX txt contents <- inlineListToLaTeX txt
ident' <- stringToLaTeX URLString ident ident' <- stringToLaTeX URLString ident
return $ text "\\hyperref" <> brackets (text ident') <> braces contents return $ text "\\hyperref" <> brackets (text $ toLabel ident') <>
braces contents
inlineToLaTeX (Link txt (src, _)) = inlineToLaTeX (Link txt (src, _)) =
case txt of case txt of
[Str x] | x == src -> -- autolink [Str x] | x == src -> -- autolink