From ed49de985bb1aec034bcf80d08040fc0a3d12378 Mon Sep 17 00:00:00 2001 From: jfschaefer <jfschaefer@outlook.com> Date: Sat, 14 Jul 2018 20:33:42 +0200 Subject: [PATCH] more work rel wip paper --- gf/DGrammarEng.gf | 2 +- gf/DLexiconGer.gf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gf/DGrammarEng.gf b/gf/DGrammarEng.gf index b77e636..a863c98 100644 --- a/gf/DGrammarEng.gf +++ b/gf/DGrammarEng.gf @@ -37,7 +37,7 @@ concrete DGrammarEng of DGrammar = MCatsEng, GrammarEng, ExtraEng ** open Syntax (DetCN aSg_Det (mobjToCN obj id)) -- (mkNP aSg_Det (mobjToCN obj)) (PastPartAP (mkVPSlash call_V2A prop))); -- -- iff_definition defi condition = lin S { s = "iff" }; -- better solution for this? - iff_definition defi condition = lin S { s = defi.s ++ "iff" ++ condition.s }; -- better solution for this? + iff_definition defi condition = lin S { s = defi.s ++ ("," | "") ++ "iff" ++ condition.s }; -- better solution for this? -- def_defmobj_defmobj a b = mkCl a b; def_mobj_is_mobj definiendum id definiens = mkS (mkCl (DetCN aSg_Det (mobjToCN definiens id)) (mobjToCN definiendum)) -- a unitary quasigroup is a loop diff --git a/gf/DLexiconGer.gf b/gf/DLexiconGer.gf index 6c1af59..15e3b1a 100644 --- a/gf/DLexiconGer.gf +++ b/gf/DLexiconGer.gf @@ -11,6 +11,6 @@ concrete DLexiconGer of DLexicon = MCatsGer ** open SyntaxGer, ParadigmsGer, Res empty_MObjProp = mkAP (ParadigmsGer.mkA "leer"); even_MObjProp = mkAP (ParadigmsGer.mkA "gerade"); positive_MObjProp = mkAP (ParadigmsGer.mkA "positiv"); - prime_MObjProp = mkAP (ParadigmsGer.mkA "primzahlig"); + prime_MObjProp = mkAP (ParadigmsGer.mkA "prim"); unital_MObjProp = mkAP (ParadigmsGer.mkA "unitär"); } -- GitLab