fran@eki:/tmp/lttoolbox$ svn diff -r HEAD
Index: lttoolbox/lt-proc.1
===================================================================
--- lttoolbox/lt-proc.1	(revision 41420)
+++ lttoolbox/lt-proc.1	(working copy)
@@ -12,7 +12,6 @@
 [
 .B \-a \fR|
 .B \-b \fR|
-.B \-o \fR|
 .B \-c \fR|
 .B \-d \fR|
 .B \-e \fR|
@@ -31,7 +30,6 @@
 [
 .B \-\-analysis \fR|
 .B \-\-bilingual \fR|
-.B \-\-surf-bilingual \fR|
 .B \-\-case-sensitive \fR|
 .B \-\-debugged-gen \fR|
 .B \-\-decompose-nouns \fR|
@@ -103,12 +101,6 @@
 form in the source language. Works tipically with the output of
 apertium-pretransfer.
 .TP
-.B \-o, \-\-surf-bilingual
-As with \-b, but takes input from apertium\-tagger \-p , with
-surface forms, and if the lexical form is not found in the bilingual
-dictionary, it outputs the surface form of the word.
-.TP
-
 .B \-c, \-\-case-sensitive
 Use the literal case of the incoming characters
 .TP
Index: lttoolbox/fst_processor.cc
===================================================================
--- lttoolbox/fst_processor.cc	(revision 41420)
+++ lttoolbox/fst_processor.cc	(working copy)
@@ -2237,34 +2237,12 @@
   int val;			// the alphabet value of current symbol, and
   wstring symbol = L"";		// the current symbol as a string
   bool seentags = false;  // have we seen any tags at all in the analysis?
-
-  bool seensurface = false;
-  wstring surface = L"";

   while(true)			// ie. while(val != 0x7fffffff)
   {
     tr = readBilingual(input, output);
     symbol = tr.first;
     val = tr.second;
-
-    //fwprintf(stderr, L"> %S : %C : %d\n", tr.first.c_str(), tr.second, tr.second);
-    if(biltransSurfaceForms && !seensurface && !outOfWord)
-    {
-      while(val != L'/' && val != 0x7fffffff)
-      {
-        surface = surface + symbol;
-        alphabet.getSymbol(surface, val);
-        tr = readBilingual(input, output);
-        symbol = tr.first;
-        val = tr.second;
-        //fwprintf(stderr, L" == %S : %C : %d => %S\n", symbol.c_str(), val, val, surface.c_str());
-      }
-      seensurface = true;
-      tr = readBilingual(input, output);
-      symbol = tr.first;
-      val = tr.second;
-    }
-
     if (val == 0x7fffffff)
     {
       break;
@@ -2291,18 +2269,10 @@
         printWordBilingual(sf, compose(result, queue), output);
       }
       else
-      { //xxx
-        if(biltransSurfaceForms)
-        {
-          printWordBilingual(surface, L"/@"+surface, output);
-        }
-        else
-        {
-          printWordBilingual(sf, L"/@"+sf, output);
-        }
+      {
+        printWordBilingual(sf, L"/@"+sf, output);
       }
-      seensurface = false;
-      surface = L"";
+
       queue = L"";
       result = L"";
       current_state = *initial_state;
@@ -2950,12 +2920,6 @@


 void
-FSTProcessor::setBiltransSurfaceForms(bool const value)
-{
-  biltransSurfaceForms = value;
-}
-
-void
 FSTProcessor::setCaseSensitiveMode(bool const value)
 {
   caseSensitive = value;
Index: lttoolbox/fst_processor.h
===================================================================
--- lttoolbox/fst_processor.h	(revision 41420)
+++ lttoolbox/fst_processor.h	(working copy)
@@ -128,12 +128,6 @@
   bool outOfWord;

   /**
-   * true if we're automatically removing surface forms.
-   */
-  bool biltransSurfaceForms;
-
-
-  /**
    * if true, makes always difference between uppercase and lowercase
    * characters
    */
@@ -372,7 +366,6 @@

   void setCaseSensitiveMode(bool const value);
   void setDictionaryCaseMode(bool const value);
-  void setBiltransSurfaceForms(bool const value);
   void setNullFlush(bool const value);
   bool getNullFlush();
   bool getDecompoundingMode();
Index: lttoolbox/lt_proc.cc
===================================================================
--- lttoolbox/lt_proc.cc	(revision 41420)
+++ lttoolbox/lt_proc.cc	(working copy)
@@ -47,7 +47,6 @@
   cout << "  -g, --generation:       morphological generation" << endl;
   cout << "  -l, --tagged-gen:       morphological generation keeping lexical forms" << endl;
   cout << "  -n, --non-marked-gen    morph. generation without unknown word marks" << endl;
-  cout << "  -o, --surf-bilingual:   lexical transfer with surface forms" << endl;
   cout << "  -p, --post-generation:  post-generation" << endl;
   cout << "  -s, --sao:              SAO annotation system input processing" << endl;
   cout << "  -t, --transliteration:  apply transliteration dictionary" << endl;
@@ -64,7 +63,6 @@
   cout << "  -g:   morphological generation" << endl;
   cout << "  -l:   morphological generation keeping lexical forms" << endl;
   cout << "  -n:   morph. generation without unknown word marks" << endl;
-  cout << "  -o:   lexical transfer with surface forms" << endl;
   cout << "  -p:   post-generation" << endl;
   cout << "  -s:   SAO annotation system input processing" << endl;
   cout << "  -t:   apply transliteration dictionary" << endl;
@@ -94,7 +92,6 @@
     {
       {"analysis",        0, 0, 'a'},
       {"bilingual",       0, 0, 'b'},
-      {"surf-bilingual",  0, 0, 'o'},
       {"generation",      0, 0, 'g'},
       {"non-marked-gen",  0, 0, 'n'},
       {"debugged-gen",    0, 0, 'd'},
@@ -114,9 +111,9 @@
   {
 #if HAVE_GETOPT_LONG
     int option_index;
-    int c = getopt_long(argc, argv, "abceglndopstzwvh", long_options, &option_index);
+    int c = getopt_long(argc, argv, "abceglndpstzwvh", long_options, &option_index);
 #else
-    int c = getopt(argc, argv, "abceglndopstzwvh");
+    int c = getopt(argc, argv, "abceglndpstzwvh");
 #endif

     if(c == -1)
@@ -133,7 +130,6 @@
     case 'e':
     case 'a':
     case 'b':
-    case 'o':
     case 'l':
     case 'g':
     case 'n':
@@ -277,13 +273,6 @@
         fstp.transliteration(input, output);
         break;

-      case 'o':
-        fstp.initBiltrans();
-        checkValidity(fstp);
-        fstp.setBiltransSurfaceForms(true);
-        fstp.bilingual(input, output);
-        break;
-
       case 'b':
         fstp.initBiltrans();
         checkValidity(fstp);
Index: lttoolbox/Makefile.am
===================================================================
--- lttoolbox/Makefile.am	(revision 41420)
+++ lttoolbox/Makefile.am	(working copy)
@@ -60,7 +60,7 @@



-man_MANS = lt-comp.1 lt-expand.1 lt-proc.1 lt-tmxcomp.1 lt-tmxproc.1 lt-print.1
+man_MANS = lt-comp.1 lt-expand.1 lt-proc.1 lt-tmxcomp.1 lt-tmxproc.1

 INCLUDES = -I$(top_srcdir) $(LTTOOLBOX_CFLAGS)
 CLEANFILES = *~