trans-coord/gnun/server/gnun gnun-recode-sr-lat... [sr-hr]

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Branch:         sr-hr
Changes by:     Yavor Doganov <yavor>   09/08/03 11:26:12

Modified files:
        gnun/server/gnun: gnun-recode-sr-latin.in configure.ac 
                          Makefile.am ChangeLog.sr-hr 

Log message:
        Hook the new recode scripts into gnun-recode-sr-latin.
        * gnun-recode-sr-latin.in: Add two more msgfilter invocations to
        preserve Cyrillic in alternative [A|B] constructs.
        * configure.ac (AC_PREREQ): Bump to 2.63b because of m4_map_args.
        (gnun_config_exec_file): New helper macro.
        (AC_CONFIG_FILES): Use m4_map_args to generate all guile scripts.
        * Makefile.am (bin_SCRIPTS): Move gnun-recode-sr-latin under the
        HAVE_GUILE conditional.
        (pkglibexec_SCRIPTS) <HAVE_GUILE>: Add recode-escape and
        recode-unescape.
        (edit): Substitute @address@hidden
        (gnun-recode-sr-latin): New target.
        (EXTRA_DIST): Add gnun-recode-sr-latin.in.
        (CLEANFILES): Add gnun-recode-sr-latin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-recode-sr-latin.in?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.16.2.2&r2=1.16.2.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.11.2.1&r2=1.11.2.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog.sr-hr?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: gnun-recode-sr-latin.in
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/Attic/gnun-recode-sr-latin.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- gnun-recode-sr-latin.in     28 Jul 2009 13:19:16 -0000      1.1.2.1
+++ gnun-recode-sr-latin.in     3 Aug 2009 11:26:12 -0000       1.1.2.2
@@ -77,7 +77,16 @@
        ;;
 esac
 
-# FIXME: Convert all [A|B] alternative constructs to numbers, to be
-# restored after the main msgfilter invocation.
+# Escape all alternative [A|B] constructs.
address@hidden@ --input $1 --output-file $2.tmp @pkglibexecdir@/recode-escape
 
address@hidden@ --input $1 --output-file $2 recode-sr-latin
+# Recode to Latin using gettext's builtin filter.
+# FIXME: The filter does not support accented characters yet; will be
+# fixed in gettext 0.18.  Reference:
+# http://thread.gmane.org/gmane.comp.gnu.utils.bugs/16408
address@hidden@ --input $2.tmp --output-file $2 recode-sr-latin
+
+# Restore all escaped characters.
address@hidden@ --input $2 --output-file $2 @pkglibexecdir@/recode-unescape
+
+rm -f $2.tmp

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -b -r1.16.2.2 -r1.16.2.3
--- configure.ac        1 Aug 2009 21:15:03 -0000       1.16.2.2
+++ configure.ac        3 Aug 2009 11:26:12 -0000       1.16.2.3
@@ -22,7 +22,7 @@
        address@hidden,
        [gnun])
 
-AC_PREREQ([2.62])
+AC_PREREQ([2.63b])
 
 AC_CONFIG_SRCDIR([GNUmakefile])        
 AC_CONFIG_MACRO_DIR([m4])
@@ -139,9 +139,10 @@
 AM_CONDITIONAL([NO_DTD], [test "$have_dtds" = no])
 
 AC_CONFIG_FILES([Makefile doc/Makefile dtd/Makefile config.mk])
+m4_define([gnun_config_exec_file], [AC_CONFIG_FILES([$1], [chmod +x $1])])
 AS_IF([test -n "$GUILE"],
-      [AC_CONFIG_FILES([make-prototype], [chmod +x make-prototype])])
-AC_CONFIG_FILES([gnun-recode-sr-latin], [chmod +x gnun-recode-sr-latin])
+      [m4_map_args([gnun_config_exec_file],
+      [make-prototype], [recode-escape], [recode-unescape])])
 AC_OUTPUT
 
 cat <<EOF

Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -b -r1.11.2.1 -r1.11.2.2
--- Makefile.am 28 Jul 2009 13:19:16 -0000      1.11.2.1
+++ Makefile.am 3 Aug 2009 11:26:12 -0000       1.11.2.2
@@ -25,7 +25,7 @@
 
 pkglibexecdir = $(libexecdir)/$(PACKAGE)
 
-bin_SCRIPTS = gnun-recode-sr-latin
+bin_SCRIPTS =
 
 if HAVE_XMLLINT
 bin_SCRIPTS += gnun-validate-html
@@ -35,7 +35,8 @@
 pkglibexec_SCRIPTS = validate-html-notify
 
 if HAVE_GUILE
-pkglibexec_SCRIPTS += make-prototype
+bin_SCRIPTS += gnun-recode-sr-latin
+pkglibexec_SCRIPTS += make-prototype recode-escape recode-unescape
 endif
 
 dist_pkglibexec_SCRIPTS = mailfail
@@ -48,9 +49,10 @@
        -e 's|@address@hidden|$(pkgdatadir)|g' \
        -e 's|@address@hidden|$(prefix)|g' \
        -e 's|@address@hidden|$(pkglibexecdir)|g' \
-       -e 's|@address@hidden|$(M4)|g'
+       -e 's|@address@hidden|$(M4)|g' \
+       -e 's|@address@hidden|$(MSGFILTER)|g'
 
-gnun-validate-html validate-html-notify: Makefile
+gnun-validate-html validate-html-notify gnun-recode-sr-latin: Makefile
        rm -f $@ address@hidden
        $(edit) '$(srcdir)/address@hidden' >address@hidden
        chmod +x address@hidden
@@ -63,12 +65,15 @@
 
 gnun-validate-html: $(srcdir)/gnun-validate-html.in
 validate-html-notify: $(srcdir)/validate-html-notify.in
+gnun-recode-sr-latin: $(srcdir)/gnun-recode-sr-latin.in
 
 doc_DATA = TODO
 pkgdata_DATA = config.mk
 dist_pkgdata_DATA = GNUmakefile
 
 EXTRA_DIST = gnun.mk GNUmakefile.team \
-            gnun-validate-html.in validate-html-notify.in
+            gnun-validate-html.in validate-html-notify.in \
+            gnun-recode-sr-latin.in
 
-CLEANFILES = gnun-validate-html validate-html-notify stamp-config.mk
+CLEANFILES = gnun-validate-html validate-html-notify gnun-recode-sr-latin \
+             stamp-config.mk

Index: ChangeLog.sr-hr
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/Attic/ChangeLog.sr-hr,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- ChangeLog.sr-hr     2 Aug 2009 13:31:58 -0000       1.1.2.3
+++ ChangeLog.sr-hr     3 Aug 2009 11:26:12 -0000       1.1.2.4
@@ -1,3 +1,20 @@
+2009-08-03  Yavor Doganov  <address@hidden>
+
+       Hook the new recode scripts into gnun-recode-sr-latin.
+       * gnun-recode-sr-latin.in: Add two more msgfilter invocations to
+       preserve Cyrillic in alternative [A|B] constructs.
+       * configure.ac (AC_PREREQ): Bump to 2.63b because of m4_map_args.
+       (gnun_config_exec_file): New helper macro.
+       (AC_CONFIG_FILES): Use m4_map_args to generate all guile scripts.
+       * Makefile.am (bin_SCRIPTS): Move gnun-recode-sr-latin under the
+       HAVE_GUILE conditional.
+       (pkglibexec_SCRIPTS) <HAVE_GUILE>: Add recode-escape and
+       recode-unescape.
+       (edit): Substitute @address@hidden
+       (gnun-recode-sr-latin): New target.
+       (EXTRA_DIST): Add gnun-recode-sr-latin.in.
+       (CLEANFILES): Add gnun-recode-sr-latin.
+
 2009-08-02  Kaloian Doganov  <address@hidden>
 
        * recode-escape: