From: Bruno Haible Date: Fri, 28 Jul 2000 23:11:12 +0000 (+0000) Subject: Drop support for old Linux specific .msg catalog format. X-Git-Tag: v0.10.36~240 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b4b3461ea4ca419efb94a0eee2c7aca5f8fb9ec;p=thirdparty%2Fgettext.git Drop support for old Linux specific .msg catalog format. --- diff --git a/NEWS b/NEWS index a747cdbf5..013a9a343 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ Version 0.10.36 - XXX 2000, by Ulrich Drepper ja_JP.UTF-8, can now share the same message catalogs. gettext converts the messages to the appropriate character encoding on the fly. +* Support for the old Linux specific .msg catalog format has been dropped. + * PO mode changes: ** PO mode does not use recursive edit anymore, many edits may be worked on diff --git a/intl/ChangeLog b/intl/ChangeLog index e6ff1767a..c2da76667 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,9 @@ +2000-07-28 Bruno Haible + + * xopen-msg.sed: Renamed to ... + * po2msg.sin: ... here. + * linux-msg.sed: Remove file. + 2000-07-28 Bruno Haible * po2tbl.sed.in: Renamed to ... diff --git a/intl/linux-msg.sed b/intl/linux-msg.sed deleted file mode 100644 index 5918e720a..000000000 --- a/intl/linux-msg.sed +++ /dev/null @@ -1,100 +0,0 @@ -# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file -# Copyright (C) 1995 Free Software Foundation, Inc. -# Ulrich Drepper , 1995. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# -# The first directive in the .msg should be the definition of the -# message set number. We use always set number 1. -# -1 { - i\ -$set 1 # Automatically created by po2msg.sed - h - s/.*/0/ - x -} -# -# Mitch's old catalog format does not allow comments. -# -# We copy the original message as a comment into the .msg file. -# -/^msgid/ { - s/msgid[ ]*"// -# -# This does not work now with the new format. -# /"$/! { -# s/\\$// -# s/$/ ... (more lines following)"/ -# } - x -# The following nice solution is by -# Bruno - td -# Increment a decimal number in pattern space. -# First hide trailing `9' digits. - :d - s/9\(_*\)$/_\1/ - td -# Assure at least one digit is available. - s/^\(_*\)$/0\1/ -# Increment the last digit. - s/8\(_*\)$/9\1/ - s/7\(_*\)$/8\1/ - s/6\(_*\)$/7\1/ - s/5\(_*\)$/6\1/ - s/4\(_*\)$/5\1/ - s/3\(_*\)$/4\1/ - s/2\(_*\)$/3\1/ - s/1\(_*\)$/2\1/ - s/0\(_*\)$/1\1/ -# Convert the hidden `9' digits to `0's. - s/_/0/g - x - G - s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p -} -# -# The .msg file contains, other then the .po file, only the translations -# but each given a unique ID. Starting from 1 and incrementing by 1 for -# each message we assign them to the messages. -# It is important that the .po file used to generate the cat-id-tbl.c file -# (with po-to-tbl) is the same as the one used here. (At least the order -# of declarations must not be changed.) -# -/^msgstr/ { - s/msgstr[ ]*"\(.*\)"/# \1/ -# Clear substitution flag. - tb -# Append the next line. - :b - N -# Look whether second part is continuation line. - s/\(.*\n\)"\(.*\)"/\1\2/ -# Yes, then branch. - ta - P - D -# Note that D includes a jump to the start!! -# We found a continuation line. But before printing insert '\'. - :a - s/\(.*\)\(\n.*\)/\1\\\2/ - P -# We cannot use D here. - s/.*\n\(.*\)/\1/ - tb -} -d diff --git a/intl/xopen-msg.sed b/intl/po2msg.sin similarity index 97% rename from intl/xopen-msg.sed rename to intl/po2msg.sin index b19c0bbd0..658e76749 100644 --- a/intl/xopen-msg.sed +++ b/intl/po2msg.sin @@ -44,7 +44,7 @@ $set 1 # Automatically created by po2msg.sed p } # -# The .msg file contains, other then the .po file, only the translations +# The .msg file contains, other than the .po file, only the translations # but each given a unique ID. Starting from 1 and incrementing by 1 for # each message we assign them to the messages. # It is important that the .po file used to generate the cat-id-tbl.c file diff --git a/m4/ChangeLog b/m4/ChangeLog index fa53204dd..61f754656 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +2000-07-28 Bruno Haible + + Drop support for old Linux specific .msg catalog format. + * gettext.m4 (AM_GNU_GETTEXT): Assume .cat is always X/Open format. + Renamed xopen-msg.sed to po2msg.sin. + 2000-07-28 Bruno Haible * gettext.m4 (AM_GNU_GETTEXT): Renamed po2tbl.sed.in to po2tbl.sin. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 731ecf5ef..c21580dfd 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -262,16 +262,12 @@ __argz_count __argz_stringify __argz_next]) fi AC_SUBST(INCLUDE_LOCALE_H) - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format test -d intl || mkdir intl if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) - + dnl Only the X/Open catalog format is supported. dnl Transform the SED scripts while copying because some dumb SEDs dnl cannot handle comments. - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + sed -e '/^#/d' $srcdir/intl/po2msg.sin > intl/po2msg.sed fi dnl po2tbl.sed is always needed. sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \