[svnbook] r3599 committed - Update po4a to 0.36.4 (2009-08-30)

codesite-noreply at google.com codesite-noreply at google.com
Wed Sep 2 03:59:51 CDT 2009

Revision: 3599
Author: songdongsheng at live.cn
Date: Wed Sep  2 01:58:55 2009
Log: Update po4a to 0.36.4 (2009-08-30)


--- /dev/null
+++ /trunk/src/tools/po4a/COPYING	Wed Sep  2 01:58:55 2009
@@ -0,0 +1,341 @@
+		       Version 2, June 1991
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+			    Preamble
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+  The precise terms and conditions for copying, distribution and
+modification follow.
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange;  
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free  
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+	    How to Apply These Terms to Your New Programs
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+    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 of the License, 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
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+Also add information on how to contact you by electronic and paper mail.
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show  
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
--- /dev/null
+++ /trunk/src/tools/po4a/NEWS	Wed Sep  2 01:58:55 2009
@@ -0,0 +1,402 @@
+po4a NEWS
+* Major changes in release 0.36.4 (2009-08-30)
+ * Added options --srcdir and --destdir. They permit to strip the base
+   directory for the input and output documents (in the config file and in
+   the references generated in the PO files).
+ * Added options --msgid-bugs-address, --copyright-holder, --package-name,
+   --package-version to control the generation of the PO header.
+ * Updated Basque translation
+ * Updated Czech translation
+ * Updated Esperanto translation
+ * Improved Estonian translation.
+ * Updated French translation
+ * Updated Russian translation
+ * Updated Spanish translation.
+ * Updated Swedish translation.
+* Major changes in release 0.36.3 (2009-07-22)
+Bug fix release.
+po4a-gettextize's new options were rejected by the modules.
+* Major changes in release 0.36.2 (2009-07-21)
+ * New script to display previews of POD translations.
+ * Added options --msgid-bugs-address, --copyright-holder, --package-name,
+   --package-version to control the generation of the PO header.
+ * Avoid the translation of some markups: title and horizontal rules.
+ * Improved Markdown support.
+ * New option customtag for inline tags that should not be treated as a
+   tag (e.g. they do not need to be closed).
+ * Fix handling of non ASCII input documents.
+* Major changes in release 0.36.1 (2009-04-05)
+ * Fix support for inline customization of separators.
+ * Fix support for double escapes, which should not introduce commands.
+ * Added support for the tabularx environment.
+ * Do not include commented out external entities (when includeexternal is
+   used).
+ * Do not add an =encoding header if the encoding is empty.
+* Major changes in release 0.36 (2009-03-15)
+ * The "type:" comments in the PO files are now tagged as extracted
+   comments (starting with #.). This changes all the PO files generated by
+   po4a. Maintainers should just let these changes pass through.
+   Translator may want to remove the comment lines starting with '# type:'
+   as they will be duplicates with the '#. type:' comments.
+ * Placeholders are presented with a type and have a more valid XML
+   representation. This changes the PO files, but translations could be
+   updated automatically.
+ * Do not fail when the doctype does not match the expected one. Only
+   issue a warning.
+ * The tags and tagsonly options are deprecated. Use the
+   translated/untranslated and break/inline/placeholder options instead.
+ * Added foldattributes option. Useful to simplify strings and avoid typos
+   when attributes shall not be translated.
+ * Better handling of spaces in command arguments.
+ * Included files are searched with kpsewhich instead of using TEXINPUTS
+   directly.
+* Major changes in release 0.35 (2009-02-10)
+ * Added support for the [po_directory] command in the configuration file.
+   It permits to avoid listing the supported languages.  Simply dropping a
+   new PO file should be sufficient.  It should be preferred over the
+   po4a_langs and po4a_paths commands.
+ * Added option -b, --blank to check which parts of a document are not
+   translated.
+ * Improved conflict handling: indicate the reference of the alternatives
+   when the same string has different translations.
+ * Added support for a nowrapi18n option in Locale::Po4a::Common in
+   order to use Locale::Po4a programatically.
+ * Manpages are generated in utf-8. This requires a recent Pod::Man with
+   support for the utf8 option.
+ * Improved support for Docbook 5 and Docbook 4, based on the official
+   documentation of the Docbook tags.
+ * Announce the encoding in the POD header.
+ * Add support for recursive inclusion.
+ * Added option asciidoc
+ * Improvements for the <u> tag.
+ * Fix the nodefault option. Derivative modules should use _default_tags
+   and _default_inline to define the default behavior of their
+   module-specific tags (instead of tags and inline).
+ * Speed improvements.
+ * Added support for placeholders.
+* Major changes in release 0.34 (2008-07-20)
+** New features
+ * Do not end re-wrapped lines with a space.
+ * Added support for the Halibut format.
+ * Fix failures with big sgml documents ("broken pipe" received from
+   nsgmls -p).
+ * Added support for the Markdown format, as used with Ikiwiki.
+ * Make sure files are not mixed together when gettextized at the same
+   time.
+ * Fix build failures with old versions of Module::Build.
+* Major changes in release 0.33.3 (2008-04-02)
+ * Add options --package-name and --package-version (similar to xgettext's
+   options).
+ * Actually ship Japanese translations.
+* Major changes in release 0.33.2 (2008-04-01)
+ * Added support for the fortunes format.
+ * New Japanese translation.
+ * The manpages are generated in UTF-8.
+* Major changes in release 0.33.1 (2008-03-16)
+This is a bug fix release.
+ * Do not translate - to \- inside \*[...], \(.., \H'...', or \Z'...'.
+ * Do not translate SSI comments by default.
+ * Fix the installation path of manpages and .mo files.
+* Major changes in release 0.33 (2008-03-03)
+Notes to packagers: Since 0.31, some tests in the sgml testsuite require
+the docbook sgml DTD. If you run the testsuite at build time you must have
+these DTD in your build dependencies or you must disable these tests
+cases in the testsuite.
+** New features
+  general: Support for PO files with plural forms.
+           Po4a does not generate such PO files, but it can receive one in
+           input. In such case, po4a cannot choose between the (singular
+           and) plural forms. It will consider that msgstr[0] is the
+           translation of msgid and msgstr[1] is the translation of
+           msgid_plural, which may be wrong. Thus, a warning will be
+           issued if po4a is asked to translate the singular or plural
+           form of a message with plural forms.
+  texinfo: Major changes. Tested on the elisp documentation.
+  sgml: Fail if nsgmls cannot validate the input file. This can be turned
+        off with the "force" option.
+  xml: New option "cpp" to support C preprocessor directives (this avoids
+       re-wrapping lines with preprocessor directives).
+  xml: New options "translated" and "untranslated" that should allow an
+       easier configuration of Xml (and derivative module)
+  xml: Avoid duplicated newlines at the end of lines of multi-lines
+       comments.
+  xml: Paragraphs which only consist in an inline tag are now extracted.
+       This makes a lot of string to available for translation in the PO
+       file.
+  docbook: Tested on the Docbook testsuite. Lots of tag added.
+  po4a: Fix failures with perl 5.10. Thanks to Roderich Schupp
+        <roderich.schupp at googlemail.com>
+  msguntypot: Fix handling of the comment of the PO header.
+* Major changes in release 0.32 (2007-08-15)
+** Security fix
+  Fix a symlink attack caused by the /tmp/gettextization.failed.po
+  temporary file.
+  (CVE-2007-4462)
+** Bug fixes
+  sgml: The handling of newlines was broken in no-wrap sections in 0.31
+  xhtml: The module is now distributed as the other modules.
+  texinfo: Fix infinite loop when a command parameter ends with \
+           (as in @samp{\})
+** New features
+  xml: New option includeexternal to support external entities.
+  texinfo: Added support for many commands and environment (see
+           changelog).
+  xhtml: New option includessi, which adds supports for Server Side
+         Includes include element (<!--#include virtual="/foo/bar.html"  
+  xml: New option ontagerror to control the behavior of the module in case
+       of error. This permits to support files that the module would
+       consider invalid otherwise.
+** Translations
+  New translations (Bengali, Estonian, Croatian, Indonesian, Kannada,
+  Korean, Occitan, Uzbek, Simplified Chinese, Chinese from Hong Kong) and
+  many updates.
+* Major changes in release 0.31 (2007-05-07)
+** Dependencies
+  po4a,
+  po4a-updatepo: New option --previous requires gettext 0.16.
+** Bug fixes
+  general: Don't hang when running in background with redirected stdout.
+           Thanks to Jim Meyering.
+** New features
+  general: po4a now uses timestamps to avoid re-generating a translation
+           if no changes are expected: if a translation is more recent
+           than its associated PO, master document, addenda or
+           configuration file, then there is no need to update it. For the
+           documents which do not pass the translation threshold, a
+           --stamp option was added to tell po4a to create files with a
+           .po4a-stamp extension (you can also create them manually).
+           This can save a lot of time when po4a knows that the
+           translation will not be generated because there were no changes
+           since the last po4a run.
+  general: Beginning of a C extension. This provides speedup. Testers are
+           welcomed.
+  po4a: New options: --msgid-bugs-address and --copyright-holder.
+  po4a: Add new tag: [options] to set global options (i.e. for every
+        documents in the configuration file).
+  po4a: Update translations based on modification times. Use timestamp to
+        avoid retrying generate uncompleted translations.
+  man: New 'unknown_macros' option to specify the behavior of po4a with
+       unknown groff macros.
+  man: Reset the configuration between two runs. This permits to define
+       different options for different files in a config file with the
+       opt:"..." parameters.
+* Major changes in release 0.30 (2007-01-05)
+** Bug fixes
+  man: Recode the text which is skipped, like comments.
+       This kind of issue may also appear on other modules.
+       A better solution would be to always use UTF-8 internally.
+  distribution: Some unit tests were missing.
+                Also, the dependencies have been simplified.
+                Locale::gettext, Text::WrapI18N, Term::ReadKey and SGMLS
+                are still recommended, but no more required.
+                The BibTex module is now distributed.
+  sgml: The module should be more friendly with XML files.
+  po4a: When po4a creates a new PO file, it now uses msginit. This may
+        change the header of created PO files.
+  guide: Major update of the tag definitions. Thanks to Azamat H.
+         Hackimov.
+  Po: use strftime instead of date because date is not available on
+      every platform.
+  tests: rename the XML testsuite to SGML, since it was testing the Sgml
+         module, and add a new testsuite for the Xml module (it currently
+         tests the Guide module).
+** Translations
+  Updated Russian translation.
+* Major changes in release 0.29 (2006-10-15)
+** New features
+** Bug fixes
+  sgml: Remove the tags from the default categories when they are defined
+  by the user.  This changes the behavior of the Sgml module's options.
+  sgml: Better line references in the generated PO.
+  sgml: Support for '/>' (empty XML tag closure) when an xml prologue is
+  found (<?xml ...?>).
+  po4a: When po4a create new PO files, it now uses msginit instead of
+  copying the POT file.
+* Major changes in release 0.29 (2006-10-15)
+** New features
+  New module for .INI files. Thanks to Costin Stroie.
+  New module for BibTeX bibliographies.
+  man: New mdoc option for stricter support of mdoc pages (NAME section
+  not translated).
+  text: Support for underlined text.
+  text: Support for bulleted paragraphs (can be deactivated with
+  -o nobullets).
+** Bug fixes
+  man: Keep empty commented lines.
+  man: Do not add spaces at the end of lines.
+  man: Languages without non breaking space could not use question marks.
+  sgml: Better support for verbatim sections, and consider <cmdsynopsis>
+  as verbatim. <arg> and <option> are now in the ignore category.
+  general: Length calculation algorithm changed for wrapping lines in the
+  output document or in the PO. This should improve output when files are
+  encoded in UTF-8.
+* Major changes in release 0.28 (2006-08-17)
+** Bug fixes
+  man: Fix for .I " " and other minor bug fixes.
+  tex/latex: Documentation and usability improvements.
+** Speed improvement
+  po4a: The POs are now only read once. This will speed the processing
+  when many documents are specified in a configuration file.
+** Translations
+  Updated French translation.
--- /trunk/src/tools/po4a/lib/Locale/Po4a/Po.pm	Wed Apr  1 22:49:13 2009
+++ /trunk/src/tools/po4a/lib/Locale/Po4a/Po.pm	Wed Sep  2 01:58:55 2009
@@ -520,6 +520,7 @@
      if (-e $filename) {
          my ($tmp_filename);
+                                                   DIR    => "/tmp",
                                                     OPEN   => 0,
                                                     UNLINK => 0);
--- /trunk/src/tools/po4a/lib/Locale/Po4a/TransTractor.pm	Wed Apr  1  
22:49:13 2009
+++ /trunk/src/tools/po4a/lib/Locale/Po4a/TransTractor.pm	Wed Sep  2  
01:58:55 2009
@@ -11,7 +11,7 @@

  use subs qw(makespace);
  use vars qw($VERSION @ISA @EXPORT);
  @ISA = qw(DynaLoader);
  @EXPORT = qw(new process translate
               read write readpo writepo
@@ -292,6 +292,8 @@

+    chdir $params{'srcdir'}
+	if (defined $params{'srcdir'});
      foreach my $file (@{$params{'po_in_name'}}) {
  	print STDERR "readpo($file)... " if $self->debug();
@@ -310,18 +312,24 @@
  	$self->addendum($file) || die "An addendum failed\n";
  	print STDERR "done.\n" if $self->debug();
+    chdir $params{'destdir'}
+	if (defined $params{'destdir'});
      if (defined $params{'file_out_name'}) {
  	print STDERR "write(".$params{'file_out_name'}.")... "
  	    if $self->debug();
  	print STDERR "done.\n" if $self->debug();
+    chdir $params{'srcdir'}
+	if (defined $params{'srcdir'});
      if (defined $params{'po_out_name'}) {
  	print STDERR "writepo(".$params{'po_out_name'}.")... "
  	     if $self->debug();
  	print STDERR "done.\n" if $self->debug();
+    chdir $params{'calldir'}
+	if (defined $params{'calldir'});
      return $self;

@@ -337,16 +345,24 @@
      ## initialize the plugin
      # prevent the plugin from croaking on the options intended for Po.pm
      $self->{options}{'porefs'} = '';
+    $self->{options}{'copyright-holder'} = '';
+    $self->{options}{'msgid-bugs-address'} = '';
+    $self->{options}{'package-name'} = '';
+    $self->{options}{'package-version'} = '';
      # let the plugin parse the options and such

      ## Create our private data
      my %po_options;
      $po_options{'porefs'} = $self->{options}{'porefs'};
+    $po_options{'copyright-holder'} = $options{'copyright-holder'};
+    $po_options{'msgid-bugs-address'} = $options{'msgid-bugs-address'};
+    $po_options{'package-name'} = $options{'package-name'};
+    $po_options{'package-version'} = $options{'package-version'};

      # private data
-    $self->{TT}{po_in}=Locale::Po4a::Po->new();
+    $self->{TT}{po_in}=Locale::Po4a::Po->new(\%po_options);
      # Warning, this is an array of array:
      #  The document is splited on lines, and for each
--- /trunk/src/tools/po4a/lib/Locale/Po4a/Xml.pm	Mon Apr  6 19:34:04 2009
+++ /trunk/src/tools/po4a/lib/Locale/Po4a/Xml.pm	Wed Sep  2 01:58:55 2009
@@ -356,6 +356,11 @@
  This is useful when attributes shall not be translated, as this simplifies  
  strings for translators, and avoids typos.

+=item B<customtag>
+Space-separated list of tags which should not be treated as tags.
+These tags are treated as inline, and do not need to be closed.
  =item B<break>

  Space-separated list of tags which should break the sequence.
@@ -493,6 +498,7 @@
+	$self->{options}{'customtag'}='';
@@ -517,6 +523,7 @@
+	$self->{options}{'_default_customtag'}='';

  	#It will maintain the list of the translatable tags
@@ -530,6 +537,8 @@
  	#It will maintain the list of the placeholder tags
+	#It will maintain the list of the customtag tags
+	$self->{customtag}=();
  	#list of the tags that must not be set in the tags or inline category
  	#by this module or sub-module (unless specified in an option)
@@ -1238,6 +1247,7 @@
  #   W: the content shall not be re-wrapped
  #   i: the tag shall be inlined
  #   p: a placeholder shall replace the tag (and its content)
+#   n: a custom tag
  # A translatable inline tag in an untranslated tag is treated as a  
translatable breaking tag.
  my %translate_options_cache;
@@ -1308,6 +1318,12 @@
  			$options .= "p";
+	$tag = $self->get_tag_from_list($path, $self->{customtag});
+	if (defined $tag) {
+		$usedefault = 0;
+		$options = "in"; # This erase any other setting
+	}

  	if ($usedefault) {
  		$options = $self->{options}{'defaulttranslateoption'};
@@ -1437,7 +1453,9 @@
  							@text = ("<$cur_tag_name po4a-id=$id>", $tag_ref);
-					push @path, $cur_tag_name;
+					unless ($t_opts =~ m/n/) {
+						push @path, $cur_tag_name;
+					}
  				} elsif ($tag_types[$type]->{'beginning'} eq "/") {
  					# Closing inline tag

@@ -1701,6 +1719,8 @@
  		$self->{options}{'_default_inline'}       = lc  
  		$self->{options}{'placeholder'}           = lc  
  		$self->{options}{'_default_placeholder'}  = lc  
+		$self->{options}{'customtag'}             = lc  
+		$self->{options}{'_default_customtag'}    = lc  

  	$self->{options}{'nodefault'} =~ /^\s*(.*)\s*$/s;
@@ -1787,7 +1807,6 @@

-	my @list_inline;
  	$self->{options}{'inline'} =~ /^\s*(.*)\s*$/s;
  	foreach my $tag (split(/\s+/s,$1)) {
  		$tag =~ m/^(.*?)(<.*)$/;
@@ -1813,6 +1832,19 @@
  			unless    $list_nodefault{$2}
  			       or defined $self->{placeholder}->{$2};
+	$self->{options}{'customtag'} =~ /^\s*(.*)\s*$/s;
+	foreach my $tag (split(/\s+/s,$1)) {
+		$tag =~ m/^(.*?)(<.*)$/;
+		$self->{customtag}->{$2} = $1 || "";
+	}
+	$self->{options}{'_default_customtag'} =~ /^\s*(.*)\s*$/s;
+	foreach my $tag (split(/\s+/s,$1)) {
+		$tag =~ m/^(.*?)(<.*)$/;
+		$self->{customtag}->{$2} = $1 || ""
+			unless    $list_nodefault{$2}
+			       or defined $self->{customtag}->{$2};
+	}

  	# There should be no translated and untranslated tags
  	foreach my $tag (keys %{$self->{translated}}) {
@@ -1821,7 +1853,7 @@
  		                      "Tag '%s' both in the %s and %s categories."),  
$tag, "translated", "untranslated")
  			if defined $self->{untranslated}->{$tag};
-	# There should be no inline, break, and placeholder tags
+	# There should be no inline, break, placeholder, and customtag tags
  	foreach my $tag (keys %{$self->{inline}}) {
  		die wrap_mod("po4a::xml",
@@ -1831,12 +1863,26 @@
  		                      "Tag '%s' both in the %s and %s categories."),  
$tag, "inline", "placeholder")
  			if defined $self->{placeholder}->{$tag};
+		die wrap_mod("po4a::xml",
+		             dgettext("po4a",
+		                      "Tag '%s' both in the %s and %s categories."),  
$tag, "inline", "customtag")
+			if defined $self->{customtag}->{$tag};
  	foreach my $tag (keys %{$self->{break}}) {
  		die wrap_mod("po4a::xml",
  		                      "Tag '%s' both in the %s and %s categories."),  
$tag, "break", "placeholder")
  			if defined $self->{placeholder}->{$tag};
+		die wrap_mod("po4a::xml",
+		             dgettext("po4a",
+		                      "Tag '%s' both in the %s and %s categories."),  
$tag, "break", "customtag")
+			if defined $self->{customtag}->{$tag};
+	}
+	foreach my $tag (keys %{$self->{placeholder}}) {
+		die wrap_mod("po4a::xml",
+		             dgettext("po4a",
+		                      "Tag '%s' both in the %s and %s categories."),  
$tag, "placeholder", "customtag")
+			if defined $self->{customtag}->{$tag};

--- /trunk/src/tools/po4a/po4a-updatepo	Wed Apr  1 22:49:13 2009
+++ /trunk/src/tools/po4a/po4a-updatepo	Wed Sep  2 01:58:55 2009
@@ -3,7 +3,7 @@
      if $running_under_some_shell;

  # pod-updatepo -- Update the po translation of POD data.
-# $Id: po4a-updatepo,v 1.44 2009-03-07 12:33:10 nekral-guest Exp $
+# $Id: po4a-updatepo,v 1.45 2009-07-29 14:32:25 nekral-guest Exp $
  # Copyright 2002, 2003, 2004 by Martin Quinson (mquinson#debian.org)
@@ -97,6 +97,24 @@

  Output some debugging information.

+=item --msgid-bugs-address email at address
+Set the report address for msgid bugs. By default, the created POT files
+have no Report-Msgid-Bugs-To fields.
+=item --copyright-holder string
+Set the copyright holder in the POT header. The default value is
+"Free Software Foundation, Inc."
+=item --package-name string
+Set the package name for the POT header. The default is "PACKAGE".
+=item --package-version string
+Set the package version for the POT header. The default is "VERSION".

  =head1 SEE ALSO
@@ -146,6 +164,7 @@
  # Parse our options
  my (@masterfiles, at pofiles);
  my ($help,$help_fmt,$verbose,$debug,$format, at options);
+my ($copyright_holder, $msgid_bugs_address, $package_name,  
  my $mastchar;
  my $previous;
  my $msgmerge_opt = "";
@@ -161,7 +180,11 @@
  	   'option|o=s'  => \@options,

  	   'previous'    => \$previous,
-	   'msgmerge-opt=s' => \$msgmerge_opt,
+	   'msgmerge-opt=s'      => \$msgmerge_opt,
+	   'copyright-holder=s'  => \$copyright_holder,
+	   'msgid-bugs-address=s'=> \$msgid_bugs_address,
+	   'package-name=s'      => \$package_name,
+	   'package-version=s'   => \$package_version,

  	   'verbose|v'   => \$verbose,
  	   'debug|d'     => \$debug,
@@ -175,8 +198,12 @@
  $msgmerge_opt .= " --previous" if $previous;

  my %options = (
-    "verbose" => $verbose,
-    "debug" => $debug);
+    "verbose"            => $verbose,
+    "debug"              => $debug,
+    "copyright-holder"   => $copyright_holder,
+    "msgid-bugs-address" => $msgid_bugs_address,
+    "package-name"       => $package_name,
+    "package-version"    => $package_version);

  foreach (@options) {
      if (m/^([^=]*)=(.*)$/) {
@@ -195,6 +222,7 @@

  my ($pot_filename);
+					   DIR    => "/tmp",
  					   SUFFIX => ".pot",
  					   OPEN   => 0,
  					   UNLINK => 0)

More information about the svnbook-dev mailing list