Changeset abd28d1

Timestamp:

02/22/12 23:10:23 (13 years ago)

Author:

Tomasz Obrebski <to@…>

Branches:

master

Children:

a15e59b

Parents:

b242df2

git-author:

Tomasz Obrebski <to@…> (02/22/12 23:10:23)

git-committer:

Tomasz Obrebski <to@…> (02/22/12 23:10:23)

Message:

fixed further bugs around compdic
cats file renamed and moved
config files updated

Files:

• conf/Makefile (modified) (1 diff)
• conf/compdic.conf.m4 (moved) (moved from conf/compiledic.conf.m4) (1 diff)
• conf/dgc.conf.m4 (modified) (1 diff)
• conf/lem.conf.m4 (modified) (1 diff)
• conf/utt.conf.m4 (modified) (1 diff)
• configure (modified) (6 diffs)
• share/Makefile (modified) (2 diffs)
• share/pl_PL.ISO-8859-2/lem.bin (modified) (previous)
• share/pl_PL.ISO-8859-2/lem.bin.cats (added)
• src/compdic/compdic (modified) (1 diff)

conf/Makefile

@@ -2 +2 @@
 
 .PHONY: all
-all: compiledic.conf cor.conf dgc.conf dgp.conf gph.conf grp.conf gue.conf kor.conf lem.conf mar.conf ser.conf utt.conf
+all: compdic.conf cor.conf dgc.conf dgp.conf gph.conf grp.conf gue.conf kor.conf lem.conf mar.conf ser.conf utt.conf
 
 %.conf: %.conf.m4
-        m4 --define=LANG_DIR=${LANG_DIR} --define=LIB_DIR=${LIB_DIR} $< > $@
+        m4 --define=LANG_DIR=${LANG_DIR} --define=LIB_DIR=${LIB_DIR} --define=LANGUAGE=${LANGUAGE} $< > $@
 
 

conf/compdic.conf.m4

@@ -11 +11 @@
 # parameter_name [=] value
 #
-symbols = LANG_DIR/pl_PL.ISO-8859-2/pl_PL.ISO-8859-2.sym
+symbols = LANG_DIR/LANGUAGE/LANGUAGE.sym

conf/dgc.conf.m4

@@ -11 +11 @@
 # parameter_name [=] value
 #
-categories = LANG_DIR/cats.dgc
+categories = LANG_DIR/LANGUAGE/lem.bin.cats
 grammar = LANG_DIR/gram.dgc
 outputfile = LANG_DIR/gram.dgp

conf/lem.conf.m4

@@ -11 +11 @@
 # parameter_name [=] value
 #
-dictionary-home = LANG_DIR
+dictionary = LANG_DIR/LANGUAGE/lem.bin
+#dictionary-home = LANG_DIR
 process = W

conf/utt.conf.m4

@@ -12 +12 @@
 #
 # user locale (dictionary)
-language = pl_PL.ISO-8859-2
+language = LANGUAGE

configure

@@ -56 +56 @@
         echo "   --libdir=LIBDIR           install libraries in LIBDIR [$libdir]"
         echo
-  echo "   --enable-static           build static versions [no]"
+        echo "   --language=LANGUAGE           select language"
+        echo
+        echo "   --enable-static           build static versions [no]"
         echo "   --enable-doc              build documentation [yes]"
         echo "   --enable-utf8             build UTF-8 versions of applications [no]"
-  echo
-  echo "   --cc=CC                   use C compiler CC [$cc_default]"
+        echo
+        echo "   --cc=CC                   use C compiler CC [$cc_default]"
         echo "   --cxx=CXX                 use C++ compiler CXX [$cxx_default]"
         echo "   --gengetopt=GGO           use gengetopt GGO [$gengetopt_default]"
         echo "   --flex=FLEX               use flex FLEX [$flex_default]"
-  echo "   --makeinfo=MAKEINFO       use makeinfo MAKEINFO [$makeinfo_default]"
+        echo "   --makeinfo=MAKEINFO       use makeinfo MAKEINFO [$makeinfo_default]"
         echo "   --texi2dvi=TEXI2DVI       use texi2dvi TEXI2DVI [$texi2dvi_default]"
         echo "   --texi2pdf=TEXI2PDF       use texi2pdf TEXI2PDF [$texi2pdf_default]"
@@ -87 +89 @@
 langdir="${PREFIX}/share/utt"
 libdir="${PREFIX}/lib/utt"
+
+language="pl_PL.ISO-8859-2"
 
 cc_default="gcc"
@@ -148 +152 @@
                 libdir="$optval"
         ;;
+        --language=*)
+                language="$optval"
+        ;;
         --cc=*)
                 cc="$optval"
@@ -157 +164 @@
                 gengetopt="$optval"
         ;;
-  --flex=*)
-    flex="$optval"
-  ;;
+        --flex=*)
+                flex="$optval"
+        ;;
         --makeinfo=*)
                 makeinfo="$optval"
@@ -236 +243 @@
 echo "LANG_DIR=$langdir" >> config.mak
 echo "LIB_DIR=$libdir" >> config.mak
+echo "LANGUAGE=$language" >> config.mak
 echo "CC=$cc" >> config.mak
 echo "CXX=$cxx" >> config.mak
@@ -276 +284 @@
 echo "langdir:    $langdir"
 echo "libdir:     $libdir"
+echo "language:   $language"
 enabled doc && {
 echo "makeinfo:   $makeinfo"

share/Makefile

@@ -9 +9 @@
         install -m 0644 pl_PL.ISO-8859-2/gue.bin $(LANG_DIR)/pl_PL.ISO-8859-2
         install -m 0644 pl_PL.ISO-8859-2/lem.bin $(LANG_DIR)/pl_PL.ISO-8859-2
+        install -m 0644 pl_PL.ISO-8859-2/lem.bin.cats $(LANG_DIR)/pl_PL.ISO-8859-2
         install -m 0644 pl_PL.ISO-8859-2/pl_PL.ISO-8859-2.sym $(LANG_DIR)/pl_PL.ISO-8859-2
         install -m 0644 pl_PL.UTF-8/lem.bin $(LANG_DIR)/pl_PL.UTF-8
-        install -m 0644 cats.dgc $(LANG_DIR)
         install -m 0644 gram.dgc $(LANG_DIR)
         install -m 0644 weights.kor $(LANG_DIR)
@@ -21 +21 @@
         rm $(LANG_DIR)/weights.kor
         rm $(LANG_DIR)/gram.dgc
-        rm $(LANG_DIR)/cats.dgc
         rm $(LANG_DIR)/pl_PL.UTF-8/lem.bin
         rm $(LANG_DIR)/pl_PL.ISO-8859-2/pl_PL.ISO-8859-2.sym
+        rm $(LANG_DIR)/pl_PL.ISO-8859-2/lem.bin.cats
         rm $(LANG_DIR)/pl_PL.ISO-8859-2/lem.bin
         rm $(LANG_DIR)/pl_PL.ISO-8859-2/gue.bin

src/compdic/compdic

@@ -172 +172 @@
 done
 
-cat $automaton | fsttopsort | fstprint --acceptor --isymbols=$alphabet > aaaa
-cat aaaa | fsm2aut | aut2fsa > $2
+echo generating binary automaton file ...
+
+cat $automaton | fsttopsort | fstprint --acceptor --isymbols=$alphabet | fsm2aut | aut2fsa > $2
 rm -r $tempdir
+
+echo generating cats file ...
+
+cat $1 | cut -d ',' -f 2 | sort -u $2.cats