diff --git a/subsyntax/ENIAMsubsyntax.ml b/subsyntax/ENIAMsubsyntax.ml index 96a9475..de819ef 100644 --- a/subsyntax/ENIAMsubsyntax.ml +++ b/subsyntax/ENIAMsubsyntax.ml @@ -79,6 +79,10 @@ let translate_digs paths = (* FIXME: brakuje initial, postal-code i być może i | Compound("realnum-interval",[Dig(x,"realnum");Dig(y,"intnum")]) -> {t with token=Lemma(x ^ "-" ^ y,"realnum-interval",[[]]); cat="Number"} | Compound("date-interval",[Compound("date",[Dig(d1,"day");Dig(m1,"month");Dig(y1,"year")]); Compound("date",[Dig(d2,"day");Dig(m2,"month");Dig(y2,"year")])]) -> {t with token=Lemma(d1 ^ "." ^ m1 ^ "." ^ y1 ^ "-" ^ d2 ^ "." ^ m2 ^ "." ^ y2,"date-interval",[[]]); cat="DayNumber"} + | Compound("date-interval",[Compound("date",[Dig(d1,"day");Dig(m1,"month");Dig(y1,"2dig")]); + Compound("date",[Dig(d2,"day");Dig(m2,"month");Dig(y2,"year")])]) -> {t with token=Lemma(d1 ^ "." ^ m1 ^ "." ^ y1 ^ "-" ^ d2 ^ "." ^ m2 ^ "." ^ y2,"date-interval",[[]]); cat="DayNumber"} + | Compound("date-interval",[Compound("date",[Dig(d1,"day");Dig(m1,"month");Dig(y1,"2dig")]); + Compound("date",[Dig(d2,"day");Dig(m2,"month");Dig(y2,"2dig")])]) -> {t with token=Lemma(d1 ^ "." ^ m1 ^ "." ^ y1 ^ "-" ^ d2 ^ "." ^ m2 ^ "." ^ y2,"date-interval",[[]]); cat="DayNumber"} | Compound("day-month-interval",[Compound("day-month",[Dig(d1,"day");Dig(m1,"month")]); Compound("day-month",[Dig(d2,"day");Dig(m2,"month")])]) -> {t with token=Lemma(d1 ^ "." ^ m1 ^ "-" ^ d2 ^ "." ^ m2,"day-month-interval",[[]]); cat="DayNumber"} | Compound("day-interval",[Dig(d1,"day");Dig(d2,"day")]) -> {t with token=Lemma(d1 ^ "-" ^ d2,"day-interval",[[]]); cat="DayNumber"} diff --git a/subsyntax/resources/brev.tab b/subsyntax/resources/brev.tab index a63468f..70d7ee1 100644 --- a/subsyntax/resources/brev.tab +++ b/subsyntax/resources/brev.tab @@ -159,7 +159,7 @@ I . I xxx ib . ibidem xxx ibid . ibidem xxx ie . indoeuropejski adj:_:_:_:pos -IgE Immunoglobina E subst:sg:_:f +IgE Immunoglobina E subst:sg:_:f ilustr . ilustracja subst:_:_:f im . imię subst:sg:nom:n:ncol im . imię subst:sg:gen:n:ncol @@ -617,7 +617,7 @@ zm . zmarły subst:_:_:m1 zm . zemrzeć praet:_:_:perf zm . zmarły adj:_:_:_:pos zm . zmiana subst:_:_:f -zm . zemrzeć praet:sg:_:m1.m2.m3 +#zm . zemrzeć praet:sg:m1.m2.m3:perf zn . znak subst:_:_:m3 zob . zobaczyć impt:sg:sec:perf Zw . związek subst:_:_:m3