From ed04be3b906bad23390ad200a1b4c66f62f6a015 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 16 Dec 2021 09:18:53 +0900 Subject: [PATCH] Imported Upstream version 2.0.6 --- ChangeLog | 40 ++++++++++++++++++++++++++++++++++++++++ NEWS | 5 +++++ configure | 20 ++++++++++---------- configure.ac | 2 +- its/docbook.its | 1 + its/docbook5.its | 1 + itstool | 5 ++++- itstool.1 | 2 +- itstool.in | 3 +++ missing | 2 +- setup.py | 2 +- 11 files changed, 68 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b51e98..1b681d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,43 @@ +commit ce3e235efbe251083f257e0b1cfdaa11e4f7b01c +Author: Shaun McCance +Date: Sun Dec 30 16:31:05 2018 -0500 + + Make DocBook keyword element within text + + its/docbook.its | 1 + + its/docbook5.its | 1 + + 2 files changed, 2 insertions(+) + +commit bc5724ed98eb591d4b82dff1b4b47ed77ec47eda +Author: Shaun McCance +Date: Thu Nov 8 19:01:43 2018 -0500 + + Apply ITS files passed with -i in --join mode + + Fixes https://github.com/itstool/itstool/issues/34 + + itstool.in | 3 +++ + 1 file changed, 3 insertions(+) + +commit 39000db89b4d376af34fd4499743ac0fa5d7cd90 +Author: Shaun McCance +Date: Sun Oct 28 17:08:04 2018 -0400 + + Version 2.0.5 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 84891bdca128192d1e8af9a3b86ac6fb9a8a09ed +Author: Shaun McCance +Date: Sun Oct 28 16:59:14 2018 -0400 + + Auto update to INSTALL file + + INSTALL | 320 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 159 insertions(+), 161 deletions(-) + commit 2eb0a6cd3b15b0bca5abf19ba0fcff45bd457523 Author: Shaun McCance Date: Tue Aug 21 11:28:54 2018 -0400 diff --git a/NEWS b/NEWS index 5b3f1d8..bd0f482 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +2.0.6 +===== +* Make DocBook keyword element within text +* Apply ITS files passed with -i in --join mode + 2.0.5 ===== * Allow preserveSpace on XML attributes (Álvaro Muñoz) diff --git a/configure b/configure index 8a99bed..a1f046d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for itstool 2.0.5. +# Generated by GNU Autoconf 2.69 for itstool 2.0.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='itstool' PACKAGE_TARNAME='itstool' -PACKAGE_VERSION='2.0.5' -PACKAGE_STRING='itstool 2.0.5' +PACKAGE_VERSION='2.0.6' +PACKAGE_STRING='itstool 2.0.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1207,7 +1207,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures itstool 2.0.5 to adapt to many kinds of systems. +\`configure' configures itstool 2.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1273,7 +1273,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of itstool 2.0.5:";; + short | recursive ) echo "Configuration of itstool 2.0.6:";; esac cat <<\_ACEOF @@ -1353,7 +1353,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -itstool configure 2.0.5 +itstool configure 2.0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1370,7 +1370,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by itstool $as_me 2.0.5, which was +It was created by itstool $as_me 2.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2233,7 +2233,7 @@ fi # Define the identity of the package. PACKAGE='itstool' - VERSION='2.0.5' + VERSION='2.0.6' cat >>confdefs.h <<_ACEOF @@ -3165,7 +3165,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by itstool $as_me 2.0.5, which was +This file was extended by itstool $as_me 2.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3218,7 +3218,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -itstool config.status 2.0.5 +itstool config.status 2.0.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 45ffa28..a46c4c9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([itstool], [2.0.5], []) +AC_INIT([itstool], [2.0.6], []) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) DATADIR=`( diff --git a/its/docbook.its b/its/docbook.its index fb60cfc..557bea3 100644 --- a/its/docbook.its +++ b/its/docbook.its @@ -100,6 +100,7 @@ //keycode | //keycombo | //keysym | + //keyword | //lhs | //lineage | //lineannotation | diff --git a/its/docbook5.its b/its/docbook5.its index 8a47948..0accb33 100644 --- a/its/docbook5.its +++ b/its/docbook5.its @@ -99,6 +99,7 @@ //db:keycode | //db:keycombo | //db:keysym | + //db:keyword | //db:lhs | //db:lineage | //db:lineannotation | diff --git a/itstool b/itstool index 4d74d44..a1f0627 100644 --- a/itstool +++ b/itstool @@ -19,7 +19,7 @@ from __future__ import print_function from __future__ import unicode_literals -VERSION="2.0.5" +VERSION="2.0.6" DATADIR="/usr/local/share" import gettext @@ -1635,6 +1635,9 @@ if __name__ == '__main__': messages = MessageList() doc = Document(opts.join, messages) doc.apply_its_rules(not(opts.nobuiltins), params=params) + if opts.itsfile is not None: + for itsfile in opts.itsfile: + doc.apply_its_file(itsfile, params=params) doc.join_translations(translations, strict=opts.strict) serialized = doc._doc.serialize('utf-8') if PY3: diff --git a/itstool.1 b/itstool.1 index 164bc3f..1ed1b93 100644 --- a/itstool.1 +++ b/itstool.1 @@ -1,4 +1,4 @@ -.TH "ITSTOOL" "1" "December 2013" "itstool 2.0.5" +.TH "ITSTOOL" "1" "December 2013" "itstool 2.0.6" .SH "NAME" itstool \- convert between XML and PO using ITS diff --git a/itstool.in b/itstool.in index b3c0033..e64cd34 100755 --- a/itstool.in +++ b/itstool.in @@ -1635,6 +1635,9 @@ if __name__ == '__main__': messages = MessageList() doc = Document(opts.join, messages) doc.apply_its_rules(not(opts.nobuiltins), params=params) + if opts.itsfile is not None: + for itsfile in opts.itsfile: + doc.apply_its_file(itsfile, params=params) doc.join_translations(translations, strict=opts.strict) serialized = doc._doc.serialize('utf-8') if PY3: diff --git a/missing b/missing index c6e3795..b7e571e 100755 --- a/missing +++ b/missing @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Common wrapper for a few potentially missing GNU programs. scriptversion=2016-01-11.22; # UTC diff --git a/setup.py b/setup.py index d60eb94..d5aab09 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ from distutils.core import setup setup(name='itstool', - version='2.0.5', + version='2.0.6', description='XML to PO and back again using W3C ITS rules', author='Shaun McCance', author_email='shaunm@gnome.org', -- 2.34.1