From fb8a7357c4c502a351aae3f18cf6cb75f07064cb Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 3 Aug 2004 11:47:32 +0000 Subject: [PATCH] Preparing for release. --- bin/jgf2 | 2 +- examples/letter/README | 34 +++++++++++++++++++ examples/numerals/README | 37 +++++++++++++++++++++ examples/numerals/arabic_modern.gf | 2 +- examples/numerals/finnish.gf | 2 +- grammars/mkDistr.sh | 41 +++++++++++++++++++++++ lib/resource-0.6/README | 53 ++++++++++++++++++++++++++++++ src/GF/Shell/ShellCommands.hs | 2 +- src/GF/Shell/SubShell.hs | 8 +++-- 9 files changed, 174 insertions(+), 7 deletions(-) create mode 100644 examples/letter/README create mode 100644 examples/numerals/README create mode 100644 grammars/mkDistr.sh create mode 100644 lib/resource-0.6/README diff --git a/bin/jgf2 b/bin/jgf2 index ed5fc144d..c4911446f 100644 --- a/bin/jgf2 +++ b/bin/jgf2 @@ -4,7 +4,7 @@ GFHOME=/home/aarne/GF2/bin JGUILIB=$GFHOME/java/ -GF=$GFHOME/gf2 +GF=$GFHOME/gf JGUI=GFEditor2 java -cp $JGUILIB $JGUI "$GF -java $*" diff --git a/examples/letter/README b/examples/letter/README new file mode 100644 index 000000000..eb5724dc7 --- /dev/null +++ b/examples/letter/README @@ -0,0 +1,34 @@ +GF challenges Microsoft Works! Here you find templates for +multilingual authoring of business and love letters! + +Another point of these grammars is to illustrate how +local updates are propagated everywhere in the document. +Form, in the editor + + Dear Colleague, + + I love you. + + With best regards, + + your wife + +and change between ColleagueHe, ColleagueShe, ColleaguesHe, ColleaguesShe. + +The grammars are somewhat ad hoc and messy, and could be improved +with better abstractions. + +(AR 2001) + +To use in the editor, it is a good idea to precompile: + + gf 2341.html + +(Requires the gft program, produces by "make gft" in GF sources) + +Document last updated August 3, 2004 by Aarne Ranta. + +Copyright (c) Koen Claessen, Carlos Gonzalía, Qiao Haiyan, Harald +Hammarström, Patrik Jansson, Peter Ljunglöf, Wojciech Mostowski, Aarne +Ranta, Karol Ostrovski, David Wahlstedt 1999--2004, under +GNU General Public License (GPL). diff --git a/examples/numerals/arabic_modern.gf b/examples/numerals/arabic_modern.gf index 5c2433400..f4f8e75fb 100644 --- a/examples/numerals/arabic_modern.gf +++ b/examples/numerals/arabic_modern.gf @@ -1,5 +1,5 @@ include numerals.Abs.gf ; - +--- flags unlexer=reverse ; param DForm = unit Place | teen | ten | hund ; param Size = small | large | dual ; param Place = attr | indep ; diff --git a/examples/numerals/finnish.gf b/examples/numerals/finnish.gf index 6cb789ff2..b1514554b 100644 --- a/examples/numerals/finnish.gf +++ b/examples/numerals/finnish.gf @@ -1,6 +1,6 @@ include numerals.Abs.gf ; -param Place = attr | indep ; +param Place = indep | attr ; param Nm = sg | pl ; oper sata : Nm => Str = table {{sg} => "sata" ; {pl} => "sataa"} ; diff --git a/grammars/mkDistr.sh b/grammars/mkDistr.sh new file mode 100644 index 000000000..27632e2f9 --- /dev/null +++ b/grammars/mkDistr.sh @@ -0,0 +1,41 @@ +rm -rf grammars +mkdir -pv grammars +mkdir -pv grammars/letter +mkdir -pv grammars/logic +mkdir -pv grammars/numerals +mkdir -pv grammars/prelude +mkdir -pv grammars/resource +mkdir -pv grammars/resource/abstract +mkdir -pv grammars/resource/english +mkdir -pv grammars/resource/finnish +mkdir -pv grammars/resource/french +mkdir -pv grammars/resource/german +mkdir -pv grammars/resource/italian +mkdir -pv grammars/resource/romance +mkdir -pv grammars/resource/russian +mkdir -pv grammars/resource/swedish + +cp -pv letter/README grammars/letter/ +cp -pv letter/mkLetter.gfs grammars/letter/ +cp -pv letter/*.gf grammars/letter/ + +# cp -pv logic/*.gf grammars/logic/ + +cp -pv newnumerals/README grammars/numerals/ +cp -pv newnumerals/*.gf grammars/numerals/ +cp -pv newnumerals/mkNumerals.gfs grammars/numerals/ + +cp -pv prelude/*.gf grammars/prelude/ + +cp -pv newresource/mkTest.gf grammars/resource/ +cp -pv newresource/mkParadigms.gf grammars/resource/ +cp -pv newresource/README grammars/resource/ +cp -pv newresource/abstract/*.gf grammars/resource/abstract/ +cp -pv newresource/english/*.gf grammars/resource/english/ +cp -pv newresource/finnish/*.gf grammars/resource/finnish/ +cp -pv newresource/french/*.gf grammars/resource/french/ +cp -pv newresource/german/*.gf grammars/resource/german/ +cp -pv newresource/italian/*.gf grammars/resource/italian/ +cp -pv newresource/romance/*.gf grammars/resource/romance/ +cp -pv newresource/russian/*.gf grammars/resource/russian/ +cp -pv newresource/swedish/*.gf grammars/resource/swedish/ diff --git a/lib/resource-0.6/README b/lib/resource-0.6/README new file mode 100644 index 000000000..1517d710f --- /dev/null +++ b/lib/resource-0.6/README @@ -0,0 +1,53 @@ +GF Resource grammar library, v. 0.6. + +To precompile a test suite: + + gf flags "printer" CSystemCommand _ -> none - CPrintGrammar -> both "utf8" "printer" + CPrintGrammar -> both "utf8" "printer lang" CPrintMultiGrammar -> opts "utf8" CHelp _ -> opts "all" diff --git a/src/GF/Shell/SubShell.hs b/src/GF/Shell/SubShell.hs index 0134b3530..bdfbe8884 100644 --- a/src/GF/Shell/SubShell.hs +++ b/src/GF/Shell/SubShell.hs @@ -9,6 +9,8 @@ import API import CommandL import ArchEdit +import List + -- AR 20/4/2000 -- 12/11/2001 editSession :: Options -> ShellState -> IO () @@ -26,10 +28,10 @@ translateSession :: Options -> ShellState -> IO () translateSession opts st = do let grs = allStateGrammars st cat = firstCatOpts opts (firstStateGrammar st) - trans s = unlines $ + trans s = unlines $ if oElem showLang opts then - [l +++ ":" +++ s | (l,s) <- zip (map (prIdent . cncId) grs) - (translateBetweenAll grs cat s)] + sort $ [l +++ ":" +++ s | (l,s) <- zip (map (prIdent . cncId) grs) + (translateBetweenAll grs cat s)] else translateBetweenAll grs cat s translateLoop opts trans