move derivation lex from stems/nouns to affixes/adjectives

src/fst/morphology/affixes/adjectives.lexc

@@ -1433,3 +1433,57 @@ LEXICON ATTR_R  !!≈ **@CODE@** sends to R, NAMAG, SAS, CMP_ADJ.
  SAS ;
  CMP_ADJ ;
 
+
+!! # Derivation
+
+LEXICON NAMAG !!≈ * **@CODE@** gives »»» and directs to NAMAG, both from adj and numerals
++Cmp#:»»# NAMAGCont ;
+!#:»»# NAMATLAGANLAGASCont ;
+
+LEXICON SAS !!≈ * **@CODE@** , both from adj and numerals
++Cmp#:»»# SASCont ;
+
+
+LEXICON NAMAGCont!!≈ * **@CODE@**
+tääsi+CmpN/SgN+CmpN/SgG+Sem/Plc:tááság DER-AG ; ! tags_via_apertium
+čiehâ+Sem/Plc:čievâg DER-AG ; ! tags_via_apertium
+jienâ+Sem/Body-abstr_Prod-audio_Semcon:jienâg DER-AG ; ! tags_via_apertium
+lonnjâ+Sem/Buildpart:loonjâg DER-AG ; ! tags_via_apertium
+čuárvi+Sem/Body_Mat:čuárvág DER-AG ; ! tags_via_apertium
+uáivi+CmpN/SgN+CmpN/SgG+Sem/Body_Plc-elevate:uáivág DER-AG ; ! tags_via_apertium
+njälmi+Sem/Body:njáálmág DER-AG ; ! tags_via_apertium
+kerdi+Sem/Plc_Time:kiärdág DER-AG ; ! tags_via_apertium
+
+LEXICON SASCont!!≈ * **@CODE@** ,
+ihe+Sem/Time:ihás DER-SAS ; ! tags_via_apertium
+ihe+Err/Orth+Sem/Time:ihas DER-SAS ; ! tags_via_apertium
+peivi+Sem/Time:piäivás DER-SAS ; ! tags_via_apertium
+kerdi+Sem/Plc_Time:kiärdás DER-SAS ; ! tags_via_apertium
+jienâ+Sem/Body-abstr_Prod-audio_Semcon:jienâs DER-SAS ; ! tags_via_apertium
+tääsi+Sem/Plc:tásás DER-SAS ;  ! ollâtásásâš tags_via_apertium
+nummeer+Sem/Sign:»»»-nummeers DER-SAS ;
+sijđo+Sem/Txt:»»»-sijđos DER-SAS ;
+suormâräigi+Sem/Dummytag:»»»-suormâráigás DER-SAS ;
+kiilu+Sem/Measr:»»»-kilus DER-SAS ;
+sentti+Sem/Measr:»»»-senttis DER-SAS ;
+meetter+Sem/Measr:»»»-meetter DER-SAS ;
+meetter+Sem/Measr:»»»meetter DER-SAS ;
+
+
+LEXICON Gen_DER   !!≈ * *@CODE@* 
++Der1+Der/lasj:l ANOLASJ ; 
++Der1+Der/lasj+Err/Orth:ll ANOLASJ ; ! historjállâš
+!+Der+Der/vualasas:#-vuálás ANOLASJ ; ! Compounding better way: gen+vuálásâš
++Der1+Der/Car:tt MUSTOTTEM ; 
+
+LEXICON Nom_DER   !!≈ * *@CODE@* 
++Der1+Der/lasj:l ANOLASJ ; ! XXX not at all? Trond
+
+
+LEXICON DER-AG  !!≈ * *@CODE@* 
++N+Der+Der/ag:  PASTEL ; !+N because of redirection from numeral-file
+
+LEXICON DER-SAS  !!≈ * *@CODE@* 
++N+Der2+Der/sasj:  ANOLASJ ; !+N because of redirection from numeral-file
+
+

src/fst/morphology/affixes/nouns.lexc

@@ -3243,6 +3243,7 @@ LEXICON C_OLMOOS  !!≈ * **@CODE@** lexicon for olmooš
 +N+Ess:ž^WG^SVLOW%>in K ;        ! olmožin 
 +N+Par:ž^WG^SVLOW%>id K ;        ! olmožid 
 +N+Sg+Nom:ž^WG^SVLOW CPXsuff ;   ! olmožâm 
++N+NomAg+Der1+Der/Dimin: 3OPPUS_SG ; !elleežijd  elleežii 
 C_OLMOOS_PL ; 
 
 LEXICON C_OLMOOS_PL  !!≈ * **@CODE@** 
@@ -3258,6 +3259,7 @@ LEXICON C_OLMOOS_PL  !!≈ * **@CODE@**
 +N+Pl+Abe:%>ittáá K ;        ! ulmuittáá 
 +N:^SVš^WG^SLEN^SVLOW%> Nom_DER ; 
 +N:^SV^SLEN%> Gen_DER ; 
++N+NomAg+Der1+Der/Dimin: 3OPPUS_PL ; !elleežijd  elleežii 
 
 
 LEXICON C_KAARBIS  !!≈ * **@CODE@** 
@@ -3425,11 +3427,11 @@ LEXICON C_KUAVSUI_COMMON  !!≈ * **@CODE@**
 CUANJA_COMMON ; 
 
 LEXICON C_CUANJA  !!≈ * **@CODE@** 
-+N+Sg+Nom:^WG K ;          ! čuánjá 
++N+Sg+Nom:^WG K ;           ! čuánjá 
 +N+Cmp/SgNom:^WG%> Rhash ;  
-+N+Sg+Ill:%>i   K ;        ! čuánnjái 
-+N+Ess:j%>in K ;     ! čuánnjájin (was: -gin)
-+N+Par:j%>id K ;     ! čuánnjájid (was: -gid)
++N+Sg+Ill:%>i   K ;         ! čuánnjái 
++N+Ess:j%>in K ;            ! čuánnjájin (was: -gin)
++N+Par:j%>id K ;            ! čuánnjájid (was: -gid)
 +N+Ess+Use/NG:g%>in K ;     ! čuánnjágin (was: -gin)
 +N+Par+Use/NG:g%>id K ;     ! čuánnjágid (was: -gid)
 
@@ -4617,10 +4619,10 @@ LEXICON 2AAIGA_DIM !!≈ * **@CODE@**
 +N+Sg+Acc:%>užii K ; 
 +N+Sg+Ill:%>užân K ; 
 +N+Sg+Loc:%>užiist K ; 
-+N+Sg+Com:%>žijn K ; 
-+N+Sg+Abe:%>žuttáá K ; 
-+N+Ess:%>žin K ; 
-+N+Par:%>žid K ; 
++N+Sg+Com:%>užijn K ; 
++N+Sg+Abe:%>žiittáá K ; 
++N+Ess:%>užin K ; 
++N+Par:%>užid K ; 
 +N+Pl+Nom:%>užiih K ; 
 +N+Pl+Gen:%>užij K ; 
 +N+Pl+Acc:%>užijd K ; 

src/fst/morphology/stems/nouns.lexc

@@ -133,55 +133,6 @@ pohe+N+Cmp/Sh+Sem/Dummytag:poh Rnoun ;
 
 
 
-LEXICON NAMAG !!≈ * **@CODE@** gives »»» and directs to NAMAG, both from adj and numerals
-+Cmp#:»»# NAMAGCont ;
-!#:»»# NAMATLAGANLAGASCont ;
-
-LEXICON SAS !!≈ * **@CODE@** , both from adj and numerals
-+Cmp#:»»# SASCont ;
-
-
-LEXICON NAMAGCont!!≈ * **@CODE@**
-tääsi+CmpN/SgN+CmpN/SgG+Sem/Plc:tááság DER-AG ; ! tags_via_apertium
-čiehâ+Sem/Plc:čievâg DER-AG ; ! tags_via_apertium
-jienâ+Sem/Body-abstr_Prod-audio_Semcon:jienâg DER-AG ; ! tags_via_apertium
-lonnjâ+Sem/Buildpart:loonjâg DER-AG ; ! tags_via_apertium
-čuárvi+Sem/Body_Mat:čuárvág DER-AG ; ! tags_via_apertium
-uáivi+CmpN/SgN+CmpN/SgG+Sem/Body_Plc-elevate:uáivág DER-AG ; ! tags_via_apertium
-njälmi+Sem/Body:njáálmág DER-AG ; ! tags_via_apertium
-kerdi+Sem/Plc_Time:kiärdág DER-AG ; ! tags_via_apertium
-
-LEXICON SASCont!!≈ * **@CODE@** ,
-ihe+Sem/Time:ihás DER-SAS ; ! tags_via_apertium
-ihe+Err/Orth+Sem/Time:ihas DER-SAS ; ! tags_via_apertium
-peivi+Sem/Time:piäivás DER-SAS ; ! tags_via_apertium
-kerdi+Sem/Plc_Time:kiärdás DER-SAS ; ! tags_via_apertium
-jienâ+Sem/Body-abstr_Prod-audio_Semcon:jienâs DER-SAS ; ! tags_via_apertium
-tääsi+Sem/Plc:tásás DER-SAS ;  ! ollâtásásâš tags_via_apertium
-nummeer+Sem/Sign:»»»-nummeers DER-SAS ;
-sijđo+Sem/Txt:»»»-sijđos DER-SAS ;
-suormâräigi+Sem/Dummytag:»»»-suormâráigás DER-SAS ;
-kiilu+Sem/Measr:»»»-kilus DER-SAS ;
-sentti+Sem/Measr:»»»-senttis DER-SAS ;
-meetter+Sem/Measr:»»»-meetter DER-SAS ;
-meetter+Sem/Measr:»»»meetter DER-SAS ;
-
-LEXICON Gen_DER   !!≈ * *@CODE@* 
-+Der1+Der/lasj:l ANOLASJ ; 
-+Der1+Der/lasj+Err/Orth:ll ANOLASJ ; ! historjállâš
-!+Der+Der/vualasas:#-vuálás ANOLASJ ; ! Compounding better way: gen+vuálásâš
-+Der1+Der/Car:tt MUSTOTTEM ; 
-
-LEXICON Nom_DER   !!≈ * *@CODE@* 
-+Der1+Der/lasj:l ANOLASJ ; ! XXX not at all? Trond
-
-
-LEXICON DER-AG  !!≈ * *@CODE@* 
-+N+Der+Der/ag:  PASTEL ; !+N because of redirection from numeral-file
-
-LEXICON DER-SAS  !!≈ * *@CODE@* 
-+N+Der2+Der/sasj:  ANOLASJ ; !+N because of redirection from numeral-file
-
 
 !! ## The split into different noun types according to Px