From 0f08827320839c62d35fc97998b40314b1d6d9ed Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 31 Jan 2006 14:04:38 +0000 Subject: [PATCH] Math to mathematical/Symbol --- examples/tram/TramEng.gf | 4 ++-- examples/tram/TramFre.gf | 4 ++-- examples/tram/TramGer.gf | 4 ++-- examples/tram/TramI.gf | 2 +- examples/tram/TramSwe.gf | 4 ++-- lib/resource-1.0/french/MathFre.gf | 2 -- .../{abstract/Math.gf => mathematical/Symbol.gf} | 13 +++++++------ .../MathEng.gf => mathematical/SymbolEng.gf} | 2 +- lib/resource-1.0/mathematical/SymbolFre.gf | 2 ++ .../MathGer.gf => mathematical/SymbolGer.gf} | 2 +- .../SymbolRomance.gf} | 2 +- .../MathScand.gf => mathematical/SymbolScand.gf} | 4 ++-- lib/resource-1.0/mathematical/SymbolSwe.gf | 2 ++ lib/resource-1.0/multimodal/Demonstrative.gf | 2 +- lib/resource-1.0/multimodal/DemonstrativeEng.gf | 2 +- lib/resource-1.0/multimodal/DemonstrativeFre.gf | 2 +- lib/resource-1.0/multimodal/DemonstrativeGer.gf | 2 +- lib/resource-1.0/multimodal/DemonstrativeI.gf | 2 +- lib/resource-1.0/multimodal/DemonstrativeSwe.gf | 2 +- lib/resource-1.0/swedish/MathSwe.gf | 2 -- 20 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 lib/resource-1.0/french/MathFre.gf rename lib/resource-1.0/{abstract/Math.gf => mathematical/Symbol.gf} (53%) rename lib/resource-1.0/{english/MathEng.gf => mathematical/SymbolEng.gf} (86%) create mode 100644 lib/resource-1.0/mathematical/SymbolFre.gf rename lib/resource-1.0/{german/MathGer.gf => mathematical/SymbolGer.gf} (87%) rename lib/resource-1.0/{romance/MathRomance.gf => mathematical/SymbolRomance.gf} (91%) rename lib/resource-1.0/{scandinavian/MathScand.gf => mathematical/SymbolScand.gf} (82%) create mode 100644 lib/resource-1.0/mathematical/SymbolSwe.gf delete mode 100644 lib/resource-1.0/swedish/MathSwe.gf diff --git a/examples/tram/TramEng.gf b/examples/tram/TramEng.gf index b4bc7921b..04ddef750 100644 --- a/examples/tram/TramEng.gf +++ b/examples/tram/TramEng.gf @@ -1,5 +1,5 @@ ---# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/english:prelude +--# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/english:prelude:resource-1.0/mathematical concrete TramEng of Tram = TramI with (Multimodal = MultimodalEng), - (Math = MathEng) ; + (Symbol = SymbolEng) ; diff --git a/examples/tram/TramFre.gf b/examples/tram/TramFre.gf index bf630c6a2..8c3cb7529 100644 --- a/examples/tram/TramFre.gf +++ b/examples/tram/TramFre.gf @@ -1,5 +1,5 @@ ---# -path=.:resource-1.0/abstract:resource-1.0/french:resource-1.0/common:resource-1.0/multimodal:resource-1.0/romance:prelude +--# -path=.:resource-1.0/abstract:resource-1.0/french:resource-1.0/common:resource-1.0/multimodal:resource-1.0/romance:prelude:resource-1.0/mathematical concrete TramFre of Tram = TramI with (Multimodal = MultimodalFre), - (Math = MathFre) ; + (Symbol = SymbolFre) ; diff --git a/examples/tram/TramGer.gf b/examples/tram/TramGer.gf index 1446cfa24..fb97452cb 100644 --- a/examples/tram/TramGer.gf +++ b/examples/tram/TramGer.gf @@ -1,5 +1,5 @@ ---# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/german:prelude +--# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/mathematical:resource-1.0/multimodal:resource-1.0/german:prelude concrete TramGer of Tram = TramI with (Multimodal = MultimodalGer), - (Math = MathGer) ; + (Symbol = SymbolGer) ; diff --git a/examples/tram/TramI.gf b/examples/tram/TramI.gf index 37b0138c0..1d505fc58 100644 --- a/examples/tram/TramI.gf +++ b/examples/tram/TramI.gf @@ -1,4 +1,4 @@ -incomplete concrete TramI of Tram = open Multimodal, Math in { +incomplete concrete TramI of Tram = open Multimodal, Symbol in { flags startcat=Query ; lexer=textlit ; diff --git a/examples/tram/TramSwe.gf b/examples/tram/TramSwe.gf index 70cce6d77..e92e5d706 100644 --- a/examples/tram/TramSwe.gf +++ b/examples/tram/TramSwe.gf @@ -1,5 +1,5 @@ ---# -path=.:resource-1.0/abstract:resource-1.0/swedish:resource-1.0/common:resource-1.0/multimodal:resource-1.0/scandinavian:prelude +--# -path=.:resource-1.0/abstract:resource-1.0/swedish:resource-1.0/common:resource-1.0/multimodal:resource-1.0/scandinavian:prelude:resource-1.0/mathematical concrete TramSwe of Tram = TramI with (Multimodal = MultimodalSwe), - (Math = MathSwe) ; + (Symbol = SymbolSwe) ; diff --git a/lib/resource-1.0/french/MathFre.gf b/lib/resource-1.0/french/MathFre.gf deleted file mode 100644 index 91368b60b..000000000 --- a/lib/resource-1.0/french/MathFre.gf +++ /dev/null @@ -1,2 +0,0 @@ -concrete MathFre of Math = CatFre ** MathRomance with - (ResRomance = ResFre) ; diff --git a/lib/resource-1.0/abstract/Math.gf b/lib/resource-1.0/mathematical/Symbol.gf similarity index 53% rename from lib/resource-1.0/abstract/Math.gf rename to lib/resource-1.0/mathematical/Symbol.gf index 4598fd724..a8ae1b38a 100644 --- a/lib/resource-1.0/abstract/Math.gf +++ b/lib/resource-1.0/mathematical/Symbol.gf @@ -3,16 +3,17 @@ -- *Note*. This module is not automatically included in the main -- grammar [Lang Lang.html]. -abstract Math = Cat ** { +abstract Symbol = Cat ** { ---2 Noun phrases with symbols +--2 Noun phrases with symbols and numbers fun - SymbPN : Symb -> PN ; -- x - IntPN : Int -> PN ; -- 27 - CNIntNP : CN -> Int -> NP ; -- level 53 - CNSymbNP : Det -> CN -> [Symb] -> NP ; -- (the) (2) numbers x and y + SymbPN : Symb -> PN ; -- x + IntPN : Int -> PN ; -- 27 + FloatPN : Float -> PN ; -- 3.14159 + CNIntNP : CN -> Int -> NP ; -- level 53 + CNSymbNP : Det -> CN -> [Symb] -> NP ; -- (the) (2) numbers x and y --2 Symbol lists diff --git a/lib/resource-1.0/english/MathEng.gf b/lib/resource-1.0/mathematical/SymbolEng.gf similarity index 86% rename from lib/resource-1.0/english/MathEng.gf rename to lib/resource-1.0/mathematical/SymbolEng.gf index 8bfaee695..a231714cb 100644 --- a/lib/resource-1.0/english/MathEng.gf +++ b/lib/resource-1.0/mathematical/SymbolEng.gf @@ -1,4 +1,4 @@ -concrete MathEng of Math = CatEng ** open Prelude, ResEng in { +concrete SymbolEng of Symbol = CatEng ** open Prelude, ResEng in { lin SymbPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c diff --git a/lib/resource-1.0/mathematical/SymbolFre.gf b/lib/resource-1.0/mathematical/SymbolFre.gf new file mode 100644 index 000000000..ab972c039 --- /dev/null +++ b/lib/resource-1.0/mathematical/SymbolFre.gf @@ -0,0 +1,2 @@ +concrete SymbolFre of Symbol = CatFre ** SymbolRomance with + (ResRomance = ResFre) ; diff --git a/lib/resource-1.0/german/MathGer.gf b/lib/resource-1.0/mathematical/SymbolGer.gf similarity index 87% rename from lib/resource-1.0/german/MathGer.gf rename to lib/resource-1.0/mathematical/SymbolGer.gf index 2ea3598e4..0c5895747 100644 --- a/lib/resource-1.0/german/MathGer.gf +++ b/lib/resource-1.0/mathematical/SymbolGer.gf @@ -1,4 +1,4 @@ -concrete MathGer of Math = CatGer ** open Prelude, ResGer in { +concrete SymbolGer of Symbol = CatGer ** open Prelude, ResGer in { lin SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c diff --git a/lib/resource-1.0/romance/MathRomance.gf b/lib/resource-1.0/mathematical/SymbolRomance.gf similarity index 91% rename from lib/resource-1.0/romance/MathRomance.gf rename to lib/resource-1.0/mathematical/SymbolRomance.gf index dc7919496..241c9dd4f 100644 --- a/lib/resource-1.0/romance/MathRomance.gf +++ b/lib/resource-1.0/mathematical/SymbolRomance.gf @@ -1,4 +1,4 @@ -incomplete concrete MathRomance of Math = +incomplete concrete SymbolRomance of Symbol = CatRomance ** open Prelude, CommonRomance, ResRomance in { lin diff --git a/lib/resource-1.0/scandinavian/MathScand.gf b/lib/resource-1.0/mathematical/SymbolScand.gf similarity index 82% rename from lib/resource-1.0/scandinavian/MathScand.gf rename to lib/resource-1.0/mathematical/SymbolScand.gf index 5317418fb..e09628aaa 100644 --- a/lib/resource-1.0/scandinavian/MathScand.gf +++ b/lib/resource-1.0/mathematical/SymbolScand.gf @@ -1,5 +1,5 @@ -incomplete concrete MathScand of Math = - CatScand ** open Prelude, ResScand, DiffScand in { +incomplete concrete SymbolScand of Symbol = + CatScand ** open Prelude, ResScand, CommonScand in { lin SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c diff --git a/lib/resource-1.0/mathematical/SymbolSwe.gf b/lib/resource-1.0/mathematical/SymbolSwe.gf new file mode 100644 index 000000000..b80619c06 --- /dev/null +++ b/lib/resource-1.0/mathematical/SymbolSwe.gf @@ -0,0 +1,2 @@ +concrete SymbolSwe of Symbol = CatSwe ** SymbolScand with + (ResScand = ResSwe) ; diff --git a/lib/resource-1.0/multimodal/Demonstrative.gf b/lib/resource-1.0/multimodal/Demonstrative.gf index d3f7c1cb2..c1427e0a3 100644 --- a/lib/resource-1.0/multimodal/Demonstrative.gf +++ b/lib/resource-1.0/multimodal/Demonstrative.gf @@ -1,4 +1,4 @@ -abstract Demonstrative = Cat, Tense ** { +abstract Demonstrative = Cat ** { -- Naming convention: $M$ prepended to 'unimodal' names. -- Exceptions: lexical units, those without unimodal counterparts. diff --git a/lib/resource-1.0/multimodal/DemonstrativeEng.gf b/lib/resource-1.0/multimodal/DemonstrativeEng.gf index 510882d16..82e323903 100644 --- a/lib/resource-1.0/multimodal/DemonstrativeEng.gf +++ b/lib/resource-1.0/multimodal/DemonstrativeEng.gf @@ -1,4 +1,4 @@ --# -path=.:../english/:../abstract:../common:prelude -concrete DemonstrativeEng of Demonstrative = CatEng, TenseX ** DemonstrativeI with +concrete DemonstrativeEng of Demonstrative = CatEng ** DemonstrativeI with (Lang = LangEng) ; diff --git a/lib/resource-1.0/multimodal/DemonstrativeFre.gf b/lib/resource-1.0/multimodal/DemonstrativeFre.gf index c6495e772..19b4497c6 100644 --- a/lib/resource-1.0/multimodal/DemonstrativeFre.gf +++ b/lib/resource-1.0/multimodal/DemonstrativeFre.gf @@ -1,2 +1,2 @@ -concrete DemonstrativeFre of Demonstrative = CatFre, TenseX ** DemonstrativeI with +concrete DemonstrativeFre of Demonstrative = CatFre ** DemonstrativeI with (Lang = LangFre) ; diff --git a/lib/resource-1.0/multimodal/DemonstrativeGer.gf b/lib/resource-1.0/multimodal/DemonstrativeGer.gf index 016cc632c..32cb8c8fe 100644 --- a/lib/resource-1.0/multimodal/DemonstrativeGer.gf +++ b/lib/resource-1.0/multimodal/DemonstrativeGer.gf @@ -1,4 +1,4 @@ --# -path=.:../german/:../abstract:../common:prelude -concrete DemonstrativeGer of Demonstrative = CatGer, TenseX ** DemonstrativeI with +concrete DemonstrativeGer of Demonstrative = CatGer ** DemonstrativeI with (Lang = LangGer) ; diff --git a/lib/resource-1.0/multimodal/DemonstrativeI.gf b/lib/resource-1.0/multimodal/DemonstrativeI.gf index e29be3845..e43ecdbbd 100644 --- a/lib/resource-1.0/multimodal/DemonstrativeI.gf +++ b/lib/resource-1.0/multimodal/DemonstrativeI.gf @@ -1,4 +1,4 @@ -incomplete concrete DemonstrativeI of Demonstrative = Cat, TenseX ** +incomplete concrete DemonstrativeI of Demonstrative = Cat ** open Prelude, Lang, ParamX, DemRes in { lincat diff --git a/lib/resource-1.0/multimodal/DemonstrativeSwe.gf b/lib/resource-1.0/multimodal/DemonstrativeSwe.gf index 51813ecbb..a34ae1f2a 100644 --- a/lib/resource-1.0/multimodal/DemonstrativeSwe.gf +++ b/lib/resource-1.0/multimodal/DemonstrativeSwe.gf @@ -1,4 +1,4 @@ -concrete DemonstrativeSwe of Demonstrative = CatSwe, TenseX ** DemonstrativeI with +concrete DemonstrativeSwe of Demonstrative = CatSwe ** DemonstrativeI with (Lang = LangSwe) ; diff --git a/lib/resource-1.0/swedish/MathSwe.gf b/lib/resource-1.0/swedish/MathSwe.gf deleted file mode 100644 index 4b81ecf0f..000000000 --- a/lib/resource-1.0/swedish/MathSwe.gf +++ /dev/null @@ -1,2 +0,0 @@ -concrete MathSwe of Math = CatSwe ** MathScand with - (ResScand = ResSwe) ;