[apertium] 01/02: Imported Upstream version 3.4.0~r61013

Tino Didriksen tinodidriksen-guest at moszumanska.debian.org
Mon Jun 22 15:00:28 UTC 2015 

This is an automated email from the git hooks/post-receive script.

tinodidriksen-guest pushed a commit to branch master
in repository apertium.

commit 8daec2756e8d74a1faf9b4dca8458ad9743cda64
Author: Tino Didriksen <mail at tinodidriksen.com>
Date:   Mon Jun 22 14:59:27 2015 +0000

    Imported Upstream version 3.4.0~r61013
---
 apertium.m4                                 | 12 ++++++++++++
 apertium/apertium-deshtml.1                 |  2 +-
 apertium/apertium-deslatex.1                |  2 +-
 apertium/apertium-desodt.1                  |  2 +-
 apertium/apertium-despptx.1                 |  2 +-
 apertium/apertium-desrtf.1                  |  2 +-
 apertium/apertium-destxt.1                  |  2 +-
 apertium/apertium-deswxml.1                 |  2 +-
 apertium/apertium-desxlsx.1                 |  2 +-
 apertium/apertium-pretransfer.1             |  2 +-
 apertium/apertium-tagger-apply-new-rules.1  |  4 ++--
 apertium/apertium-tagger.1                  |  4 ++--
 apertium/apertium-transfer.1                | 10 +++++-----
 apertium/apertium.1                         |  2 +-
 apertium/apertium_tagger_apply_new_rules.cc |  2 +-
 apertium/tagger.cc                          |  2 +-
 apertium/tmx_aligner_tool.cc                |  4 ++--
 17 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/apertium.m4 b/apertium.m4
index 774d163..6fa79b2 100644
--- a/apertium.m4
+++ b/apertium.m4
@@ -140,6 +140,18 @@ langs:
 	test -z "\$\$fail"
 .PHONY: langs
 
+
+.deps/%.autobil.prefixes: %.autobil.bin .deps/.d
+	lt-print $< | sed 's/ /@_SPACE_@/g' > .deps/\@S|@*.autobil.att
+	hfst-txt2fst -e ε <  .deps/\@S|@*.autobil.att > .deps/\@S|@*.autobil.hfst
+	hfst-project -p upper .deps/\@S|@*.autobil.hfst > .deps/\@S|@*.autobil.upper                                   # bidix
+	echo ' @<:@ ? - %+ @:>@* ' | hfst-regexp2fst > .deps/\@S|@*.any-nonplus.hfst                                                        # [^+]*
+	hfst-concatenate -1 .deps/\@S|@*.autobil.upper -2 .deps/\@S|@*.any-nonplus.hfst -o .deps/\@S|@*.autobil.nonplussed    # bidix [^+]*
+	echo ' %+ ' | hfst-regexp2fst > .deps/\@S|@*.single-plus.hfst                                                                 # +
+	hfst-concatenate -1 .deps/\@S|@*.single-plus.hfst -2 .deps/\@S|@*.autobil.nonplussed -o .deps/\@S|@*.autobil.postplus # + bidix [^+]*
+	hfst-repeat -f0 -t1 -i .deps/\@S|@*.autobil.postplus -o .deps/\@S|@*.autobil.postplus.0,1                      # (+ bidix [^+]*){0,1} -- gives at most one +
+	hfst-concatenate -1 .deps/\@S|@*.autobil.nonplussed -2 .deps/\@S|@*.autobil.postplus.0,1 -o \@S|@@                 # bidix [^+]* (+ bidix [^+]*){0,1}
+
 EOF
 
 ])
diff --git a/apertium/apertium-deshtml.1 b/apertium/apertium-deshtml.1
index 88a4e79..995b532 100644
--- a/apertium/apertium-deshtml.1
+++ b/apertium/apertium-deshtml.1
@@ -8,7 +8,7 @@ This tool is part of the apertium open-source machine translation
 toolbox: \fBhttp://www.apertium.org\fR.
 .SH SYNOPSIS
 .B apertium-deshtml
-[ -h ] [ -i ] [ -n ]
+[ \-h ] [ \-i ] [ \-n ]
 [ <input file> [ <output file> ] ]
 .PP
 .SH DESCRIPTION
diff --git a/apertium/apertium-deslatex.1 b/apertium/apertium-deslatex.1
index 4a9f496..dd2645d 100644
--- a/apertium/apertium-deslatex.1
+++ b/apertium/apertium-deslatex.1
@@ -7,7 +7,7 @@ apertium-deslatex \- This application is part of (
 This tool is part of the apertium open-source machine translation toolbox: \fBhttp://www.apertium.org\fR.
 .SH SYNOPSIS
 .B apertium-deslatex
-[ -h ] [ -i ] [ -n ]
+[ \-h ] [ \-i ] [ \-n ]
 [ <input file> [ <output file> ] ]
 .PP
 .SH DESCRIPTION
diff --git a/apertium/apertium-desodt.1 b/apertium/apertium-desodt.1
index f8bf4d9..86b2e5d 100644
--- a/apertium/apertium-desodt.1
+++ b/apertium/apertium-desodt.1
@@ -8,7 +8,7 @@ This tool is part of the apertium open-source machine translation
 toolbox: \fBhttp://www.apertium.org\fR.
 .SH SYNOPSIS
 .B apertium-desodt
-[ -h ] [ -i ] [ -n ]
+[ \-h ] [ \-i ] [ \-n ]
 [ <input file> [ <output file> ] ]
 .PP
 .SH DESCRIPTION
diff --git a/apertium/apertium-despptx.1 b/apertium/apertium-despptx.1
index 216b181..8bb9515 100644
--- a/apertium/apertium-despptx.1
+++ b/apertium/apertium-despptx.1
@@ -8,7 +8,7 @@ This tool is part of the apertium open-source machine translation
 toolbox: \fBhttp://www.apertium.org\fR.
 .SH SYNOPSIS
 .B apertium-despptx
-[ -h ] [ -i ] [ -n ]
+[ \-h ] [ \-i ] [ \-n ]
 [ <input file> [ <output file> ] ]
 .PP
 .SH DESCRIPTION
diff --git a/apertium/apertium-desrtf.1 b/apertium/apertium-desrtf.1
index eef5b8a..5957905 100644
--- a/apertium/apertium-desrtf.1
+++ b/apertium/apertium-desrtf.1
@@ -8,7 +8,7 @@ This tool is part of the apertium open-source machine translation
 toolbox: \fBhttp://apertium.org\fR.
 .SH SYNOPSIS
 .B apertium-desrtf
-[ -h ] [ -i ] [ -n ]
+[ \-h ] [ \-i ] [ \-n ]
 [ <input file> [ <output file> ] ]
 .PP
 .SH DESCRIPTION
diff --git a/apertium/apertium-destxt.1 b/apertium/apertium-destxt.1
index 64e8df5..bcad6ea 100644
--- a/apertium/apertium-destxt.1
+++ b/apertium/apertium-destxt.1
@@ -7,7 +7,7 @@ apertium-destxt \- This application is part of (
 This tool is part of the apertium open-source machine translation toolbox: \fBhttp://www.apertium.org\fR.
 .SH SYNOPSIS
 .B apertium-destxt
-[ -h ] [ -i ] [ -n ]
+[ \-h ] [ \-i ] [ \-n ]
 [ <input file> [ <output file> ] ]
 .PP
 .SH DESCRIPTION
diff --git a/apertium/apertium-deswxml.1 b/apertium/apertium-deswxml.1
index 6906f86..ffe0152 100644
--- a/apertium/apertium-deswxml.1
+++ b/apertium/apertium-deswxml.1
@@ -8,7 +8,7 @@ This tool is part of the apertium open-source machine translation
 toolbox: \fBhttp://www.apertium.org\fR.
 .SH SYNOPSIS
 .B apertium-deswxml
-[ -h ] [ -i ] [ -n ]
+[ \-h ] [ \-i ] [ \-n ]
 [ <input file> [ <output file> ] ]
 .PP
 .SH DESCRIPTION
diff --git a/apertium/apertium-desxlsx.1 b/apertium/apertium-desxlsx.1
index d73f6a4..e377ea9 100644
--- a/apertium/apertium-desxlsx.1
+++ b/apertium/apertium-desxlsx.1
@@ -8,7 +8,7 @@ This tool is part of the apertium open-source machine translation
 toolbox: \fBhttp://www.apertium.org\fR.
 .SH SYNOPSIS
 .B apertium-desxlsx
-[ -h ] [ -i ] [ -n ]
+[ \-h ] [ \-i ] [ \-n ]
 [ <input file> [ <output file> ] ]
 .PP
 .SH DESCRIPTION
diff --git a/apertium/apertium-pretransfer.1 b/apertium/apertium-pretransfer.1
index 4d12ae9..9722c8b 100644
--- a/apertium/apertium-pretransfer.1
+++ b/apertium/apertium-pretransfer.1
@@ -24,7 +24,7 @@ Display this help.
 .TP
 You could write the following to show how the expression "trobant-lo a faltar" is analysed: 
 .TP
-echo "trobant-lo a faltar" | apertium-destxt | lt-proc ca-es.automorf.bin |./ca-es.tagger --tagger ca-es | apertium-pretransfer
+echo "trobant-lo a faltar" | apertium-destxt | lt-proc ca-es.automorf.bin |./ca-es.tagger \-\-tagger ca-es | apertium-pretransfer
 .PP
 .SH SEE ALSO
 .I apertium-destxt\fR(1),
diff --git a/apertium/apertium-tagger-apply-new-rules.1 b/apertium/apertium-tagger-apply-new-rules.1
index 5300c20..98fe5bc 100644
--- a/apertium/apertium-tagger-apply-new-rules.1
+++ b/apertium/apertium-tagger-apply-new-rules.1
@@ -8,14 +8,14 @@ This tool is part of the apertium open-source machine translation
 toolbox: \fBhttp://www.apertium.org\fR.
 .SH SYNOPSIS
 .B apertium-tagger-apply-new-rules 
---filein [ <input file> ] --fileout [ <output file> ] --tsxfile [ <rule file> ]
+\-\-filein [ <input file> ] \-\-fileout [ <output file> ] \-\-tsxfile [ <rule file> ]
 
 .PP
 .SH DESCRIPTION
 .BR apertium-tagger-apply-new-rules
 is used to forbid and enforce rules which are applied to the given HMM parameters.
 
-Note that the TSX file provided with --tsxfile *must* be equal, in terms of label definitions, to the one used when training the HMM parameters that are to be modified.
+Note that the TSX file provided with \-\-tsxfile *must* be equal, in terms of label definitions, to the one used when training the HMM parameters that are to be modified.
 
 .SH OPTIONS
 .TP
diff --git a/apertium/apertium-tagger.1 b/apertium/apertium-tagger.1
index bedfe4b..cedf443 100644
--- a/apertium/apertium-tagger.1
+++ b/apertium/apertium-tagger.1
@@ -49,7 +49,7 @@ Prints the superficial form of the word along side the lexical form
 in the output stream.
 .TP
 .B \-f, \-\-first
-Used in conjuntion with -g (--tagger) makes the tagger
+Used in conjuntion with \-g (\-\-tagger) makes the tagger
 give all lexical forms of each word, with the chosen
 one in the first place (after the lemma)
 .TP
@@ -81,7 +81,7 @@ Hand-tagged text corpus
 .PP
 .B UNTAG       
 Untagged text corpus, morphological analysis of HTAG corpus to use
-both jointly with -s option
+both jointly with \-s option
 .PP
 .B INPUT       
 Input file, stdin by default
diff --git a/apertium/apertium-transfer.1 b/apertium/apertium-transfer.1
index 22ca95a..6d4692c 100644
--- a/apertium/apertium-transfer.1
+++ b/apertium/apertium-transfer.1
@@ -14,13 +14,13 @@ toolbox: \fBhttp://www.apertium.org\fR.
 trules preproc [input [output]]
 .PP
 .B apertium-transfer
--x extended trules preproc biltrans [input [output]]
+\-x extended trules preproc biltrans [input [output]]
 .PP
 .B apertium-transfer
--c trules preproc biltrans [input [output]]
+\-c trules preproc biltrans [input [output]]
 .PP
 .B apertium-transfer
--t trules preproc biltrans [input [output]]
+\-t trules preproc biltrans [input [output]]
 .SH DESCRIPTION
 .BR apertium-transfer 
 is the program that performs the transfer from input language
@@ -45,10 +45,10 @@ Input file (stdin by default).
 .B outfile
 Output file (stdout by default).
 .PP
-\-.B -b
+\-.B \-b
 \-input from lexical transfer (single level transfer only)
 \-.PP
-\-.B -h
+\-.B \-h
 \-shows this message
 \-.PP
 .B -n
diff --git a/apertium/apertium.1 b/apertium/apertium.1
index 9622383..b703450 100644
--- a/apertium/apertium.1
+++ b/apertium/apertium.1
@@ -8,7 +8,7 @@ This tool is part of the apertium machine translation
 architecture: \fBhttp://apertium.sf.net\fR.
 .SH SYNOPSIS
 .B apertium
-[-d datadir] [-f format] [-u] [-a] {language-pair} [infile [outfile]]
+[\-d datadir] [\-f format] [\-u] [\-a] {language-pair} [infile [outfile]]
 .SH DESCRIPTION
 .BR apertium 
 is the application that most people will be using as it simplifies the
diff --git a/apertium/apertium_tagger_apply_new_rules.cc b/apertium/apertium_tagger_apply_new_rules.cc
index 1555be3..80c2373 100644
--- a/apertium/apertium_tagger_apply_new_rules.cc
+++ b/apertium/apertium_tagger_apply_new_rules.cc
@@ -46,7 +46,7 @@ void check_file(FILE *f, const string& path) {
 }
 
 void help(char *name) {
-  cerr<<"Forbid and enforce rules are applied to the given HMM paramters\n\n";
+  cerr<<"Forbid and enforce rules are applied to the given HMM parameters\n\n";
   cerr<<"USAGE:\n";
   cerr<<name<<" --filein filein.prob --fileout fileout.prob --tsxfile file.tsx\n\n";
 
diff --git a/apertium/tagger.cc b/apertium/tagger.cc
index 9b50cb7..630bfc5 100644
--- a/apertium/tagger.cc
+++ b/apertium/tagger.cc
@@ -726,7 +726,7 @@ Tagger::help() {
   out << "  -t, --train=n:          performs n iterations of training (unsupervised)" << endl;
   out << "  -s, --supervised=n:     initializes parameters against a hand-tagged text (supervised)," << endl;
   out << "                          and trains it with n iterations" << endl;
-  out << "  -r, --retrain=n:        retrains the model with n aditional iterations (unsupervised)" << endl;
+  out << "  -r, --retrain=n:        retrains the model with n additional iterations (unsupervised)" << endl;
   out << "  -g, --tagger:           tags input text" << endl;
   out << "  -p, --show-superficial: show superficial forms in the output stream" << endl;
   out << "  -f, --first:            used in conjuntion with -g (--tagger) makes the tagger"<< endl;
diff --git a/apertium/tmx_aligner_tool.cc b/apertium/tmx_aligner_tool.cc
index b42210b..f4ee9dc 100644
--- a/apertium/tmx_aligner_tool.cc
+++ b/apertium/tmx_aligner_tool.cc
@@ -493,9 +493,9 @@ Arguments:\n\
 	starting rung is printed.\n\
 \n\
 -cautious\n\
-	In -bisent mode, only bisentences for which both the preceeding and the following\n\
+	In -bisent mode, only bisentences for which both the preceding and the following\n\
 	segments are one-to-one are printed. In the default non-bisent mode, only rungs\n\
-	for which both the preceeding and the following segments are one-to-one are printed.\n\
+	for which both the preceding and the following segments are one-to-one are printed.\n\
 \n\
 -hand=file\n\
 	When this argument is given, the precision and recall of the alignment is calculated\n\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/apertium.git

More information about the debian-science-commits mailing list