[svnbook commit] r2596 - in trunk/src: de/book en en/book es/book it/book nb/book pt_BR/book ru/book tools tools/dtd/docbook-4.4 tools/dtd/docbook-4.4/ent zh/book
cmpilato
noreply at red-bean.com
Wed Jan 3 13:44:38 CST 2007
Author: cmpilato
Date: Wed Jan 3 13:44:38 2007
New Revision: 2596
Added:
trunk/src/tools/dtd/docbook-4.4/
- copied from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/
trunk/src/tools/dtd/docbook-4.4/calstblx.dtd
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/calstblx.dtd
trunk/src/tools/dtd/docbook-4.4/catalog
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/catalog
trunk/src/tools/dtd/docbook-4.4/catalog.xml
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/catalog.xml
trunk/src/tools/dtd/docbook-4.4/dbcentx.mod
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/dbcentx.mod
trunk/src/tools/dtd/docbook-4.4/dbgenent.mod
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/dbgenent.mod
trunk/src/tools/dtd/docbook-4.4/dbhierx.mod
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/dbhierx.mod
trunk/src/tools/dtd/docbook-4.4/dbnotnx.mod
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/dbnotnx.mod
trunk/src/tools/dtd/docbook-4.4/dbpoolx.mod
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/dbpoolx.mod
trunk/src/tools/dtd/docbook-4.4/docbookx.dtd
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/docbookx.dtd
trunk/src/tools/dtd/docbook-4.4/ent/
- copied from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/
trunk/src/tools/dtd/docbook-4.4/ent/ISOamsa.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOamsa.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOamsb.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOamsb.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOamsc.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOamsc.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOamsn.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOamsn.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOamso.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOamso.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOamsr.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOamsr.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISObox.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISObox.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOcyr1.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOcyr1.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOcyr2.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOcyr2.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOdia.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOdia.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOgrk1.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOgrk1.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOgrk2.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOgrk2.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOgrk3.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOgrk3.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOgrk4.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOgrk4.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOlat1.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOlat1.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOlat2.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOlat2.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOnum.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOnum.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOpub.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOpub.ent
trunk/src/tools/dtd/docbook-4.4/ent/ISOtech.ent
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/ISOtech.ent
trunk/src/tools/dtd/docbook-4.4/ent/catalog
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/catalog
trunk/src/tools/dtd/docbook-4.4/ent/catalog.xml
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/ent/catalog.xml
trunk/src/tools/dtd/docbook-4.4/htmltblx.mod
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/htmltblx.mod
trunk/src/tools/dtd/docbook-4.4/soextblx.dtd
- copied unchanged from r2594, /branches/ora-2e-reorg/src/tools/dtd/docbook-4.4/soextblx.dtd
Modified:
trunk/src/de/book/book.xml
trunk/src/en/Makefile
trunk/src/en/book/book.xml
trunk/src/es/book/book.xml
trunk/src/it/book/book.xml
trunk/src/nb/book/book.xml
trunk/src/pt_BR/book/book.xml
trunk/src/ru/book/book.xml
trunk/src/tools/Makefile.base-rules
trunk/src/zh/book/book.xml
Log:
Merge the DocBook 4.4 DTD and build system changes from the
ora-2e-reorg branch, and update all the translations to deal with the
changes.
* src/tools/dtd/docbook-4.4
* src/tools/dtd/docbook-4.4/docbookx.dtd
* src/tools/dtd/docbook-4.4/soextblx.dtd
* src/tools/dtd/docbook-4.4/dbhierx.mod
* src/tools/dtd/docbook-4.4/dbgenent.mod
* src/tools/dtd/docbook-4.4/dbcentx.mod
* src/tools/dtd/docbook-4.4/dbpoolx.mod
* src/tools/dtd/docbook-4.4/calstblx.dtd
* src/tools/dtd/docbook-4.4/ent
* src/tools/dtd/docbook-4.4/ent/ISOcyr2.ent
* src/tools/dtd/docbook-4.4/ent/ISOamsa.ent
* src/tools/dtd/docbook-4.4/ent/ISOamsb.ent
* src/tools/dtd/docbook-4.4/ent/ISOamsc.ent
* src/tools/dtd/docbook-4.4/ent/ISOtech.ent
* src/tools/dtd/docbook-4.4/ent/ISOpub.ent
* src/tools/dtd/docbook-4.4/ent/ISObox.ent
* src/tools/dtd/docbook-4.4/ent/ISOdia.ent
* src/tools/dtd/docbook-4.4/ent/ISOamsn.ent
* src/tools/dtd/docbook-4.4/ent/ISOamso.ent
* src/tools/dtd/docbook-4.4/ent/ISOnum.ent
* src/tools/dtd/docbook-4.4/ent/ISOlat1.ent
* src/tools/dtd/docbook-4.4/ent/ISOlat2.ent
* src/tools/dtd/docbook-4.4/ent/ISOamsr.ent
* src/tools/dtd/docbook-4.4/ent/ISOgrk1.ent
* src/tools/dtd/docbook-4.4/ent/ISOgrk2.ent
* src/tools/dtd/docbook-4.4/ent/ISOgrk3.ent
* src/tools/dtd/docbook-4.4/ent/ISOgrk4.ent
* src/tools/dtd/docbook-4.4/ent/catalog.xml
* src/tools/dtd/docbook-4.4/ent/catalog
* src/tools/dtd/docbook-4.4/ent/ISOcyr1.ent
* src/tools/dtd/docbook-4.4/catalog.xml
* src/tools/dtd/docbook-4.4/catalog
* src/tools/dtd/docbook-4.4/dbnotnx.mod
* src/tools/dtd/docbook-4.4/htmltblx.mod
Added.
* src/tools/Makefile.base-rules
Break &svn.version; entity value into &svn.l10n_revision; and
&svn.version;. Add new &svn.date; entity value.
* src/de/book/book.xml
* src/en/book/book.xml
* src/es/book/book.xml
* src/it/book/book.xml
* src/nb/book/book.xml
* src/pt_BR/book/book.xml
* src/ru/book/book.xml
* src/zh/book/book.xml
Track the split of &svn.version;'s value into &svn.l10n_revision; and
&svn.version;.
* src/en/Makefile
(L10N_REVISION): Override the default value.
Modified: trunk/src/de/book/book.xml
==============================================================================
--- trunk/src/de/book/book.xml (original)
+++ trunk/src/de/book/book.xml Wed Jan 3 13:44:38 2007
@@ -34,7 +34,7 @@
<!-- Die Verwendung der Revisionsnummer wäre passender, aber die -->
<!-- benutzten stylesheets scheinen dies nicht zu unterstützen. -->
- <subtitle>&svn.version;</subtitle>
+ <subtitle>&svn.l10n_revision; &svn.version;</subtitle>
<bookinfo>
Modified: trunk/src/en/Makefile
==============================================================================
--- trunk/src/en/Makefile (original)
+++ trunk/src/en/Makefile Wed Jan 3 13:44:38 2007
@@ -1 +1,4 @@
include ../tools/Makefile.base
+
+# Makefile.base overrides
+L10N_REVISION = r
\ No newline at end of file
Modified: trunk/src/en/book/book.xml
==============================================================================
--- trunk/src/en/book/book.xml (original)
+++ trunk/src/en/book/book.xml Wed Jan 3 13:44:38 2007
@@ -26,7 +26,7 @@
<!-- Using revnumber would be more appropriate, but our stylesheets -->
<!-- don't seem to render it. -->
<subtitle>For Subversion 1.3</subtitle>
- <subtitle>(book compiled from &svn.version;)</subtitle>
+ <subtitle>(book compiled from &svn.l10n_revision;&svn.version;)</subtitle>
<bookinfo>
Modified: trunk/src/es/book/book.xml
==============================================================================
--- trunk/src/es/book/book.xml (original)
+++ trunk/src/es/book/book.xml Wed Jan 3 13:44:38 2007
@@ -30,7 +30,7 @@
<!-- Using revnumber would be more appropriate, but our stylesheets -->
<!-- don't seem to render it. -->
- <subtitle>&svn.version;</subtitle>
+ <subtitle>&svn.l10n_revision; &svn.version;</subtitle>
<bookinfo>
Modified: trunk/src/it/book/book.xml
==============================================================================
--- trunk/src/it/book/book.xml (original)
+++ trunk/src/it/book/book.xml Wed Jan 3 13:44:38 2007
@@ -32,7 +32,7 @@
<!-- Using revnumber would be more appropriate, but our stylesheets -->
<!-- don't seem to render it. -->
<subtitle>Per Subversion 1.2</subtitle>
- <subtitle>(libro compilato da &svn.version;)</subtitle>
+ <subtitle>(libro compilato da &svn.l10n_revision; &svn.version;)</subtitle>
<bookinfo>
Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml (original)
+++ trunk/src/nb/book/book.xml Wed Jan 3 13:44:38 2007
@@ -73,9 +73,9 @@
<!-- don't seem to render it. -->
<subtitle>For Subversion 1.3</subtitle>
<!-- @ENGLISH {{{
- <subtitle>(book compiled from &svn.version;)</subtitle>
+ <subtitle>(book compiled from r&svn.version;)</subtitle>
@ENGLISH }}} -->
- <subtitle>(Bok&svn.version;)</subtitle>
+ <subtitle>(Bok&svn.l10n_revision; &svn.version;)</subtitle>
<bookinfo>
Modified: trunk/src/pt_BR/book/book.xml
==============================================================================
--- trunk/src/pt_BR/book/book.xml (original)
+++ trunk/src/pt_BR/book/book.xml Wed Jan 3 13:44:38 2007
@@ -26,7 +26,7 @@
<!-- Using revnumber would be more appropriate, but our stylesheets -->
<!-- don't seem to render it. -->
<subtitle>Para Subversion 1.2</subtitle>
- <subtitle>(livro compilado de &svn.version;)</subtitle>
+ <subtitle>(livro compilado de &svn.l10n_revision; &svn.version;)</subtitle>
<bookinfo>
Modified: trunk/src/ru/book/book.xml
==============================================================================
--- trunk/src/ru/book/book.xml (original)
+++ trunk/src/ru/book/book.xml Wed Jan 3 13:44:38 2007
@@ -35,7 +35,7 @@
<subtitle>For Subversion 1.3</subtitle>
@ENGLISH }}} -->
<subtitle>ÐÐ»Ñ Subversion 1.3</subtitle>
- <subtitle>(&svn.version;)</subtitle>
+ <subtitle>(&svn.l10n_revision; &svn.version;)</subtitle>
<bookinfo>
Modified: trunk/src/tools/Makefile.base-rules
==============================================================================
--- trunk/src/tools/Makefile.base-rules (original)
+++ trunk/src/tools/Makefile.base-rules Wed Jan 3 13:44:38 2007
@@ -9,11 +9,15 @@
$(VERSION_SOURCE): version
version:
@if $(SVNVERSION) . > /dev/null; then \
- echo '<!ENTITY svn.version "$(L10N_REVISION) '`$(SVNVERSION) .`'">' \
+ echo '<!ENTITY svn.version "'`$(SVNVERSION) .`'">' \
> $(VERSION_SOURCE).tmp; \
+ echo '<!ENTITY svn.l10n_revision "$(L10N_REVISION)">' \
+ >> $(VERSION_SOURCE).tmp; \
else \
echo '<!ENTITY svn.version "">' > $(VERSION_SOURCE).tmp; \
+ echo '<!ENTITY svn.l10n_revision "">' > $(VERSION_SOURCE).tmp; \
fi
+ @echo '<!ENTITY svn.date "'`date`'">' >> $(VERSION_SOURCE).tmp
@if cmp -s $(VERSION_SOURCE) $(VERSION_SOURCE).tmp; then \
rm $(VERSION_SOURCE).tmp; \
else \
Modified: trunk/src/zh/book/book.xml
==============================================================================
--- trunk/src/zh/book/book.xml (original)
+++ trunk/src/zh/book/book.xml Wed Jan 3 13:44:38 2007
@@ -30,7 +30,8 @@
<!-- Using revnumber would be more appropriate, but our stylesheets -->
<!-- don't seem to render it. -->
<subtitle>é对 Subversion 1.3</subtitle>
- <subtitle>ï¼æ¬ä¹¦å½åçæ¬å¯¹åºç&svn.version;ï¼</subtitle>
+ <subtitle>ï¼æ¬ä¹¦å½åçæ¬å¯¹åºç&svn.l10n_revision;
+ &svn.version;ï¼</subtitle>
<bookinfo>
More information about the svnbook-dev
mailing list