May 2010 - Docbook-tools-commits - mailman.cloud.codelutin.com

r11 - trunk/docbook-style-nuiton/src/main
by jcouteau＠users.nuiton.org 19 May '10

19 May '10

Author: jcouteau Date: 2010-05-19 16:16:28 +0200 (Wed, 19 May 2010) New Revision: 11 Url: http://nuiton.org/repositories/revision/docbook-tools/11 Log: Remove old empty directories Removed: trunk/docbook-style-nuiton/src/main/css/ trunk/docbook-style-nuiton/src/main/images/

1 0

r10 - in trunk/docbook-style-nuiton/src/main/resources/images: . community
by jcouteau＠users.nuiton.org 19 May '10

19 May '10

Author: jcouteau Date: 2010-05-19 16:12:43 +0200 (Wed, 19 May 2010) New Revision: 10 Url: http://nuiton.org/repositories/revision/docbook-tools/10 Log: Put images in the right directory Added: trunk/docbook-style-nuiton/src/main/resources/images/community/ trunk/docbook-style-nuiton/src/main/resources/images/community/bkg_gradient.gif trunk/docbook-style-nuiton/src/main/resources/images/community/docbook/ trunk/docbook-style-nuiton/src/main/resources/images/community/dot.png trunk/docbook-style-nuiton/src/main/resources/images/community/dot2.png trunk/docbook-style-nuiton/src/main/resources/images/community/shine.png Removed: trunk/docbook-style-nuiton/src/main/resources/images/bkg_gradient.gif trunk/docbook-style-nuiton/src/main/resources/images/docbook/ trunk/docbook-style-nuiton/src/main/resources/images/dot.png trunk/docbook-style-nuiton/src/main/resources/images/dot2.png trunk/docbook-style-nuiton/src/main/resources/images/shine.png Deleted: trunk/docbook-style-nuiton/src/main/resources/images/bkg_gradient.gif =================================================================== (Binary files differ) Copied: trunk/docbook-style-nuiton/src/main/resources/images/community/bkg_gradient.gif (from rev 9, trunk/docbook-style-nuiton/src/main/resources/images/bkg_gradient.gif) =================================================================== (Binary files differ) Property changes on: trunk/docbook-style-nuiton/src/main/resources/images/community/bkg_gradient.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Copied: trunk/docbook-style-nuiton/src/main/resources/images/community/dot.png (from rev 9, trunk/docbook-style-nuiton/src/main/resources/images/dot.png) =================================================================== (Binary files differ) Property changes on: trunk/docbook-style-nuiton/src/main/resources/images/community/dot.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Copied: trunk/docbook-style-nuiton/src/main/resources/images/community/dot2.png (from rev 9, trunk/docbook-style-nuiton/src/main/resources/images/dot2.png) =================================================================== (Binary files differ) Property changes on: trunk/docbook-style-nuiton/src/main/resources/images/community/dot2.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Copied: trunk/docbook-style-nuiton/src/main/resources/images/community/shine.png (from rev 9, trunk/docbook-style-nuiton/src/main/resources/images/shine.png) =================================================================== (Binary files differ) Property changes on: trunk/docbook-style-nuiton/src/main/resources/images/community/shine.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Deleted: trunk/docbook-style-nuiton/src/main/resources/images/dot.png =================================================================== (Binary files differ) Deleted: trunk/docbook-style-nuiton/src/main/resources/images/dot2.png =================================================================== (Binary files differ) Deleted: trunk/docbook-style-nuiton/src/main/resources/images/shine.png =================================================================== (Binary files differ)

1 0

r9 - in trunk: . docbook-style-nuiton docbook-style-nuiton/src/main docbook-style-nuiton/src/main/css docbook-style-nuiton/src/main/images docbook-style-nuiton/src/main/resources docbook-xsl-nuiton docbook-xsl-nuiton/src/main/resources docbook-xsl-nuiton/src/main/resources/org/nuiton
by jcouteau＠users.nuiton.org 19 May '10

19 May '10

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) 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> <parent> - <groupId>org.nuiton</groupId> - <artifactId>docbook-tools</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - -  + </parent>   @@ -33,8 +27,6 @@   - <packaging>jdocbook-style</packaging> -  <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…</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>  - </configuration> - </plugin> - - </plugins> - - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - </build> -    - <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> -  + <groupId>net.sf.offo</groupId> + <artifactId>fop-hyph</artifactId> + <version>1.2</version> </dependency> </dependencies> @@ -37,22 +42,13 @@   - <packaging>jar</packaging> - -  - <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-n…</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> +  + <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-n…</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="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="hyphenate.verbatim">1</xsl:param> +  <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 @@  <xsl:param name="variablelist.as.blocks">1</xsl:param> - +   <xsl:param name="callout.defaultcolumn">80</xsl:param> @@ -291,7 +295,7 @@  - + <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 @@   + <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(a)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(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - </developers>    @@ -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>    - <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> +

2 1

r8 - in trunk/docbook-xsl-nuiton: . src/main/resources/org/nuiton
by jcouteau＠users.nuiton.org 17 May '10

17 May '10

Author: jcouteau Date: 2010-05-17 17:02:53 +0200 (Mon, 17 May 2010) New Revision: 8 Url: http://nuiton.org/repositories/revision/docbook-tools/8 Log: Do not download stylesheets when needed, include them in jar file (reduce generation time by more than 50%) Modified: trunk/docbook-xsl-nuiton/pom.xml trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/eclipse.xsl trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf-nuiton.xsl trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf.xsl trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/xhtml-single.xsl trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/xhtml.xsl Modified: trunk/docbook-xsl-nuiton/pom.xml =================================================================== --- trunk/docbook-xsl-nuiton/pom.xml 2010-05-09 12:33:50 UTC (rev 7) +++ trunk/docbook-xsl-nuiton/pom.xml 2010-05-17 15:02:53 UTC (rev 8) @@ -8,12 +8,12 @@ <groupId>org.nuiton.docbook-tools</groupId> <artifactId>docbook-xsl-nuiton</artifactId> -  + <version>1.0-SNAPSHOT</version> <parent> <groupId>org.nuiton</groupId> - <artifactId>docbook-tools</artifactId> - <version>1.0-SNAPSHOT</version> + <artifactId>mavenpom4redmine</artifactId> + <version>2.1.1</version> </parent> <dependencies> @@ -21,15 +21,9 @@ <dependency> <groupId>net.sf.docbook</groupId> <artifactId>docbook-xsl-ns</artifactId> -  +  </dependency> - <dependency> - <groupId>org.jboss.docs</groupId> - <artifactId>highlight</artifactId> -  - </dependency> - </dependencies>  @@ -53,6 +47,26 @@ </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> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + <configuration> + <finalName>${artifactId}-${version}</finalName> + </configuration> + </plugin> + </plugins> + <extensions> <extension> <groupId>org.apache.maven.wagon</groupId> Modified: trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/eclipse.xsl =================================================================== --- trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/eclipse.xsl 2010-05-09 12:33:50 UTC (rev 7) +++ trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/eclipse.xsl 2010-05-17 15:02:53 UTC (rev 8) @@ -12,7 +12,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">  - <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/1.74.0/xhtml/chunk.xsl"/> + <xsl:import href="../../1.74.0/xhtml/chunk.xsl"/> <xsl:template match="/"> <xsl:choose> 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-09 12:33:50 UTC (rev 7) +++ trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf-nuiton.xsl 2010-05-17 15:02:53 UTC (rev 8) @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/TR/xhtml1/transitional" xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/1.75.2/fo/docbook.xsl"/> + <xsl:import href="../../fo/docbook.xsl"/> <xsl:output method="xml" indent="yes" encoding="UTF-8" /> @@ -33,7 +33,7 @@ <xsl:param name="paper.type" select="'A4'"/>  - <xsl:param name="title.color">#EE7D01</xsl:param> + <xsl:param name="title.color">#6161e1</xsl:param> <xsl:param name="chapter.title.color" select="$title.color" /> <xsl:param name="section.title.color" select="$title.color" /> <xsl:param name="titlepage.color" select="$title.color"/> @@ -227,7 +227,7 @@ <xsl:if test="$img.src.path != ''"> <xsl:value-of select="$img.src.path"/> </xsl:if> - <xsl:text>images/community/sharengo.svg</xsl:text> + <xsl:text>images/logo.svg</xsl:text> </xsl:with-param> </xsl:call-template> </xsl:attribute> Modified: trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf.xsl =================================================================== --- trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf.xsl 2010-05-09 12:33:50 UTC (rev 7) +++ trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/pdf.xsl 2010-05-17 15:02:53 UTC (rev 8) @@ -22,7 +22,7 @@ xmlns:jbh="java:org.jboss.highlight.renderer.FORenderer" exclude-result-prefixes="jbh"> -<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/1.74.0/fo/docbook.xsl"/> +<xsl:import href="../../fo/docbook.xsl"/> <xsl:import href="common.xsl" /> Modified: trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/xhtml-single.xsl =================================================================== --- trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/xhtml-single.xsl 2010-05-09 12:33:50 UTC (rev 7) +++ trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/xhtml-single.xsl 2010-05-17 15:02:53 UTC (rev 8) @@ -11,7 +11,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/1.74.0/xhtml/docbook.xsl"/> + <xsl:import href="../../xhtml/docbook.xsl"/> <xsl:include href="xhtml-common.xsl"/> Modified: trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/xhtml.xsl =================================================================== --- trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/xhtml.xsl 2010-05-09 12:33:50 UTC (rev 7) +++ trunk/docbook-xsl-nuiton/src/main/resources/org/nuiton/xhtml.xsl 2010-05-17 15:02:53 UTC (rev 8) @@ -11,7 +11,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/1.74.0/xhtml/chunk.xsl"/> + <xsl:import href="../../xhtml/chunk.xsl"/> <xsl:include href="xhtml-common.xsl"/>

1 0

r7 - trunk
by tchemit＠users.nuiton.org 09 May '10

09 May '10

Author: tchemit Date: 2010-05-09 14:33:50 +0200 (Sun, 09 May 2010) New Revision: 7 Url: http://nuiton.org/repositories/revision/docbook-tools/7 Log: Utilisation de mavenpom4redmine 2.1.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-29 05:43:41 UTC (rev 6) +++ trunk/pom.xml 2010-05-09 12:33:50 UTC (rev 7) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.3</version> + <version>2.1.4</version> </parent> <artifactId>docbook-tools</artifactId>

1 0