From 303b3f470009daf4256158659aa1af3d83a7eb60 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Wed, 29 Sep 2010 07:07:07 +0000
Subject: [PATCH] restricted Cat import in Numeral (for some languages; to do
 more)

---
 lib/src/abstract/Numeral.gf   | 2 +-
 lib/src/english/NumeralEng.gf | 2 +-
 lib/src/finnish/NumeralFin.gf | 2 +-
 lib/src/french/NumeralFre.gf  | 2 +-
 lib/src/german/NumeralGer.gf  | 2 +-
 lib/src/italian/NumeralIta.gf | 2 +-
 lib/src/swedish/NumeralSwe.gf | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/src/abstract/Numeral.gf b/lib/src/abstract/Numeral.gf
index aaeb7a378..a483a7dd2 100644
--- a/lib/src/abstract/Numeral.gf
+++ b/lib/src/abstract/Numeral.gf
@@ -17,7 +17,7 @@
 -- parts of a numeral, which is often incorrect - more work on
 -- (un)lexing is needed to solve this problem.
 
-abstract Numeral = Cat ** {
+abstract Numeral = Cat [Numeral,Digits] ** {
 
 cat 
   Digit ;       -- 2..9
diff --git a/lib/src/english/NumeralEng.gf b/lib/src/english/NumeralEng.gf
index ff41a4a70..fbc28717e 100644
--- a/lib/src/english/NumeralEng.gf
+++ b/lib/src/english/NumeralEng.gf
@@ -1,4 +1,4 @@
-concrete NumeralEng of Numeral = CatEng ** open ResEng in {
+concrete NumeralEng of Numeral = CatEng [Numeral,Digits] ** open ResEng in {
 
 lincat 
   Digit = {s : DForm => CardOrd => Case => Str} ;
diff --git a/lib/src/finnish/NumeralFin.gf b/lib/src/finnish/NumeralFin.gf
index 9aaa2b29b..f7f596769 100644
--- a/lib/src/finnish/NumeralFin.gf
+++ b/lib/src/finnish/NumeralFin.gf
@@ -1,4 +1,4 @@
-concrete NumeralFin of Numeral = CatFin **  open Prelude, ParadigmsFin, MorphoFin in {
+concrete NumeralFin of Numeral = CatFin [Numeral,Digits] **  open Prelude, ParadigmsFin, MorphoFin in {
 
 -- Notice: possessive forms are not used. They get wrong, since every
 -- part is made to agree in them.
diff --git a/lib/src/french/NumeralFre.gf b/lib/src/french/NumeralFre.gf
index 0c2999707..dd7ad3760 100644
--- a/lib/src/french/NumeralFre.gf
+++ b/lib/src/french/NumeralFre.gf
@@ -1,4 +1,4 @@
-concrete NumeralFre of Numeral = CatFre ** 
+concrete NumeralFre of Numeral = CatFre [Numeral,Digits] ** 
   open CommonRomance, ResRomance, MorphoFre, Prelude in {
 
 -- originally written in 1998, automatically translated to current notation...
diff --git a/lib/src/german/NumeralGer.gf b/lib/src/german/NumeralGer.gf
index 27299c0c7..9c4a79e5c 100644
--- a/lib/src/german/NumeralGer.gf
+++ b/lib/src/german/NumeralGer.gf
@@ -1,4 +1,4 @@
-concrete NumeralGer of Numeral = CatGer ** open MorphoGer, Prelude in {
+concrete NumeralGer of Numeral = CatGer [Numeral,Digits] ** open MorphoGer, Prelude in {
 
 flags optimize = all_subs ;
 
diff --git a/lib/src/italian/NumeralIta.gf b/lib/src/italian/NumeralIta.gf
index 3dd3e694d..5f5e48f84 100644
--- a/lib/src/italian/NumeralIta.gf
+++ b/lib/src/italian/NumeralIta.gf
@@ -1,4 +1,4 @@
-concrete NumeralIta of Numeral = CatIta ** 
+concrete NumeralIta of Numeral = CatIta [Numeral,Digits] ** 
   open CommonRomance, ResRomance, MorphoIta, Prelude in {
 
 lincat 
diff --git a/lib/src/swedish/NumeralSwe.gf b/lib/src/swedish/NumeralSwe.gf
index 7c06a702e..82d4ac0f8 100644
--- a/lib/src/swedish/NumeralSwe.gf
+++ b/lib/src/swedish/NumeralSwe.gf
@@ -1,4 +1,4 @@
-concrete NumeralSwe of Numeral = CatSwe ** open ResSwe, MorphoSwe, Prelude in {
+concrete NumeralSwe of Numeral = CatSwe [Numeral,Digits] ** open ResSwe, MorphoSwe, Prelude in {
 
 lincat 
   Digit = {s : DForm => CardOrd => Str} ;