diverse RGL and Phrasebook fixes, and a corrected Synopsis

This commit is contained in:
aarne
2011-12-05 15:25:06 +00:00
parent d5623f9d67
commit 25c9dabd02
12 changed files with 338 additions and 341 deletions

View File

@@ -14,7 +14,7 @@ mkExx sss = case sss of
(s1:ss1,s2:ss2) | isMsg s1 -> mkExx (ss1,s2:ss2)
(s1:ss1,s2:ss2) | isMsg s2 -> mkExx (s1:ss1,ss2)
(s1:ss1,s2:ss2) | s1 /= s2 ->
putStrLn (drops s1) >> putStrLn (drops s2) >> putStrLn [] >> mkExx (ss1,ss2) -- show the strings
putStrLn (drops s1) >> putStrLn (filter (not . (==' ')) (drops s2)) >> putStrLn [] >> mkExx (ss1,ss2) -- show strings
(s1:ss1,s2:ss2) | s1 == s2 && not (isJunk s1) ->
putStrLn (drops s1) >> mkExx (ss1,ss2) -- show the term
(s1:ss1,s2:ss2) | s1 == s2 -> mkExx (ss1,ss2)

View File

@@ -68,9 +68,10 @@ prApiExx aexx = unlines
prApiEx :: M.Map String String -> [String]
prApiEx apexx = case M.toList apexx of
(a,e):lexx -> (a ++ ": ``" ++ unwords (words e) ++ "``"):
[l ++ ": //" ++ mkEx e ++ "//" | (l,e) <- lexx]
[l ++ ": //" ++ mkEx l e ++ "//" | (l,e) <- lexx]
mkEx = unwords . bind . mkE . words where
mkEx l = unws . bind . mkE . words where
unws = if l == "Tha" then concat else unwords
mkE e = case e of
"atomic":"term":_ -> ["*"]
"[]":_ -> ["''"]

View File

@@ -742,7 +742,7 @@ mkAdv during_Prep it_NP
either7or_DConj : Conj -- either...or
mkAdv either7or_DConj here_Adv there_Adv
every_Det : Det
every_Det
mkUtt (mkNP every_Det woman_N)
everybody_NP : NP -- everybody
mkUtt everybody_NP
everything_NP : NP
@@ -750,7 +750,7 @@ mkUtt everything_NP
everywhere_Adv : Adv
everywhere_Adv
few_Det : Det
few_Det
mkUtt (mkNP few_Det women_N)
for_Prep : Prep
mkAdv for_Prep it_NP
from_Prep : Prep
@@ -788,7 +788,7 @@ more_CAdv
most_Predet : Predet
most_Predet
much_Det : Det
much_Det
mkUtt (mkNP much_Det wine_N)
must_VV : VV
must_VV
no_Utt : Utt
@@ -814,9 +814,9 @@ mkUtt (mkNP she_Pron)
so_AdA : AdA
so_AdA
someSg_Det : Det
someSg_Det
mkUtt (mkNP someSg_Det wine_N)
somePl_Det : Det
somePl_Det
mkUtt (mkNP somePl_Det woman_N)
somebody_NP : NP
mkUtt somebody_NP
something_NP : NP

View File

@@ -23,12 +23,12 @@ constructing trees in them.
- [Chapter 2 #toc5]: syntactic construction functions, with cross-links and
examples.
- [Chapter 3 #toc83]: morphological paradigms.
- [Chapter 4 #toc102]: additional libraries.
- [Chapter 5 #toc109]: how to "browse" the library by
- [Chapter 4 #toc103]: additional libraries.
- [Chapter 5 #toc110]: how to "browse" the library by
loading the grammars into the ``gf`` command editor.
- [Chapter 6 #toc110]: a brief example of how application grammars can
- [Chapter 6 #toc111]: a brief example of how application grammars can
use the resource modules.
- [Detailed table of contents #toc111].
- [Detailed table of contents #toc112].
Other relevant documents:

File diff suppressed because it is too large Load Diff