diff --git a/src/abstract/Documentation.gf b/src/abstract/Documentation.gf
index dd7d0457..f5be1a36 100644
--- a/src/abstract/Documentation.gf
+++ b/src/abstract/Documentation.gf
@@ -13,6 +13,7 @@ fun
   InflectionN   : N -> Inflection ;
   InflectionN2  : N2 -> Inflection ;
   InflectionN3  : N3 -> Inflection ;
+  InflectionPN  : PN -> Inflection ;
   InflectionA   : A -> Inflection ;
   InflectionA2  : A2 -> Inflection ;
   InflectionV   : V -> Inflection ;
@@ -27,6 +28,9 @@ fun
   InflectionV2Q : V2Q -> Inflection ;
   InflectionV2A : V2A -> Inflection ;
   InflectionAdv : Adv -> Inflection ;
+  InflectionAdV : AdV -> Inflection ;
+  InflectionAdA : AdA -> Inflection ;
+  InflectionAdN : AdN -> Inflection ;
   InflectionPrep : Prep -> Inflection ;
 
 fun
diff --git a/src/bulgarian/DocumentationBul.gf b/src/bulgarian/DocumentationBul.gf
index a1996f6a..850de1e4 100644
--- a/src/bulgarian/DocumentationBul.gf
+++ b/src/bulgarian/DocumentationBul.gf
@@ -79,6 +79,19 @@ lin
     s3 = ""
     } ;
 
+  InflectionPN = \pn -> {
+    t = "същ.с." ;
+    s1= heading1 ("Съществително Собствено"++
+                  case pn.gn of {
+                    GSg Masc => "(м.р.)" ;
+                    GSg Fem  => "(ж.р.)" ;
+                    GSg Neut => "(ср.р.)" ;
+                    GPl      => "(мн.ч.)"
+                  }) ;
+    s2 = pn.s ;
+    s3 = ""
+    } ;
+
   InflectionA, InflectionA2 = \a -> {
     t = "пр" ;
     s1= heading1 ("Прилагателно") ;
@@ -104,7 +117,7 @@ lin
     s3= ""
     } ;
 
-  InflectionAdv = \adv -> {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t = "нар" ;
     s1= heading1 ("Наречие") ;
     s2= paragraph (adv.s) ;
diff --git a/src/catalan/DocumentationCatFunctor.gf b/src/catalan/DocumentationCatFunctor.gf
index 74e0e3f1..0ee970e5 100644
--- a/src/catalan/DocumentationCatFunctor.gf
+++ b/src/catalan/DocumentationCatFunctor.gf
@@ -50,7 +50,7 @@ lin
          )
     } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 "Adverbi" ;
     s2 = paragraph adv.s
diff --git a/src/chinese/DocumentationChi.gf b/src/chinese/DocumentationChi.gf
index 7c7cd7e2..ef76c9ee 100644
--- a/src/chinese/DocumentationChi.gf
+++ b/src/chinese/DocumentationChi.gf
@@ -22,7 +22,7 @@ lin
     s2 = adj.s
     } ;
     
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 "Adverb" ;
     s2 = paragraph adv.s
diff --git a/src/dutch/DocumentationDutFunctor.gf b/src/dutch/DocumentationDutFunctor.gf
index 980b0363..920a7db3 100644
--- a/src/dutch/DocumentationDutFunctor.gf
+++ b/src/dutch/DocumentationDutFunctor.gf
@@ -59,7 +59,7 @@ lin
          s2 = dtable
        } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 (heading preposition_Category) ;
     s2 = paragraph adv.s
diff --git a/src/english/DocumentationEng.gf b/src/english/DocumentationEng.gf
index a1056d15..44a6d4e1 100644
--- a/src/english/DocumentationEng.gf
+++ b/src/english/DocumentationEng.gf
@@ -24,6 +24,20 @@ lin
          )
     } ;
 
+  InflectionPN = \pn -> {
+    t  = "pn" ;
+    s1 = heading1 ("Proper Name" ++
+                    case pn.g of {
+                      Neutr => "";
+                      Masc  => "(masc)";
+                      Fem   => "(fem)"
+                    }) ;
+    s2 = frameTable (
+           tr (th "nom"        ++ th "gen") ++
+           tr (td (pn.s ! Nom) ++ td (pn.s ! Gen))
+         )
+    } ;
+
   InflectionA, InflectionA2 = \adj -> {
     t  = "a" ;
     s1 = heading1 "Adjective" ;
@@ -37,7 +51,7 @@ lin
          paragraph (adj.s ! AAdv)
     } ;
 
-  InflectionAdv = \adv -> {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t = "adv" ;
     s1= heading1 "Adverb" ;
     s2= paragraph (adv.s) ;
diff --git a/src/estonian/DocumentationEstFunctor.gf b/src/estonian/DocumentationEstFunctor.gf
index ec41be16..4011c2c1 100644
--- a/src/estonian/DocumentationEstFunctor.gf
+++ b/src/estonian/DocumentationEstFunctor.gf
@@ -44,7 +44,7 @@ lin
              inflNoun (\nf -> superl ! AN nf)
     } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 (heading adverb_Category) ;
     s2 = paragraph adv.s
diff --git a/src/finnish/DocumentationFinFunctor.gf b/src/finnish/DocumentationFinFunctor.gf
index f4d183d8..3c3b0413 100644
--- a/src/finnish/DocumentationFinFunctor.gf
+++ b/src/finnish/DocumentationFinFunctor.gf
@@ -41,7 +41,7 @@ lin
          inflNoun (\nf -> (snoun2nounSep {s = \\f => adj.s ! Superl ! sAN f ; h = adj.h}).s ! nf)
     } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 (heading adverb_Category) ;
     s2 = paragraph adv.s
diff --git a/src/french/DocumentationFreFunctor.gf b/src/french/DocumentationFreFunctor.gf
index 5ea92921..dc10b42b 100644
--- a/src/french/DocumentationFreFunctor.gf
+++ b/src/french/DocumentationFreFunctor.gf
@@ -50,7 +50,7 @@ lin
          )
     } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 "Adverbe" ;
     s2 = paragraph adv.s
diff --git a/src/german/DocumentationGerFunctor.gf b/src/german/DocumentationGerFunctor.gf
index edf605f1..aa912a27 100644
--- a/src/german/DocumentationGerFunctor.gf
+++ b/src/german/DocumentationGerFunctor.gf
@@ -62,7 +62,7 @@ lin
          s2 = dtable positive_Parameter Posit ++ dtable comparative_Parameter Compar ++ dtable superlative_Parameter Superl
        } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adverb" ;
     s1 = heading1 (heading adverb_Category) ;
     s2 = paragraph adv.s
diff --git a/src/hindi/DocumentationHin.gf b/src/hindi/DocumentationHin.gf
index 1b0df58b..e3f01dc4 100644
--- a/src/hindi/DocumentationHin.gf
+++ b/src/hindi/DocumentationHin.gf
@@ -59,6 +59,12 @@ lin
           )
     } ;
 
+  InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
+    t  = "adv" ;
+    s1 = heading1 "Adverb" ;
+    s2 = adv.s
+    } ;
+
   InflectionPrep = \prep -> {
     t  = "prep" ;
     s1 = heading1 "Preposition" ;
diff --git a/src/icelandic/DocumentationIceFunctor.gf b/src/icelandic/DocumentationIceFunctor.gf
index 4ed45d38..f63aad96 100644
--- a/src/icelandic/DocumentationIceFunctor.gf
+++ b/src/icelandic/DocumentationIceFunctor.gf
@@ -74,7 +74,7 @@ lin
        } ;
 
 {-
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adverb" ;
     s1 = heading1 (heading adverb_Category) ;
     s2 = paragraph adv.s
diff --git a/src/italian/DocumentationItaFunctor.gf b/src/italian/DocumentationItaFunctor.gf
index e36d281f..c32b9220 100644
--- a/src/italian/DocumentationItaFunctor.gf
+++ b/src/italian/DocumentationItaFunctor.gf
@@ -50,7 +50,7 @@ lin
          )
     } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 "Adverbe" ;
     s2 = paragraph adv.s
diff --git a/src/portuguese/DocumentationPorFunctor.gf b/src/portuguese/DocumentationPorFunctor.gf
index 8e550541..df6491e5 100644
--- a/src/portuguese/DocumentationPorFunctor.gf
+++ b/src/portuguese/DocumentationPorFunctor.gf
@@ -50,7 +50,7 @@ lin
          )
     } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 "Advérbio" ;
     s2 = paragraph adv.s
diff --git a/src/russian/DocumentationRusFunctor.gf b/src/russian/DocumentationRusFunctor.gf
index d618e2a9..694c69ee 100644
--- a/src/russian/DocumentationRusFunctor.gf
+++ b/src/russian/DocumentationRusFunctor.gf
@@ -44,7 +44,7 @@ lin
          frameTable (tr (tr (adj.comp)))
     } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 (heading adverb_Category) ;
     s2 = paragraph adv.s
diff --git a/src/russian/v1/DocumentationRus.gf b/src/russian/v1/DocumentationRus.gf
index 8239d518..b69629a8 100644
--- a/src/russian/v1/DocumentationRus.gf
+++ b/src/russian/v1/DocumentationRus.gf
@@ -357,7 +357,7 @@ intagAttr "tr" "style=\"border-top-color:white;border-left-color:white;border-ri
 
   } ;    
 
-  InflectionAdv = \adv -> {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t = "нар" ;
     s1= heading1 ("Наречие") ;
     s2= paragraph (adv.s) ;
diff --git a/src/slovenian/DocumentationSlv.gf b/src/slovenian/DocumentationSlv.gf
index c0a3eaef..1812ce19 100644
--- a/src/slovenian/DocumentationSlv.gf
+++ b/src/slovenian/DocumentationSlv.gf
@@ -60,7 +60,7 @@ lin
         )
       } ;
 
-  InflectionAdv = \adv -> {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t = "prs" ;
     s1= heading1 ("Prislov") ;
     s2= paragraph (adv.s)
diff --git a/src/spanish/DocumentationSpaFunctor.gf b/src/spanish/DocumentationSpaFunctor.gf
index 41734738..866b6c3b 100644
--- a/src/spanish/DocumentationSpaFunctor.gf
+++ b/src/spanish/DocumentationSpaFunctor.gf
@@ -50,7 +50,7 @@ lin
          )
     } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 "Adverbe" ;
     s2 = paragraph adv.s
diff --git a/src/swedish/DocumentationSwe.gf b/src/swedish/DocumentationSwe.gf
index d75b95c5..bb82b5b4 100644
--- a/src/swedish/DocumentationSwe.gf
+++ b/src/swedish/DocumentationSwe.gf
@@ -32,6 +32,18 @@ lin
            )
      } ;
 
+  InflectionPN = \pn -> {
+    t  = "nm" ;
+    s1 = heading1 ("Namn" ++ case pn.g of {
+                               Utr   => "(utr)" ;
+                               Neutr => "(neutr)"
+                             }) ;
+    s2 = frameTable (
+           tr (th "nom" ++ td (pn.s ! Nom)) ++
+           tr (th "gen" ++ td (pn.s ! Gen))
+           )
+     } ;
+
   InflectionA, InflectionA2 = \adj -> { 
     t  = "a" ;
     s1 = heading1 "Adjektiv" ;
@@ -66,7 +78,7 @@ lin
               td (adj.s ! (AF (APosit (Weak Pl)) c))) ;
     } ;
 
-  InflectionAdv adv = {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t  = "adv" ;
     s1 = heading1 "Adverb" ;
     s2 = paragraph adv.s
diff --git a/src/turkish/DocumentationTur.gf b/src/turkish/DocumentationTur.gf
index d00a3a24..6e222bb5 100644
--- a/src/turkish/DocumentationTur.gf
+++ b/src/turkish/DocumentationTur.gf
@@ -54,7 +54,7 @@ lin
         paragraph (adj.adv) ;
     } ;
 
-  InflectionAdv = \adv -> {
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
     t = "b" ;
     s1= heading1 ("Belirteç") ;
     s2= paragraph (adv.s) ;
diff --git a/src/urdu/DocumentationUrd.gf b/src/urdu/DocumentationUrd.gf
index cbc8b89f..a00cbd9f 100644
--- a/src/urdu/DocumentationUrd.gf
+++ b/src/urdu/DocumentationUrd.gf
@@ -59,6 +59,12 @@ lin
           )
     } ;
 
+  InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
+    t  = "adv" ;
+    s1 = heading1 "Adverb" ;
+    s2 = adv.s
+    } ;
+
   InflectionPrep = \prep -> {
     t  = "prep" ;
     s1 = heading1 "Preposition" ;