replace N prefix (natural language) by D prefix (discourse)

gf/NGrammar.gf → gf/DGrammar.gf

 -- abstract grammar for natural language
-abstract NGrammar = MCats, Grammar, Extra, ExtraEngAbs ** {
+abstract DGrammar = MCats, Grammar, Extra, ExtraEngAbs ** {
     fun
         PosPol : PosNegPol;
         NegPol : PosNegPol;

gf/NGrammarEng.gf → gf/DGrammarEng.gf

-concrete NGrammarEng of NGrammar = MCatsEng, GrammarEng, ExtraEng ** open SyntaxEng, ParadigmsEng, UtilsEng, ResEng, ParamX in {
+concrete DGrammarEng of DGrammar = MCatsEng, GrammarEng, ExtraEng ** open SyntaxEng, ParadigmsEng, UtilsEng, ResEng, ParamX in {
     oper
         call_V2A : V2A = mkV2A (mkV "call" "calls" "called" "called" "calling") noPrep;
         call_V3 : V3 = mkV3 (mkV "call" "calls" "called" "called" "calling");

gf/NGrammarGer.gf → gf/DGrammarGer.gf

-concrete NGrammarGer of NGrammar = MCatsGer, GrammarGer** open SyntaxGer, ParadigmsGer, UtilsGer, ResGer, ParamX, Prelude in {
+concrete DGrammarGer of DGrammar = MCatsGer, GrammarGer** open SyntaxGer, ParadigmsGer, UtilsGer, ResGer, ParamX, Prelude in {
     oper
         call_V2A : V2A = mkV2A (ParadigmsGer.mkV "heißen");
         call_V3 : V3 = mkV3 (ParadigmsGer.mkV "heißen");

gf/NGrammarLog.gf → gf/DGrammarLog.gf

-concrete NGrammarLog of NGrammar = MCatsLog ** {
+concrete DGrammarLog of DGrammar = MCatsLog ** {
     oper
         ofx : Str -> Str = \s -> s ++ "(" ++ "x" ++ ")";
         lwrap : Str -> Str = \f -> "(" ++ "λx." ++ f ++ ")";

gf/NLexicon.gf → gf/DLexicon.gf

 -- natural language lexicon
-abstract NLexicon = MCats, NLexiconMObj, Cat ** {
+abstract DLexicon = MCats, DLexiconMObj, Cat ** {
     fun
 --        integer_MObj : MObj;
 --        set_MObj : MObj;

gf/NLexiconEng.gf → gf/DLexiconEng.gf

-concrete NLexiconEng of NLexicon = MCatsEng, NLexiconMObjEng ** open SyntaxEng, ParadigmsEng, UtilsEng in {
+concrete DLexiconEng of DLexicon = MCatsEng, DLexiconMObjEng ** open SyntaxEng, ParadigmsEng, UtilsEng in {
     lin
 --        integer_MObj = mkCN (mkN "integer");
 --        set_MObj = mkCN (mkN "set");

gf/NLexiconGer.gf → gf/DLexiconGer.gf

-concrete NLexiconGer of NLexicon = MCatsGer ** open SyntaxGer, ParadigmsGer, ResGer, UtilsGer in {
+concrete DLexiconGer of DLexicon = MCatsGer ** open SyntaxGer, ParadigmsGer, ResGer, UtilsGer in {
     lin
 --        integer_MObj = mkCN (mkN "integer");
 --        set_MObj = mkCN (mkN "set");

gf/NLexiconLog.gf → gf/DLexiconLog.gf

-concrete NLexiconLog of NLexicon = MCatsLog, NLexiconMObjLog ** {
+concrete DLexiconLog of DLexicon = MCatsLog, DLexiconMObjLog ** {
     lin
 --        integer_MObj = mkCN (mkN "integer");
 --        set_MObj = mkCN (mkN "set");

gf/NLexiconMObj.gf → gf/DLexiconMObj.gf

@@ -2,7 +2,7 @@
 -- Some physics papers were included, so a few physical nouns are contained as well.
 -- The machine learning algorithm is still under development and more refined and more complete results can be expected.
 -- Currently all nouns are of type MObj. This shouldn't be the case, as e.g. optimality does not represent a mathematical object.
-abstract NLexiconMObj = MCats ** {
+abstract DLexiconMObj = MCats ** {
     fun
         set_MObj : MObj;
         function_MObj : MObj;

gf/NLexiconMObjEng.gf → gf/DLexiconMObjEng.gf

@@ -3,7 +3,7 @@
 -- The machine learning algorithm is still under development and more refined and more complete results can be expected.
 -- Currently all nouns are of type MObj. This shouldn't be the case, as e.g. optimality does not represent a mathematical object.
 -- NOTE: IRREGULAR NOUNS ARE NOT HANDLED PROPERLY (consider e.g. "vertex" (pl. "vertices"))
-concrete NLexiconMObjEng of NLexiconMObj = MCatsEng ** open SyntaxEng, ParadigmsEng, UtilsEng in {
+concrete DLexiconMObjEng of DLexiconMObj = MCatsEng ** open SyntaxEng, ParadigmsEng, UtilsEng in {
 --    oper
 --        mkMObj : N -> MObj = \noun -> let obj : CN = mkCN noun in
 --        lin MObj {

gf/NLexiconMObjLog.gf → gf/DLexiconMObjLog.gf

-concrete NLexiconMObjLog of NLexiconMObj = MCatsLog ** {
+concrete DLexiconMObjLog of DLexiconMObj = MCatsLog ** {
     lin
         set_MObj = "set" ++ "(" ++ "x" ++ ")";
         function_MObj = "function" ++ "(" ++ "x" ++ ")";

gf/MNlp.gf

 -- Collects all the stuff we have for parsing math
-abstract MNlp = NLexicon, NGrammar, FGrammar, FLexicon ** {
+abstract MNlp = DLexicon, DGrammar, FGrammar, FLexicon ** {
     flags
         startcat = Utterance;
 }

gf/MNlpEng.gf

-concrete MNlpEng of MNlp = NLexiconEng, NGrammarEng, FGrammarEng, FLexiconEng ** {
+concrete MNlpEng of MNlp = DLexiconEng, DGrammarEng, FGrammarEng, FLexiconEng ** {
 
 }

gf/MNlpGer.gf

-concrete MNlpGer of MNlp = NLexiconGer, NGrammarGer, FGrammarGer, FLexiconGer ** {
+concrete MNlpGer of MNlp = DLexiconGer, DGrammarGer, FGrammarGer, FLexiconGer ** {
 
 }

gf/MNlpLog.gf

-concrete MNlpLog of MNlp = NLexiconLog, NGrammarLog, FGrammarLog, FLexiconLog ** {
+concrete MNlpLog of MNlp = DLexiconLog, DGrammarLog, FGrammarLog, FLexiconLog ** {
 
 }