*** empty log message ***

3 files changed, 302 insertions, 2 deletions

diff --git a/grammars/health/healthExcept.gf b/grammars/health/healthExcept.gf
new file mode 100644
index 000000000..bf86e8110
--- /dev/null
+++ b/grammars/health/healthExcept.gf
@@ -0,0 +1,20 @@
+abstract healthExcept = Structural ** {
+fun painkiller58 : N ;
+fun painkiller59 : N ;
+fun painkiller60 : N ;
+fun painkiller61 : N ;
+fun painkiller62 : N ;
+fun painkiller63 : N ;
+fun painkiller64 : N ;
+fun painkiller65 : N ;
+fun painkiller66 : N ;
+fun painkiller67 : N ;
+fun painkiller68 : N ;
+fun painkiller68 : N ;
+fun painkiller68 : N ;
+fun painkiller68 : N ;
+fun painkiller69 : N ;
+fun painkiller70 : N ;
+fun painkiller71 : N ;
+fun painkiller72 : N ;
+}
\ No newline at end of file
diff --git a/grammars/health/healthExceptEng.gf b/grammars/health/healthExceptEng.gf
new file mode 100644
index 000000000..db0ec86b8
--- /dev/null
+++ b/grammars/health/healthExceptEng.gf
@@ -0,0 +1,280 @@
+--# -path=.:../resource/abstract:../prelude:../resource/english
+
+concrete healthExceptEng of healthExcept = StructuralEng ** open ParadigmsEng, TypesEng in {
+
+flags startcat=Phr ; lexer=textlit ; parser=chart ; unlexer=text ;
+
+lin painkiller58 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+}lin painkiller59 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller60 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    }
+    } ;
+  g : Gender = Hm ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller61 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    }
+    } ;
+  g : Gender = Hm ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller62 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    }
+    } ;
+  g : Gender = Hm ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller63 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    }
+    } ;
+  g : Gender = Hu ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller64 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    }
+    } ;
+  g  Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller65 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    }
+    } ;
+  g : Gender = Hum;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller66 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller67 = mkN "painkiller" "painkiller" "painkiller" "painkiller" nonhuman  ;
+lin painkiller68 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "??????" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller68 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "привет" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller68 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "åöä" ;
+      Gen => "здрасте" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller68 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "öäå" ;
+      Gen => "привет" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller69 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "привет" ;
+      Gen => "öäå" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller70 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "??????" ;
+      Gen => "���" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller71 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "painkiller" ;
+      Gen => "привет" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+lin painkiller72 = {
+  s : Number => Case => Str = table Number {
+    Sg => table Case {
+      Nom => "painkiller" ;
+      Gen => "painkiller" 
+    } ;
+    Pl => table Case {
+      Nom => "öäå" ;
+      Gen => "привет" 
+    }
+    } ;
+  g : Gender = Hum ;
+  lock_N : {
+    }
+  = < > 
+} ;
+}
\ No newline at end of file
diff --git a/src/JavaGUI/GFEditor2.java b/src/JavaGUI/GFEditor2.java
index cf0471134..aa2e13bf4 100644
--- a/src/JavaGUI/GFEditor2.java
+++ b/src/JavaGUI/GFEditor2.java
@@ -31,9 +31,9 @@ public class GFEditor2 extends JFrame implements ActionListener, CaretListener,
     public MouseEvent m2;

     public static String selectedText="";

 

-    public static boolean debug = false;

+    public static boolean debug = true;

     public static boolean debug3 = false;

-    public static boolean debug2 = false;

+    public static boolean debug2 = true;

     public static boolean selectionCheck = false;

     public static String focusPosition = "";

     public static String stringToAppend = "";