diff --git a/src/api/TryNor.gf b/src/api/TryNor.gf
index 37982283..3950e0e2 100644
--- a/src/api/TryNor.gf
+++ b/src/api/TryNor.gf
@@ -1,3 +1,16 @@
--# -path=.:../norwegian:../scandinavian:../common:../abstract:../prelude
-resource TryNor = SyntaxNor, LexiconNor, ParadigmsNor - [mkAdv] ;
+resource TryNor = SyntaxNor-[mkAdN], LexiconNor, ParadigmsNor - [mkAdv,mkAdN] **
+ open (P = ParadigmsNor) in {
+
+oper
+ mkAdv = overload SyntaxNor {
+ mkAdv : Str -> Adv = P.mkAdv ;
+ } ;
+
+ mkAdN = overload {
+ mkAdN : CAdv -> AdN = SyntaxNor.mkAdN ;
+ mkAdN : Str -> AdN = P.mkAdN ;
+ } ;
+
+}
diff --git a/src/norwegian/DocumentationNor.gf b/src/norwegian/DocumentationNor.gf
new file mode 100644
index 00000000..7011a5d7
--- /dev/null
+++ b/src/norwegian/DocumentationNor.gf
@@ -0,0 +1,283 @@
+concrete DocumentationNor of Documentation = CatNor ** open
+ ResNor,
+ CommonScand,
+ HTML
+in {
+flags coding=utf8 ;
+lincat
+ Inflection = {t : Str; s1,s2 : Str} ;
+ Definition = {s : Str} ;
+ Document = {s : Str} ;
+ Tag = {s : Str} ;
+
+{-
+-} --# notpresent
+
+
+lin
+ InflectionN, InflectionN2, InflectionN3 = \noun -> {
+ t = "s" ;
+ s1 = heading1 ("Substantiv" ++ case noun.g of {
+ NUtr Male => "(maskulinum)" ;
+ NUtr Female => "(femininum)" ;
+ NNeutr => "(neutr)"
+ }) ;
+ s2 = frameTable (
+ tr (intagAttr "th" "colspan=2" "" ++ th "obest" ++ th "best") ++
+ tr (intagAttr "th" "rowspan=2" "nom" ++
+ th "sg" ++ td (noun.s ! Sg ! Indef ! Nom) ++ td (noun.s ! Sg ! Def ! Nom)) ++
+ tr (th "pl" ++ td (noun.s ! Pl ! Indef ! Nom) ++ td (noun.s ! Pl ! Def ! Nom)) ++
+ tr (intagAttr "th" "rowspan=2" "gen" ++
+ th "sg" ++ td (noun.s ! Sg ! Indef ! Gen) ++ td (noun.s ! Sg ! Def ! Gen)) ++
+ tr (th "pl" ++ td (noun.s ! Pl ! Indef ! Gen) ++ td (noun.s ! Pl ! Def ! Gen))
+ )
+ } ;
+
+ InflectionLN = \n -> {
+ t = "nm" ;
+ s1 = heading1 ("Platsnamn" ++ case n.g of {
+ Utr => "(utr)" ;
+ Neutr => "(neutr)"
+ }) ;
+ s2 = frameTable (
+ tr (th "nom" ++ td (n.s ! Nom)) ++
+ tr (th "gen" ++ td (n.s ! Gen))
+ ) ;
+ } ;
+
+ InflectionGN = \pn -> {
+ t = "fnm" ;
+ s1 = heading1 ("Förnamn" ++ case pn.g of {
+ Male => "(man)" ;
+ Female => "(kvinna)"
+ }) ;
+ s2 = frameTable (
+ tr (th "nom" ++ td (pn.s ! Nom)) ++
+ tr (th "gen" ++ td (pn.s ! Gen))
+ )
+ } ;
+
+ InflectionSN = \pn -> {
+ t = "enm" ;
+ s1 = heading1 "Efternamn" ;
+ s2 = frameTable (
+ tr (th "nom" ++ td (pn.s ! Male ! Nom)) ++
+ tr (th "gen" ++ td (pn.s ! Male ! Gen))
+ )
+ } ;
+
+ InflectionA, InflectionA2 = \adj -> {
+ t = "a" ;
+ s1 = heading1 "Adjektiv" ;
+ s2 = frameTable (
+ tr (intagAttr "th" "colspan=5" "nominativ") ++
+ tr (intagAttr "th" "colspan=2" "posit" ++
+ th "posit" ++
+ th "kompar" ++
+ th "superl") ++
+ caseInfl Nom ++
+ tr (intagAttr "th" "colspan=5" "genitiv") ++
+ caseInfl Nom
+ ) ++
+ heading1 ("Adverb") ++
+ paragraph (adj.s ! AAdv) ;
+ } where {
+ caseInfl : Case -> Str = \c ->
+ tr (intagAttr "th" "rowspan=3" "obest" ++
+ th "utr" ++
+ td (adj.s ! (AF (APosit (Strong (GSg Utr))) c)) ++
+ intagAttr "td" "rowspan=5" (adj.s ! (AF ACompar c)) ++
+ intagAttr "td" "rowspan=3" (adj.s ! (AF (ASuperl SupStrong) c))) ++
+ tr (th "neut" ++
+ td (adj.s ! (AF (APosit (Strong (GSg Neutr))) c))) ++
+ tr (th "pl" ++
+ td (adj.s ! (AF (APosit (Strong GPl)) c))) ++
+ tr (intagAttr "th" "rowspan=2" "best" ++
+ th "sg" ++
+ td (adj.s ! (AF (APosit (Weak Sg)) c)) ++
+ intagAttr "td" "rowspan=2" (adj.s ! (AF (ASuperl SupWeak) c))) ++
+ tr (th "pl" ++
+ td (adj.s ! (AF (APosit (Weak Pl)) c))) ;
+ } ;
+
+ InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
+ t = "adv" ;
+ s1 = heading1 "Adverb" ;
+ s2 = paragraph adv.s
+ } ;
+
+ InflectionPrep p = {
+ t = "prep" ;
+ s1 = heading1 "Preposition" ;
+ s2 = paragraph p.s
+ } ;
+
+ InflectionV v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part);
+ s2 = inflVerb v
+ } ;
+
+ InflectionV2 v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++ v.c2.s ++
+ pp "objekt") ;
+ s2 = inflVerb v
+ } ;
+
+ InflectionV3 v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++
+ v.c2.s ++ pp "arg1" ++
+ v.c3.s ++ pp "arg2") ;
+ s2 = inflVerb v
+ } ;
+
+ InflectionV2V v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++
+ v.c2.s ++ pp "objekt" ++
+ v.c3.s ++ pp "verb") ;
+ s2 = inflVerb v
+ } ;
+
+ InflectionV2S v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++
+ v.c2.s ++ pp "objekt" ++
+ conjThat ++ pp "mening") ;
+ s2 = inflVerb v
+ } ;
+
+ InflectionV2Q v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++
+ v.c2.s ++ pp "objekt" ++
+ pp "fråga") ;
+ s2 = inflVerb v
+ } ;
+
+ InflectionV2A v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++
+ v.c2.s ++ pp "objekt" ++
+ pp "adjektiv") ;
+ s2 = inflVerb v
+ } ;
+
+ InflectionVV v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++
+ pp "verb") ;
+ s2 = inflVerb v
+ } ;
+
+ InflectionVS v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++
+ conjThat ++ pp "mening") ;
+ s2 = inflVerb v
+ } ;
+
+ InflectionVQ v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++
+ pp "fråga") ;
+ s2 = inflVerb v
+ } ;
+
+ InflectionVA v = {
+ t = "v" ;
+ s1 = heading1 "Verb" ++
+ paragraph (pp "subjekt" ++
+ v.s ! VI (VInfin Act) ++ v.part ++
+ pp "adjektiv") ;
+ s2 = inflVerb v
+ } ;
+
+lin
+ NoDefinition t = {s=t.s};
+ MkDefinition t d = {s="Definition:"++t.s++d.s++"
"};
+ MkDefinitionEx t d e = {s="Definition:"++t.s++d.s++"
Exempel:"++e.s++"
"};
+
+ MkDocument d i e = {s = i.s1 ++ d.s ++ i.s2 ++ paragraph e.s} ; -- explanation appended in a new paragraph
+ MkTag i = {s = i.t} ;
+
+oper
+ inflVerb : Verb -> Str = \verb ->
+ frameTable (
+ tr (th "" ++ th "active" ++ th "passive") ++
+ tr (th "infitiv" ++ td (verb.s ! VI (VInfin Act)) ++ td (verb.s ! VI (VInfin Pass))) ++
+ tr (th "presens" ++ td (verb.s ! VF (VPres Act)) ++ td (verb.s ! VF (VPres Pass))) ++
+ tr (th "preteritum" ++ td (verb.s ! VF (VPret Act)) ++ td (verb.s ! VF (VPret Pass))) ++
+ tr (th "supinum" ++ td (verb.s ! VI (VSupin Act)) ++ td (verb.s ! VI (VSupin Pass))) ++
+ tr (th "imperativ" ++ td (verb.s ! VF (VImper Act)) ++ td (verb.s ! VF (VImper Pass)))
+ ) ++
+ heading2 "Particip Presens" ++
+ frameTable (
+ tr (intagAttr "th" "colspan=2" "" ++ th "obest" ++ th "best") ++
+ tr (intagAttr "th" "rowspan=2" "nom" ++
+ th "sg" ++
+ td (verb.s ! VI (VPtPres Sg Indef Nom)) ++
+ td (verb.s ! VI (VPtPres Sg Def Nom))) ++
+ tr (th "pl" ++
+ td (verb.s ! VI (VPtPres Pl Indef Nom)) ++
+ td (verb.s ! VI (VPtPres Pl Def Nom))) ++
+ tr (intagAttr "th" "rowspan=2" "gen" ++
+ th "sg" ++
+ td (verb.s ! VI (VPtPres Sg Indef Gen)) ++
+ td (verb.s ! VI (VPtPres Sg Def Gen))) ++
+ tr (th "pl" ++
+ td (verb.s ! VI (VPtPres Pl Indef Gen)) ++
+ td (verb.s ! VI (VPtPres Pl Def Gen)))
+ ) ++
+ heading2 "Particip Perfekt" ++
+ frameTable (
+ tr (intagAttr "th" "colspan=2" "" ++
+ th "nom" ++
+ th "gen") ++
+ tr (intagAttr "th" "rowspan=3" "obest" ++
+ th "utr" ++
+ td (verb.s ! VI (VPtPret (Strong (GSg Utr)) Nom)) ++
+ td (verb.s ! VI (VPtPret (Strong (GSg Utr)) Gen))) ++
+ tr (th "neut" ++
+ td (verb.s ! VI (VPtPret (Strong (GSg Neutr)) Nom)) ++
+ td (verb.s ! VI (VPtPret (Strong (GSg Neutr)) Gen))) ++
+ tr (th "pl" ++
+ td (verb.s ! VI (VPtPret (Strong GPl) Nom)) ++
+ td (verb.s ! VI (VPtPret (Strong GPl) Gen))) ++
+ tr (intagAttr "th" "rowspan=2" "best" ++
+ th "sg" ++
+ td (verb.s ! VI (VPtPret (Weak Sg) Nom)) ++
+ td (verb.s ! VI (VPtPret (Weak Sg) Gen))) ++
+ tr (th "pl" ++
+ td (verb.s ! VI (VPtPret (Weak Pl) Nom)) ++
+ td (verb.s ! VI (VPtPret (Weak Pl) Gen)))
+ ) ;
+
+ pp : Str -> Str = \s -> "<"+s+">";
+
+{- --# notpresent
+-}
+
+}
diff --git a/src/norwegian/GrammarNor.gf b/src/norwegian/GrammarNor.gf
index 25b0ecc6..65a3cf82 100644
--- a/src/norwegian/GrammarNor.gf
+++ b/src/norwegian/GrammarNor.gf
@@ -14,7 +14,8 @@ concrete GrammarNor of Grammar =
TextX - [Tense,Temp] ,
IdiomNor,
StructuralNor,
- TenseNor
+ TenseNor,
+ NamesNor
** {
flags startcat = Phr ; unlexer = text ; lexer = text ;
diff --git a/src/norwegian/LangNor.gf b/src/norwegian/LangNor.gf
index 899fdbf7..f82a8134 100644
--- a/src/norwegian/LangNor.gf
+++ b/src/norwegian/LangNor.gf
@@ -3,6 +3,7 @@
concrete LangNor of Lang =
GrammarNor,
LexiconNor
+ ,DocumentationNor --# notpresent
** {
flags startcat = Phr ; unlexer = text ; lexer = text ;
diff --git a/src/norwegian/ParadigmsNor.gf b/src/norwegian/ParadigmsNor.gf
index a3dc7de9..9238b663 100644
--- a/src/norwegian/ParadigmsNor.gf
+++ b/src/norwegian/ParadigmsNor.gf
@@ -135,6 +135,25 @@ oper
mkPN : N -> PN ; --%
} ;
+ mkLN = overload {
+ mkLN : Str -> LN = \s -> lin LN (regPN s) ** {n=Sg}; -- default gender utrum
+ mkLN : Str -> Gender -> LN = \s,g -> lin LN (regGenPN s g) ** {n=Sg} ; -- set other gender
+ mkLN : Str -> Gender -> Number -> LN = \s,g,n -> lin LN (regGenPN s g) ** {n=n} ; -- set other gender and number
+ } ;
+
+ mkGN = overload {
+ mkGN : Str -> GN = \s -> lin GN {s = \\c => mkCase c s ; g = Male}; -- default gender utrum
+ mkGN : Str -> Sex -> GN = \s,g -> lin GN {s = \\c => mkCase c s ; g = g} ; -- set other gender
+ } ;
+
+ mkSN = overload {
+ mkSN : Str -> SN = \s -> lin SN {s = \\_,c => mkCase c s; pl = \\c => mkCase c s}; -- default gender utrum
+ mkSN : Str -> Str -> Str -> SN =
+ \male,female,pl -> lin SN {s = table {Male => \\c => mkCase c male;
+ Female => \\c => mkCase c female} ;
+ pl = \\c => mkCase c pl
+ } ;
+ } ;
--2 Adjectives
@@ -173,7 +192,7 @@ oper
-- Adverbs modifying adjectives and sentences can also be formed.
mkAdA : Str -> AdA ; -- e.g. mye
-
+ mkAdN : Str -> AdN ;
--2 Verbs
--
@@ -370,6 +389,7 @@ oper
mkAdv x = ss x ** {lock_Adv = <>} ;
mkAdV x = ss x ** {lock_AdV = <>} ;
mkAdA x = ss x ** {lock_AdA = <>} ;
+ mkAdN x = ss x ** {lock_AdN = <>} ;
mkPrep p = {s = p ; lock_Prep = <>} ;
noPrep = mkPrep [] ;
@@ -519,4 +539,8 @@ oper
mk2V2 : V -> Prep -> V2 ;
dirV2 : V -> V2 ;
+
+ mkInterj : Str -> Interj
+ = \s -> lin Interj {s = s} ;
+
} ;