Merge branch 'master' of github.com:GrammaticalFramework/gf-rgl

This commit is contained in:
Krasimir Angelov
2026-09-03 10:41:27 +02:00
5 changed files with 14 additions and 3 deletions
+3
View File
@@ -122,6 +122,9 @@ lin
inflClauseTense (heading past_Parameter) inflClauseTense (heading past_Parameter)
(heading past_Parameter ++ " " ++ heading perfect_Parameter) (heading past_Parameter ++ " " ++ heading perfect_Parameter)
RPast cl ++ RPast cl ++
inflClauseTense (heading past_Parameter)
(heading past_Parameter ++ " " ++ heading perfect_Parameter)
RPasse cl ++
inflClauseTense (heading future_Parameter) inflClauseTense (heading future_Parameter)
(heading future_Parameter ++ " " ++ heading perfect_Parameter) (heading future_Parameter ++ " " ++ heading perfect_Parameter)
RFut cl ++ RFut cl ++
+3
View File
@@ -112,6 +112,9 @@ lin
inflClauseTense (heading past_Parameter) inflClauseTense (heading past_Parameter)
(heading past_Parameter ++ " " ++ heading perfect_Parameter) (heading past_Parameter ++ " " ++ heading perfect_Parameter)
RPast cl ++ RPast cl ++
inflClauseTense (heading past_Parameter)
(heading past_Parameter ++ " " ++ heading perfect_Parameter)
RPasse cl ++
inflClauseTense (heading future_Parameter) inflClauseTense (heading future_Parameter)
(heading future_Parameter ++ " " ++ heading perfect_Parameter) (heading future_Parameter ++ " " ++ heading perfect_Parameter)
RFut cl ++ RFut cl ++
@@ -112,6 +112,9 @@ lin
inflClauseTense (heading past_Parameter) inflClauseTense (heading past_Parameter)
(heading past_Parameter ++ " " ++ heading perfect_Parameter) (heading past_Parameter ++ " " ++ heading perfect_Parameter)
RPast cl ++ RPast cl ++
inflClauseTense (heading past_Parameter)
(heading past_Parameter ++ " " ++ heading perfect_Parameter)
RPasse cl ++
inflClauseTense (heading future_Parameter) inflClauseTense (heading future_Parameter)
(heading future_Parameter ++ " " ++ heading perfect_Parameter) (heading future_Parameter ++ " " ++ heading perfect_Parameter)
RFut cl ++ RFut cl ++
+2 -3
View File
@@ -177,11 +177,10 @@ oper
{- {-
-} --# notpresent -} --# notpresent
clauseTense : Str -> ResRus.Tense -> Cl -> Str = \label,tense,cl -> clauseTense : Str -> ResRus.Tense -> Cl -> Str = \label,tense,cl ->
tr (th (label ++ " (полож.)") ++ tr (intagAttr "th" "rowspan=\"2\"" label ++
td (clauseForm tense Pos cl) ++ td (clauseForm tense Pos cl) ++
td (clauseForm tense Pos cl)) ++ td (clauseForm tense Pos cl)) ++
tr (th (label ++ " (отриц.)") ++ tr (td (clauseForm tense Neg cl) ++
td (clauseForm tense Neg cl) ++
td (clauseForm tense Neg cl)) ; td (clauseForm tense Neg cl)) ;
clauseForm : ResRus.Tense -> Polarity -> Cl -> Str = \tense,pol,cl -> clauseForm : ResRus.Tense -> Polarity -> Cl -> Str = \tense,pol,cl ->
+3
View File
@@ -120,6 +120,9 @@ lin
inflClauseTense (heading past_Parameter) inflClauseTense (heading past_Parameter)
(heading past_Parameter ++ " " ++ heading perfect_Parameter) (heading past_Parameter ++ " " ++ heading perfect_Parameter)
RPast cl ++ RPast cl ++
inflClauseTense (heading past_Parameter)
(heading past_Parameter ++ " " ++ heading perfect_Parameter)
RPasse cl ++
inflClauseTense (heading future_Parameter) inflClauseTense (heading future_Parameter)
(heading future_Parameter ++ " " ++ heading perfect_Parameter) (heading future_Parameter ++ " " ++ heading perfect_Parameter)
RFut cl ++ RFut cl ++