[svn] r2262@freebird: fabien | 2006-01-27 17:24:00 -0500
Make the nargir book validate (I must consider if each file is a
document, or each book, or the whole document; the distinction is not
clear but I prefer to work with each file being a valid document).
--- a/.cvsignore Thu Jan 26 16:51:38 2006 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-nargir-html
-nargir.fo
-nargir.html
-nargir.pdf
-nargir.txt
-set.ced
--- a/book1/.cvsignore Thu Jan 26 16:51:38 2006 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-nargir
-nargir.fo
-nargir.html
-nargir.pdf
-nargir.txt
--- a/book1/7ages.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/7ages.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<chapter id="sept_ages" lang="fr"
xmlns:xi="http://www.w3.org/2001/XInclude">
--- a/book1/7dragons.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/7dragons.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<chapter id="sept_dragons" lang="fr"
xmlns:xi="http://www.w3.org/2001/XInclude">
--- a/book1/bete.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/bete.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<chapter id="bete" lang="fr" role="cite"
xmlns:xi="http://www.w3.org/2001/XInclude">
--- a/book1/enfants.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/enfants.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<chapter id="enfants" lang="fr"
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -25,11 +30,13 @@
</blockquote>
<para>Les Enfants Premiers des Dragons sont ceux nés lors de la
- <link linkend="genese">Genèse</link>. À ces derniers se rajoutent
- les victimes de la Bête avant la Fermeture du Cercle. Bien
- qu'ils soient possible de jouer n'importe lequel d'entre eux, il
- est recommandé de jouer principalement des Enfants d'Iol qui
- possède le don d'<link linkend="immortels">Immortalité</link>.</para>
+ <olink targetdoc="nargir" targetptr="genese">Genèse</olink>. À
+ ces derniers se rajoutent les victimes de la Bête avant la
+ Fermeture du Cercle. Bien qu'ils soient possible de jouer
+ n'importe lequel d'entre eux, il est recommandé de jouer
+ principalement des Enfants d'Iol qui possède le don d'<olink
+ targetdoc="nargir"
+ targetptr="immortels">Immortalité</olink>.</para>
<xi:include href="iol.xml"/>
--- a/book1/fael.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/fael.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<section id="fael" lang="fr"
xmlns:xi="http://www.w3.org/2001/XInclude">
--- a/book1/gardien.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/gardien.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<chapter id="gardien" lang="fr"
xmlns:xi="http://www.w3.org/2001/XInclude">
--- a/book1/genese.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/genese.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<section id="genese" lang="fr" role="cite"
xmlns:xi="http://www.w3.org/2001/XInclude">
--- a/book1/immortels.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/immortels.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<section id="immortels" lang="fr"
xmlns:xi="http://www.w3.org/2001/XInclude">
--- a/book1/iol.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/iol.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<section id="iol" lang="fr"
xmlns:xi="http://www.w3.org/2001/XInclude">
--- a/book1/nargir.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/nargir.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,12 @@
<?xml version='1.0'?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.chapter.class "|xi:include">
+ %xinclude;
+]
+>
<book id="nargir_base" lang="fr"
xmlns:xi="http://www.w3.org/2001/XInclude">
<bookinfo>
--- a/book1/preface.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/book1/preface.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,6 +1,11 @@
<?xml version='1.0'?>
<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % xinclude SYSTEM "../xinclude.dtd" >
+ <!ENTITY % local.section.class "|xi:include">
+ %xinclude;
+]>
<preface id="base_intro" lang="fr"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Introduction</title>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/db-chunk.xml Fri Feb 03 16:27:35 2006 -0500
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<targetset>
+<document targetdoc="nargir">
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chunk.db"/>
+</document>
+</targetset>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/db-html.xml Fri Feb 03 16:27:35 2006 -0500
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<targetset>
+<document targetdoc="nargir">
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="html.db"/>
+</document>
+</targetset>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/db-print.xml Fri Feb 03 16:27:35 2006 -0500
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<targetset>
+<document targetdoc="nargir">
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="print.db"/>
+</document>
+</targetset>
\ No newline at end of file
--- a/nargir.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/nargir.xml Fri Feb 03 16:27:35 2006 -0500
@@ -1,7 +1,13 @@
<?xml version='1.0'?>
<!DOCTYPE set PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
-<set lang="fr" status="draft"
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+ [
+ <!ENTITY % xinclude SYSTEM "xinclude.dtd" >
+ <!ENTITY % local.book.class "|xi:include">
+ %xinclude;
+ ]
+ >
+<set lang="fr" status="draft" id="nargir"
xmlns:xi="http://www.w3.org/2001/XInclude">
<setinfo>
<title>Nargir, la Terre des Sept Dragons</title>
--- a/styles/nargir-chunked.xsl Thu Jan 26 16:51:38 2006 -0500
+++ b/styles/nargir-chunked.xsl Fri Feb 03 16:27:35 2006 -0500
@@ -3,11 +3,13 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default"
version='1.0'>
+<xsl:import href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/xhtml/chunk.xsl"/>
<xsl:import href="nargir.xsl"/>
-<xsl:import href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/xhtml/chunk.xsl"/>
<xsl:param name="make.valid.html" select="1"/>
<xsl:param name="html.stylesheet">nargir.css</xsl:param>
<xsl:param name="use.id.as.filename" select="'1'"/>
-
+<xsl:param name="collect.xref.targets" select="'yes'"/>
+<xsl:param name="target.database.document" select="'db-chunk.xml'"/>
+<xsl:param name="targets.filename" select="'../chunk.db'"/>
</xsl:stylesheet>
--- a/styles/nargir-html.xsl Thu Jan 26 16:51:38 2006 -0500
+++ b/styles/nargir-html.xsl Fri Feb 03 16:27:35 2006 -0500
@@ -3,10 +3,13 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default"
version='1.0'>
+<xsl:import href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/xhtml/docbook.xsl"/>
<xsl:import href="nargir.xsl"/>
-<xsl:import href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/xhtml/docbook.xsl"/>
<xsl:param name="make.valid.html" select="1"/>
<xsl:param name="html.stylesheet">nargir.css</xsl:param>
+<xsl:param name="collect.xref.targets">yes</xsl:param>
+<xsl:param name="target.database.document">db-html.xml</xsl:param>
+<xsl:param name="targets.filename">html.db</xsl:param>
</xsl:stylesheet>
--- a/styles/nargir-print.xsl Thu Jan 26 16:51:38 2006 -0500
+++ b/styles/nargir-print.xsl Fri Feb 03 16:27:35 2006 -0500
@@ -2,10 +2,13 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version='1.0'
xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<xsl:import href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/fo/docbook.xsl"/>
<xsl:import href="nargir.xsl"/>
-<xsl:import href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/fo/docbook.xsl"/>
<!-- print options -->
<xsl:param name="hyphenate">false</xsl:param>
+<xsl:param name="collect.xref.targets" select="'yes'"/>
+<xsl:param name="target.database.document" select="'db-print.xml'"/>
+<xsl:param name="targets.filename" select="'print.db'"/>
</xsl:stylesheet>
--- a/styles/nargir.xsl Thu Jan 26 16:51:38 2006 -0500
+++ b/styles/nargir.xsl Fri Feb 03 16:27:35 2006 -0500
@@ -2,6 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version='1.0'>
-<xsl:param name="segmentedlist.as.table" select="1"/>
+<!-- xsl:param name="segmentedlist.as.table" select="1"/ -->
+<xsl:param name="prefer.internal.olink" select="1"/>
+<xsl:param name="current.docid" select="nargir"/>
</xsl:stylesheet>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xinclude.dtd Fri Feb 03 16:27:35 2006 -0500
@@ -0,0 +1,5 @@
+ <!ENTITY % local.common.attrib
+ "xmlns:xi CDATA #IMPLIED
+ xml:base CDATA #IMPLIED">
+ <!ELEMENT xi:include EMPTY>
+ <!ATTLIST xi:include href CDATA #REQUIRED>