started to move have_V2 from Lexicon to Structural ; fixes in Hindi translit table

8 files changed, 9 insertions, 4 deletions

diff --git a/next-lib/src/abstract/Lexicon.gf b/next-lib/src/abstract/Lexicon.gf
index 2d5e533bc..2c2a97c0f 100644
--- a/next-lib/src/abstract/Lexicon.gf
+++ b/next-lib/src/abstract/Lexicon.gf
@@ -137,7 +137,6 @@ fun
   harbour_N : N ;
   hate_V2 : V2 ;
   hat_N : N ;
-  have_V2 : V2 ;
   head_N : N ;
   heart_N : N ;
   hear_V2 : V2 ;
diff --git a/next-lib/src/abstract/Structural.gf b/next-lib/src/abstract/Structural.gf
index 57cb6453e..dbf9eb6c5 100644
--- a/next-lib/src/abstract/Structural.gf
+++ b/next-lib/src/abstract/Structural.gf
@@ -119,4 +119,5 @@ abstract Structural = Cat ** {
 
   as_CAdv : CAdv ;
 
+  have_V2 : V2 ;
 }
diff --git a/next-lib/src/english/LexiconEng.gf b/next-lib/src/english/LexiconEng.gf
index 310899ebc..393ad779b 100644
--- a/next-lib/src/english/LexiconEng.gf
+++ b/next-lib/src/english/LexiconEng.gf
@@ -90,7 +90,6 @@ lin
   harbour_N = regN "harbour" ;
   hate_V2 = dirV2 (regV "hate") ;
   hat_N = regN "hat" ;
-  have_V2 = dirV2 (mk5V "have" "has" "had" "had" "having") ;
   hear_V2 = dirV2 (irregV "hear" "heard" "heard") ;
   hill_N = regN "hill" ;
   hope_VS = mkVS (regV "hope") ;
diff --git a/next-lib/src/english/StructuralEng.gf b/next-lib/src/english/StructuralEng.gf
index ba3c58e23..2d929a121 100644
--- a/next-lib/src/english/StructuralEng.gf
+++ b/next-lib/src/english/StructuralEng.gf
@@ -135,5 +135,7 @@ concrete StructuralEng of Structural = CatEng **
 
   as_CAdv = C.mkCAdv "as" "as" ;
 
+  have_V2 = dirV2 (mk5V "have" "has" "had" "had" "having") ;
+
 }
 
diff --git a/next-lib/src/finnish/LexiconFin.gf b/next-lib/src/finnish/LexiconFin.gf
index 0591ca178..397fa96fa 100644
--- a/next-lib/src/finnish/LexiconFin.gf
+++ b/next-lib/src/finnish/LexiconFin.gf
@@ -94,7 +94,6 @@ lin
   harbour_N = mkN "satama" "sataman" "satamia" ;
   hate_V2 = mkV2 (mkV "vihata") cpartitive ;
   hat_N = mkN "hattu" ;
-  have_V2 = mkV2 (caseV adessive vOlla) ;
   hear_V2 = mkV2 (mkV "kuulla") ;
   hill_N = mkN "kukkula" ;
   hope_VS = mkVS (mkV "toivoa") ;
diff --git a/next-lib/src/finnish/StructuralFin.gf b/next-lib/src/finnish/StructuralFin.gf
index 5b54da246..58b7fc2e9 100644
--- a/next-lib/src/finnish/StructuralFin.gf
+++ b/next-lib/src/finnish/StructuralFin.gf
@@ -305,5 +305,8 @@ lin
   as_CAdv = X.mkCAdv "yhtä" "kuin" ;
 
   except_Prep = postPrep partitive "lukuunottamatta" ;
+
+  have_V2 = mkV2 (caseV adessive vOlla) ;
+
 }
 
diff --git a/next-lib/src/italian/LexiconIta.gf b/next-lib/src/italian/LexiconIta.gf
index 20cf35fbd..31d2d43d1 100644
--- a/next-lib/src/italian/LexiconIta.gf
+++ b/next-lib/src/italian/LexiconIta.gf
@@ -91,7 +91,6 @@ lin
   harbour_N = regN "porto" ;
   hate_V2 = dirV2 (regV "odiare") ;
   hat_N = regN "capello" ;
-  have_V2 = dirV2 (verboV (avere_2 "avere")) ;
   hear_V2 = dirV2 (verboV (sentire_99 "sentire")) ;
   hill_N = regN "collina" ;
   hope_VS = mkVS (regV "sperare") ;
diff --git a/next-lib/src/italian/StructuralIta.gf b/next-lib/src/italian/StructuralIta.gf
index 1cd96d3af..313dad334 100644
--- a/next-lib/src/italian/StructuralIta.gf
+++ b/next-lib/src/italian/StructuralIta.gf
@@ -176,5 +176,8 @@ lin
 
   as_CAdv = X.mkCAdv "così" conjThan ;
   except_Prep = mkPrep "eccetto" ;
+
+  have_V2 = dirV2 (verboV (avere_2 "avere")) ;
+
 }