[hfst] 01/01: Refreshed patch
Kartik Mistry
kartik at moszumanska.debian.org
Mon Jun 13 06:12:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
kartik pushed a commit to branch master
in repository hfst.
commit 97d82d8818bec5765f12e1d9987243f72d67f9a2
Author: Kartik Mistry <kartik.mistry at gmail.com>
Date: Mon Jun 13 11:42:02 2016 +0530
Refreshed patch
---
debian/patches/hfst_03_char2int.diff | 673 ++++++++++++++++-------------------
1 file changed, 307 insertions(+), 366 deletions(-)
diff --git a/debian/patches/hfst_03_char2int.diff b/debian/patches/hfst_03_char2int.diff
index f4fa0df..e218166 100644
--- a/debian/patches/hfst_03_char2int.diff
+++ b/debian/patches/hfst_03_char2int.diff
@@ -1,9 +1,10 @@
-Index: tools/src/hfst-affix-guessify.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-affix-guessify.cc b/trunk/tools/src/hfst-affix-guessify.cc
---- a/trunk/tools/src/hfst-affix-guessify.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-affix-guessify.cc (working copy)
-@@ -111,7 +111,7 @@
+Description: Return value of getopt is int, not char.
+Bug: https://bugs.debian.org/826659
+diff --git a/tools/src/hfst-affix-guessify.cc b/tools/src/hfst-affix-guessify.cc
+index 7aceeba..d97cbbc 100644
+--- a/tools/src/hfst-affix-guessify.cc
++++ b/tools/src/hfst-affix-guessify.cc
+@@ -111,7 +111,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -12,12 +13,11 @@ diff --git a/trunk/tools/src/hfst-affix-guessify.cc b/trunk/tools/src/hfst-affix
HFST_GETOPT_UNARY_SHORT
"w:D:",
long_options, &option_index);
-Index: tools/src/hfst-binary-tool.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-binary-tool.cc b/trunk/tools/src/hfst-binary-tool.cc
---- a/trunk/tools/src/hfst-binary-tool.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-binary-tool.cc (working copy)
-@@ -78,7 +78,7 @@
+diff --git a/tools/src/hfst-binary-tool.cc b/tools/src/hfst-binary-tool.cc
+index 1689ad0..2035e85 100644
+--- a/tools/src/hfst-binary-tool.cc
++++ b/tools/src/hfst-binary-tool.cc
+@@ -78,7 +78,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -26,12 +26,11 @@ diff --git a/trunk/tools/src/hfst-binary-tool.cc b/trunk/tools/src/hfst-binary-t
HFST_GETOPT_BINARY_SHORT,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-compare.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-compare.cc b/trunk/tools/src/hfst-compare.cc
---- a/trunk/tools/src/hfst-compare.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-compare.cc (working copy)
-@@ -103,7 +103,7 @@
+diff --git a/tools/src/hfst-compare.cc b/tools/src/hfst-compare.cc
+index 71d7d8b..80a0bda 100644
+--- a/tools/src/hfst-compare.cc
++++ b/tools/src/hfst-compare.cc
+@@ -103,7 +103,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -40,12 +39,11 @@ diff --git a/trunk/tools/src/hfst-compare.cc b/trunk/tools/src/hfst-compare.cc
HFST_GETOPT_BINARY_SHORT "He",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-compiler.yy
-===================================================================
-diff --git a/trunk/tools/src/hfst-compiler.yy b/trunk/tools/src/hfst-compiler.yy
---- a/trunk/tools/src/hfst-compiler.yy (revision 2798)
-+++ b/trunk/tools/src/hfst-compiler.yy (working copy)
-@@ -327,7 +327,7 @@
+diff --git a/tools/src/hfst-compiler.yy b/tools/src/hfst-compiler.yy
+index 2b97ae2..50ff720 100644
+--- a/tools/src/hfst-compiler.yy
++++ b/tools/src/hfst-compiler.yy
+@@ -327,7 +327,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -54,12 +52,11 @@ diff --git a/trunk/tools/src/hfst-compiler.yy b/trunk/tools/src/hfst-compiler.yy
HFST_GETOPT_UNARY_SHORT "f:Hw",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-compose-intersect.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-compose-intersect.cc b/trunk/tools/src/hfst-compose-intersect.cc
---- a/trunk/tools/src/hfst-compose-intersect.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-compose-intersect.cc (working copy)
-@@ -119,7 +119,7 @@
+diff --git a/tools/src/hfst-compose-intersect.cc b/tools/src/hfst-compose-intersect.cc
+index 7595eaf..0805d94 100644
+--- a/tools/src/hfst-compose-intersect.cc
++++ b/tools/src/hfst-compose-intersect.cc
+@@ -119,7 +119,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -68,12 +65,11 @@ diff --git a/trunk/tools/src/hfst-compose-intersect.cc b/trunk/tools/src/hfst-co
HFST_GETOPT_BINARY_SHORT "FIeHfa",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-compose.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-compose.cc b/trunk/tools/src/hfst-compose.cc
---- a/trunk/tools/src/hfst-compose.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-compose.cc (working copy)
-@@ -105,7 +105,7 @@
+diff --git a/tools/src/hfst-compose.cc b/tools/src/hfst-compose.cc
+index d801c83..287709b 100644
+--- a/tools/src/hfst-compose.cc
++++ b/tools/src/hfst-compose.cc
+@@ -105,7 +105,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -82,12 +78,11 @@ diff --git a/trunk/tools/src/hfst-compose.cc b/trunk/tools/src/hfst-compose.cc
HFST_GETOPT_BINARY_SHORT "FHx:X:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-concatenate.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-concatenate.cc b/trunk/tools/src/hfst-concatenate.cc
---- a/trunk/tools/src/hfst-concatenate.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-concatenate.cc (working copy)
-@@ -96,7 +96,7 @@
+diff --git a/tools/src/hfst-concatenate.cc b/tools/src/hfst-concatenate.cc
+index 4130ba0..683be3a 100644
+--- a/tools/src/hfst-concatenate.cc
++++ b/tools/src/hfst-concatenate.cc
+@@ -96,7 +96,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -96,12 +91,11 @@ diff --git a/trunk/tools/src/hfst-concatenate.cc b/trunk/tools/src/hfst-concaten
HFST_GETOPT_BINARY_SHORT "FH",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-conjunct.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-conjunct.cc b/trunk/tools/src/hfst-conjunct.cc
---- a/trunk/tools/src/hfst-conjunct.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-conjunct.cc (working copy)
-@@ -95,7 +95,7 @@
+diff --git a/tools/src/hfst-conjunct.cc b/tools/src/hfst-conjunct.cc
+index f3b524c..ecd660a 100644
+--- a/tools/src/hfst-conjunct.cc
++++ b/tools/src/hfst-conjunct.cc
+@@ -95,7 +95,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -110,12 +104,11 @@ diff --git a/trunk/tools/src/hfst-conjunct.cc b/trunk/tools/src/hfst-conjunct.cc
HFST_GETOPT_BINARY_SHORT "FH",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-determinize.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-determinize.cc b/trunk/tools/src/hfst-determinize.cc
---- a/trunk/tools/src/hfst-determinize.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-determinize.cc (working copy)
-@@ -92,7 +92,7 @@
+diff --git a/tools/src/hfst-determinize.cc b/tools/src/hfst-determinize.cc
+index 5c5010d..2ef47d1 100644
+--- a/tools/src/hfst-determinize.cc
++++ b/tools/src/hfst-determinize.cc
+@@ -92,7 +92,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -124,12 +117,11 @@ diff --git a/trunk/tools/src/hfst-determinize.cc b/trunk/tools/src/hfst-determin
HFST_GETOPT_UNARY_SHORT "E",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-disjunct.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-disjunct.cc b/trunk/tools/src/hfst-disjunct.cc
---- a/trunk/tools/src/hfst-disjunct.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-disjunct.cc (working copy)
-@@ -94,7 +94,7 @@
+diff --git a/tools/src/hfst-disjunct.cc b/tools/src/hfst-disjunct.cc
+index 1c395e8..55041d8 100644
+--- a/tools/src/hfst-disjunct.cc
++++ b/tools/src/hfst-disjunct.cc
+@@ -94,7 +94,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -138,12 +130,11 @@ diff --git a/trunk/tools/src/hfst-disjunct.cc b/trunk/tools/src/hfst-disjunct.cc
HFST_GETOPT_BINARY_SHORT "H",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-edit-metadata.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-edit-metadata.cc b/trunk/tools/src/hfst-edit-metadata.cc
---- a/trunk/tools/src/hfst-edit-metadata.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-edit-metadata.cc (working copy)
-@@ -106,7 +106,7 @@
+diff --git a/tools/src/hfst-edit-metadata.cc b/tools/src/hfst-edit-metadata.cc
+index 9e44ccb..9f71397 100644
+--- a/tools/src/hfst-edit-metadata.cc
++++ b/tools/src/hfst-edit-metadata.cc
+@@ -106,7 +106,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -152,12 +143,11 @@ diff --git a/trunk/tools/src/hfst-edit-metadata.cc b/trunk/tools/src/hfst-edit-m
HFST_GETOPT_UNARY_SHORT "a:p::t:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-expand-equivalences.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-expand-equivalences.cc b/trunk/tools/src/hfst-expand-equivalences.cc
---- a/trunk/tools/src/hfst-expand-equivalences.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-expand-equivalences.cc (working copy)
-@@ -119,7 +119,7 @@
+diff --git a/tools/src/hfst-expand-equivalences.cc b/tools/src/hfst-expand-equivalences.cc
+index 809d076..ae8ca2e 100644
+--- a/tools/src/hfst-expand-equivalences.cc
++++ b/tools/src/hfst-expand-equivalences.cc
+@@ -119,7 +119,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -166,12 +156,11 @@ diff --git a/trunk/tools/src/hfst-expand-equivalences.cc b/trunk/tools/src/hfst-
HFST_GETOPT_UNARY_SHORT "f:t:a:T:l:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-flookup.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-flookup.cc b/trunk/tools/src/hfst-flookup.cc
---- a/trunk/tools/src/hfst-flookup.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-flookup.cc (working copy)
-@@ -336,7 +336,7 @@
+diff --git a/tools/src/hfst-flookup.cc b/tools/src/hfst-flookup.cc
+index 165c829..f0f5ab7 100644
+--- a/tools/src/hfst-flookup.cc
++++ b/tools/src/hfst-flookup.cc
+@@ -336,7 +336,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -180,12 +169,11 @@ diff --git a/trunk/tools/src/hfst-flookup.cc b/trunk/tools/src/hfst-flookup.cc
HFST_GETOPT_UNARY_SHORT "I:O:F:xc:X:e:E:b:t:p::PRf",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-format.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-format.cc b/trunk/tools/src/hfst-format.cc
---- a/trunk/tools/src/hfst-format.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-format.cc (working copy)
-@@ -94,7 +94,7 @@
+diff --git a/tools/src/hfst-format.cc b/tools/src/hfst-format.cc
+index 57495dd..46cc5ab 100644
+--- a/tools/src/hfst-format.cc
++++ b/tools/src/hfst-format.cc
+@@ -94,7 +94,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -194,12 +182,11 @@ diff --git a/trunk/tools/src/hfst-format.cc b/trunk/tools/src/hfst-format.cc
HFST_GETOPT_UNARY_SHORT "1:2:lt:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-fst2fst.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-fst2fst.cc b/trunk/tools/src/hfst-fst2fst.cc
---- a/trunk/tools/src/hfst-fst2fst.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-fst2fst.cc (working copy)
-@@ -115,7 +115,7 @@
+diff --git a/tools/src/hfst-fst2fst.cc b/tools/src/hfst-fst2fst.cc
+index 7e3b0ed..fedf357 100644
+--- a/tools/src/hfst-fst2fst.cc
++++ b/tools/src/hfst-fst2fst.cc
+@@ -115,7 +115,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -208,12 +195,11 @@ diff --git a/trunk/tools/src/hfst-fst2fst.cc b/trunk/tools/src/hfst-fst2fst.cc
HFST_GETOPT_UNARY_SHORT "SFtlOwQf:bx",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-fst2strings.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-fst2strings.cc b/trunk/tools/src/hfst-fst2strings.cc
---- a/trunk/tools/src/hfst-fst2strings.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-fst2strings.cc (working copy)
-@@ -167,7 +167,7 @@
+diff --git a/tools/src/hfst-fst2strings.cc b/tools/src/hfst-fst2strings.cc
+index 8995270..d600c23 100644
+--- a/tools/src/hfst-fst2strings.cc
++++ b/tools/src/hfst-fst2strings.cc
+@@ -167,7 +167,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -222,12 +208,11 @@ diff --git a/trunk/tools/src/hfst-fst2strings.cc b/trunk/tools/src/hfst-fst2stri
HFST_GETOPT_UNARY_SHORT
"Swb:c:e:u:p:l:L:n:r:N:U:P:X:",
long_options, &option_index);
-Index: tools/src/hfst-fst2txt.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-fst2txt.cc b/trunk/tools/src/hfst-fst2txt.cc
---- a/trunk/tools/src/hfst-fst2txt.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-fst2txt.cc (working copy)
-@@ -121,7 +121,7 @@
+diff --git a/tools/src/hfst-fst2txt.cc b/tools/src/hfst-fst2txt.cc
+index c8f3105..0a3536f 100644
+--- a/tools/src/hfst-fst2txt.cc
++++ b/tools/src/hfst-fst2txt.cc
+@@ -121,7 +121,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -236,12 +221,11 @@ diff --git a/trunk/tools/src/hfst-fst2txt.cc b/trunk/tools/src/hfst-fst2txt.cc
HFST_GETOPT_UNARY_SHORT "wDnf:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-getopt.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-getopt.cc b/trunk/tools/src/hfst-getopt.cc
---- a/trunk/tools/src/hfst-getopt.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-getopt.cc (working copy)
-@@ -21,7 +21,7 @@
+diff --git a/tools/src/hfst-getopt.cc b/tools/src/hfst-getopt.cc
+index ce1e487..faf22c7 100644
+--- a/tools/src/hfst-getopt.cc
++++ b/tools/src/hfst-getopt.cc
+@@ -21,7 +21,7 @@ int optind = 1;
std::vector<char *> free_arguments;
std::vector<char *> other_arguments;
@@ -250,24 +234,22 @@ diff --git a/trunk/tools/src/hfst-getopt.cc b/trunk/tools/src/hfst-getopt.cc
const struct option * longopts, int * longindex)
{
// check that there are more args
-Index: tools/src/hfst-getopt.h
-===================================================================
-diff --git a/trunk/tools/src/hfst-getopt.h b/trunk/tools/src/hfst-getopt.h
---- a/trunk/tools/src/hfst-getopt.h (revision 2798)
-+++ b/trunk/tools/src/hfst-getopt.h (working copy)
-@@ -14,5 +14,5 @@
+diff --git a/tools/src/hfst-getopt.h b/tools/src/hfst-getopt.h
+index eceb9fd..97137b3 100644
+--- a/tools/src/hfst-getopt.h
++++ b/tools/src/hfst-getopt.h
+@@ -14,5 +14,5 @@ extern char * optarg;
extern int optopt;
extern int optind;
-char getopt_long(int argc, char * /*const*/ argv [], const char * optstring,
+int getopt_long(int argc, char * /*const*/ argv [], const char * optstring,
const struct option * longopts, int * longindex);
-Index: tools/src/hfst-grep.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-grep.cc b/trunk/tools/src/hfst-grep.cc
---- a/trunk/tools/src/hfst-grep.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-grep.cc (working copy)
-@@ -267,7 +267,7 @@
+diff --git a/tools/src/hfst-grep.cc b/tools/src/hfst-grep.cc
+index bb8142e..0765743 100644
+--- a/tools/src/hfst-grep.cc
++++ b/tools/src/hfst-grep.cc
+@@ -267,7 +267,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -276,12 +258,11 @@ diff --git a/trunk/tools/src/hfst-grep.cc b/trunk/tools/src/hfst-grep.cc
HFST_GETOPT_UNARY_SHORT
"EFGPXe:f:IwxzqmbnOad:D:rLlcZA:B:C:uU9:",
long_options, &option_index);
-Index: tools/src/hfst-guess.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-guess.cc b/trunk/tools/src/hfst-guess.cc
---- a/trunk/tools/src/hfst-guess.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-guess.cc (working copy)
-@@ -156,7 +156,7 @@
+diff --git a/tools/src/hfst-guess.cc b/tools/src/hfst-guess.cc
+index c3fb85c..b9a56e1 100644
+--- a/tools/src/hfst-guess.cc
++++ b/tools/src/hfst-guess.cc
+@@ -156,7 +156,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -290,12 +271,11 @@ diff --git a/trunk/tools/src/hfst-guess.cc b/trunk/tools/src/hfst-guess.cc
HFST_GETOPT_UNARY_SHORT "f:m:n:g:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-guessify.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-guessify.cc b/trunk/tools/src/hfst-guessify.cc
---- a/trunk/tools/src/hfst-guessify.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-guessify.cc (working copy)
-@@ -131,7 +131,7 @@
+diff --git a/tools/src/hfst-guessify.cc b/tools/src/hfst-guessify.cc
+index 86501fe..83894e5 100644
+--- a/tools/src/hfst-guessify.cc
++++ b/tools/src/hfst-guessify.cc
+@@ -131,7 +131,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -304,12 +284,11 @@ diff --git a/trunk/tools/src/hfst-guessify.cc b/trunk/tools/src/hfst-guessify.cc
HFST_GETOPT_UNARY_SHORT "p:G",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-head.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-head.cc b/trunk/tools/src/hfst-head.cc
---- a/trunk/tools/src/hfst-head.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-head.cc (working copy)
-@@ -98,7 +98,7 @@
+diff --git a/tools/src/hfst-head.cc b/tools/src/hfst-head.cc
+index 1ba2ada..8f8b0e1 100644
+--- a/tools/src/hfst-head.cc
++++ b/tools/src/hfst-head.cc
+@@ -98,7 +98,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -318,12 +297,11 @@ diff --git a/trunk/tools/src/hfst-head.cc b/trunk/tools/src/hfst-head.cc
HFST_GETOPT_UNARY_SHORT "n:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-info.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-info.cc b/trunk/tools/src/hfst-info.cc
---- a/trunk/tools/src/hfst-info.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-info.cc (working copy)
-@@ -134,7 +134,7 @@
+diff --git a/tools/src/hfst-info.cc b/tools/src/hfst-info.cc
+index 4ff37e1..c71c810 100644
+--- a/tools/src/hfst-info.cc
++++ b/tools/src/hfst-info.cc
+@@ -134,7 +134,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -332,12 +310,11 @@ diff --git a/trunk/tools/src/hfst-info.cc b/trunk/tools/src/hfst-info.cc
"a:e:f:m:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-invert.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-invert.cc b/trunk/tools/src/hfst-invert.cc
---- a/trunk/tools/src/hfst-invert.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-invert.cc (working copy)
-@@ -86,7 +86,7 @@
+diff --git a/tools/src/hfst-invert.cc b/tools/src/hfst-invert.cc
+index 9127a21..2d6679e 100644
+--- a/tools/src/hfst-invert.cc
++++ b/tools/src/hfst-invert.cc
+@@ -86,7 +86,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -346,12 +323,11 @@ diff --git a/trunk/tools/src/hfst-invert.cc b/trunk/tools/src/hfst-invert.cc
HFST_GETOPT_UNARY_SHORT,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-lexc-compiler.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-lexc-compiler.cc b/trunk/tools/src/hfst-lexc-compiler.cc
---- a/trunk/tools/src/hfst-lexc-compiler.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-lexc-compiler.cc (working copy)
-@@ -145,7 +145,7 @@
+diff --git a/tools/src/hfst-lexc-compiler.cc b/tools/src/hfst-lexc-compiler.cc
+index f5c9869..c2d5f68 100644
+--- a/tools/src/hfst-lexc-compiler.cc
++++ b/tools/src/hfst-lexc-compiler.cc
+@@ -145,7 +145,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -360,12 +336,11 @@ diff --git a/trunk/tools/src/hfst-lexc-compiler.cc b/trunk/tools/src/hfst-lexc-c
"Ef:o:AFMRx:X:W",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-lexc-wrapper.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-lexc-wrapper.cc b/trunk/tools/src/hfst-lexc-wrapper.cc
---- a/trunk/tools/src/hfst-lexc-wrapper.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-lexc-wrapper.cc (working copy)
-@@ -115,7 +115,7 @@
+diff --git a/tools/src/hfst-lexc-wrapper.cc b/tools/src/hfst-lexc-wrapper.cc
+index 0c61902..8e7896d 100644
+--- a/tools/src/hfst-lexc-wrapper.cc
++++ b/tools/src/hfst-lexc-wrapper.cc
+@@ -115,7 +115,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -374,12 +349,11 @@ diff --git a/trunk/tools/src/hfst-lexc-wrapper.cc b/trunk/tools/src/hfst-lexc-wr
"f:o:l::u::X",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-lookup.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-lookup.cc b/trunk/tools/src/hfst-lookup.cc
---- a/trunk/tools/src/hfst-lookup.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-lookup.cc (working copy)
-@@ -329,7 +329,7 @@
+diff --git a/tools/src/hfst-lookup.cc b/tools/src/hfst-lookup.cc
+index 130bf83..cde6769 100644
+--- a/tools/src/hfst-lookup.cc
++++ b/tools/src/hfst-lookup.cc
+@@ -329,7 +329,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -388,12 +362,11 @@ diff --git a/trunk/tools/src/hfst-lookup.cc b/trunk/tools/src/hfst-lookup.cc
HFST_GETOPT_UNARY_SHORT "I:O:F:xc:X:e:E:b:t:p::P",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-minimize.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-minimize.cc b/trunk/tools/src/hfst-minimize.cc
---- a/trunk/tools/src/hfst-minimize.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-minimize.cc (working copy)
-@@ -94,7 +94,7 @@
+diff --git a/tools/src/hfst-minimize.cc b/tools/src/hfst-minimize.cc
+index 1b21c77..9b3453f 100644
+--- a/tools/src/hfst-minimize.cc
++++ b/tools/src/hfst-minimize.cc
+@@ -94,7 +94,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -402,12 +375,11 @@ diff --git a/trunk/tools/src/hfst-minimize.cc b/trunk/tools/src/hfst-minimize.cc
HFST_GETOPT_UNARY_SHORT "E",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-multiply.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-multiply.cc b/trunk/tools/src/hfst-multiply.cc
---- a/trunk/tools/src/hfst-multiply.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-multiply.cc (working copy)
-@@ -93,7 +93,7 @@
+diff --git a/tools/src/hfst-multiply.cc b/tools/src/hfst-multiply.cc
+index b6a23ad..4cf78b0 100644
+--- a/tools/src/hfst-multiply.cc
++++ b/tools/src/hfst-multiply.cc
+@@ -93,7 +93,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -416,12 +388,11 @@ diff --git a/trunk/tools/src/hfst-multiply.cc b/trunk/tools/src/hfst-multiply.cc
HFST_GETOPT_UNARY_SHORT "n:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-name.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-name.cc b/trunk/tools/src/hfst-name.cc
---- a/trunk/tools/src/hfst-name.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-name.cc (working copy)
-@@ -96,7 +96,7 @@
+diff --git a/tools/src/hfst-name.cc b/tools/src/hfst-name.cc
+index 296df56..406ae05 100644
+--- a/tools/src/hfst-name.cc
++++ b/tools/src/hfst-name.cc
+@@ -96,7 +96,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -430,12 +401,11 @@ diff --git a/trunk/tools/src/hfst-name.cc b/trunk/tools/src/hfst-name.cc
HFST_GETOPT_UNARY_SHORT "n:pt:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-pair-test.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-pair-test.cc b/trunk/tools/src/hfst-pair-test.cc
---- a/trunk/tools/src/hfst-pair-test.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-pair-test.cc (working copy)
-@@ -171,7 +171,7 @@
+diff --git a/tools/src/hfst-pair-test.cc b/tools/src/hfst-pair-test.cc
+index 89fdd71..f04c602 100644
+--- a/tools/src/hfst-pair-test.cc
++++ b/tools/src/hfst-pair-test.cc
+@@ -171,7 +171,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -444,12 +414,11 @@ diff --git a/trunk/tools/src/hfst-pair-test.cc b/trunk/tools/src/hfst-pair-test.
HFST_GETOPT_UNARY_SHORT "I:NX",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-pmatch.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-pmatch.cc b/trunk/tools/src/hfst-pmatch.cc
---- a/trunk/tools/src/hfst-pmatch.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-pmatch.cc (working copy)
-@@ -180,7 +180,7 @@
+diff --git a/tools/src/hfst-pmatch.cc b/tools/src/hfst-pmatch.cc
+index c8f821a..10a3f71 100644
+--- a/tools/src/hfst-pmatch.cc
++++ b/tools/src/hfst-pmatch.cc
+@@ -180,7 +180,7 @@ int parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -458,12 +427,11 @@ diff --git a/trunk/tools/src/hfst-pmatch.cc b/trunk/tools/src/hfst-pmatch.cc
long_options, &option_index);
if (-1 == c)
{
-Index: tools/src/hfst-pmatch2fst.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-pmatch2fst.cc b/trunk/tools/src/hfst-pmatch2fst.cc
---- a/trunk/tools/src/hfst-pmatch2fst.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-pmatch2fst.cc (working copy)
-@@ -132,7 +132,7 @@
+diff --git a/tools/src/hfst-pmatch2fst.cc b/tools/src/hfst-pmatch2fst.cc
+index 07c8ac6..fa78d1a 100644
+--- a/tools/src/hfst-pmatch2fst.cc
++++ b/tools/src/hfst-pmatch2fst.cc
+@@ -132,7 +132,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -472,12 +440,11 @@ diff --git a/trunk/tools/src/hfst-pmatch2fst.cc b/trunk/tools/src/hfst-pmatch2fs
HFST_GETOPT_UNARY_SHORT "e:1:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-preprocess-for-optimized-lookup-format.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-preprocess-for-optimized-lookup-format.cc b/trunk/tools/src/hfst-preprocess-for-optimized-lookup-format.cc
---- a/trunk/tools/src/hfst-preprocess-for-optimized-lookup-format.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-preprocess-for-optimized-lookup-format.cc (working copy)
-@@ -87,7 +87,7 @@
+diff --git a/tools/src/hfst-preprocess-for-optimized-lookup-format.cc b/tools/src/hfst-preprocess-for-optimized-lookup-format.cc
+index b277a0e..61c7be1 100644
+--- a/tools/src/hfst-preprocess-for-optimized-lookup-format.cc
++++ b/tools/src/hfst-preprocess-for-optimized-lookup-format.cc
+@@ -87,7 +87,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -486,12 +453,11 @@ diff --git a/trunk/tools/src/hfst-preprocess-for-optimized-lookup-format.cc b/tr
HFST_GETOPT_UNARY_SHORT,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-project.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-project.cc b/trunk/tools/src/hfst-project.cc
---- a/trunk/tools/src/hfst-project.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-project.cc (working copy)
-@@ -92,7 +92,7 @@
+diff --git a/tools/src/hfst-project.cc b/tools/src/hfst-project.cc
+index 6b65ff9..9dc4390 100644
+--- a/tools/src/hfst-project.cc
++++ b/tools/src/hfst-project.cc
+@@ -92,7 +92,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -500,12 +466,11 @@ diff --git a/trunk/tools/src/hfst-project.cc b/trunk/tools/src/hfst-project.cc
HFST_GETOPT_UNARY_SHORT "p:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-prune-alphabet.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-prune-alphabet.cc b/trunk/tools/src/hfst-prune-alphabet.cc
---- a/trunk/tools/src/hfst-prune-alphabet.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-prune-alphabet.cc (working copy)
-@@ -94,7 +94,7 @@
+diff --git a/tools/src/hfst-prune-alphabet.cc b/tools/src/hfst-prune-alphabet.cc
+index 0703b53..132b1fa 100644
+--- a/tools/src/hfst-prune-alphabet.cc
++++ b/tools/src/hfst-prune-alphabet.cc
+@@ -94,7 +94,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -514,12 +479,11 @@ diff --git a/trunk/tools/src/hfst-prune-alphabet.cc b/trunk/tools/src/hfst-prune
HFST_GETOPT_UNARY_SHORT "fS",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-push-weights.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-push-weights.cc b/trunk/tools/src/hfst-push-weights.cc
---- a/trunk/tools/src/hfst-push-weights.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-push-weights.cc (working copy)
-@@ -93,7 +93,7 @@
+diff --git a/tools/src/hfst-push-weights.cc b/tools/src/hfst-push-weights.cc
+index 346d48b..f0814ec 100644
+--- a/tools/src/hfst-push-weights.cc
++++ b/tools/src/hfst-push-weights.cc
+@@ -93,7 +93,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -528,12 +492,11 @@ diff --git a/trunk/tools/src/hfst-push-weights.cc b/trunk/tools/src/hfst-push-we
HFST_GETOPT_UNARY_SHORT "p:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-regexp2fst.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-regexp2fst.cc b/trunk/tools/src/hfst-regexp2fst.cc
---- a/trunk/tools/src/hfst-regexp2fst.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-regexp2fst.cc (working copy)
-@@ -160,7 +160,7 @@
+diff --git a/tools/src/hfst-regexp2fst.cc b/tools/src/hfst-regexp2fst.cc
+index 25ad3a5..21d659d 100644
+--- a/tools/src/hfst-regexp2fst.cc
++++ b/tools/src/hfst-regexp2fst.cc
+@@ -160,7 +160,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -542,12 +505,11 @@ diff --git a/trunk/tools/src/hfst-regexp2fst.cc b/trunk/tools/src/hfst-regexp2fs
HFST_GETOPT_UNARY_SHORT "je:lSf:HFEx:X:"/*"123"*/,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-remove-epsilons.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-remove-epsilons.cc b/trunk/tools/src/hfst-remove-epsilons.cc
---- a/trunk/tools/src/hfst-remove-epsilons.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-remove-epsilons.cc (working copy)
-@@ -86,7 +86,7 @@
+diff --git a/tools/src/hfst-remove-epsilons.cc b/tools/src/hfst-remove-epsilons.cc
+index cd9cc1c..75d9cf1 100644
+--- a/tools/src/hfst-remove-epsilons.cc
++++ b/tools/src/hfst-remove-epsilons.cc
+@@ -86,7 +86,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -556,12 +518,11 @@ diff --git a/trunk/tools/src/hfst-remove-epsilons.cc b/trunk/tools/src/hfst-remo
HFST_GETOPT_UNARY_SHORT,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-repeat.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-repeat.cc b/trunk/tools/src/hfst-repeat.cc
---- a/trunk/tools/src/hfst-repeat.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-repeat.cc (working copy)
-@@ -100,7 +100,7 @@
+diff --git a/tools/src/hfst-repeat.cc b/tools/src/hfst-repeat.cc
+index 8bc2069..598a1b1 100644
+--- a/tools/src/hfst-repeat.cc
++++ b/tools/src/hfst-repeat.cc
+@@ -100,7 +100,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -570,12 +531,11 @@ diff --git a/trunk/tools/src/hfst-repeat.cc b/trunk/tools/src/hfst-repeat.cc
HFST_GETOPT_UNARY_SHORT "f:t:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-reverse.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-reverse.cc b/trunk/tools/src/hfst-reverse.cc
---- a/trunk/tools/src/hfst-reverse.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-reverse.cc (working copy)
-@@ -86,7 +86,7 @@
+diff --git a/tools/src/hfst-reverse.cc b/tools/src/hfst-reverse.cc
+index 9269f8c..c72f98b 100644
+--- a/tools/src/hfst-reverse.cc
++++ b/tools/src/hfst-reverse.cc
+@@ -86,7 +86,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -584,12 +544,11 @@ diff --git a/trunk/tools/src/hfst-reverse.cc b/trunk/tools/src/hfst-reverse.cc
HFST_GETOPT_UNARY_SHORT,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-reweight.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-reweight.cc b/trunk/tools/src/hfst-reweight.cc
---- a/trunk/tools/src/hfst-reweight.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-reweight.cc (working copy)
-@@ -159,7 +159,7 @@
+diff --git a/tools/src/hfst-reweight.cc b/tools/src/hfst-reweight.cc
+index c21a72c..6a5ab25 100644
+--- a/tools/src/hfst-reweight.cc
++++ b/tools/src/hfst-reweight.cc
+@@ -159,7 +159,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -598,12 +557,11 @@ diff --git a/trunk/tools/src/hfst-reweight.cc b/trunk/tools/src/hfst-reweight.cc
HFST_GETOPT_UNARY_SHORT "a:b:F:l:u:I:O:S:eT:A",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-shuffle.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-shuffle.cc b/trunk/tools/src/hfst-shuffle.cc
---- a/trunk/tools/src/hfst-shuffle.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-shuffle.cc (working copy)
-@@ -86,7 +86,7 @@
+diff --git a/tools/src/hfst-shuffle.cc b/tools/src/hfst-shuffle.cc
+index 390ffb1..6d3414d 100644
+--- a/tools/src/hfst-shuffle.cc
++++ b/tools/src/hfst-shuffle.cc
+@@ -86,7 +86,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -612,12 +570,11 @@ diff --git a/trunk/tools/src/hfst-shuffle.cc b/trunk/tools/src/hfst-shuffle.cc
HFST_GETOPT_BINARY_SHORT,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-split.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-split.cc b/trunk/tools/src/hfst-split.cc
---- a/trunk/tools/src/hfst-split.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-split.cc (working copy)
-@@ -103,7 +103,7 @@
+diff --git a/tools/src/hfst-split.cc b/tools/src/hfst-split.cc
+index e1d4292..044efbe 100644
+--- a/tools/src/hfst-split.cc
++++ b/tools/src/hfst-split.cc
+@@ -103,7 +103,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -626,12 +583,11 @@ diff --git a/trunk/tools/src/hfst-split.cc b/trunk/tools/src/hfst-split.cc
long_options, &option_index);
if (-1 == c)
{
-Index: tools/src/hfst-strings2fst.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-strings2fst.cc b/trunk/tools/src/hfst-strings2fst.cc
---- a/trunk/tools/src/hfst-strings2fst.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-strings2fst.cc (working copy)
-@@ -200,7 +200,7 @@
+diff --git a/tools/src/hfst-strings2fst.cc b/tools/src/hfst-strings2fst.cc
+index 860b7f0..3c44afa 100644
+--- a/tools/src/hfst-strings2fst.cc
++++ b/tools/src/hfst-strings2fst.cc
+@@ -200,7 +200,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -640,12 +596,11 @@ diff --git a/trunk/tools/src/hfst-strings2fst.cc b/trunk/tools/src/hfst-strings2
HFST_GETOPT_UNARY_SHORT "je:234pSm:f:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-strip-header.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-strip-header.cc b/trunk/tools/src/hfst-strip-header.cc
---- a/trunk/tools/src/hfst-strip-header.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-strip-header.cc (working copy)
-@@ -63,7 +63,7 @@
+diff --git a/tools/src/hfst-strip-header.cc b/tools/src/hfst-strip-header.cc
+index ed48c3b..5b01b88 100644
+--- a/tools/src/hfst-strip-header.cc
++++ b/tools/src/hfst-strip-header.cc
+@@ -63,7 +63,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -654,12 +609,11 @@ diff --git a/trunk/tools/src/hfst-strip-header.cc b/trunk/tools/src/hfst-strip-h
HFST_GETOPT_UNARY_SHORT,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-substitute.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-substitute.cc b/trunk/tools/src/hfst-substitute.cc
---- a/trunk/tools/src/hfst-substitute.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-substitute.cc (working copy)
-@@ -220,7 +220,7 @@
+diff --git a/tools/src/hfst-substitute.cc b/tools/src/hfst-substitute.cc
+index 7347e40..436d7d7 100644
+--- a/tools/src/hfst-substitute.cc
++++ b/tools/src/hfst-substitute.cc
+@@ -220,7 +220,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -668,12 +622,11 @@ diff --git a/trunk/tools/src/hfst-substitute.cc b/trunk/tools/src/hfst-substitut
HFST_GETOPT_UNARY_SHORT "f:F:t:T:R9C",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-subtract.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-subtract.cc b/trunk/tools/src/hfst-subtract.cc
---- a/trunk/tools/src/hfst-subtract.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-subtract.cc (working copy)
-@@ -96,7 +96,7 @@
+diff --git a/tools/src/hfst-subtract.cc b/tools/src/hfst-subtract.cc
+index 198f626..2127132 100644
+--- a/tools/src/hfst-subtract.cc
++++ b/tools/src/hfst-subtract.cc
+@@ -96,7 +96,7 @@ parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -682,12 +635,11 @@ diff --git a/trunk/tools/src/hfst-subtract.cc b/trunk/tools/src/hfst-subtract.cc
HFST_GETOPT_BINARY_SHORT "FH",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-summarize.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-summarize.cc b/trunk/tools/src/hfst-summarize.cc
---- a/trunk/tools/src/hfst-summarize.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-summarize.cc (working copy)
-@@ -100,7 +100,7 @@
+diff --git a/tools/src/hfst-summarize.cc b/tools/src/hfst-summarize.cc
+index 73edaf4..f70ed2c 100644
+--- a/tools/src/hfst-summarize.cc
++++ b/tools/src/hfst-summarize.cc
+@@ -100,7 +100,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -696,12 +648,11 @@ diff --git a/trunk/tools/src/hfst-summarize.cc b/trunk/tools/src/hfst-summarize.
HFST_GETOPT_UNARY_SHORT "S::",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-tagger/src/hfst-build-tagger.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-tagger/src/hfst-build-tagger.cc b/trunk/tools/src/hfst-tagger/src/hfst-build-tagger.cc
---- a/trunk/tools/src/hfst-tagger/src/hfst-build-tagger.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-tagger/src/hfst-build-tagger.cc (working copy)
-@@ -64,7 +64,7 @@
+diff --git a/tools/src/hfst-tagger/src/hfst-build-tagger.cc b/tools/src/hfst-tagger/src/hfst-build-tagger.cc
+index c7e84c0..e274705 100644
+--- a/tools/src/hfst-tagger/src/hfst-build-tagger.cc
++++ b/tools/src/hfst-tagger/src/hfst-build-tagger.cc
+@@ -64,7 +64,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -710,12 +661,11 @@ diff --git a/trunk/tools/src/hfst-tagger/src/hfst-build-tagger.cc b/trunk/tools/
HFST_GETOPT_UNARY_SHORT "wDnf:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc b/trunk/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc
---- a/trunk/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc (working copy)
-@@ -73,7 +73,7 @@
+diff --git a/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc b/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc
+index 5eed2fc..85d9f0b 100644
+--- a/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc
++++ b/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc
+@@ -73,7 +73,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -724,12 +674,11 @@ diff --git a/trunk/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc
HFST_GETOPT_UNARY_SHORT "wDnf:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-tagger/src/hfst-reweight-tagger.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc b/trunk/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc
---- a/trunk/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc (working copy)
-@@ -81,7 +81,7 @@
+diff --git a/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc b/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc
+index 150005c..c7fcb32 100644
+--- a/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc
++++ b/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc
+@@ -81,7 +81,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -738,12 +687,11 @@ diff --git a/trunk/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc b/trunk/too
HFST_GETOPT_UNARY_SHORT "wDnf:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-tagger/src/hfst-tag.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-tagger/src/hfst-tag.cc b/trunk/tools/src/hfst-tagger/src/hfst-tag.cc
---- a/trunk/tools/src/hfst-tagger/src/hfst-tag.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-tagger/src/hfst-tag.cc (working copy)
-@@ -75,7 +75,7 @@
+diff --git a/tools/src/hfst-tagger/src/hfst-tag.cc b/tools/src/hfst-tagger/src/hfst-tag.cc
+index 1c03d6c..df6c7fb 100644
+--- a/tools/src/hfst-tagger/src/hfst-tag.cc
++++ b/tools/src/hfst-tagger/src/hfst-tag.cc
+@@ -75,7 +75,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -752,12 +700,11 @@ diff --git a/trunk/tools/src/hfst-tagger/src/hfst-tag.cc b/trunk/tools/src/hfst-
HFST_GETOPT_UNARY_SHORT "wDnf:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-tail.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-tail.cc b/trunk/tools/src/hfst-tail.cc
---- a/trunk/tools/src/hfst-tail.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-tail.cc (working copy)
-@@ -97,7 +97,7 @@
+diff --git a/tools/src/hfst-tail.cc b/tools/src/hfst-tail.cc
+index f4ed4ed..cafb896 100644
+--- a/tools/src/hfst-tail.cc
++++ b/tools/src/hfst-tail.cc
+@@ -97,7 +97,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -766,12 +713,11 @@ diff --git a/trunk/tools/src/hfst-tail.cc b/trunk/tools/src/hfst-tail.cc
HFST_GETOPT_UNARY_SHORT "n:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-tokenize.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-tokenize.cc b/trunk/tools/src/hfst-tokenize.cc
---- a/trunk/tools/src/hfst-tokenize.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-tokenize.cc (working copy)
-@@ -376,7 +376,7 @@
+diff --git a/tools/src/hfst-tokenize.cc b/tools/src/hfst-tokenize.cc
+index 369b999..588a8de 100644
+--- a/tools/src/hfst-tokenize.cc
++++ b/tools/src/hfst-tokenize.cc
+@@ -376,7 +376,7 @@ int parse_options(int argc, char** argv)
{0,0,0,0}
};
int option_index = 0;
@@ -780,12 +726,11 @@ diff --git a/trunk/tools/src/hfst-tokenize.cc b/trunk/tools/src/hfst-tokenize.cc
long_options, &option_index);
if (-1 == c)
{
-Index: tools/src/hfst-traverse.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-traverse.cc b/trunk/tools/src/hfst-traverse.cc
---- a/trunk/tools/src/hfst-traverse.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-traverse.cc (working copy)
-@@ -137,7 +137,7 @@
+diff --git a/tools/src/hfst-traverse.cc b/tools/src/hfst-traverse.cc
+index bf00938..9a28ded 100644
+--- a/tools/src/hfst-traverse.cc
++++ b/tools/src/hfst-traverse.cc
+@@ -137,7 +137,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -794,12 +739,11 @@ diff --git a/trunk/tools/src/hfst-traverse.cc b/trunk/tools/src/hfst-traverse.cc
HFST_GETOPT_UNARY_SHORT,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-twolc/src/commandline_src/CommandLine.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc b/trunk/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc
---- a/trunk/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc (working copy)
-@@ -113,7 +113,7 @@
+diff --git a/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc b/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc
+index 0c4b25d..040100b 100644
+--- a/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc
++++ b/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc
+@@ -113,7 +113,7 @@ int CommandLine::parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -808,12 +752,11 @@ diff --git a/trunk/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc b/tru
":hVvqsu" "i:o:" "RDi:d:f:",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-txt2fst.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-txt2fst.cc b/trunk/tools/src/hfst-txt2fst.cc
---- a/trunk/tools/src/hfst-txt2fst.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-txt2fst.cc (working copy)
-@@ -118,7 +118,7 @@
+diff --git a/tools/src/hfst-txt2fst.cc b/tools/src/hfst-txt2fst.cc
+index 1c60826..6de653d 100644
+--- a/tools/src/hfst-txt2fst.cc
++++ b/tools/src/hfst-txt2fst.cc
+@@ -118,7 +118,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -822,12 +765,11 @@ diff --git a/trunk/tools/src/hfst-txt2fst.cc b/trunk/tools/src/hfst-txt2fst.cc
HFST_GETOPT_UNARY_SHORT "e:nf:pC",
long_options, &option_index);
if (-1 == c)
-Index: tools/src/hfst-unary-tool.cc
-===================================================================
-diff --git a/trunk/tools/src/hfst-unary-tool.cc b/trunk/tools/src/hfst-unary-tool.cc
---- a/trunk/tools/src/hfst-unary-tool.cc (revision 2798)
-+++ b/trunk/tools/src/hfst-unary-tool.cc (working copy)
-@@ -82,7 +82,7 @@
+diff --git a/tools/src/hfst-unary-tool.cc b/tools/src/hfst-unary-tool.cc
+index 6f31a52..54e244b 100644
+--- a/tools/src/hfst-unary-tool.cc
++++ b/tools/src/hfst-unary-tool.cc
+@@ -82,7 +82,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
@@ -836,12 +778,11 @@ diff --git a/trunk/tools/src/hfst-unary-tool.cc b/trunk/tools/src/hfst-unary-too
HFST_GETOPT_UNARY_SHORT,
long_options, &option_index);
if (-1 == c)
-Index: tools/src/parsers/hfst-xfst.cc
-===================================================================
-diff --git a/trunk/tools/src/parsers/hfst-xfst.cc b/trunk/tools/src/parsers/hfst-xfst.cc
---- a/trunk/tools/src/parsers/hfst-xfst.cc (revision 2798)
-+++ b/trunk/tools/src/parsers/hfst-xfst.cc (working copy)
-@@ -126,7 +126,7 @@
+diff --git a/tools/src/parsers/hfst-xfst.cc b/tools/src/parsers/hfst-xfst.cc
+index 0ae48bc..42753e3 100644
+--- a/tools/src/parsers/hfst-xfst.cc
++++ b/tools/src/parsers/hfst-xfst.cc
+@@ -126,7 +126,7 @@ parse_options(int argc, char** argv)
};
int option_index = 0;
// add tool-specific options here
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hfst.git
More information about the debian-science-commits
mailing list