--- a/software/mpdl-services/mpiwg-mpdl-lt/src/de/mpg/mpiwg/berlin/mpdl/lt/text/norm/lang/MpdlNormalizerLexFR.java	Wed Dec 14 13:57:09 2011 +0100
+++ b/software/mpdl-services/mpiwg-mpdl-lt/src/de/mpg/mpiwg/berlin/mpdl/lt/text/norm/lang/MpdlNormalizerLexFR.java	Tue Nov 27 12:35:19 2012 +0100
@@ -1,11 +1,11 @@
-/* The following code was generated by JFlex 1.4.3 on 05.09.11 10:35 */
+/* The following code was generated by JFlex 1.4.3 on 28.03.12 18:57 */
 
 /*
  * Normalization rules for French text
  * [this is a JFlex specification]
  *
  * Wolfgang Schmidle 
- * version 2011-08-10
+ * version 2011-07-12
  *
  */
 
@@ -15,8 +15,8 @@
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 05.09.11 10:35 from the specification file
- * <tt>MpdlNormalizerLexFR.lex</tt>
+ * on 28.03.12 18:57 from the specification file
+ * <tt>/Users/jwillenborg/test/jflexNew/MpdlNormalizerLexFR.lex</tt>
  */
 public class MpdlNormalizerLexFR {
 
@@ -27,10 +27,10 @@
   private static final int ZZ_BUFFERSIZE = 16384;
 
   /** lexical states */
-  public static final int DICT_ASCII = 8;
   public static final int SEARCH = 6;
   public static final int DICT = 4;
   public static final int YYINITIAL = 0;
+  public static final int CELEX = 8;
   public static final int DISP = 2;
 
   /**
@@ -47,11 +47,11 @@
    * Translates characters to character classes
    */
   private static final String ZZ_CMAP_PACKED = 
-    "\12\0\1\3\25\0\1\2\14\0\1\1\2\0\1\1\17\0\1\20"+
-    "\32\4\6\0\1\5\2\4\1\5\20\4\1\5\5\4\1\1\1\0"+
-    "\1\1\141\0\1\7\3\12\3\0\1\10\1\0\3\13\1\0\3\14"+
-    "\3\0\3\15\4\0\3\16\126\0\2\11\53\0\1\6\u1e99\0\1\17"+
-    "\udfe6\0";
+    "\12\0\1\3\25\0\1\2\14\0\1\11\1\0\1\10\1\1\13\0"+
+    "\1\6\1\0\1\7\1\0\1\24\32\4\6\0\1\5\2\4\1\5"+
+    "\20\4\1\5\5\4\1\1\1\0\1\1\141\0\1\13\3\16\3\0"+
+    "\1\14\1\0\3\17\1\0\3\20\3\0\3\21\4\0\3\22\126\0"+
+    "\2\15\53\0\1\12\u1e99\0\1\23\udfe6\0";
 
   /** 
    * Translates characters to character classes
@@ -64,12 +64,12 @@
   private static final int [] ZZ_ACTION = zzUnpackAction();
 
   private static final String ZZ_ACTION_PACKED_0 =
-    "\5\0\2\1\1\2\1\3\1\4\1\5\1\6\1\7"+
-    "\1\10\1\2\1\11\1\12\1\13\1\14\1\15\1\16"+
-    "\1\17";
+    "\5\0\4\1\1\2\1\3\1\4\1\5\1\6\1\7"+
+    "\1\10\3\2\1\11\1\12\1\13\1\14\1\15\1\16"+
+    "\1\17\5\0\1\1\2\0";
 
   private static int [] zzUnpackAction() {
-    int [] result = new int[22];
+    int [] result = new int[34];
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
@@ -94,12 +94,14 @@
   private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
 
   private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\21\0\42\0\63\0\104\0\125\0\146\0\125"+
-    "\0\125\0\125\0\125\0\125\0\125\0\125\0\146\0\125"+
-    "\0\125\0\125\0\125\0\125\0\125\0\125";
+    "\0\0\0\25\0\52\0\77\0\124\0\151\0\176\0\223"+
+    "\0\250\0\151\0\151\0\151\0\151\0\151\0\151\0\151"+
+    "\0\176\0\223\0\250\0\151\0\151\0\151\0\151\0\151"+
+    "\0\151\0\151\0\275\0\223\0\322\0\347\0\374\0\322"+
+    "\0\u0111\0\u0126";
 
   private static int [] zzUnpackRowMap() {
-    int [] result = new int[22];
+    int [] result = new int[34];
     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;
@@ -122,17 +124,23 @@
   private static final int [] ZZ_TRANS = zzUnpackTrans();
 
   private static final String ZZ_TRANS_PACKED_0 =
-    "\1\6\1\7\1\6\1\0\1\6\1\7\12\6\1\10"+
-    "\1\6\1\7\1\6\1\11\1\6\1\7\1\12\1\13"+
-    "\1\14\7\6\1\10\1\6\1\7\1\6\1\15\1\6"+
-    "\1\7\1\12\1\13\1\14\7\6\1\10\1\6\1\7"+
-    "\1\6\1\16\1\6\1\7\1\12\1\13\1\14\7\6"+
-    "\2\10\1\17\1\10\1\15\1\6\1\7\1\12\1\13"+
-    "\1\14\1\20\1\21\1\22\1\23\1\24\1\25\1\26"+
-    "\1\10\23\0\1\6\16\0";
+    "\1\6\1\7\1\6\1\0\1\6\1\7\1\10\2\6"+
+    "\1\11\12\6\1\12\1\6\1\7\1\6\1\13\1\6"+
+    "\1\7\1\10\2\6\1\11\1\14\1\15\1\16\7\6"+
+    "\1\12\1\6\1\7\1\6\1\17\1\6\1\7\1\10"+
+    "\2\6\1\11\1\14\1\15\1\16\7\6\1\12\1\6"+
+    "\1\7\1\6\1\20\1\6\1\7\1\10\2\6\1\11"+
+    "\1\14\1\15\1\16\7\6\2\12\1\21\1\12\1\17"+
+    "\1\6\1\7\1\22\2\12\1\23\1\14\1\15\1\16"+
+    "\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\12"+
+    "\27\0\1\6\22\0\6\33\2\0\15\33\2\0\1\6"+
+    "\3\0\1\34\16\0\6\33\1\0\1\35\1\36\14\33"+
+    "\6\0\1\37\16\0\6\33\1\0\1\40\1\36\14\33"+
+    "\10\0\1\41\14\0\6\42\2\0\23\42\1\0\1\6"+
+    "\15\42";
 
   private static int [] zzUnpackTrans() {
-    int [] result = new int[119];
+    int [] result = new int[315];
     int offset = 0;
     offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;
@@ -170,10 +178,11 @@
   private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
 
   private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\5\0\1\11\1\1\7\11\1\1\7\11";
+    "\5\0\1\11\3\1\7\11\3\1\7\11\5\0\1\1"+
+    "\2\0";
 
   private static int [] zzUnpackAttribute() {
-    int [] result = new int[22];
+    int [] result = new int[34];
     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;
@@ -283,7 +292,7 @@
     char [] map = new char[0x10000];
     int i = 0;  /* index in packed string  */
     int j = 0;  /* index in unpacked array */
-    while (i < 82) {
+    while (i < 92) {
       int  count = packed.charAt(i++);
       char value = packed.charAt(i++);
       do map[j++] = value; while (--count > 0);