added Ice and Nno to synopsis and ResourceDemo, and updated documentation

Setup.hs

@@ -214,6 +214,7 @@ langsCoding = [
   (("hebrew",   "Heb"),""),
   (("hindi",    "Hin"),"to_devanagari"),
   (("german",   "Ger"),""),
+  (("icelandic","Ice"),""),
   (("interlingua","Ina"),""),
   (("italian",  "Ita"),""),
   (("japanese", "Jpn"),""),
@@ -223,6 +224,7 @@ langsCoding = [
   (("mongolian","Mon"),""),
   (("nepali",   "Nep"),""),
   (("norwegian","Nor"),""),
+  (("nynorsk",  "Nno"),""),
   (("persian",  "Pes"),""),
   (("polish",   "Pol"),""),
   (("punjabi",   "Pnb"),""),
@@ -246,7 +248,7 @@ langsLang = langs -- `except` ["Amh","Ara","Lat","Tur"]
 --langsLang = langs `only` ["Fin"] --test
 
 -- languagues that have notpresent marked
-langsPresent = langsLang `except` ["Afr","Chi","Gre","Heb","Jpn","Mlt","Mon","Nep","Pes","Snd","Tha","Thb","Est"]
+langsPresent = langsLang `except` ["Afr","Chi","Gre","Heb","Ice","Jpn","Mlt","Mon","Nep","Pes","Snd","Tha","Thb","Est"]
 
 -- languages for which to compile Try
 langsAPI  = langsLang `except` langsIncomplete -- ["Ina","Amh","Ara"]
@@ -254,7 +256,7 @@ langsAPI  = langsLang `except` langsIncomplete -- ["Ina","Amh","Ara"]
 langsIncomplete = ["Amh","Ara","Grc","Heb","Ina","Lat","Tur"]
 
 -- languages for which to compile Symbolic
-langsSymbolic  = langsAPI `except` ["Afr","Jpn","Mon","Nep"]
+langsSymbolic  = langsAPI `except` ["Afr","Ice","Jpn","Mon","Nep"]
 
 -- languages for which to run demo test
 langsDemo = langsLang `except` ["Ara","Hin","Ina","Lav","Tha"]

lib/doc/Makefile

@@ -34,6 +34,7 @@ exx: exx-script
 	gf -retain -s $(GF_alltenses)/TryGer.gfo <api-examples.gfs >api-examples-Ger.txt
 	gf -retain -s $(GF_alltenses)/TryGre.gfo <api-examples.gfs >api-examples-Gre.txt
 	gf -retain -s $(GF_alltenses)/TryHin.gfo <api-examples.gfs >api-examples-Hin.txt
+	gf -retain -s $(GF_alltenses)/TryIce.gfo <api-examples.gfs >api-examples-Ice.txt
 	gf -retain -s $(GF_alltenses)/TryIta.gfo <api-examples.gfs >api-examples-Ita.txt
 	gf -retain -s $(GF_alltenses)/TryJpn.gfo <api-examples.gfs >api-examples-Jpn.txt
 	gf -retain -s $(GF_alltenses)/TryLav.gfo <api-examples.gfs >api-examples-Lav.txt
@@ -41,6 +42,7 @@ exx: exx-script
 	gf -retain -s $(GF_alltenses)/TryMon.gfo <api-examples.gfs >api-examples-Mon.txt
 	gf -retain -s $(GF_alltenses)/TryNep.gfo <api-examples.gfs >api-examples-Nep.txt
 	gf -retain -s $(GF_alltenses)/TryNor.gfo <api-examples.gfs >api-examples-Nor.txt
+	gf -retain -s $(GF_alltenses)/TryNno.gfo <api-examples.gfs >api-examples-Nno.txt
 	gf -retain -s $(GF_alltenses)/TryPes.gfo <api-examples.gfs >api-examples-Pes.txt
 	gf -retain -s $(GF_alltenses)/TryPnb.gfo <api-examples.gfs >api-examples-Pnb.txt
 	gf -retain -s $(GF_alltenses)/TryPol.gfo <api-examples.gfs >api-examples-Pol.txt

lib/doc/MkSynopsis.hs

@@ -19,7 +19,7 @@ revealedLang = "Eng"
 -- all languages shown
 apiExxFiles = ["api-examples-" ++ lang ++ ".txt" | lang <- words
 --   "Eng Chi"
-  "Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Mon Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd"
+  "Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ice Ita Jpn Lav Mlt Mon Nep Nor Nno Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd"
    ]
 
 main = do
@@ -252,6 +252,7 @@ paradigmFiles = [
   ("German",  srcPath "/german/ParadigmsGer.gf"),
   ("Greek",  srcPath "/greek/ParadigmsGre.gf"),
   ("Hindi", srcPath "/hindi/ParadigmsHin.gf"),
+  ("Icelandic", srcPath "/icelandic/ParadigmsIce.gf"),
 --  ("Interlingua", srcPath "/interlingua/ParadigmsIna.gf"),
   ("Italian",  srcPath "/italian/ParadigmsIta.gf"),
   ("Japanese",  srcPath "/japanese/ParadigmsJpn.gf"),
@@ -260,6 +261,7 @@ paradigmFiles = [
   ("Mongolian",  srcPath "/mongolian/ParadigmsMon.gf"),
   ("Nepali", srcPath "/nepali/ParadigmsNep.gf"),
   ("Norwegian", srcPath "/norwegian/ParadigmsNor.gf"),
+  ("Nynorsk", srcPath "/nynorsk/ParadigmsNno.gf"),
   ("Polish", srcPath "/polish/ParadigmsPol.gf"),
   ("Punjabi", srcPath "/punjabi/ParadigmsPnb.gf"),
   ("Romanian", srcPath "/romanian/ParadigmsRon.gf"),

lib/doc/rgl-publications.html

@@ -9,7 +9,7 @@
 <CENTER>
 <H1>GF Resource Grammar Library Documentation and Publications</H1>
 <FONT SIZE="4"><I>Aarne Ranta</I></FONT><BR>
-<FONT SIZE="4">20131018</FONT>
+<FONT SIZE="4">20170119</FONT>
 </CENTER>
 
 <P>
@@ -239,6 +239,16 @@ In The 3rd Workshop
 on South and Southeast Asian NLP, COLING 2012. <I>Reprinted in Shafqat's thesis</I>
 </UL>
 
+<H3>Icelandic</H3>
+
+<UL>
+<LI><B>Source</B>: <A HREF="http://www.grammaticalframework.org/lib/src/icelandic">http://www.grammaticalframework.org/lib/src/icelandic</A> (Bjarki Traustason)
+<P></P>
+<B>Publications</B>
+<P></P>
+Bjarki Traustason, MSc thesis, Chalmers
+</UL>
+
 <H3>Interlingua</H3>
 
 <UL>
@@ -325,12 +335,18 @@ MSc thesis, Chalmers University of Technology,
 <A HREF="http://publications.lib.chalmers.se/records/fulltext/161384.pdf">http://publications.lib.chalmers.se/records/fulltext/161384.pdf</A>
 </UL>
 
-<H3>Norwegian</H3>
+<H3>Norwegian (bokmål)</H3>
 
 <UL>
 <LI><B>Source</B>: <A HREF="http://www.grammaticalframework.org/lib/src/norwegian">http://www.grammaticalframework.org/lib/src/norwegian</A>  <A HREF="http://www.grammaticalframework.org/lib/src/scandinavian">http://www.grammaticalframework.org/lib/src/scandinavian</A> (Aarne Ranta)
 </UL>
 
+<H3>Norwegian (nynorsk)</H3>
+
+<UL>
+<LI><B>Source</B>: <A HREF="http://www.grammaticalframework.org/lib/src/nynorsk">http://www.grammaticalframework.org/lib/src/nynorsk</A> (Stian Rødven Eide) <A HREF="http://www.grammaticalframework.org/lib/src/scandinavian">http://www.grammaticalframework.org/lib/src/scandinavian</A> (Aarne Ranta)
+</UL>
+
 <H3>Persian</H3>
 
 <UL>

lib/doc/rgl-publications.txt

@@ -258,6 +258,15 @@ on South and Southeast Asian NLP, COLING 2012. //Reprinted in Shafqat's thesis//
 
 
 
+===Icelandic===
+
+- **Source**: http://www.grammaticalframework.org/lib/src/icelandic (Bjarki Traustason)
+
+**Publications**
+
+Bjarki Traustason, MSc thesis, Chalmers
+
+
 ===Interlingua===
 
 - **Source**: http://www.grammaticalframework.org/lib/src/interlingua (Jean-Philippe Bernardy)
@@ -350,12 +359,18 @@ http://publications.lib.chalmers.se/records/fulltext/161384.pdf
 
 
 
-===Norwegian===
+===Norwegian (bokmål)===
 
 - **Source**: http://www.grammaticalframework.org/lib/src/norwegian  http://www.grammaticalframework.org/lib/src/scandinavian (Aarne Ranta)
 
 %- **Publications**
 
+===Norwegian (nynorsk)===
+
+- **Source**: http://www.grammaticalframework.org/lib/src/nynorsk (Stian Rødven Eide) http://www.grammaticalframework.org/lib/src/scandinavian (Aarne Ranta)
+
+%- **Publications**
+
 
 ===Persian===
 

lib/doc/status.html

@@ -2,12 +2,13 @@
 <HTML>
 <HEAD>
 <META NAME="generator" CONTENT="http://txt2tags.org">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf8">
 <TITLE>The Status of the GF Resource Grammar Library</TITLE>
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <CENTER>
 <H1>The Status of the GF Resource Grammar Library</H1>
 <FONT SIZE="4"><I>Aarne Ranta</I></FONT><BR>
-<FONT SIZE="4">20150313</FONT>
+<FONT SIZE="4">20170119</FONT>
 </CENTER>
 
 <P>
@@ -332,6 +333,23 @@ are marked in the table
 <TD>*SV,*KP,MH,AR,PK</TD>
 </TR>
 <TR>
+<TD>Ice</TD>
+<TD>Icelandic</TD>
+<TD>+</TD>
+<TD>-</TD>
+<TD>++</TD>
+<TD>+</TD>
+<TD>+</TD>
+<TD>+</TD>
+<TD>-</TD>
+<TD>-</TD>
+<TD>-</TD>
+<TD>-</TD>
+<TD>-</TD>
+<TD>+</TD>
+<TD>*BT</TD>
+</TR>
+<TR>
 <TD>Ina</TD>
 <TD>Interlingua</TD>
 <TD>+</TD>
@@ -393,7 +411,7 @@ are marked in the table
 <TD>-</TD>
 <TD>-</TD>
 <TD>-</TD>
-<TD>-</TD>
+<TD>+</TD>
 <TD>-</TD>
 <TD>-</TD>
 <TD>-</TD>
@@ -468,6 +486,23 @@ are marked in the table
 <TD>*DS</TD>
 </TR>
 <TR>
+<TD>Nno</TD>
+<TD>Norwegian(n)</TD>
+<TD>+</TD>
+<TD>+</TD>
+<TD>++</TD>
+<TD>+</TD>
+<TD>+</TD>
+<TD>+</TD>
+<TD>+</TD>
+<TD>+</TD>
+<TD>-</TD>
+<TD>-</TD>
+<TD>-</TD>
+<TD>-</TD>
+<TD>*SRE</TD>
+</TR>
+<TR>
 <TD>Nor</TD>
 <TD>Norwegian(b)</TD>
 <TD>+</TD>
@@ -563,8 +598,8 @@ are marked in the table
 <TD>+</TD>
 <TD>-</TD>
 <TD>-</TD>
-<TD>-</TD>
+<TD>+</TD>
-<TD>-</TD>
+<TD>+</TD>
 <TD>-</TD>
 <TD>+</TD>
 <TD>JK,*NF</TD>
@@ -759,15 +794,16 @@ AB Ansu Berg,
 AD Ali El Dada,
 AR Aarne Ranta,
 AS Adam Slaski,
-BB Björn Bringert,
+BB Björn Bringert,
+BT Bjarki Traustason,
 CK Chotiros Kairoje,
 CP Chen Peng,
-DD Dana Dannélls,
+DD Dana Dannélls,
 DS Dinesh Simk,
 EA Elnaz Abolahrar,
-EG Erzsébet Galgóczy
+EG Erzsébet Galgóczy
 FJ Femke Johansson,
-HH Harald Hammarström,
+HH Harald Hammarström,
 HLa Herbert Lange,
 HLe Hans Leiss,
 GP Gabriele Paganelli,
@@ -799,8 +835,9 @@ RE Ramona Enache,
 PP Peteris Paikens,
 SC Server Cimen,
 SM Sofy Moradi,
+SRE Stian Rødven Eide,
 SV Shafqat Virk,
-TH Therese Söderberg,
+TH Therese Söderberg,
 WN Wanjiku Ng'ang'a,
 ZL Zhuo Lin Qiqige
 </P>

lib/doc/status.txt

@@ -2,7 +2,7 @@ The Status of the GF Resource Grammar Library
 Aarne Ranta
 %%date
 
-
+%!Encoding:utf8
 
 The following table gives the languages currently available in the
 GF Resource Grammar Library.
@@ -33,20 +33,22 @@ are marked in the table
 | Grc   | Greek(anc)   | -     | -    | -     | -   | -    | -   | -    | -     | -    | - | -      | +      | *HLe
 | Heb   | Hebrew       | +     | -    | -     | -   | -    | -   | -    | -     | -    | - | -      | +      | *DD
 | Hin   | Hindi        | +     | +    | ++    | +   | +    | +   | +    | -     | -    | + | +      | +      | *SV,*KP,MH,AR,PK
+| Ice   | Icelandic    | +     | -    | ++    | +   | +    | +   | -    | -     | -    | - | -      | +      | *BT
 | Ina   | Interlingua  | +     | +    | ++    | +   | +    | -   | -    | -     | -    | - | -      | -      | JB
 | Ita   | Italian      | +     | +    | ++    | +   | +    | +   | +    | -     | -    | + | ++     | -      | *AR,*RE,GP
 | Jpn   | Japanese     | +     | -    | ++    | +   | +    | +   | -    | -     | -    | + | +      | +      | *LZ
-| Lat   | Latin        | +     | -    | -     | -   | -    | -   | -    | -     | -    | - | -      | -      | *AR,*HLa
+| Lat   | Latin        | +     | -    | -     | -   | -    | -   | -    | -     | +    | - | -      | -      | *AR,*HLa
 | Lav   | Latvian      | +     | -    | ++    | +   | +    | +   | -    | -     | -    | - | +      | +      | *NG,*PP
 | Mlt   | Maltese      | +     | +    | ++    | +   | +    | +   | +    | -     | -    | - | -      | +      | *JC
 | Mon   | Mongolian    | +     | -    | ++    | +   | +    | +   | -    | -     | +    | - | -      | +      | *NE
 | Nep   | Nepali       | +     | +    | ++    | +   | +    | -   | -    | -     | -    | - | -      | +      | *DS
+| Nno   | Norwegian(n) | +     | +    | ++    | +   | +    | +   | +    | +     | -    | - | -      | -      | *SRE
 | Nor   | Norwegian(b) | +     | +    | ++    | +   | +    | +   | +    | +     | -    | - | +      | -      | *AR
 | Pes   | Persian      | +     | -    | +     | +   | +    | +   | -    | -     | -    | - | +      | +      | *SV,*EA,SM
 | Pnb   | Punjabi      | +     | +    | +     | +   | +    | +   | +    | -     | -    | - | -      | +      | *SV,MH
 | Pol   | Polish       | +     | +    | +     | +   | +    | +   | +    | -     | -    | - | +      | +      | IN,*AS
 | Ron   | Romanian     | +     | +    | ++    | +   | +    | +   | +    | -     | -    | - | +      | +      | *RE
-| Rus   | Russian      | +     | +    | ++    | +   | +    | +   | -    | -     | -    | - | -      | +      | JK,*NF
+| Rus   | Russian      | +     | +    | ++    | +   | +    | +   | -    | -     | +    | + | -      | +      | JK,*NF
 | Snd   | Sindhi       | +     | +    | ++    | +   | +    | +   | +    | -     | -    | - | -      | +      | *SV,*JD
 | Spa   | Spanish      | +     | +    | ++    | +   | +    | +   | +    | +     | -    | + | ++     | -      | *AR,IA,TS,*IL
 | Swa   | Swahili      | +     | -    | -     | -   | -    | -   | -    | -     | -    | - | -      | +      | *WN,JM
@@ -93,15 +95,16 @@ AB Ansu Berg,
 AD Ali El Dada,
 AR Aarne Ranta,
 AS Adam Slaski,
-BB Björn Bringert,
+BB Björn Bringert,
+BT Bjarki Traustason,
 CK Chotiros Kairoje,
 CP Chen Peng,
-DD Dana Dannélls,
+DD Dana Dannélls,
 DS Dinesh Simk,
 EA Elnaz Abolahrar,
-EG Erzsébet Galgóczy
+EG Erzsébet Galgóczy
 FJ Femke Johansson,
-HH Harald Hammarström,
+HH Harald Hammarström,
 HLa Herbert Lange,
 HLe Hans Leiss,
 GP Gabriele Paganelli,
@@ -133,8 +136,9 @@ RE Ramona Enache,
 PP Peteris Paikens,
 SC Server Cimen,
 SM Sofy Moradi,
+SRE Stian Rødven Eide,
 SV Shafqat Virk,
-TH Therese Söderberg,
+TH Therese Söderberg,
 WN Wanjiku Ng'ang'a,
 ZL Zhuo Lin Qiqige
 

lib/doc/synopsis-intro.txt

@@ -8,7 +8,7 @@
 =Introduction=
 
 The GF Resource Grammar Library is the standard library for Grammatical Framework.
-It covers the morphology and basic syntax of currently 30 languages:
+It covers the morphology and basic syntax of currently 32 languages:
 Afrikaans,
 Bulgarian,
 Catalan,
@@ -22,13 +22,15 @@ French,
 German,
 Greek,
 Hindi,
+Icelandic,
 Japanese,
 Italian,
 Latvian,
 Maltese,
 Mongolian,
 Nepali,
-Norwegian bokmål,
+Norwegian (bokmål),
+Norwegial (nynorsk),
 Persian,
 Polish,
 Punjabi,
@@ -53,12 +55,12 @@ constructing trees in them.
 - [Chapter 2 #toc5]: syntactic construction functions, with cross-links and
 examples. 
 - [Chapter 3 #toc84]: morphological paradigms.
-- [Chapter 4 #toc114]: additional libraries.
+- [Chapter 4 #toc116]: additional libraries.
-- [Chapter 5 #toc120]: how to "browse" the library by 
+- [Chapter 5 #toc122]: how to "browse" the library by 
 loading the grammars into the ``gf`` command editor.
-- [Chapter 6 #toc121]: a brief example of how application grammars can
+- [Chapter 6 #toc123]: a brief example of how application grammars can
 use the resource modules. 
-- [Detailed table of contents #toc122].
+- [Detailed table of contents #toc124].
 
 
 Other relevant documents:

lib/src/api/SymbolicIce.gf

@@ -1,4 +1,4 @@
---# -path=.:../english:../common:../abstract:../prelude
+--# -path=.:../icelandic:../common:../abstract:../prelude
 
 resource SymbolicIce = Symbolic with 
   (Symbol = SymbolIce),

lib/src/api/TryIce.gf

@@ -1,3 +1,3 @@
---# -path=.:alltenses:prelude
+--# -path=.:../icelandic:../common:../abstract:../prelude
 
 resource TryIce = SyntaxIce, LexiconIce, ParadigmsIce - [mkAdv,mkAdN,mkOrd] ;

lib/src/demo/Makefile

@@ -6,7 +6,7 @@ src:
 	runghc MkMini.hs
 
 compdemo:
-	$(compile) Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Mon Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
+	$(compile) Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ice Ita Jpn Lav Mlt Mon Nep Nor Nno Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
 
 linkdemo:
-	$(compile) -link Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Mon Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
+	$(compile) -link Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ice Ita Jpn Lav Mlt Mon Nep Nor Nno Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd

lib/src/demo/MkMini.hs

@@ -2,9 +2,10 @@ src = "Eng"
 langs = [
   "Afr","Bul","Cat","Chi","Dan","Dut",
   "Est","Fin","Fre","Ger","Gre","Hin",
-  "Ita","Jpn","Lav","Mlt","Mon","Nep",
+  "Ice","Ita","Jpn","Lav","Mlt","Mon",
-  "Nor","Pes","Pol","Pnb","Ron","Rus",
+  "Nep","Nor","Nno","Pes","Pol","Pnb",
-  "Snd","Spa","Swe","Tha","Urd"
+  "Ron","Rus","Snd","Spa","Swe","Tha",
+  "Urd"
   ]
 
 file lng = "ResourceDemo" ++ lng ++ ".gf"