Removed hardcoded spaces

spockz · Dec 16, 2011 · 4c16e35 · 4c16e35
1 parent b9d9c58
commit 4c16e35
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/src/Language/LaTeX.hs b/src/Language/LaTeX.hs
@@ -20,24 +20,24 @@ makeLatexSafe = replace ">" "\\textgreater"
 {- This part is to conserve some lhs2TeX behaviour. Really shouldn't be here... -}
               . replace "=" "\\ = \\ "
               -- . replace "_" "\\ \\anonymous\\ "
-              . replace "$" "\\ \\mathbin{\\$}\\ "
+              . replace "$"   "{\\$} "
-              . replace "&&" "\\ \\mathrel{\\wedge}\\ "
+              . replace "&&"  "\\mathrel{\\wedge}"
-              . replace "||" "\\ \\mathrel{\\vee}\\ "
+              . replace "||"  "\\mathrel{\\vee}"
-              . replace "<-" "\\ \\leftarrow\\ "
+              . replace "<-"  "\\leftarrow"
-              . replace "->" "\\ \\to\\  "
+              . replace "->"  "\\to"
-              . replace "=>" "\\ \\Rightarrow\\ "
+              . replace "=>"  "\\Rightarrow"
-              . replace "==" "\\ \\equiv\\ "
+              . replace "=="  "\\equiv"
-              . replace "++" "\\ \\plus\\ "
+              . replace "++"  "\\plus"
-              . replace "/=" "\\ \\not\\equiv\\ "
+              . replace "/="  "\\not\\equiv"
-              . replace "<=" "\\ \\leq\\ "
+              . replace "<="  "\\leq"
-              . replace ">=" "\\ \\geq\\ "
+              . replace ">="  "\\geq"
-              . replace ">>" "\\ \\sequ\\ "
+              . replace ">>"  "\\seq"
-              . replace ">>>" "\\ \\ggg\\ "
+              . replace ">>>" "\\ggg"
-              . replace "<<<" "\\ \\lll\\ "              
+              . replace "<<<" "\\lll"              
-              . replace ">>=" "\\ \\bind\\ "
+              . replace ">>=" "\\bind"
-              . replace "=<<" "\\ \\rbind\\ "
+              . replace "=<<" "\\rbind"
-              . replace "undefined" "\\bot\\  "
+              . replace "undefined" "\\bot"
-              . replace "not" "\\ \\neg "
+              . replace "not" "\\neg"
 
 
               -- %format _          = "\anonymous "

diff --git a/src/Literate/Haskell.hs b/src/Literate/Haskell.hs
@@ -142,7 +142,7 @@ mapping = [
 
 mtypes :: SimpleInfo -> [(String, String)]
 mtypes SimpleInfo{types} = map dp types
-moperators SimpleInfo{operators} = map (\ a -> (a, "\\ \\mathbin{"++ makeLatexSafe a++"}\\ ")) 
+moperators SimpleInfo{operators} = map (\ a -> (a, "\\mathbin{"++ makeLatexSafe a++"}")) 
                                        operators
 mconstructors SimpleInfo{constructors} = map dp constructors
 mfunctions SimpleInfo{functions   }    = map dp functions

diff --git a/src/LiterateHighlighter.hs b/src/LiterateHighlighter.hs
@@ -43,7 +43,7 @@ main = do args <- cmdArgsRun standard
                               else 
                                 printFormatting args
 
-  where printFormat keyword (seek, rep) = "%format " ++ seek ++ " = \" {\\lhsCH" ++ keyword ++ "{" ++ rep ++ "}}\"" 
+  where printFormat keyword (seek, rep) = "%format " ++ seek ++ " = \"{\\lhsCH" ++ keyword ++ "{" ++ rep ++ "}}\"" 
         writeOutput output mapping si = 
                       mapM_  (\(keyword, f) -> mapM_ (hPutStrLn output . printFormat keyword) 
                                                      (filter lhs2TeXSafe (f si))