diff --git a/ParseSyntaxFiles.hs b/ParseSyntaxFiles.hs --- a/ParseSyntaxFiles.hs +++ b/ParseSyntaxFiles.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} {- ParseSyntaxFiles.hs processes a directory containing Kate @@ -22,7 +22,6 @@ import Text.XML.HXT.Arrow import Text.XML.HXT.Arrow.Edit -import Text.XML.HXT.Arrow.XmlNodeSet import Control.Arrow import Control.Arrow.ArrowList import Data.List @@ -83,25 +82,32 @@ } deriving (Read, Show) +-- | Converts a list of files (ending in .xml) and directories containing .xml files +-- into a list of .xml files. +argFiles :: [String] -> IO [String] +argFiles [] = error "Specify paths of xml files and/or directories containing xml syntax files." +argFiles args = do + let isXmlFile x = isSuffixOf ".xml" x + let (files, dirs) = partition isXmlFile args + dirContents <- mapM (\dir -> getDirectoryContents dir >>= return . map (combine dir) . filter isXmlFile) dirs + return $ nub (files ++ concat dirContents) + + libraryPath = joinPath ["Text", "Highlighting", "Kate"] destDir = joinPath [libraryPath, "Syntax"] main :: IO () main = do - argv <- getArgs - srcDir <- if null argv - then error "Specify path of directory containing xml syntax files." - else return $ argv !! 0 - let isXmlFile x = isSuffixOf ".xml" x - files <- getDirectoryContents srcDir >>= (return . map (combine srcDir) . filter isXmlFile) + files <- getArgs >>= argFiles destDirExists <- doesDirectoryExist destDir if destDirExists then return () else createDirectory destDir - mapM processOneFile files >> return () + mapM_ processOneFile files let syntaxFile = combine libraryPath (addExtension "Syntax" "hs") putStrLn $ "Writing " ++ syntaxFile - let names = sort $ map nameFromPath files + -- Get all syntax files, not only the newly generated ones. + names <- getDirectoryContents destDir >>= return . sort . map dropExtension . filter (isSuffixOf ".hs") let imports = unlines $ map (\name -> "import qualified Text.Highlighting.Kate.Syntax." ++ name ++ " as " ++ name) names let cases = unlines $ map (\name -> " " ++ show (map toLower name) ++ " -> " ++ name ++ ".highlight") names let languageExtensions = concat $ intersperse ", " $ map (\name -> "(" ++ show name ++ ", " ++ name ++ ".syntaxExtensions)") names diff --git a/README b/README --- a/README +++ b/README @@ -71,6 +71,7 @@ - perl.xml: Fixed regexes - needed backslash-escapes before ] and ^ - haskell.xml: Added support for module names - bash.xml: Changed "\\" to "\" in two Detect2Char rules in FindString +- literate-haskell.xml: Fixed single line comments and growing context stack NOTE: This software is largely untested. Known bugs are recorded in the file BUGS. Please send bug reports (or better, patches) to the author (jgm at diff --git a/Text/Highlighting/Kate.hs b/Text/Highlighting/Kate.hs --- a/Text/Highlighting/Kate.hs +++ b/Text/Highlighting/Kate.hs @@ -35,4 +35,4 @@ import Text.Highlighting.Kate.Syntax ( highlightAs, languages, languagesByExtension ) import Text.Highlighting.Kate.Definitions ( SourceLine, LabeledSource ) -highlightingKateVersion = "0.2.3" +highlightingKateVersion = "0.2.4" diff --git a/Text/Highlighting/Kate/Syntax/LiterateHaskell.hs b/Text/Highlighting/Kate/Syntax/LiterateHaskell.hs --- a/Text/Highlighting/Kate/Syntax/LiterateHaskell.hs +++ b/Text/Highlighting/Kate/Syntax/LiterateHaskell.hs @@ -50,8 +50,8 @@ context <- currentContext case context of "literate-normal" -> return () - "normal" -> pushContext "literate-normal" - "comment_single_line" -> (popContext >> return ()) + "normal" -> (popContext >> return ()) + "comment_single_line" -> (popContext >> popContext >> return ()) "comment_multi_line" -> return () "string" -> return () "infix" -> return () diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,10 +1,39 @@ -highlighting-kate (0.2.1) +highlighting-kate 0.2.4 (15 Mar 2009) + * Fixed bug in literate-haskell-xml. Also fixed now upstream. + (Bjorn Buckwalter) + + * Modified ParseSyntaxFiles.hs to allow regeneration of individual + syntax files. With the change ParseSyntaxFiles accepts any number of + arguments. Those ending with .xml are assumed to be files while the + rest are assumed to be directories containing .xml files. + The syntaxes included in Syntax.hs are based on the contents of + destDir rather than the arguments, this allows regenerating a subset + of syntaxes but still having all syntaxes in Syntax.hs. (Bjorn Buckwalter) + + * ParseSyntaxFiles.hs: Change deprecated pragma, remove obsolete import. + (Bjorn Buckwalter) + +highlighting-kate 0.2.3 (9 Jul 2008) + + * Removed -O2 in Ghc-Options, as it provides very little speedup + +highlighting-kate 0.2.2 (9 Jul 2008) + + * Added Cc-options -O0 to cabal file. This is needed to prevent + gcc from using enormous amounts of memory on platforms + that lack a native code generator and compile via C. See + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469893. + + * Depend on parsec < 3, because parsec 3 is much slower. + + * normalizeHighlighting now strips out empty strings + +highlighting-kate 0.2.1 (10 Feb 2008) + * Implemented lookAhead in parsers, which fixed bugs in perl, bash, and other parsers. -highlighting-kate 0.2 +highlighting-kate 0.2 (10 Feb 2008) * Initial release - - -- John MacFarlane 10 Feb 2008 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.2.3 +Version: 0.2.4 Cabal-Version: >= 1.2 Build-Type: Simple Category: Text @@ -68,6 +68,7 @@ xml/latex.xml xml/lex.xml xml/literate-haskell.xml + xml/literate-haskell.xml.bkp xml/lua.xml xml/makefile.xml xml/matlab.xml diff --git a/xml/literate-haskell.xml b/xml/literate-haskell.xml --- a/xml/literate-haskell.xml +++ b/xml/literate-haskell.xml @@ -327,7 +327,7 @@ - + @@ -343,7 +343,7 @@ - + diff --git a/xml/literate-haskell.xml.bkp b/xml/literate-haskell.xml.bkp new file mode 100644 --- /dev/null +++ b/xml/literate-haskell.xml.bkp @@ -0,0 +1,386 @@ + + + + + + case + class + data + deriving + do + else + if + in + infixl + infixr + instance + let + module + of + primitive + then + type + where + + + quot + rem + div + mod + elem + notElem + seq + + + + + FilePath + IOError + abs + acos + acosh + all + and + any + appendFile + approxRational + asTypeOf + asin + asinh + atan + atan2 + atanh + basicIORun + break + catch + ceiling + chr + compare + concat + concatMap + const + cos + cosh + curry + cycle + decodeFloat + denominator + digitToInt + div + divMod + drop + dropWhile + either + elem + encodeFloat + enumFrom + enumFromThen + enumFromThenTo + enumFromTo + error + even + exp + exponent + fail + filter + flip + floatDigits + floatRadix + floatRange + floor + fmap + foldl + foldl1 + foldr + foldr1 + fromDouble + fromEnum + fromInt + fromInteger + fromIntegral + fromRational + fst + gcd + getChar + getContents + getLine + head + id + inRange + index + init + intToDigit + interact + ioError + isAlpha + isAlphaNum + isAscii + isControl + isDenormalized + isDigit + isHexDigit + isIEEE + isInfinite + isLower + isNaN + isNegativeZero + isOctDigit + isPrint + isSpace + isUpper + iterate + last + lcm + length + lex + lexDigits + lexLitChar + lines + log + logBase + lookup + map + mapM + mapM_ + max + maxBound + maximum + maybe + min + minBound + minimum + mod + negate + not + notElem + null + numerator + odd + or + ord + otherwise + pi + pred + primExitWith + print + product + properFraction + putChar + putStr + putStrLn + quot + quotRem + range + rangeSize + read + readDec + readFile + readFloat + readHex + readIO + readInt + readList + readLitChar + readLn + readOct + readParen + readSigned + reads + readsPrec + realToFrac + recip + rem + repeat + replicate + return + reverse + round + scaleFloat + scanl + scanl1 + scanr + scanr1 + seq + sequence + sequence_ + show + showChar + showInt + showList + showLitChar + showParen + showSigned + showString + shows + showsPrec + significand + signum + sin + sinh + snd + span + splitAt + sqrt + subtract + succ + sum + tail + take + takeWhile + tan + tanh + threadToIOResult + toEnum + toInt + toInteger + toLower + toRational + toUpper + truncate + uncurry + undefined + unlines + until + unwords + unzip + unzip3 + userError + words + writeFile + zip + zip3 + zipWith + zipWith3 + + + Bool + Char + Double + Either + Float + IO + Integer + Int + Maybe + Ordering + Rational + Ratio + ReadS + ShowS + String + + + + Bounded + Enum + Eq + Floating + Fractional + Functor + Integral + Ix + Monad + Num + Ord + Read + RealFloat + RealFrac + Real + Show + + + EQ + False + GT + Just + LT + Left + Nothing + Right + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +