Le Wed, 19 May 2010 14:46:19 +0200 (CEST), jcouteau@users.nuiton.org a écrit :

Author: jcouteau Date: 2010-05-19 14:46:19 +0200 (Wed, 19 May 2010) New Revision: 9

Url: http://nuiton.org/repositories/revision/docbook-tools/9

Log: Use docbkx plugin instead of jboss (Tony should be happy) Indeed :)

Everything is on central

Added: trunk/docbook-style-nuiton/src/main/resources/ trunk/docbook-style-nuiton/src/main/resources/css/ trunk/docbook-style-nuiton/src/main/resources/images/ Removed: trunk/docbook-style-nuiton/src/main/css/css/ trunk/docbook-style-nuiton/src/main/images/images/ trunk/docbook-style-nuiton/src/main/resources/community/ trunk/docbook-xsl-nuiton/src/main/resources/hyph/ Modified: trunk/docbook-style-nuiton/pom.xml trunk/docbook-xsl-nuiton/pom.xml trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf-nuiton.xsl trunk/pom.xml

Modified: trunk/docbook-style-nuiton/pom.xml =================================================================== --- trunk/docbook-style-nuiton/pom.xml 2010-05-17 15:02:53 UTC (rev 8) +++ trunk/docbook-style-nuiton/pom.xml 2010-05-19 12:46:19 UTC (rev 9) @@ -8,19 +8,13 @@

<groupId>org.nuiton.docbook-tools</groupId> <artifactId>docbook-style-nuiton</artifactId> - <!--<version>1.0-SNAPSHOT</version>--> + <version>1.0-SNAPSHOT</version>

<parent> - <groupId>org.nuiton</groupId> - <artifactId>docbook-tools</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <!--parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> <version>2.1.1</version> - </parent--> + </parent>

<!-- ************************************************************* --> <!-- *** Project Information ************************************* --> @@ -33,8 +27,6 @@ <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* -->

- <packaging>jdocbook-style</packaging> - <!-- Source control management. --> <scm> <connection>scm:svn:http://svn.nuiton.org/svn/docbook-tools/trunk/docbook-style-nuiton</connection> @@ -42,47 +34,10 @@ <url>http://www.nuiton.org/repositories/browse/docbook-tools/trunk/docbook-style-nuiton</url> </scm>

- <build> - <plugins>

- <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-style-plugin</artifactId> - <version>1.0.0</version> - <extensions>true</extensions> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <includePom>true</includePom> <!-- Used to avoid empty source for -DperformRelease --> - </configuration> - </plugin> - - </plugins> - - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - </build> - <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* -->

- <pluginRepositories> - - <pluginRepository> - <id>jboss-maven2-repository</id> - <name>Jboss repository</name> - <url>http://repository.jboss.org/maven2</url> - </pluginRepository> - - </pluginRepositories> - </project>

Modified: trunk/docbook-xsl-nuiton/pom.xml =================================================================== --- trunk/docbook-xsl-nuiton/pom.xml 2010-05-17 15:02:53 UTC (rev 8) +++ trunk/docbook-xsl-nuiton/pom.xml 2010-05-19 12:46:19 UTC (rev 9) @@ -17,11 +17,16 @@ </parent>

<dependencies> + <dependency> + <groupId>org.docbook</groupId> + <artifactId>docbook-xml</artifactId> + <version>4.4</version> + </dependency>

<dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook-xsl-ns</artifactId> - <!--version>1.74.0</version--> + <groupId>net.sf.offo</groupId> + <artifactId>fop-hyph</artifactId> + <version>1.2</version> </dependency>

</dependencies> @@ -37,22 +42,13 @@ <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* -->

- <packaging>jar</packaging> - - <!-- Source control management. --> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/docbook-tools/trunk/docbook-xsl-nuiton</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/docbook-tools/trunk/docbook-xsl-nuiton</developerConnection> - <url>http://www.nuiton.org/repositories/browse/docbook-tools/trunk/docbook-xsl-nuiton</url> - </scm> - <build> - + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>1.3.2</version> + <executions> <execution> <phase>package</phase> @@ -61,38 +57,27 @@ </goals> </execution> </executions> + <configuration> <finalName>${artifactId}-${version}</finalName> </configuration> </plugin> </plugins> - - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> + + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> </build>

- <repositories> + <!-- Source control management. --> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/docbook-tools/trunk/docbook-xsl-nuiton</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/docbook-tools/trunk/docbook-xsl-nuiton</developerConnection> + <url>http://www.nuiton.org/repositories/browse/docbook-tools/trunk/docbook-xsl-nuiton</url> + </scm>

- <repository> - <id>jboss-maven2-repository</id> - <name>Jboss repository</name> - <url>http://repository.jboss.org/maven2</url> - </repository> - - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>jboss-maven2-repository</id> - <name>Jboss repository</name> - <url>http://repository.jboss.org/maven2</url> - </pluginRepository> - </pluginRepositories> - </project>

Modified: trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf-nuiton.xsl =================================================================== --- trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf-nuiton.xsl 2010-05-17 15:02:53 UTC (rev 8) +++ trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf-nuiton.xsl 2010-05-19 12:46:19 UTC (rev 9) @@ -9,7 +9,8 @@ xmlns="http://www.w3.org/TR/xhtml1/transitional" xmlns:fo="http://www.w3.org/1999/XSL/Format">

- <xsl:import href="../../fo/docbook.xsl"/> + <!--xsl:import href="../../fo/docbook.xsl"/--> + <xsl:import href="urn:docbkx:stylesheet"/>

<xsl:output method="xml" indent="yes" encoding="UTF-8" />

@@ -148,12 +149,15 @@ <xsl:param name="graphicsize.extension" select="'1'" /> <!--xsl:param name="default.image.width">15cm</xsl:param-->

+ <xsl:param name="hyphenate.verbatim">1</xsl:param>

+ <!-- Properties for monospace and verbatim texts, should impact programlistings--> <xsl:attribute-set name="monospace.properties"> <xsl:attribute name="font-size">9pt</xsl:attribute> <xsl:attribute name="wrap-option">wrap</xsl:attribute> + <xsl:attribute name="hyphenation-character">\</xsl:attribute> <xsl:attribute name="font-family"> <xsl:value-of select="$monospace.font.family"/> </xsl:attribute> @@ -163,7 +167,7 @@ use-attribute-sets="verbatim.properties monospace.properties"> <xsl:attribute name="text-align">start</xsl:attribute> <xsl:attribute name="wrap-option">wrap</xsl:attribute> - <xsl:attribute name="hyphenation-character">►</xsl:attribute> + <xsl:attribute name="hyphenation-character">\</xsl:attribute> </xsl:attribute-set>

<xsl:param name="shade.verbatim" select="1"/> @@ -273,7 +277,7 @@

<!-- Format Variable Lists as Blocks (prevents horizontal overflow). --> <xsl:param name="variablelist.as.blocks">1</xsl:param> - + <!-- Callouts --> <!-- Place callout bullets at this column in programlisting.--> <xsl:param name="callout.defaultcolumn">80</xsl:param> @@ -291,7 +295,7 @@

<!-- Override indexterm template to avoid title not being with following paragraph when putting indexterm right after title--> - + <xsl:template name="indexterm"> <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> <fo:block keep-with-previous.within-column="always" @@ -301,5 +305,5 @@ </xsl:attribute> </fo:block> </xsl:template> - + </xsl:stylesheet>

Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-17 15:02:53 UTC (rev 8) +++ trunk/pom.xml 2010-05-19 12:46:19 UTC (rev 9) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

@@ -7,15 +8,16 @@ <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* -->

+ <groupId>org.nuiton</groupId> + <artifactId>docbook-tools</artifactId> + <version>1.0-SNAPSHOT</version> + <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> + <version>2.1.1</version> </parent>

- <artifactId>docbook-tools</artifactId> - <version>1.0-SNAPSHOT</version> - <modules> <module>docbook-style-nuiton</module> <module>docbook-xsl-nuiton</module> @@ -31,31 +33,6 @@ <inceptionYear>2010</inceptionYear> <url>http://maven-site.nuiton.org/${project.artifactId}</url>

- <developers> - - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - <developer> - <name>Jean Couteau</name> - <id>jcouteau</id> - <email>couteau@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - </developers> <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> @@ -69,45 +46,9 @@ <url>http://www.nuiton.org/repositories/browse/docbook-tools/trunk</url> </scm>

- <dependencyManagement> - - <dependencies> - - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook-xsl-ns</artifactId> - <version>1.74.0</version> - </dependency> - - <dependency> - <groupId>org.jboss.docs</groupId> - <artifactId>highlight</artifactId> - <version>1.0.0</version> - </dependency> - - </dependencies> - - </dependencyManagement> <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* -->

- <repositories> - - <repository> - <id>jboss-maven2-repository</id> - <name>Jboss repository</name> - <url>http://repository.jboss.org/maven2</url> - </repository> - - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>jboss-maven2-repository</id> - <name>Jboss repository</name> - <url>http://repository.jboss.org/maven2</url> - </pluginRepository> - </pluginRepositories> - </project> +

_______________________________________________ Docbook-tools-commits mailing list Docbook-tools-commits@list.nuiton.org http://list.nuiton.org/cgi-bin/mailman/listinfo/docbook-tools-commits

-- Tony Chemit -------------------- tél: +33 (0) 2 40 50 29 28 email: chemit@codelutin.com http://www.codelutin.com