msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

diverse RGL and Phrasebook fixes, and a corrected Synopsis

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/phrasebook/SentencesTha.gf
View File

@@ -1,7 +1,7 @@
concrete SentencesTha of Sentences = NumeralTha ** SentencesI - [ concrete SentencesTha of Sentences = NumeralTha ** SentencesI - [
PGreetingMale, PGreetingFemale, PGreetingMale, PGreetingFemale,
GObjectPlease, GObjectPlease,
ACitizen, WherePlace, WherePerson ACitizen
] with ] with
(Syntax = SyntaxTha), (Syntax = SyntaxTha),
(Symbolic = SymbolicTha), (Symbolic = SymbolicTha),
@@ -17,11 +17,6 @@ lin
ACitizen p n = mkCl p.name (mkVP (mkCN n (P.personN R.khon_s))) ; ACitizen p n = mkCl p.name (mkVP (mkCN n (P.personN R.khon_s))) ;
WherePlace place = mkQS (mkQCl where_IAdv (mkCl place.name yuu_V)) ;
WherePerson person = mkQS (mkQCl where_IAdv (mkCl person.name yuu_V)) ;
oper oper
yuu_V : V = R.regV "อยู่" ;
thpron = R.thpron ; thpron = R.thpron ;
} }

2
lib/doc/Compare.hs
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 s1 -> mkExx (ss1,s2:ss2)
(s1:ss1,s2:ss2) | isMsg s2 -> mkExx (s1:ss1,ss2) (s1:ss1,s2:ss2) | isMsg s2 -> mkExx (s1:ss1,ss2)
(s1:ss1,s2:ss2) | s1 /= s2 -> (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) -> (s1:ss1,s2:ss2) | s1 == s2 && not (isJunk s1) ->
putStrLn (drops s1) >> mkExx (ss1,ss2) -- show the term putStrLn (drops s1) >> mkExx (ss1,ss2) -- show the term
(s1:ss1,s2:ss2) | s1 == s2 -> mkExx (ss1,ss2) (s1:ss1,s2:ss2) | s1 == s2 -> mkExx (ss1,ss2)

5
lib/doc/MkExxTable.hs
View File

@@ -68,9 +68,10 @@ prApiExx aexx = unlines
prApiEx :: M.Map String String -> [String] prApiEx :: M.Map String String -> [String]
prApiEx apexx = case M.toList apexx of prApiEx apexx = case M.toList apexx of
(a,e):lexx -> (a ++ ": ``" ++ unwords (words e) ++ "``"): (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 mkE e = case e of
"atomic":"term":_ -> ["*"] "atomic":"term":_ -> ["*"]
"[]":_ -> ["''"] "[]":_ -> ["''"]

10
lib/doc/api-examples.txt
View File

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

8
lib/doc/synopsis-intro.txt
View File

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

32
lib/doc/synopsis.html
View File

@@ -37,12 +37,12 @@ constructing trees in them.
<LI><A HREF="#toc5">Chapter 2</A>: syntactic construction functions, with cross-links and <LI><A HREF="#toc5">Chapter 2</A>: syntactic construction functions, with cross-links and
examples. examples.
<LI><A HREF="#toc83">Chapter 3</A>: morphological paradigms. <LI><A HREF="#toc83">Chapter 3</A>: morphological paradigms.
<LI><A HREF="#toc102">Chapter 4</A>: additional libraries. <LI><A HREF="#toc103">Chapter 4</A>: additional libraries.
<LI><A HREF="#toc109">Chapter 5</A>: how to "browse" the library by <LI><A HREF="#toc110">Chapter 5</A>: how to "browse" the library by
loading the grammars into the <CODE>gf</CODE> command editor. loading the grammars into the <CODE>gf</CODE> command editor.
<LI><A HREF="#toc110">Chapter 6</A>: a brief example of how application grammars can <LI><A HREF="#toc111">Chapter 6</A>: a brief example of how application grammars can
use the resource modules. use the resource modules.
<LI><A HREF="#toc111">Detailed table of contents</A>. <LI><A HREF="#toc112">Detailed table of contents</A>.
</UL> </UL>
<P> <P>
@@ -1081,7 +1081,7 @@ Lexical category, constructors given in
<TR> <TR>
<TD><CODE>mkCl</CODE></TD> <TD><CODE>mkCl</CODE></TD>
<TD><A HREF="#NP" TITLE="NP - noun phrase (subject or object)">NP</A> <CODE>-&gt;</CODE> <A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#Cl" TITLE="Cl - declarative clause, with all tenses">Cl</A></TD> <TD><A HREF="#NP" TITLE="NP - noun phrase (subject or object)">NP</A> <CODE>-&gt;</CODE> <A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#Cl" TITLE="Cl - declarative clause, with all tenses">Cl</A></TD>
<TD><div class=reveal> <I>she is here</I> <div class=popup> <ul> <li>API: <CODE>mkCl she_NP here_Adv</CODE> <li>Afr: <I>sy is hier</I> <li>Bul: <I>тя е тук</I> <li>Cat: <I>ella és aquí</I> <li>Dan: <I>hun er her</I> <li>Dut: <I>ze is hier</I> <li>Eng: <I>she is here</I> <li>Fin: <I>hän on täällä</I> <li>Fre: <I>elle est ici</I> <li>Ger: <I>sie ist hier</I> <li>Ita: <I>lei è quà</I> <li>Nep: <I>उनी यहाँ छिन्</I> <li>Nor: <I>hun er her</I> <li>Pes: <I>او اینجا است</I> <li>Pnb: <I>او ایتھے اے</I> <li>Pol: <I>ona jest tutaj</I> <li>Ron: <I>ea este aici</I> <li>Rus: <I>она здесь</I> <li>Spa: <I>ella es aquí</I> <li>Swe: <I>hon är här</I> <li>Tha: <I>เขา ที่นี่</I> <li>Urd: <I>وہ یہاں ہے</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>she is here</I> <div class=popup> <ul> <li>API: <CODE>mkCl she_NP here_Adv</CODE> <li>Afr: <I>sy is hier</I> <li>Bul: <I>тя е тук</I> <li>Cat: <I>ella és aquí</I> <li>Dan: <I>hun er her</I> <li>Dut: <I>ze is hier</I> <li>Eng: <I>she is here</I> <li>Fin: <I>hän on täällä</I> <li>Fre: <I>elle est ici</I> <li>Ger: <I>sie ist hier</I> <li>Ita: <I>lei è quà</I> <li>Nep: <I>उनी यहाँ छिन्</I> <li>Nor: <I>hun er her</I> <li>Pes: <I>او اینجا است</I> <li>Pnb: <I>او ایتھے اے</I> <li>Pol: <I>ona jest tutaj</I> <li>Ron: <I>ea este aici</I> <li>Rus: <I>она здесь</I> <li>Spa: <I>ella es aquí</I> <li>Swe: <I>hon är här</I> <li>Tha: <I>เขาอยู่ที่นี่</I> <li>Urd: <I>وہ یہاں ہے</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>mkCl</CODE></TD> <TD><CODE>mkCl</CODE></TD>
@@ -1193,7 +1193,7 @@ Lexical category, constructors given in
<TR> <TR>
<TD><CODE>mkComp</CODE></TD> <TD><CODE>mkComp</CODE></TD>
<TD><A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#Comp" TITLE="Comp - complement of copula, such as AP">Comp</A></TD> <TD><A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#Comp" TITLE="Comp - complement of copula, such as AP">Comp</A></TD>
<TD><div class=reveal> <I>here</I> <div class=popup> <ul> <li>API: <CODE>mkComp here_Adv</CODE> <li>Afr: <I>hier</I> <li>Bul: <I>тук</I> <li>Cat: <I>aquí</I> <li>Dan: <I>her</I> <li>Dut: <I>hier</I> <li>Eng: <I>here</I> <li>Fin: <I>täällä</I> <li>Fre: <I>ici</I> <li>Ger: <I>hier</I> <li>Ita: <I>quà</I> <li>Nep: <I>यहाँ</I> <li>Nor: <I>her</I> <li>Pes: <I>اینجا</I> <li>Pnb: <I>ایتھے</I> <li>Pol: <I>tutaj</I> <li>Ron: <I>aici</I> <li>Rus: <I>здесь</I> <li>Spa: <I>aquí</I> <li>Swe: <I>här</I> <li>Tha: <I>ที่นี่</I> <li>Urd: <I>یہاں</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>here</I> <div class=popup> <ul> <li>API: <CODE>mkComp here_Adv</CODE> <li>Afr: <I>hier</I> <li>Bul: <I>тук</I> <li>Cat: <I>aquí</I> <li>Dan: <I>her</I> <li>Dut: <I>hier</I> <li>Eng: <I>here</I> <li>Fin: <I>täällä</I> <li>Fre: <I>ici</I> <li>Ger: <I>hier</I> <li>Ita: <I>quà</I> <li>Nep: <I>यहाँ</I> <li>Nor: <I>her</I> <li>Pes: <I>اینجا</I> <li>Pnb: <I>ایتھے</I> <li>Pol: <I>tutaj</I> <li>Ron: <I>aici</I> <li>Rus: <I>здесь</I> <li>Spa: <I>aquí</I> <li>Swe: <I>här</I> <li>Tha: <I>อยู่ที่นี่</I> <li>Urd: <I>یہاں</I> </ul> </div> </div></TD>
</TR> </TR>
</TABLE> </TABLE>
@@ -1260,12 +1260,12 @@ Lexical category, constructors given in
<TR> <TR>
<TD><CODE>every_Det</CODE></TD> <TD><CODE>every_Det</CODE></TD>
<TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD> <TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD>
<TD><div class=reveal> <I>every</I> <div class=popup> <ul> <li>API: <CODE>every_Det</CODE> <li>Afr: <I>elk</I> <li>Bul: <I>всеки</I> <li>Cat: <I>cada</I> <li>Dan: <I>hver</I> <li>Dut: <I>elke</I> <li>Eng: <I>every</I> <li>Fin: <I>Prelude.True</I> <li>Fre: <I>chaque</I> <li>Ger: <I>jeder</I> <li>Ita: <I>ogni</I> <li>Nep: <I>सबै</I> <li>Nor: <I>hver</I> <li>Pes: <I>هر</I> <li>Pnb: <I>ہر</I> <li>Pol: <I>każdy</I> <li>Ron: <I>orice</I> <li>Rus: <I>каждый</I> <li>Spa: <I>cada</I> <li>Swe: <I>varje</I> <li>Tha: <I>Prelude.True</I> <li>Urd: <I>ہر</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>every woman</I> <div class=popup> <ul> <li>API: <CODE>mkUtt (mkNP every_Det woman_N)</CODE> <li>Afr: <I>elk vrou</I> <li>Bul: <I>всяка жена</I> <li>Cat: <I>cada dona</I> <li>Dan: <I>hver kvinde</I> <li>Dut: <I>elke vrouw</I> <li>Eng: <I>every woman</I> <li>Fin: <I>jokainen nainen</I> <li>Fre: <I>chaque femme</I> <li>Ger: <I>jede Frau</I> <li>Ita: <I>ogni donna</I> <li>Nep: <I>सबै आईमाई</I> <li>Nor: <I>hver kvinne</I> <li>Pes: <I>هر زن</I> <li>Pnb: <I>ہر زنانی</I> <li>Pol: <I>każda kobieta</I> <li>Ron: <I>orice femeie</I> <li>Rus: <I>каждую женщину</I> <li>Spa: <I>cada mujer</I> <li>Swe: <I>varje kvinna</I> <li>Tha: <I>หญิงทุกคน</I> <li>Urd: <I>ہر عورت</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>few_Det</CODE></TD> <TD><CODE>few_Det</CODE></TD>
<TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD> <TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD>
<TD><div class=reveal> <I>few</I> <div class=popup> <ul> <li>API: <CODE>few_Det</CODE> <li>Afr: <I>min</I> <li>Bul: <I>няколко</I> <li>Cat: <I>pocs</I> <li>Dan: <I>få</I> <li>Dut: <I>weinig</I> <li>Eng: <I>few</I> <li>Fin: <I>Prelude.True</I> <li>Fre: <I>peu de</I> <li>Ger: <I>wenige</I> <li>Ita: <I>pochi</I> <li>Nep: <I>थोरै</I> <li>Nor: <I>få</I> <li>Pes: <I>تعداد کمی</I> <li>Pnb: <I>كچھ</I> <li>Pol: <I>parę</I> <li>Ron: <I>câţiva</I> <li>Rus: <I>немного</I> <li>Spa: <I>pocos</I> <li>Swe: <I>få</I> <li>Tha: <I>Prelude.True</I> <li>Urd: <I>چند</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>constant not found: women_N</I> <div class=popup> <ul> <li>API: <CODE>mkUtt (mkNP few_Det women_N)</CODE> <li>Afr: <I>constant not found: women_N</I> <li>Bul: <I>constant not found: women_N</I> <li>Cat: <I>constant not found: women_N</I> <li>Dan: <I>constant not found: women_N</I> <li>Dut: <I>constant not found: women_N</I> <li>Eng: <I>constant not found: women_N</I> <li>Fin: <I>constant not found: women_N</I> <li>Fre: <I>constant not found: women_N</I> <li>Ger: <I>constant not found: women_N</I> <li>Ita: <I>constant not found: women_N</I> <li>Nep: <I>constant not found: women_N</I> <li>Nor: <I>constant not found: women_N</I> <li>Pes: <I>constant not found: women_N</I> <li>Pnb: <I>constant not found: women_N</I> <li>Pol: <I>constant not found: women_N</I> <li>Ron: <I>constant not found: women_N</I> <li>Rus: <I>constant not found: women_N</I> <li>Spa: <I>constant not found: women_N</I> <li>Swe: <I>constant not found: women_N</I> <li>Tha: <I>constantnotfound:women_N</I> <li>Urd: <I>constant not found: women_N</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>many_Det</CODE></TD> <TD><CODE>many_Det</CODE></TD>
@@ -1325,17 +1325,17 @@ Lexical category, constructors given in
<TR> <TR>
<TD><CODE>much_Det</CODE></TD> <TD><CODE>much_Det</CODE></TD>
<TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD> <TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD>
<TD><div class=reveal> <I>much</I> <div class=popup> <ul> <li>API: <CODE>much_Det</CODE> <li>Afr: <I>baie</I> <li>Bul: <I>много</I> <li>Cat: <I>molt</I> <li>Dan: <I>meget</I> <li>Dut: <I>veel</I> <li>Eng: <I>much</I> <li>Fin: <I>Prelude.True</I> <li>Fre: <I>beaucoup de</I> <li>Ger: <I>vieler</I> <li>Ita: <I>molto</I> <li>Nep: <I>निक्कै</I> <li>Nor: <I>mye</I> <li>Pes: <I>مقدار زیادی</I> <li>Pnb: <I>بہت</I> <li>Pol: <I>dużo</I> <li>Ron: <I>// <li>Rus: //много</I> <li>Spa: <I>mucho</I> <li>Swe: <I>mycket</I> <li>Tha: <I>Prelude.True</I> <li>Urd: <I>بہت</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>much wine</I> <div class=popup> <ul> <li>API: <CODE>mkUtt (mkNP much_Det wine_N)</CODE> <li>Afr: <I>baie wyn</I> <li>Bul: <I>много вино</I> <li>Cat: <I>molt vi</I> <li>Dan: <I>meget viner</I> <li>Dut: <I>veel wijn</I> <li>Eng: <I>much wine</I> <li>Fin: <I>paljon viini</I> <li>Fre: <I>beaucoup de vins</I> <li>Ger: <I>vieler Wein</I> <li>Ita: <I>molto vino</I> <li>Nep: <I>निक्कै वाईन</I> <li>Nor: <I>mye viner</I> <li>Pes: <I>مقدار زیادی شراب ها</I> <li>Pnb: <I>بہت شراب</I> <li>Pol: <I>dużo win</I> <li>Ron: <I>// <li>Rus: //много вина</I> <li>Spa: <I>mucho vino</I> <li>Swe: <I>mycket viner</I> <li>Tha: <I>เหล้าองุ่นมากขวด</I> <li>Urd: <I>بہت شراب</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>somePl_Det</CODE></TD> <TD><CODE>somePl_Det</CODE></TD>
<TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD> <TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD>
<TD><div class=reveal> <I>some</I> <div class=popup> <ul> <li>API: <CODE>somePl_Det</CODE> <li>Afr: <I>sommige</I> <li>Bul: <I>някои</I> <li>Cat: <I>alguns</I> <li>Dan: <I>nogle</I> <li>Dut: <I>sommige</I> <li>Eng: <I>some</I> <li>Fin: <I>Prelude.True</I> <li>Fre: <I>quelques</I> <li>Ger: <I>einige</I> <li>Ita: <I>qualche</I> <li>Nep: <I>कोही</I> <li>Nor: <I>noen</I> <li>Pes: <I>چند</I> <li>Pnb: <I>كچھ</I> <li>Pol: <I>pewne</I> <li>Ron: <I>unii</I> <li>Rus: <I>некоторый</I> <li>Spa: <I>algunos</I> <li>Swe: <I>några</I> <li>Tha: <I>Prelude.True</I> <li>Urd: <I>كچھ</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>some women</I> <div class=popup> <ul> <li>API: <CODE>mkUtt (mkNP somePl_Det woman_N)</CODE> <li>Afr: <I>sommige vroue</I> <li>Bul: <I>някои жени</I> <li>Cat: <I>algunes dones</I> <li>Dan: <I>nogle kvinder</I> <li>Dut: <I>sommige vrouwen</I> <li>Eng: <I>some women</I> <li>Fin: <I>jotkut naiset</I> <li>Fre: <I>quelques femmes</I> <li>Ger: <I>einige Frauen</I> <li>Ita: <I>qualche donne</I> <li>Nep: <I>केही आईमाईहरु</I> <li>Nor: <I>noen kvinner</I> <li>Pes: <I>چند زن</I> <li>Pnb: <I>كچھ زنانیاں</I> <li>Pol: <I>pewne kobiety</I> <li>Ron: <I>unele femei</I> <li>Rus: <I>некоторые женщины</I> <li>Spa: <I>algunas mujeres</I> <li>Swe: <I>några kvinnor</I> <li>Tha: <I>หญิงบ้างคน</I> <li>Urd: <I>كچھ عورتیں</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>someSg_Det</CODE></TD> <TD><CODE>someSg_Det</CODE></TD>
<TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD> <TD><A HREF="#Det" TITLE="Det - determiner phrase">Det</A></TD>
<TD><div class=reveal> <I>some</I> <div class=popup> <ul> <li>API: <CODE>someSg_Det</CODE> <li>Afr: <I>sommige</I> <li>Bul: <I>някой</I> <li>Cat: <I>algun</I> <li>Dan: <I>nogen</I> <li>Dut: <I>sommige</I> <li>Eng: <I>some</I> <li>Fin: <I>Prelude.True</I> <li>Fre: <I>quelque</I> <li>Ger: <I>ein</I> <li>Ita: <I>qualche</I> <li>Nep: <I>कोही</I> <li>Nor: <I>noen</I> <li>Pes: <I>مقداری</I> <li>Pnb: <I>كچھ</I> <li>Pol: <I>pewien</I> <li>Ron: <I>nişte</I> <li>Rus: <I>некоторый</I> <li>Spa: <I>algun</I> <li>Swe: <I>någon</I> <li>Tha: <I>Prelude.True</I> <li>Urd: <I>كچھ</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>some wine</I> <div class=popup> <ul> <li>API: <CODE>mkUtt (mkNP someSg_Det wine_N)</CODE> <li>Afr: <I>sommige wyn</I> <li>Bul: <I>някое вино</I> <li>Cat: <I>algun vi</I> <li>Dan: <I>nogen vin</I> <li>Dut: <I>sommige wijn</I> <li>Eng: <I>some wine</I> <li>Fin: <I>joku viini</I> <li>Fre: <I>quelque vin</I> <li>Ger: <I>ein Wein</I> <li>Ita: <I>qualche vino</I> <li>Nep: <I>कोही वाईन</I> <li>Nor: <I>noen vin</I> <li>Pes: <I>مقداری شراب</I> <li>Pnb: <I>كچھ شراب</I> <li>Pol: <I>pewne wino</I> <li>Ron: <I>nişte vin</I> <li>Rus: <I>некоторое вино</I> <li>Spa: <I>algun vino</I> <li>Swe: <I>något vin</I> <li>Tha: <I>เหล้าองุ่นบ้างขวด</I> <li>Urd: <I>كچھ شراب</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>that_Det</CODE></TD> <TD><CODE>that_Det</CODE></TD>
@@ -2656,7 +2656,7 @@ Lexical category, constructors given in
<TR> <TR>
<TD><CODE>mkQCl</CODE></TD> <TD><CODE>mkQCl</CODE></TD>
<TD><A HREF="#IP" TITLE="IP - interrogative pronoun">IP</A> <CODE>-&gt;</CODE> <A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#QCl" TITLE="QCl - question clause, with all tenses">QCl</A></TD> <TD><A HREF="#IP" TITLE="IP - interrogative pronoun">IP</A> <CODE>-&gt;</CODE> <A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#QCl" TITLE="QCl - question clause, with all tenses">QCl</A></TD>
<TD><div class=reveal> <I>who is here</I> <div class=popup> <ul> <li>API: <CODE>mkQCl who_IP here_Adv</CODE> <li>Afr: <I>wie is hier</I> <li>Bul: <I>кой е тук</I> <li>Cat: <I>qui és aquí</I> <li>Dan: <I>hvem er her</I> <li>Dut: <I>wie is hier</I> <li>Eng: <I>who is here</I> <li>Fin: <I>kuka on täällä</I> <li>Fre: <I>qui est ici</I> <li>Ger: <I>wer ist hier</I> <li>Ita: <I>chi è quà</I> <li>Nep: <I>को यहाँ छन्</I> <li>Nor: <I>hvem er her</I> <li>Pes: <I>چه کسی اینجا است</I> <li>Pnb: <I>كون ایتھے اے</I> <li>Pol: <I>kto jest tutaj</I> <li>Ron: <I>cine este aici</I> <li>Rus: <I>кто здесь</I> <li>Spa: <I>quién es aquí</I> <li>Swe: <I>vem är här</I> <li>Tha: <I>ไคร ที่นี่</I> <li>Urd: <I>كون یہاں ہے</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>who is here</I> <div class=popup> <ul> <li>API: <CODE>mkQCl who_IP here_Adv</CODE> <li>Afr: <I>wie is hier</I> <li>Bul: <I>кой е тук</I> <li>Cat: <I>qui és aquí</I> <li>Dan: <I>hvem er her</I> <li>Dut: <I>wie is hier</I> <li>Eng: <I>who is here</I> <li>Fin: <I>kuka on täällä</I> <li>Fre: <I>qui est ici</I> <li>Ger: <I>wer ist hier</I> <li>Ita: <I>chi è quà</I> <li>Nep: <I>को यहाँ छन्</I> <li>Nor: <I>hvem er her</I> <li>Pes: <I>چه کسی اینجا است</I> <li>Pnb: <I>كون ایتھے اے</I> <li>Pol: <I>kto jest tutaj</I> <li>Ron: <I>cine este aici</I> <li>Rus: <I>кто здесь</I> <li>Spa: <I>quién es aquí</I> <li>Swe: <I>vem är här</I> <li>Tha: <I>ไครอยู่ที่นี่</I> <li>Urd: <I>كون یہاں ہے</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>mkQCl</CODE></TD> <TD><CODE>mkQCl</CODE></TD>
@@ -2681,12 +2681,12 @@ Lexical category, constructors given in
<TR> <TR>
<TD><CODE>mkQCl</CODE></TD> <TD><CODE>mkQCl</CODE></TD>
<TD><A HREF="#IAdv" TITLE="IAdv - interrogative adverb">IAdv</A> <CODE>-&gt;</CODE> <A HREF="#NP" TITLE="NP - noun phrase (subject or object)">NP</A> <CODE>-&gt;</CODE> <A HREF="#QCl" TITLE="QCl - question clause, with all tenses">QCl</A></TD> <TD><A HREF="#IAdv" TITLE="IAdv - interrogative adverb">IAdv</A> <CODE>-&gt;</CODE> <A HREF="#NP" TITLE="NP - noun phrase (subject or object)">NP</A> <CODE>-&gt;</CODE> <A HREF="#QCl" TITLE="QCl - question clause, with all tenses">QCl</A></TD>
<TD><div class=reveal> <I>where is she</I> <div class=popup> <ul> <li>API: <CODE>mkQCl where_IAdv she_NP</CODE> <li>Afr: <I>waar is sy</I> <li>Bul: <I>къде е тя</I> <li>Cat: <I>on és ella</I> <li>Dan: <I>hvor er hun</I> <li>Dut: <I>waar is ze</I> <li>Eng: <I>where is she</I> <li>Fin: <I>missä hän on</I> <li>Fre: <I>où est elle</I> <li>Ger: <I>wo ist sie</I> <li>Ita: <I>dove è lei</I> <li>Nep: <I>उनी कहाँ छिन्</I> <li>Nor: <I>hvor er hun</I> <li>Pes: <I>او کجا است</I> <li>Pnb: <I>او كتھے اے</I> <li>Pol: <I>gdzie jest ona</I> <li>Ron: <I>unde este ea</I> <li>Rus: <I>где она</I> <li>Spa: <I>donde es ella</I> <li>Swe: <I>var är hon</I> <li>Tha: <I>เขา ที่ไหน</I> <li>Urd: <I>وہ كہاں ہے</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>where is she</I> <div class=popup> <ul> <li>API: <CODE>mkQCl where_IAdv she_NP</CODE> <li>Afr: <I>waar is sy</I> <li>Bul: <I>къде е тя</I> <li>Cat: <I>on és ella</I> <li>Dan: <I>hvor er hun</I> <li>Dut: <I>waar is ze</I> <li>Eng: <I>where is she</I> <li>Fin: <I>missä hän on</I> <li>Fre: <I>où est elle</I> <li>Ger: <I>wo ist sie</I> <li>Ita: <I>dove è lei</I> <li>Nep: <I>उनी कहाँ छिन्</I> <li>Nor: <I>hvor er hun</I> <li>Pes: <I>او کجا است</I> <li>Pnb: <I>او كتھے اے</I> <li>Pol: <I>gdzie jest ona</I> <li>Ron: <I>unde este ea</I> <li>Rus: <I>где она</I> <li>Spa: <I>donde es ella</I> <li>Swe: <I>var är hon</I> <li>Tha: <I>เขาอยู่ที่ไหน</I> <li>Urd: <I>وہ كہاں ہے</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>mkQCl</CODE></TD> <TD><CODE>mkQCl</CODE></TD>
<TD><A HREF="#IComp" TITLE="IComp - interrogative complement of copula">IComp</A> <CODE>-&gt;</CODE> <A HREF="#NP" TITLE="NP - noun phrase (subject or object)">NP</A> <CODE>-&gt;</CODE> <A HREF="#QCl" TITLE="QCl - question clause, with all tenses">QCl</A></TD> <TD><A HREF="#IComp" TITLE="IComp - interrogative complement of copula">IComp</A> <CODE>-&gt;</CODE> <A HREF="#NP" TITLE="NP - noun phrase (subject or object)">NP</A> <CODE>-&gt;</CODE> <A HREF="#QCl" TITLE="QCl - question clause, with all tenses">QCl</A></TD>
<TD><div class=reveal> <I>who is this man</I> <div class=popup> <ul> <li>API: <CODE>mkQCl (mkIComp who_IP) (mkNP this_Det man_N)</CODE> <li>Afr: <I>wie is hierdie man</I> <li>Bul: <I>кой е този мъж</I> <li>Cat: <I>qui és aquest home</I> <li>Dan: <I>hvem er denne mand</I> <li>Dut: <I>wie is deze man</I> <li>Eng: <I>who is this man</I> <li>Fin: <I>kuka tämä mies on</I> <li>Fre: <I>qui est cet homme</I> <li>Ger: <I>wer ist dieser Mann</I> <li>Ita: <I>chi è questo uomo</I> <li>Nep: <I>यो मान्छे को छ</I> <li>Nor: <I>hvem er denne mannen</I> <li>Pes: <I>این مرد چه کسی است</I> <li>Pnb: <I>اے بندہ كون اے</I> <li>Pol: <I>kim jest ten mężczyzna</I> <li>Ron: <I>cine este acest om</I> <li>Rus: <I>кто этот человек</I> <li>Spa: <I>quién es este hombre</I> <li>Swe: <I>vem är den här mannen</I> <li>Tha: <I>ชาย คน นี้ ไคร</I> <li>Urd: <I>یہ آدمی كون ہے</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>who is this man</I> <div class=popup> <ul> <li>API: <CODE>mkQCl (mkIComp who_IP) (mkNP this_Det man_N)</CODE> <li>Afr: <I>wie is hierdie man</I> <li>Bul: <I>кой е този мъж</I> <li>Cat: <I>qui és aquest home</I> <li>Dan: <I>hvem er denne mand</I> <li>Dut: <I>wie is deze man</I> <li>Eng: <I>who is this man</I> <li>Fin: <I>kuka tämä mies on</I> <li>Fre: <I>qui est cet homme</I> <li>Ger: <I>wer ist dieser Mann</I> <li>Ita: <I>chi è questo uomo</I> <li>Nep: <I>यो मान्छे को छ</I> <li>Nor: <I>hvem er denne mannen</I> <li>Pes: <I>این مرد چه کسی است</I> <li>Pnb: <I>اے بندہ كون اے</I> <li>Pol: <I>kim jest ten mężczyzna</I> <li>Ron: <I>cine este acest om</I> <li>Rus: <I>кто этот человек</I> <li>Spa: <I>quién es este hombre</I> <li>Swe: <I>vem är den här mannen</I> <li>Tha: <I>ชายคนนี้เป็นไคร</I> <li>Urd: <I>یہ آدمی كون ہے</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>mkQCl</CODE></TD> <TD><CODE>mkQCl</CODE></TD>
@@ -2874,7 +2874,7 @@ Lexical category, constructors given in
<TR> <TR>
<TD><CODE>mkRCl</CODE></TD> <TD><CODE>mkRCl</CODE></TD>
<TD><A HREF="#RP" TITLE="RP - relative pronoun">RP</A> <CODE>-&gt;</CODE> <A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#RCl" TITLE="RCl - relative clause, with all tenses">RCl</A></TD> <TD><A HREF="#RP" TITLE="RP - relative pronoun">RP</A> <CODE>-&gt;</CODE> <A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#RCl" TITLE="RCl - relative clause, with all tenses">RCl</A></TD>
<TD><div class=reveal> <I>woman who is here</I> <div class=popup> <ul> <li>API: <CODE>mkCN woman_N (mkRS (mkRCl which_RP here_Adv))</CODE> <li>Afr: <I>vrou wat hier is</I> <li>Bul: <I>жена която е тук</I> <li>Cat: <I>dona que és aquí</I> <li>Dan: <I>kvinde som er her</I> <li>Dut: <I>vrouw die hier is</I> <li>Eng: <I>woman who is here</I> <li>Fin: <I>nainen joka on täällä</I> <li>Fre: <I>femme qui est ici</I> <li>Ger: <I>Frau die hier ist</I> <li>Ita: <I>donna che è quà</I> <li>Nep: <I>आईमाई जो यहाँ छे</I> <li>Nor: <I>kvinne som er her</I> <li>Pes: <I>زنی که اینجا است</I> <li>Pnb: <I>{s : ParamX.Number =&gt; ResPnb.Case =&gt; Str</I> <li>Pol: <I>kobieta , która jest tutaj</I> <li>Ron: <I>femeie care este aici</I> <li>Rus: <I>женщина , которая здесь</I> <li>Spa: <I>mujer que es aquí</I> <li>Swe: <I>kvinna som är här</I> <li>Tha: <I>หญิง ที่ ที่นี่</I> <li>Urd: <I>عورت جو یہاں ہے</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>woman who is here</I> <div class=popup> <ul> <li>API: <CODE>mkCN woman_N (mkRS (mkRCl which_RP here_Adv))</CODE> <li>Afr: <I>vrou wat hier is</I> <li>Bul: <I>жена която е тук</I> <li>Cat: <I>dona que és aquí</I> <li>Dan: <I>kvinde som er her</I> <li>Dut: <I>vrouw die hier is</I> <li>Eng: <I>woman who is here</I> <li>Fin: <I>nainen joka on täällä</I> <li>Fre: <I>femme qui est ici</I> <li>Ger: <I>Frau die hier ist</I> <li>Ita: <I>donna che è quà</I> <li>Nep: <I>आईमाई जो यहाँ छे</I> <li>Nor: <I>kvinne som er her</I> <li>Pes: <I>زنی که اینجا است</I> <li>Pnb: <I>{s : ParamX.Number =&gt; ResPnb.Case =&gt; Str</I> <li>Pol: <I>kobieta , która jest tutaj</I> <li>Ron: <I>femeie care este aici</I> <li>Rus: <I>женщина , которая здесь</I> <li>Spa: <I>mujer que es aquí</I> <li>Swe: <I>kvinna som är här</I> <li>Tha: <I>หญิงที่อยู่ที่นี่</I> <li>Urd: <I>عورت جو یہاں ہے</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>mkRCl</CODE></TD> <TD><CODE>mkRCl</CODE></TD>
@@ -3555,7 +3555,7 @@ Lexical category, constructors given in
<TR> <TR>
<TD><CODE>mkVP</CODE></TD> <TD><CODE>mkVP</CODE></TD>
<TD><A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#VP" TITLE="VP - verb phrase">VP</A></TD> <TD><A HREF="#Adv" TITLE="Adv - verb-phrase-modifying adverb">Adv</A> <CODE>-&gt;</CODE> <A HREF="#VP" TITLE="VP - verb phrase">VP</A></TD>
<TD><div class=reveal> <I>to be here</I> <div class=popup> <ul> <li>API: <CODE>mkUtt (mkVP here_Adv)</CODE> <li>Afr: <I>hier wees</I> <li>Bul: <I>да е тук</I> <li>Cat: <I>ser aquí</I> <li>Dan: <I>at være her</I> <li>Dut: <I>hier zijn</I> <li>Eng: <I>to be here</I> <li>Fin: <I>olla täällä</I> <li>Fre: <I>être ici</I> <li>Ger: <I>hier sein</I> <li>Ita: <I>essere quà</I> <li>Nep: <I>यहाँ</I> <li>Nor: <I>å være her</I> <li>Pes: <I>اینجا بودن</I> <li>Pnb: <I>ایتھے</I> <li>Pol: <I>być tutaj</I> <li>Ron: <I>sã fie aici</I> <li>Rus: <I>быть здесь</I> <li>Spa: <I>ser aquí</I> <li>Swe: <I>att vara här</I> <li>Tha: <I>ที่นี่</I> <li>Urd: <I>یہاں</I> </ul> </div> </div></TD> <TD><div class=reveal> <I>to be here</I> <div class=popup> <ul> <li>API: <CODE>mkUtt (mkVP here_Adv)</CODE> <li>Afr: <I>hier wees</I> <li>Bul: <I>да е тук</I> <li>Cat: <I>ser aquí</I> <li>Dan: <I>at være her</I> <li>Dut: <I>hier zijn</I> <li>Eng: <I>to be here</I> <li>Fin: <I>olla täällä</I> <li>Fre: <I>être ici</I> <li>Ger: <I>hier sein</I> <li>Ita: <I>essere quà</I> <li>Nep: <I>यहाँ</I> <li>Nor: <I>å være her</I> <li>Pes: <I>اینجا بودن</I> <li>Pnb: <I>ایتھے</I> <li>Pol: <I>być tutaj</I> <li>Ron: <I>sã fie aici</I> <li>Rus: <I>быть здесь</I> <li>Spa: <I>ser aquí</I> <li>Swe: <I>att vara här</I> <li>Tha: <I>อยู่ที่นี่</I> <li>Urd: <I>یہاں</I> </ul> </div> </div></TD>
</TR> </TR>
<TR> <TR>
<TD><CODE>mkVP</CODE></TD> <TD><CODE>mkVP</CODE></TD>

2
lib/src/mini/MiniGrammarEng.gf
View File

@@ -1,4 +1,4 @@
--# -path=.:full:alltenses --# -path=.:alltenses
concrete MiniGrammarEng of MiniGrammar = LexiconEng, GrammarEng [ concrete MiniGrammarEng of MiniGrammar = LexiconEng, GrammarEng [

2
lib/src/thai/LexiconTha.gf
View File

@@ -239,7 +239,7 @@ lin
read_V2 = mkV2 "อ่าน" ; read_V2 = mkV2 "อ่าน" ;
red_A = mkA (thword "สี" "แดง") ; red_A = mkA (thword "สี" "แดง") ;
religion_N = mkN (thword "ศาส" "นา") ; ----? religion_N = mkN (thword "ศาส" "นา") ; ----?
restaurant_N = placeN (thword "ร้าน" "อาหาร") ; restaurant_N = placeN (thword "ร้าน" "อา" "หาร") ;
right_Ord = ss "ขวา" ; right_Ord = ss "ขวา" ;
river_N = mkN (thword "แม่" "น้ำ") ; river_N = mkN (thword "แม่" "น้ำ") ;
road_N = mkN (thword "ถนน") ; road_N = mkN (thword "ถนน") ;

6
lib/src/thai/QuestionTha.gf
View File

@@ -17,7 +17,7 @@ concrete QuestionTha of Question = CatTha **
QuestIAdv iadv cl = {s = \\p => thbind (cl.s ! ClDecl ! p) iadv.s} ; QuestIAdv iadv cl = {s = \\p => thbind (cl.s ! ClDecl ! p) iadv.s} ;
QuestIComp icomp np = {s = \\p => thbind np.s icomp.s} ; QuestIComp icomp np = {s = \\p => thbind np.s (polStr may_s p) icomp.s} ;
PrepIP p ip = thbind p ip ; PrepIP p ip = thbind p ip ;
@@ -37,9 +37,9 @@ concrete QuestionTha of Question = CatTha **
AdvIAdv i a = thbind i a ; AdvIAdv i a = thbind i a ;
CompIAdv a = a ; CompIAdv a = ss (thbind yuu_s a.s) ;
CompIP ip = ip ; CompIP ip = ss (thbind pen_s ip.s) ;
} }

2
lib/src/thai/StringsTha.gf
View File

@@ -94,6 +94,6 @@ yay_s = "ใหญ" ; -- big
yig_s = "หญิง" ; -- woman2 yig_s = "หญิง" ; -- woman2
yii_s = "ยี่" ; -- two' yii_s = "ยี่" ; -- two'
yin_s = "ยิน" ; -- you're-welcome1 yin_s = "ยิน" ; -- you're-welcome1
yuu_s = "ยู" ; -- where0(?) yuu_s = "อยู่" ; -- be (in a place)
} }

1
lib/src/thai/ThaiScript.hs
View File

@@ -13,6 +13,7 @@ allThpron = do
System.system "ls *Tha*.gf ../api/*Tha*.gf >srcThai.txt" System.system "ls *Tha*.gf ../api/*Tha*.gf >srcThai.txt"
files <- readFile "srcThai.txt" >>= return . lines files <- readFile "srcThai.txt" >>= return . lines
mapM_ fileThpron files mapM_ fileThpron files
return ()
fileThpron file = do fileThpron file = do
s <- readFile file s <- readFile file

2
lib/src/thai/VerbTha.gf
View File

@@ -73,7 +73,7 @@ concrete VerbTha of Verb = CatTha ** open ResTha, StringsTha, Prelude in {
} }
} ; } ;
CompAdv a = {s = \\p => polStr may_s p ++ a.s} ; --- ?? CompAdv a = {s = \\p => thbind (polStr may_s p) yuu_s a.s} ; --- works for place adverbs
} }