Index: app/TODO =================================================================== --- app/TODO (revision 6ac84d8bba375e6caf620f62d632c4fb07aa95d4) +++ app/TODO (revision 19760efd7bb36c499d7149474a4898332fa60a7c) @@ -2,4 +2,5 @@ * przemyslec sposob wybierania jezyka / slownika po zainstalowaniu roznych dystrybucji [PK, TO] * gue nie sortuje wynikow, opcja weights dziala na odwrot +* kor nie wykonuje zamian -> , np. ÅŒ rz WAZNE: Index: app/conf/kor.conf =================================================================== --- app/conf/kor.conf (revision adb4c8d65ba8b406a1703d1c091bcf1af4bdfb3c) +++ app/conf/kor.conf (revision 19760efd7bb36c499d7149474a4898332fa60a7c) @@ -14,2 +14,3 @@ weights = PATH_PREFIX/share/utt/weights.kor threshold = 1.0 +process=W Index: app/conf/ser.conf =================================================================== --- app/conf/ser.conf (revision adb4c8d65ba8b406a1703d1c091bcf1af4bdfb3c) +++ app/conf/ser.conf (revision 19760efd7bb36c499d7149474a4898332fa60a7c) @@ -13,2 +13,3 @@ macros = PATH_PREFIX/lib/utt/terms.m4 flex-template = PATH_PREFIX/lib/utt/ser.l.template +tags=uam Index: app/doc/utt.texinfo =================================================================== --- app/doc/utt.texinfo (revision 246900abc92b7d822ca17bd69aeb06d2b30db588) +++ app/doc/utt.texinfo (revision 19760efd7bb36c499d7149474a4898332fa60a7c) @@ -11,5 +11,5 @@ This manual is for UAM Text Tools (version 0.90, November, 2007) -Copyright @copyright{} 2005, 2007 Tomasz Obrêbski, Micha³ Stolarski, Justyna Walkowska, Pawe³ Konieczka. +Copyright @copyright{} 2005, 2007 Tomasz Obrêbski, Micha³ Stolarski, Justyna Walkowska, Pawe³ Konieczka. Permission is granted to copy, distribute and/or modify this document @@ -128,4 +128,5 @@ @item Marcin Walas @item Justyna Walkowska +@item Paweł Wereński @end itemize @@ -249,5 +250,5 @@ @example 0000 00 BOS * -0000 07 W Piszemy lem:pisaæ,V +0000 07 W Piszemy lem:pisaÊ,V 0007 01 S _ 0008 05 W dobre lem:dobry,ADJ @@ -260,5 +261,5 @@ 0024 11 W Warszawiacy lem:Warszawiak,N 0035 01 S _ -0036 03 W te¿ +0036 03 W te¿ 0039 01 P . 0040 00 EOS * @@ -268,5 +269,5 @@ @example 0000 BOS * -0000 W Piszemy lem:pisaæ,V +0000 W Piszemy lem:pisaÊ,V 0007 S _ 0008 W dobre lem:dobry,ADJ @@ -281,5 +282,5 @@ @example 0000 BOS * -W Piszemy lem:pisaæ,V +W Piszemy lem:pisaÊ,V S _ W dobre lem:dobry,ADJ @@ -292,5 +293,5 @@ W Warszawiacy lem:Warszawiak,N S _ -W te¿ +W te¿ P . EOS * @@ -406,5 +407,5 @@ -@c [JAK UZYSKAÆ POLSKIE CZCIONKI W DVI???] +@c [JAK UZYSKAÆ POLSKIE CZCIONKI W DVI???] @macro parhelp @@ -719,5 +720,5 @@ @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} -@item @strong{Authors:} @tab Tomasz Obrêbski +@item @strong{Authors:} @tab Tomasz Obrêbski @item @strong{Component category:} @tab source @end multitable @@ -821,5 +822,5 @@ @c @chapter sen - sentencizer -@c Authors: Tomasz Obrêbski +@c Authors: Tomasz Obrêbski @c --------------------------------------------------------------------- @@ -832,5 +833,5 @@ @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} -@item @strong{Authors:} @tab Tomasz Obrêbski, Micha³ Stolarski +@item @strong{Authors:} @tab Tomasz Obrêbski, Micha³ Stolarski @item @strong{Component category:} @tab filter @end multitable @@ -933,5 +934,5 @@ @example -0000 07 W Piszemy lem:pisaæ,V/AiVpMdTrfNpP1 +0000 07 W Piszemy lem:pisaÊ,V/AiVpMdTrfNpP1 0007 01 B _ 0008 05 W dobre lem:dobry,ADJ/DpNpCnavGaifn @@ -948,5 +949,5 @@ @example -0000 07 W Piszemy lem:pisaæ,V/AiVpMdTrfNpP1 +0000 07 W Piszemy lem:pisaÊ,V/AiVpMdTrfNpP1 0007 01 S _ 0008 05 W dobre lem:dobry,ADJ/DpNpCnavGaifn lem:dobry,ADJ/DpNsCnavGn @@ -960,5 +961,5 @@ @example -0000 07 W Piszemy lem:pisaæ,V/AiVpMdTrfNpP1 +0000 07 W Piszemy lem:pisaÊ,V/AiVpMdTrfNpP1 0007 01 S _ 0008 05 W dobre lem:dobry,ADJ/DpNpCnavGaifn,ADJ/DpNsCnavGn @@ -994,5 +995,5 @@ string @code{}, replace suffix of length @code{} with string @code{}. For example @code{3t} transforms @samp{kocie} into -@samp{kot}, @code{3-4a³y} transforms @samp{najbielsi} into @samp{bia³y} +@samp{kot}, @code{3-4a³y} transforms @samp{najbielsi} into @samp{bia³y} Each dictionary entry must be written in one line and must not contain blank characters. @@ -1005,6 +1006,6 @@ kotem;2,N/GaNsCi kocie;3t,N/GaNsCl;3t,N/GaNsCv -najbielsi;3-4a³y,ADJ/DsNpCnGp -najbielsze;3-5a³y,ADJ/DsNpCnGaifn +najbielsi;3-4a³y,ADJ/DsNpCnGp +najbielsze;3-5a³y,ADJ/DsNpCnGaifn najlepsi;dobry,ADJ/DsNpCnGp najlepsze;dobry,ADJ/DsNpCnGaifn @@ -1065,5 +1066,5 @@ @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} -@item @strong{Authors:} @tab Micha³ Stolarski, Tomasz Obrêbski +@item @strong{Authors:} @tab Micha³ Stolarski, Tomasz Obrêbski @item @strong{Component category:} @tab filter @@ -1156,5 +1157,5 @@ -Example: @code{3-4a³y} transforms @i{najbielsi} into @i{bia³y} +Example: @code{3-4a³y} transforms @i{najbielsi} into @i{bia³y} @@ -1165,6 +1166,6 @@ @example -*³kê;1a,N/GfNsCa -naj*elszy;3-4a³y,ADJ/...:... +*³kê;1a,N/GfNsCa +naj*elszy;3-4a³y,ADJ/...:... @end example @@ -1179,5 +1180,5 @@ @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} -@item @strong{Authors:} @tab Tomasz Obrêbski, Micha³ Stolarski +@item @strong{Authors:} @tab Tomasz Obrêbski, Micha³ Stolarski @item @strong{Component category:} @tab filter @end multitable @@ -1248,5 +1249,5 @@ @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} -@item @strong{Authors:} @tab Tomasz Obrêbski +@item @strong{Authors:} @tab Tomasz Obrêbski @item @strong{Component category:} @tab filter @@ -1268,5 +1269,5 @@ input: -0000 05 W Cze¶æ +0000 05 W Cze¶Ê 0005 01 P ! 0006 01 S _ @@ -1279,5 +1280,5 @@ output: 0000 00 BOS * -0000 05 W Cze¶æ +0000 05 W Cze¶Ê 0005 01 P ! 0006 00 EOS * @@ -1300,5 +1301,5 @@ @c @chapter gph - graphizer -@c Authors: Tomasz Obrêbski +@c Authors: Tomasz Obrêbski @@ -1313,5 +1314,5 @@ @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} -@item @strong{Authors:} @tab Tomasz Obrêbski +@item @strong{Authors:} @tab Tomasz Obrêbski @item @strong{Component category:} @tab filter @end multitable @@ -1541,5 +1542,5 @@ @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} -@item @strong{Authors:} @tab Tomasz Obrêbski +@item @strong{Authors:} @tab Tomasz Obrêbski @item @strong{Component category:} @tab filter @end multitable @@ -1635,5 +1636,5 @@ @section kot - untokenizer -Authors: Tomasz Obrêbski +Authors: Tomasz Obrêbski @command{kot} is the opposite of @command{tok}. It changes UTT-formatted text into plain text. @@ -1850,5 +1851,5 @@ @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} -@item @strong{Authors:} @tab Tomasz Obrêbski +@item @strong{Authors:} @tab Tomasz Obrêbski @item @strong{Component category:} @tab filter @end multitable @@ -1889,5 +1890,5 @@ @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} -@item @strong{Authors:} @tab Tomasz Obrêbski +@item @strong{Authors:} @tab Tomasz Obrêbski @item @strong{Component category:} @tab filter @end multitable Index: app/src/dgp/tre.rb =================================================================== --- app/src/dgp/tre.rb (revision adb4c8d65ba8b406a1703d1c091bcf1af4bdfb3c) +++ app/src/dgp/tre.rb (revision 19760efd7bb36c499d7149474a4898332fa60a7c) @@ -1,5 +1,9 @@ #!/usr/bin/ruby -I /usr/local/lib/utt -I $HOME/.local/lib/utt +$: << "#{ENV['HOME']}/.local/lib/utt" +$: << "/usr/local/lib/utt" + require 'getoptlong' +require 'seg.rb' opts = GetoptLong.new( @@ -60,7 +64,4 @@ end end - -#require File.expand_path(File.dirname(__FILE__) + "../lib/utt/seg.rb") -require 'seg.rb' $dgpsep=';' Index: app/src/gue/cmdline_guess.ggo =================================================================== --- app/src/gue/cmdline_guess.ggo (revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1) +++ app/src/gue/cmdline_guess.ggo (revision 19760efd7bb36c499d7149474a4898332fa60a7c) @@ -8,5 +8,5 @@ option "dictionary" d "File with dictionary information" string typestr="filename" default="gue.bin" no option "per-info" v "Display performance information" flag off -option "weights" w "Print weights" flag off hidden +option "weights" w "Print weights" flag off option "no-uppercase" - "Do not process form containing uppercase letters" flag off Index: app/src/gue/common_guess.cc =================================================================== --- app/src/gue/common_guess.cc (revision 6ac84d8bba375e6caf620f62d632c4fb07aa95d4) +++ app/src/gue/common_guess.cc (revision 19760efd7bb36c499d7149474a4898332fa60a7c) @@ -8,5 +8,5 @@ char dictionary[255]; bool per_info=false; -bool weights=true; +bool weights=false; void process_guess_options(gengetopt_args_info* args) @@ -56,5 +56,5 @@ if(args->weights_given) - weights=false; + weights=true; }