diff --git a/README b/README --- a/README +++ b/README @@ -78,6 +78,7 @@ - Relaxngcompact - Rhtml - Ruby +- Rust - Scala - Scheme - Sci diff --git a/Text/Highlighting/Kate/Common.hs b/Text/Highlighting/Kate/Common.hs --- a/Text/Highlighting/Kate/Common.hs +++ b/Text/Highlighting/Kate/Common.hs @@ -73,7 +73,7 @@ popContext :: KateParser () popContext = do st <- getState case synStContexts st of - [x] -> return () -- stay if we're at the root + [_] -> return () -- stay if we're at the root (_:xs) -> updateState $ \st -> st{ synStContexts = xs } [] -> fail "Stack empty" diff --git a/Text/Highlighting/Kate/Format/LaTeX.hs b/Text/Highlighting/Kate/Format/LaTeX.hs --- a/Text/Highlighting/Kate/Format/LaTeX.hs +++ b/Text/Highlighting/Kate/Format/LaTeX.hs @@ -19,29 +19,31 @@ import Control.Monad (mplus) import Data.Char (isSpace) -formatLaTeX :: FormatOptions -> [SourceLine] -> String -formatLaTeX _ = intercalate "\n" . map sourceLineToLaTeX +formatLaTeX :: Bool -> [SourceLine] -> String +formatLaTeX inline = intercalate "\n" . map (sourceLineToLaTeX inline) -- | Formats tokens as LaTeX using custom commands inside -- @|@ characters. Assumes that @|@ is defined as a short verbatim -- command by the macros produced by 'styleToLaTeX'. -- A @KeywordTok@ is rendered using @\\KeywordTok{..}@, and so on. formatLaTeXInline :: FormatOptions -> [SourceLine] -> String -formatLaTeXInline opts ls = "|" ++ formatLaTeX opts ls ++ "|" +formatLaTeXInline _opts ls = "|" ++ formatLaTeX True ls ++ "|" -sourceLineToLaTeX :: SourceLine -> String -sourceLineToLaTeX contents = concatMap tokenToLaTeX contents +sourceLineToLaTeX :: Bool -> SourceLine -> String +sourceLineToLaTeX inline contents = concatMap (tokenToLaTeX inline) contents -tokenToLaTeX :: Token -> String -tokenToLaTeX (NormalTok, txt) | all isSpace txt = escapeLaTeX txt -tokenToLaTeX (toktype, txt) = '\\':(show toktype ++ "{" ++ escapeLaTeX txt ++ "}") +tokenToLaTeX :: Bool -> Token -> String +tokenToLaTeX inline (NormalTok, txt) | all isSpace txt = escapeLaTeX inline txt +tokenToLaTeX inline (toktype, txt) = '\\':(show toktype ++ "{" ++ escapeLaTeX inline txt ++ "}") -escapeLaTeX :: String -> String -escapeLaTeX = concatMap escapeLaTeXChar +escapeLaTeX :: Bool -> String -> String +escapeLaTeX inline = concatMap escapeLaTeXChar where escapeLaTeXChar '\\' = "\\textbackslash{}" escapeLaTeXChar '{' = "\\{" escapeLaTeXChar '}' = "\\}" - escapeLaTeXChar '|' = "\\textbar{}" -- used in inline verbatim + escapeLaTeXChar '|' = if inline + then "\\VerbBar{}" -- used in inline verbatim + else "|" escapeLaTeXChar x = [x] -- LaTeX @@ -65,7 +67,7 @@ then "" else ",firstnumber=" ++ show (startNumber opts)) ++ "," else "") ++ "]" - ,formatLaTeX opts ls + ,formatLaTeX False ls ,"\\end{Highlighting}" ,"\\end{Shaded}"] @@ -88,6 +90,7 @@ styleToLaTeX f = unlines $ [ "\\usepackage{color}" , "\\usepackage{fancyvrb}" + , "\\newcommand{\\VerbBar}{|}" , "\\DefineShortVerb[commandchars=\\\\\\{\\}]{\\|}" , "\\DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\\\\{\\}}" , "% Add ',fontsize=\\small' for more characters per line" diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,11 @@ +highlighting-kate 0.5.3.9 (06 May 2013) + + * LaTeX formatter: Avoid using \textbar, which gives a bar that + is narrow and in a proportional font. Instead, use literal | in + block code and a new macro \VerbBar in inline code. + + * Updated Curry highlighting (Björn Peemöller). + highlighting-kate 0.5.3.8 (05 Mar 2013) * Support mozilla rust. diff --git a/highlighting-kate.cabal b/highlighting-kate.cabal --- a/highlighting-kate.cabal +++ b/highlighting-kate.cabal @@ -1,5 +1,5 @@ Name: highlighting-kate -Version: 0.5.3.8 +Version: 0.5.3.9 Cabal-Version: >= 1.10 Build-Type: Simple Category: Text diff --git a/xml/curry.xml b/xml/curry.xml --- a/xml/curry.xml +++ b/xml/curry.xml @@ -8,11 +8,29 @@ - + + + + + + + + + + + + + + + + + + + ]> - @@ -42,7 +60,7 @@ type where - + and all any @@ -164,120 +182,176 @@ GT - + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + - + - - + + - + - + - - - - + + + + - - + + - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - + + + - - - - + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + - + diff --git a/xml/literate-curry.xml b/xml/literate-curry.xml --- a/xml/literate-curry.xml +++ b/xml/literate-curry.xml @@ -1,6 +1,6 @@ -