fixed further bugs around compdic

cats file renamed and moved
config files updated

conf/Makefile

@@ -1,10 +1,10 @@
 include ../config.mak
 
 .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} $< > $@
 
 
 .PHONY: clean

conf/compdic.conf.m4

@@ -10,4 +10,4 @@
 # All lines must looks like:
 # 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

@@ -10,6 +10,6 @@
 # All lines must looks like:
 # 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

@@ -10,5 +10,6 @@
 # All lines must looks like:
 # parameter_name [=] value
 #
-dictionary-home = LANG_DIR
+dictionary = LANG_DIR/LANGUAGE/lem.bin
+#dictionary-home = LANG_DIR
 process = W

conf/utt.conf.m4

@@ -11,4 +11,4 @@
 # parameter_name [=] value
 #
 # user locale (dictionary)
-language = pl_PL.ISO-8859-2
+language = LANGUAGE

configure

@@ -55,15 +55,17 @@ show_help(){
 	echo "   --langdir=LANGDIR         install lang in LANGDIR [$langdir]"
 	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
-  echo "   --cc=CC                   use C compiler CC [$cc_default]"
+	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]"
 	echo "   --dvips=DVIPS             use dvips DVIPS [$dvips_default]"
@@ -87,6 +89,8 @@ docdir="${PREFIX}/share/doc/utt"
 langdir="${PREFIX}/share/utt"
 libdir="${PREFIX}/lib/utt"
 
+language="pl_PL.ISO-8859-2"
+
 cc_default="gcc"
 cxx_default="g++"
 gengetopt_default="gengetopt"
@@ -147,6 +151,9 @@ for opt do
 	--libdir=*)
 		libdir="$optval"
 	;;
+	--language=*)
+		language="$optval"
+	;;
 	--cc=*)
 		cc="$optval"
 	;;
@@ -156,9 +163,9 @@ for opt do
 	--gengetopt=*)
 		gengetopt="$optval"
 	;;
-  --flex=*)
+	--flex=*)
-    flex="$optval"
+	        flex="$optval"
-  ;;
+	;;
 	--makeinfo=*)
 		makeinfo="$optval"
 	;;
@@ -235,6 +242,7 @@ echo "SHARE_DIR=$sharedir" >> config.mak
 echo "DOC_DIR=$docdir" >> config.mak
 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
 echo "GENGETOPT=$gengetopt" >> config.mak
@@ -275,6 +283,7 @@ echo "sharedir:   $sharedir"
 echo "docdir:     $docdir"
 echo "langdir:    $langdir"
 echo "libdir:     $libdir"
+echo "language:   $language"
 enabled doc && {
 echo "makeinfo:   $makeinfo"
 echo "texi2dvi:   $texi2dvi"

share/Makefile

@@ -8,9 +8,9 @@ ifdef LANG_DIR
 	install -m 0644 pl_PL.ISO-8859-2/cor.bin $(LANG_DIR)/pl_PL.ISO-8859-2
 	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)
 endif
@@ -20,9 +20,9 @@ uninstall:
 ifdef LANG_DIR
 	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
 	rm $(LANG_DIR)/pl_PL.ISO-8859-2/cor.bin

src/compdic/compdic

@@ -171,6 +171,11 @@ do
     fstminimize $temp3 $automaton
 done
 
-cat $automaton | fsttopsort | fstprint --acceptor --isymbols=$alphabet > aaaa
+echo generating binary automaton file ...
-cat aaaa | fsm2aut | aut2fsa > $2
+
+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