msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

extensions and corrections in BeschCat to be compatible with FreeLing. Some of the diffs were plain bugs in the original module

Browse Source
This commit is contained in:
krangelov
2019-04-26 13:06:57 +02:00
parent 70ae58b089
commit d198436d7d
7 changed files with 1484 additions and 2431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2716
src/catalan/BeschCat.gf
View File

File diff suppressed because it is too large Load Diff

2
src/catalan/DiffCat.gf
View File

@@ -201,7 +201,7 @@ oper
haver_V, auxPassive : Verb = verbBeschH (estar_54 "estar") ; haver_V, auxPassive : Verb = verbBeschH (estar_54 "estar") ;
essere_V, copula = verbBeschH (ser_52 "ser") ; essere_V, copula = verbBeschH (ser_52 "ser" True) ;
stare_V, estar_V = verbBeschH (estar_54 "estar") ; stare_V, estar_V = verbBeschH (estar_54 "estar") ;
verbBeschH : Verbum -> Verb = \v -> verbBesch v ** {vtyp = VHabere ; p = []} ; verbBeschH : Verbum -> Verb = \v -> verbBesch v ** {vtyp = VHabere ; p = []} ;

4
src/catalan/ExtraCat.gf
View File

@@ -82,6 +82,6 @@ lin
} ; } ;
ExistsNP np = ExistsNP np =
mkClause [] True False np.a (insertComplement (\\_ => (np.s ! Nom).ton) (predV (mkV (complir_25 "existir")))) ; mkClause [] True False np.a (insertComplement (\\_ => (np.s ! Nom).ton) (predV (mkV (complir_25 "existir" True)))) ;
} }

1131
src/catalan/IrregCat.gf
View File

File diff suppressed because it is too large Load Diff

26
src/catalan/LexiconCat.gf
View File

@@ -1,7 +1,7 @@
--# -path=.:../romance:../common:../abstract:../../prelude --# -path=.:../romance:../common:../abstract:../../prelude
concrete LexiconCat of Lexicon = CatCat ** open concrete LexiconCat of Lexicon = CatCat ** open
(M=MorphoCat), ParadigmsCat, BeschCat, (D = DiffCat) in { Prelude, (M=MorphoCat), ParadigmsCat, BeschCat, (D = DiffCat) in {
flags flags
coding=utf8 ; coding=utf8 ;
@@ -16,7 +16,7 @@ oper
lin lin
airplane_N = regMN "avió" ; airplane_N = regMN "avió" ;
answer_V2S = mkV2S (verbV (compondre_26 "respondre")) dative ; answer_V2S = mkV2S (verbV (compondre_26 "respondre" True)) dative ;
apartment_N = regMN "pis" ; apartment_N = regMN "pis" ;
apple_N = regFN "poma" ; apple_N = regFN "poma" ;
art_N = regMN "art" ; art_N = regMN "art" ;
@@ -61,7 +61,7 @@ lin
close_V2 = dirV2 (verbV (trencar_112 "tancar")) ; close_V2 = dirV2 (verbV (trencar_112 "tancar")) ;
coat_N = regMN "abric" ; coat_N = regMN "abric" ;
cold_A = regADeg "fred" ; cold_A = regADeg "fred" ;
come_V = verbV (venir_117 "venir") ; come_V = verbV (venir_117 "venir" True) ;
computer_N = regMN "ordinador" ; computer_N = regMN "ordinador" ;
country_N = mkN "país" "països" masculine ; country_N = mkN "país" "països" masculine ;
cousin_N = regMN "cosí" ; cousin_N = regMN "cosí" ;
@@ -93,7 +93,7 @@ lin
glove_N = regMN "guant" ; glove_N = regMN "guant" ;
gold_N = regMN "or" ; gold_N = regMN "or" ;
good_A = mkA (prefA "bo" "bon") (mkA "millor") ; good_A = mkA (prefA "bo" "bon") (mkA "millor") ;
go_V = (verbV (anar_4 "anar")) ; go_V = (verbV (anar_4 "anar" 0)) ;
green_A = regADeg "verd" ; green_A = regADeg "verd" ;
harbour_N = regMN "port" ; harbour_N = regMN "port" ;
hate_V2 = dirV2 (verbV (canviar_16 "odiar")) ; hate_V2 = dirV2 (verbV (canviar_16 "odiar")) ;
@@ -159,14 +159,14 @@ lin
rock_N = regFN "roca" ; rock_N = regFN "roca" ;
roof_N = regFN "teulada" ; roof_N = regFN "teulada" ;
rubber_N = regFN "goma" ; rubber_N = regFN "goma" ;
run_V = verbV (córrer_30 "córrer") ; run_V = verbV (córrer_30 "córrer" True) ;
say_VS = mkVS (verbV (dir_41 "dir")) ; say_VS = mkVS (verbV (dir_41 "dir")) ;
school_N = regFN "escola" ; school_N = regFN "escola" ;
science_N = regFN "ciència" ; science_N = regFN "ciència" ;
sea_N = regMN "mar" ; -- masc & fem sea_N = regMN "mar" ; -- masc & fem
seek_V2 = dirV2 (verbV (trencar_112 "buscar")) ; seek_V2 = dirV2 (verbV (trencar_112 "buscar")) ;
see_V2 = dirV2 (verbV (veure_118 "veure")) ; see_V2 = dirV2 (verbV (veure_118 "veure" 0)) ;
sell_V3 = dirV3 (verbV (vendre_116 "vendre")) dative ; sell_V3 = dirV3 (verbV (vendre_116 "vendre" True)) dative ;
send_V3 = dirV3 (verbV (canviar_16 "enviar")) dative ; send_V3 = dirV3 (verbV (canviar_16 "enviar")) dative ;
sheep_N = regFN "ovella" ; -- xai sheep_N = regFN "ovella" ; -- xai
ship_N = regMN "vaixell" ; ship_N = regMN "vaixell" ;
@@ -218,7 +218,7 @@ lin
woman_N = regFN "dona" ; woman_N = regFN "dona" ;
wonder_VQ = mkVQ (reflV (mkV "preguntar")) ; wonder_VQ = mkVQ (reflV (mkV "preguntar")) ;
wood_N = regFN "fusta" ; wood_N = regFN "fusta" ;
write_V2 = dirV2 (verbV (escriure_50 "escriure")) ; write_V2 = dirV2 (verbV (escriure_50 "escriure" True)) ;
yellow_A = compADeg (mkA "groc" "groga" "grocs" "grogues" "grogament") ; yellow_A = compADeg (mkA "groc" "groga" "grocs" "grogues" "grogament") ;
young_A = compADeg (mkA "jove" "jove" "joves" "joves" "jovement") ; young_A = compADeg (mkA "jove" "jove" "joves" "joves" "jovement") ;
do_V2 = dirV2 (verbV (fer_56 "fer")) ; do_V2 = dirV2 (verbV (fer_56 "fer")) ;
@@ -319,16 +319,16 @@ lin
fear_V2 = dirV2 (verbV (témer_107 "témer")) ; fear_V2 = dirV2 (verbV (témer_107 "témer")) ;
fight_V2 = dirV2 (mkV "lluitar") ; fight_V2 = dirV2 (mkV "lluitar") ;
float_V = mkV "surar" ; float_V = mkV "surar" ;
flow_V = verbV (reduir_94 "fluir") ; -- also: mkV "circular" flow_V = verbV (reduir_94 "fluir" True) ; -- also: mkV "circular"
fly_V = mkV "volar" ; fly_V = mkV "volar" ;
freeze_V = mkV "congelar" ; freeze_V = mkV "congelar" ;
give_V3 = dirdirV3 (verbV (donar_43 "donar")) ; give_V3 = dirdirV3 (verbV (donar_43 "donar" True)) ;
hit_V2 = dirV2 (verbV (trencar_112 "picar")) ; hit_V2 = dirV2 (verbV (trencar_112 "picar")) ;
hold_V2 = dirV2 (verbV (obtenir_78 "sostenir")) ; hold_V2 = dirV2 (verbV (obtenir_78 "sostenir" True)) ;
hunt_V2 = dirV2 (verbV (començar_22 "caçar")) ; hunt_V2 = dirV2 (verbV (començar_22 "caçar")) ;
kill_V2 = dirV2 (mkV "matar") ; kill_V2 = dirV2 (mkV "matar") ;
laugh_V = verbV (riure_96 "riure") ; laugh_V = verbV (riure_96 "riure") ;
lie_V = reflV (verbV (jeure_62 "jeure")) ; lie_V = reflV (verbV (jeure_62 "jeure" True)) ;
play_V = verbV (pregar_86 "jugar") ; play_V = verbV (pregar_86 "jugar") ;
pull_V2 = dirV2 (mkV "tibar") ; pull_V2 = dirV2 (mkV "tibar") ;
push_V2 = dirV2 (verbV (atènyer_59 "empènyer")) ; push_V2 = dirV2 (verbV (atènyer_59 "empènyer")) ;
@@ -336,7 +336,7 @@ lin
scratch_V2 = dirV2 (mkV "gratar") ; scratch_V2 = dirV2 (mkV "gratar") ;
sew_V = verbV (cosir_31 "cosir") ; sew_V = verbV (cosir_31 "cosir") ;
sing_V = mkV "cantar" ; sing_V = mkV "cantar" ;
sit_V = reflV (verbV (seure_102 "seure")) ; sit_V = reflV (verbV (seure_102 "seure" True)) ;
smell_V = mkV "ensumar" ; smell_V = mkV "ensumar" ;
spit_V = verbV (escopir_49 "escopir") ; spit_V = verbV (escopir_49 "escopir") ;
split_V2 = dirV2 (mkV "separar") ; -- dividir,) ; split_V2 = dirV2 (mkV "separar") ; -- dividir,) ;

34
src/catalan/ParadigmsCat.gf
View File

@@ -367,12 +367,12 @@ oper
"çar" => començar_22 x ; "çar" => començar_22 x ;
"gir" => fugir_58 x ; "gir" => fugir_58 x ;
"ure" => beure_11 x ; "ure" => beure_11 x ;
"xer" => créixer_33 x ; --conèixer,aparèixer with regAltV "xer" => créixer_33 x True ; --conèixer,aparèixer with regAltV
_ + "re" => perdre_83 x ; _ + "re" => perdre_83 x ;
_ + "er" => verbEr x ; --handles accents in infinitives and c/ç, g/j _ + "er" => verbEr x ; --handles accents in infinitives and c/ç, g/j
_ + "ir" => dormir_44 x ; --inchoative verbs with regAltV _ + "ir" => dormir_44 x ; --inchoative verbs with regAltV
_ + "ur" => dur_45 x ; _ + "ur" => dur_45 x True ;
_ => cantar_15 x } ; _ => cantar_15 x } ;
regAltV x y = regAltV x y =
@@ -384,15 +384,15 @@ oper
<"ure",_+"c"> => regV x ; --caure,viure etc. with non-smart paradigms <"ure",_+"c"> => regV x ; --caure,viure etc. with non-smart paradigms
--small set of irregular verbs that have unique P1 Sg --small set of irregular verbs that have unique P1 Sg
<_+"ir","tinc"> => tenir_108 x ; --tenir, obtenir, ... <_+"ir","tinc"> => tenir_108 x 0 ; --tenir, obtenir, ...
<_+"ir","vinc"> => venir_117 x ; --venir, prevenir, ... <_+"ir","vinc"> => venir_117 x True ; --venir, prevenir, ...
<_+"er",_+"ig"> => fer_56 x ; <_+"er",_+"ig"> => fer_56 x ;
<_+"re",_+"ig"> => veure_118 x ; <_+"re",_+"ig"> => veure_118 x 0 ;
<_+"ar",_+"ig"> => anar_4 x ; <_+"ar",_+"ig"> => anar_4 x 0 ;
<"xer" ,_+ "c"> => conèixer_27 x ; --créixer, merèixer with regV <"xer" ,_+ "c"> => conèixer_27 x ; --créixer, merèixer with regV
<_+"er",_+ "c"> => valer_114 x ; <_+"er",_+ "c"> => valer_114 x True ;
<_+"re",_+ "c"> => doldre_42 x ; --participles of type dolgut <_+"re",_+ "c"> => doldre_42 x True ; --participles of type dolgut
--for absolt, pres, ... use mk3V --for absolt, pres, ... use mk3V
<_ ,_> => regV x } ; <_ ,_> => regV x } ;
@@ -406,25 +406,25 @@ oper
--if these are overfitting, just comment out. --if these are overfitting, just comment out.
--still doesn't catch creure, seure; mk4V with creiem as 4th arg? --still doesn't catch creure, seure; mk4V with creiem as 4th arg?
<"ure",_, "uit"> => coure_32 x ; --coure coem cuit <"ure",_, "uit"> => coure_32 x ; --coure coem cuit
<"ure",_,_+"it"> => escriure_50 x ; --escriure escrivim escrit <"ure",_,_+"it"> => escriure_50 x True ; --escriure escrivim escrit
<"ure",_,_+"et"> => treure_113 x ; --treure traiem tret <"ure",_,_+"et"> => treure_113 x True ; --treure traiem tret
<"ure",_,_+"st"> => veure_118 x ; --veure veiem vist <"ure",_,_+"st"> => veure_118 x 0 ; --veure veiem vist
<"ure",_, "cut"> => viure_119 x ; --viure vivim viscut <"ure",_, "cut"> => viure_119 x ; --viure vivim viscut
<"dre",_,_+"st"> => compondre_26 x ; --compondre compost <"dre",_,_+"st"> => compondre_26 x True ; --compondre compost
<"rir", _+"ixo",_+"rt"> => cobrir_20 x ; --cob|rir cob|ert <"rir", _+"ixo",_+"rt"> => cobrir_20 x True ; --cob|rir cob|ert
<_+"ir",_+"ixo",_+"rt"> => complir_25 x ; --compl|ir compl|ert <_+"ir",_+"ixo",_+"rt"> => complir_25 x True ; --compl|ir compl|ert
<_+"ir",_+"ixo",_+"ït"> => lluir_64 x ; --lluir lluïm lluït <_+"ir",_+"ixo",_+"ït"> => lluir_64 x 0 ; --lluir lluïm lluït
<"dre",_,"nut"> => vendre_116 x ; <"dre",_,"nut"> => vendre_116 x True ;
<_+"re",_+"c",_+"t"> => absoldre_1 x ; --c in sgP1 and subj, not in part <_+"re",_+"c",_+"t"> => absoldre_1 x ; --c in sgP1 and subj, not in part
<_+"re",_,_+"es"> => prendre_87 x ; <_+"re",_,_+"es"> => prendre_87 x ;
<_+"re",_,_+"ès"> => atendre_8 x ; <_+"re",_,_+"ès"> => atendre_8 x ;
<_+"re",_,_+"as"> => raure_91 x ; <_+"re",_,_+"as"> => raure_91 x True ;
<_+"re",_,_+"às"> => romandre_97 x ; <_+"re",_,_+"às"> => romandre_97 x ;
<_+"re",_,_+"os"> => cloure_19 x ; <_+"re",_,_+"os"> => cloure_19 x ;
<_+"re",_,_+"ós"> => confondre_28 x ; <_+"re",_,_+"ós"> => confondre_28 x ;

2
src/catalan/StructuralCat.gf
View File

@@ -165,7 +165,7 @@ lin
Masc Sg P3 ; Masc Sg P3 ;
not_Predet = {s = \\a,c => prepCase c ++ "no pas" ; c = Nom ; not_Predet = {s = \\a,c => prepCase c ++ "no pas" ; c = Nom ;
a = PNoAg} ; a = PNoAg} ;
have_V2 = dirV2 (verbV (tenir_108 "tenir")) ; have_V2 = dirV2 (verbV (tenir_108 "tenir" 0)) ;
oper oper
etConj : {s : Str ; n : MorphoCat.Number} = {s = "i" } ** {n = Pl} ; etConj : {s : Str ; n : MorphoCat.Number} = {s = "i" } ** {n = Pl} ;