diff options
| author | aarne <unknown> | 2005-03-31 14:47:42 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2005-03-31 14:47:42 +0000 |
| commit | 0151c5c418fb64e01e46c6bff464f0d7b2dd91ba (patch) | |
| tree | b3e6478b3aef1257a18aaf4a8e5698b179e9612e | |
| parent | 70deda4132b66bc8d61e25d7f585012f09bf01fc (diff) | |
new unlexers ; work on Romance
| -rw-r--r-- | src/GF/Text/Text.hs | 28 | ||||
| -rw-r--r-- | src/GF/UseGrammar/Custom.hs | 6 |
2 files changed, 22 insertions, 12 deletions
diff --git a/src/GF/Text/Text.hs b/src/GF/Text/Text.hs index 3aee3b378..6eaa27b06 100644 --- a/src/GF/Text/Text.hs +++ b/src/GF/Text/Text.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/18 19:21:16 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.6 $ +-- > CVS $Date: 2005/03/31 15:47:43 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.7 $ -- -- elementary text postprocessing. AR 21\/11\/2001. -- @@ -22,6 +22,8 @@ module Text (untokWithXML, formatAsTextLit, formatAsCodeLit, formatAsText, + formatAsHTML, + formatAsLatex, formatAsCode, performBinds, unStringLit, @@ -56,20 +58,26 @@ formatAsTextLit = formatAsText . unwords . map unStringLit . words formatAsCodeLit :: String -> String formatAsCodeLit = formatAsCode . unwords . map unStringLit . words -formatAsText :: String -> String -formatAsText = unwords . format . cap . words where +formatAsText,formatAsHTML,formatAsLatex :: String -> String +formatAsText = formatAsTextGen (=="&-") (=="&-") +formatAsHTML = formatAsTextGen ((=="<") . take 1) (const False) +formatAsLatex = formatAsTextGen ((=="\\") . take 1) (const False) + +formatAsTextGen :: (String -> Bool) -> (String -> Bool) -> String -> String +formatAsTextGen tag para = unwords . format . cap . words where format ws = case ws of - w : c : ww | major c -> (w ++ c) : format (cap ww) - w : c : ww | minor c -> (w ++ c) : format ww + w : c : ww | major c -> format $ (w ++ c) :(cap ww) + w : c : ww | minor c -> format $ (w ++ c) : ww + p : c : ww | openp p -> format $ (p ++ c) :ww c : ww | para c -> "\n\n" : format ww w : ww -> w : format ww [] -> [] - cap (p:(c:cs):ww) | para p = p : (toUpper c : cs) : ww + cap (p:ww) | tag p = p : cap ww cap ((c:cs):ww) = (toUpper c : cs) : ww cap [] = [] major = flip elem (map singleton ".!?") - minor = flip elem (map singleton ",:;") - para = (=="&-") + minor = flip elem (map singleton ",:;)") + openp = all (flip elem "(") formatAsCode :: String -> String formatAsCode = rend 0 . words where diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs index 9b77123ce..727b11950 100644 --- a/src/GF/UseGrammar/Custom.hs +++ b/src/GF/UseGrammar/Custom.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/03/29 13:26:37 $ +-- > CVS $Date: 2005/03/31 15:47:43 $ -- > CVS $Author: aarne $ --- > CVS $Revision: 1.49 $ +-- > CVS $Revision: 1.50 $ -- -- A database for customizable GF shell commands. -- @@ -376,6 +376,8 @@ customUntokenizer = [ (strCI "unwords", const $ id) -- DEFAULT ,(strCI "text", const $ formatAsText) + ,(strCI "html", const $ formatAsHTML) + ,(strCI "latex", const $ formatAsLatex) ,(strCI "code", const $ formatAsCode) ,(strCI "concat", const $ filter (not . isSpace)) ,(strCI "textlit", const $ formatAsTextLit) |