May 2009 - Jrst-commits - mailman.cloud.codelutin.com

r337 - in maven-jrst-plugin/trunk: . src/main/java/org src/main/java/org/nuiton src/main/java/org/nuiton/jrst/plugin src/site
by tchemit＠users.labs.libre-entreprise.org 16 May '09

16 May '09

Author: tchemit Date: 2009-05-16 06:01:39 +0000 (Sat, 16 May 2009) New Revision: 337 Added: maven-jrst-plugin/trunk/src/main/java/org/nuiton/ Removed: maven-jrst-plugin/trunk/src/main/java/org/codelutin/ Modified: maven-jrst-plugin/trunk/pom.xml maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java maven-jrst-plugin/trunk/src/site/site.xml maven-jrst-plugin/trunk/src/site/site_en.xml Log: migrate to nuiton Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-05-16 05:51:01 UTC (rev 336) +++ maven-jrst-plugin/trunk/pom.xml 2009-05-16 06:01:39 UTC (rev 337) @@ -6,25 +6,27 @@    + <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.5.4</version> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>maven-jrst-plugin</artifactId> <dependencies> <dependency> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>0.8.6</version> + <version>1.0.0-SNAPSHOT</version> <scope>compile</scope> </dependency> + <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>${lutinpluginutil.version}</version> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.0.0-alpha-1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -48,7 +50,7 @@   <name>Maven JRST Plugin</name> - <version>0.8.6</version> + <version>1.0.0-SNAPSHOT</version> <description> Maven2 plugin to generate reStructuredText file into xDoc. </description> @@ -60,18 +62,13 @@ <packaging>maven-plugin</packaging> <properties> -  - <labs.id>54</labs.id> -  - <labs.project>jrst</labs.project> -  <maven.site.locales>fr,en</maven.site.locales> - <lutinpluginutil.version>0.5</lutinpluginutil.version> - - <maven.version>2.0.10</maven.version> +  + <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/jrst/htdocs/nuiton</site.deploy.url> + </properties> <build> @@ -82,7 +79,7 @@  <plugin> - <artifactId>maven-plugin-plugin</artifactId> + <artifactId>maven-plugin-plugin</artifactId> <executions> <execution> <goals> @@ -124,18 +121,13 @@    - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> -  +  <repositories> <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <id>nuiton-repository</id> + <name>NuitonRepository</name> + <url>${repository.home.url}</url> <snapshots> <enabled>true</enabled> <checksumPolicy>warn</checksumPolicy> @@ -147,39 +139,4 @@ </repository> </repositories> -  - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.8</version> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>license</goal> - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - </profile> - </profiles> - </project> Copied: maven-jrst-plugin/trunk/src/main/java/org/nuiton (from rev 335, maven-jrst-plugin/trunk/src/main/java/org/codelutin) Property changes on: maven-jrst-plugin/trunk/src/main/java/org/nuiton ___________________________________________________________________ Name: svn:mergeinfo + Modified: maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java =================================================================== --- maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/GenerationJRstException.java 2009-05-16 05:34:07 UTC (rev 335) +++ maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java 2009-05-16 06:01:39 UTC (rev 337) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst.plugin; +package org.nuiton.jrst.plugin; /** * GenerationJRstException. Modified: maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java =================================================================== --- maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2009-05-16 05:34:07 UTC (rev 335) +++ maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java 2009-05-16 06:01:39 UTC (rev 337) @@ -15,14 +15,14 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst.plugin; +package org.nuiton.jrst.plugin; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.codehaus.plexus.util.DirectoryScanner; -import org.codelutin.jrst.JRST; -import org.codelutin.util.FileUtil; -import org.codelutin.util.MirroredFileUpdater; +import org.nuiton.jrst.JRST; +import org.nuiton.util.FileUtil; +import org.nuiton.util.MirroredFileUpdater; import java.io.File; import java.io.IOException; @@ -179,6 +179,7 @@ /** * Execute mojo. */ + @Override public void execute() throws MojoExecutionException { try { actionGenerate(); @@ -290,10 +291,12 @@ protected RstUpdater(File sourceDirectory, File destinationDirectory, String defaultLocale) { - super(sourceDirectory, destinationDirectory); + //FIXME should use the two paramters to transform names + super("", "", sourceDirectory, destinationDirectory); this.defaultLocale = defaultLocale; } + @Override public File getMirrorFile(File f) { String file = f.getAbsolutePath().substring(prefixSourceDirecotory); file = file.replace(".rst", ".xml").replaceFirst( @@ -317,10 +320,12 @@ protected RessourceUpdater(File sourceDirectory, File destinationDirectory, String defaultLocale) { - super(sourceDirectory, destinationDirectory); + //FIXME should use the two paramters to transform names + super("", "", sourceDirectory, destinationDirectory); this.defaultLocale = defaultLocale; } + @Override public File getMirrorFile(File f) { String file = f.getAbsolutePath().substring(prefixSourceDirecotory); file = file.replaceFirst("([/\\\\])rst([/\\\\])", "$1$2"); Modified: maven-jrst-plugin/trunk/src/site/site.xml =================================================================== --- maven-jrst-plugin/trunk/src/site/site.xml 2009-05-16 05:51:01 UTC (rev 336) +++ maven-jrst-plugin/trunk/src/site/site.xml 2009-05-16 06:01:39 UTC (rev 337) @@ -28,9 +28,10 @@ <body> <links> - <item name="jrst" href="http://jrst.labs.libre-entreprise.org/jrst/"/> - <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/> + <item name="jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/jrst/"/> + <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/doxia-module-jrst/"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Nuiton" href="http://www.nuiton.org"/> <item name="${project.organization.name}" href="${project.organization.url}"/> <item name="[fr" href="index.html"/> <item name="en]" href="en/index.html"/> @@ -45,11 +46,11 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu> Modified: maven-jrst-plugin/trunk/src/site/site_en.xml =================================================================== --- maven-jrst-plugin/trunk/src/site/site_en.xml 2009-05-16 05:51:01 UTC (rev 336) +++ maven-jrst-plugin/trunk/src/site/site_en.xml 2009-05-16 06:01:39 UTC (rev 337) @@ -26,9 +26,10 @@ <body> <links> - <item name="jrst" href="http://jrst.labs.libre-entreprise.org/jrst/en"/> - <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/> + <item name="jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/jrst/en"/> + <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/doxia-module-jrst/"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Nuiton" href="http://www.nuiton.org"/> <item name="${project.organization.name}" href="${project.organization.url}"/> <item name="[fr" href="../index.html"/> <item name="en]" href="index.html"/> @@ -43,11 +44,11 @@ </menu> <menu name="Download"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairy (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Library (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu>

1 0

r336 - jrst/trunk/src/site
by tchemit＠users.labs.libre-entreprise.org 16 May '09

16 May '09

Author: tchemit Date: 2009-05-16 05:51:01 +0000 (Sat, 16 May 2009) New Revision: 336 Modified: jrst/trunk/src/site/site_en.xml Log: i18n on site Modified: jrst/trunk/src/site/site_en.xml =================================================================== --- jrst/trunk/src/site/site_en.xml 2009-05-16 05:34:07 UTC (rev 335) +++ jrst/trunk/src/site/site_en.xml 2009-05-16 05:51:01 UTC (rev 336) @@ -50,17 +50,17 @@ <item name="External documentation" href="/devel/externalDoc.html"/> </menu> - <menu name="Téléchargement"> + <menu name="Download"> <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> + name="Library (jar)"/> <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" - name="Bundle sans sources (zip)"/> + name="Bundle without sources (zip)"/> <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" - name="Bundle complêt (zip)"/> + name="Bundle with sources (zip)"/> </menu> <menu ref="reports"/>

1 0

r335 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org 16 May '09

16 May '09

Author: tchemit Date: 2009-05-16 05:34:07 +0000 (Sat, 16 May 2009) New Revision: 335 Modified: jrst/trunk/pom.xml Log: fix main class Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-05-16 05:33:16 UTC (rev 334) +++ jrst/trunk/pom.xml 2009-05-16 05:34:07 UTC (rev 335) @@ -104,7 +104,7 @@  <maven.site.locales>fr,en</maven.site.locales> - <maven.jar.main.class>org.codelutin.jrst.JRST</maven.jar.main.class> + <maven.jar.main.class>org.nuiton.jrst.JRST</maven.jar.main.class>  <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/jrst/htdocs/nuiton</site.deploy.url>

1 0

r334 - in jrst/trunk/src: main/java/org main/java/org/nuiton main/java/org/nuiton/jrst main/java/org/nuiton/jrst/directive test/java/org test/java/org/nuiton test/java/org/nuiton/jrst
by tchemit＠users.labs.libre-entreprise.org 16 May '09

16 May '09

Author: tchemit Date: 2009-05-16 05:33:16 +0000 (Sat, 16 May 2009) New Revision: 334 Added: jrst/trunk/src/main/java/org/nuiton/ jrst/trunk/src/main/java/org/nuiton/jrst/JRST.java jrst/trunk/src/main/java/org/nuiton/jrst/JRSTInterface.java jrst/trunk/src/main/java/org/nuiton/jrst/JRSTReader.java jrst/trunk/src/test/java/org/nuiton/ Removed: jrst/trunk/src/main/java/org/codelutin/ jrst/trunk/src/main/java/org/nuiton/jrst/JRST.java jrst/trunk/src/main/java/org/nuiton/jrst/JRSTInterface.java jrst/trunk/src/main/java/org/nuiton/jrst/JRSTReader.java jrst/trunk/src/test/java/org/codelutin/ Modified: jrst/trunk/src/main/java/org/nuiton/jrst/AdvancedReader.java jrst/trunk/src/main/java/org/nuiton/jrst/DocumentHandler.java jrst/trunk/src/main/java/org/nuiton/jrst/DocumentWalker.java jrst/trunk/src/main/java/org/nuiton/jrst/JRSTDirective.java jrst/trunk/src/main/java/org/nuiton/jrst/JRSTGenerator.java jrst/trunk/src/main/java/org/nuiton/jrst/JRSTLexer.java jrst/trunk/src/main/java/org/nuiton/jrst/ReStructuredText.java jrst/trunk/src/main/java/org/nuiton/jrst/directive/ContentDirective.java jrst/trunk/src/main/java/org/nuiton/jrst/directive/DateDirective.java jrst/trunk/src/main/java/org/nuiton/jrst/directive/ImageDirective.java jrst/trunk/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java jrst/trunk/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java jrst/trunk/src/test/java/org/nuiton/jrst/Compare.java jrst/trunk/src/test/java/org/nuiton/jrst/GutterColor.java jrst/trunk/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java jrst/trunk/src/test/java/org/nuiton/jrst/JRSTReaderTest.java jrst/trunk/src/test/java/org/nuiton/jrst/ThreadRedirection.java jrst/trunk/src/test/java/org/nuiton/jrst/XMLCaseTest.java Log: migrate to nuiton part 2 Copied: jrst/trunk/src/main/java/org/nuiton (from rev 332, jrst/trunk/src/main/java/org/codelutin) Property changes on: jrst/trunk/src/main/java/org/nuiton ___________________________________________________________________ Name: svn:mergeinfo + Modified: jrst/trunk/src/main/java/org/nuiton/jrst/AdvancedReader.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/AdvancedReader.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/AdvancedReader.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import org.apache.commons.collections.primitives.ArrayCharList; import org.apache.commons.collections.primitives.CharList; Modified: jrst/trunk/src/main/java/org/nuiton/jrst/DocumentHandler.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/DocumentHandler.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/DocumentHandler.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import org.dom4j.Document; import org.dom4j.Element; Modified: jrst/trunk/src/main/java/org/nuiton/jrst/DocumentWalker.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/DocumentWalker.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/DocumentWalker.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Deleted: jrst/trunk/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/JRST.java 2009-05-16 05:33:16 UTC (rev 334) @@ -1,565 +0,0 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 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 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ - -package org.codelutin.jrst; - -import static org.codelutin.i18n.I18n._; - -import java.awt.GraphicsDevice; -import java.awt.GraphicsEnvironment; -import java.io.BufferedOutputStream; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.Reader; -import java.io.StringReader; -import java.lang.reflect.Method; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.sax.SAXResult; -import javax.xml.transform.stream.StreamSource; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.fop.apps.FOUserAgent; -import org.apache.fop.apps.Fop; -import org.apache.fop.apps.FopFactory; -import org.apache.fop.apps.MimeConstants; -import org.codelutin.i18n.I18n; -import org.codelutin.util.FileCompletion; -import org.codelutin.util.FileUtil; -import org.codelutin.util.Resource; -import org.codelutin.util.StringUtil; -import org.dom4j.Document; -import org.dom4j.io.OutputFormat; -import org.dom4j.io.XMLWriter; - -import uk.co.flamingpenguin.jewel.cli.Cli; -import uk.co.flamingpenguin.jewel.cli.CliFactory; -import uk.co.flamingpenguin.jewel.cli.CommandLineInterface; -import uk.co.flamingpenguin.jewel.cli.Option; -import uk.co.flamingpenguin.jewel.cli.Unparsed; - -/** - * FIXME: 'JRST --help' doesn't work, but 'JRST --help toto' work :( FIXME: - * 'JRST -c' doesn't work, but 'JRST -c toto' - * - * Created: 3 nov. 06 20:56:00 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -@CommandLineInterface(application = "JRST") -public class JRST { - - public static enum Overwrite { - NEVER, IFNEWER, ALLTIME - } - - /** to use log facility, just put in your code: log.info("..."); */ - protected static Log log = LogFactory.getLog(JRST.class); - - /** XSL Stylesheet to transform RST into HTML. */ - protected static final String rst2xhtml = "/xsl/rst2xhtml.xsl"; - /** XSL Stylesheet to transform RST into Xdoc. */ - protected static final String rst2xdoc = "/xsl/rst2xdoc.xsl"; - /** XSL Stylesheet to transform RST into Docbook. */ - protected static final String rst2docbook = "/xsl/dn2dbk.xsl"; - - /** XSL Stylesheet to transform Docbook into xHTML. */ - protected static final String docbook2xhtml = "/xhtml/docbook.xsl"; - /** XSL Stylesheet to transform Docbook into javahelp. */ - protected static final String docbook2javahelp = "/javahelp/javahelp.xsl"; - /** XSL Stylesheet to transform Docbook into htmlhelp. */ - protected static final String docbook2htmlhelp = "/htmlhelp/htmlhelp.xsl"; - - /** XSL Stylesheet to transform xml into rst. */ - protected static final String rst2rst = "/xsl/xml2rst.xsl"; - - /** XSL Stylesheet to transform Docbook into ODF. */ - protected static final String docbook2odf = "/xsl/docbook2odf-0.244/docbook.xsl"; - /** XSL Stylesheet to transform Docbook into PDF. */ - protected static final String docbook2fo = "/fo/docbook.xsl"; - - /** HTML output format type */ - public static final String TYPE_HTML = "html"; - - /** XDOC output format type */ - public static final String TYPE_XDOC = "xdoc"; - - /** DOCBOOK output format type */ - public static final String TYPE_DOCBOOK = "docbook"; - - /** XHTML output format type */ - public static final String TYPE_XHTML = "xhtml"; - - /** JAVA HELP output format type */ - public static final String TYPE_JAVAHELP = "javahelp"; - - /** HTML HELP output format type */ - public static final String TYPE_HTMLHELP = "htmlhelp"; - - /** RST output format type */ - public static final String TYPE_RST = "rst"; - - /** ODT output format type */ - public static final String TYPE_ODT = "odt"; - - /** FO output format type */ - public static final String TYPE_FO = "fo"; - - /** PDF output format type */ - public static final String TYPE_PDF = "pdf"; - - /** - * key, Out type; value: chain of XSL file to provide wanted file for output - */ - protected static Map<String, String> stylesheets = null; - - static { - stylesheets = new HashMap<String, String>(); - stylesheets.put(TYPE_HTML, rst2xhtml); - stylesheets.put(TYPE_XDOC, rst2xdoc); - stylesheets.put(TYPE_DOCBOOK, rst2docbook); - stylesheets.put(TYPE_XHTML, rst2docbook + "," + docbook2xhtml); - stylesheets.put(TYPE_JAVAHELP, rst2docbook + "," + docbook2javahelp); - stylesheets.put(TYPE_HTMLHELP, rst2docbook + "," + docbook2htmlhelp); - stylesheets.put(TYPE_RST, rst2rst); - stylesheets.put(TYPE_ODT, rst2docbook + "," + docbook2odf); - stylesheets.put(TYPE_FO, rst2docbook + "," + docbook2fo); - stylesheets.put(TYPE_PDF, rst2docbook + "," + docbook2fo); - } - - /** - * - * @param args - * @throws Exception - */ - public static void main(String[] args) throws Exception { - - I18n.init(); - - if (args.length == 0) { - args = askOption(); - } - if (args == null) { - System.exit(0); - } - - JRSTOption option = CliFactory.parseArguments(JRSTOption.class, args); - - if (option.isHelp()) { - Cli<JRSTOption> cli = CliFactory.createCli(JRSTOption.class); - System.out.println(cli.getHelpMessage()); - return; - } - if (option.isConsole()) { - args = askOptionText(); - } - option = CliFactory.parseArguments(JRSTOption.class, args); - // search xsl file list to apply - String xslList = null; - if (option.isXslFile()) { - xslList = option.getXslFile(); - } else { - xslList = option.getOutType(); - } - - generate(xslList, option.getFile(), option.getOutFile(), option - .isForce() ? Overwrite.ALLTIME : Overwrite.NEVER); - } - - private static String[] askOption() throws SecurityException, - NoSuchMethodException, IOException { - String[] result = null; - try { - GraphicsEnvironment ge = GraphicsEnvironment - .getLocalGraphicsEnvironment(); - GraphicsDevice[] gs = ge.getScreenDevices(); - boolean done = false; - if (!(gs == null)) { - if (gs.length > 0) { - result = askOptionGraph(); - done = true; - } - } - if (!done) { - result = askOptionText(); - } - } catch (java.awt.HeadlessException e) { - result = askOptionText(); - } - - return result; - - } - - /** - * interface graphique - * - * @return - * @throws SecurityException - * @throws NoSuchMethodException - */ - private static String[] askOptionGraph() throws SecurityException, - NoSuchMethodException { - - Method m = JRSTOption.class.getMethod("getOutType"); - Option a = m.getAnnotation(Option.class); - JRSTInterface graph = new JRSTInterface(a.pattern()); - - // String[] result=graph.askOption(); - return graph.getCmd(); - } - - /** - * Interface textuel - * - * @return String[] - * @throws IOException - */ - private static String[] askOptionText() throws IOException { - - System.out.println(_("help?")); - Boolean done = false; - String cheminRST = ""; - while (!done) { - System.out.println(_("rstFile?")); - cheminRST = lireFile(false, false); - if (cheminRST.length() == 0) - System.exit(0); - File fileRST = new File(cheminRST); - if (!fileRST.exists()) { - System.out.println(_("dontExist")); - cheminRST = ""; - } else { - done = true; - } - } - done = false; - String type = ""; - while (!done) { - type = ""; - System.out.println(_("outputFormat?")); - type = lire(); - if (type.matches("xhtml|docbook|xml|html|xdoc|rst|pdf|odt|rtf") - || type.length() == 0) { - done = true; - } - } - String cheminXSL = ""; - if (type.length() == 0) { - done = false; - while (!done) { - System.out.println(_("xslFile?")); - String cheminXSLtmp = lireFile(false, true); - - File fileRST = new File(cheminXSLtmp); - if (cheminXSLtmp.equals("")) { - if (cheminXSL.length() != 0) { - cheminXSL = cheminXSL.substring(0, - cheminXSL.length() - 1); - } - done = true; - } else { - if (!fileRST.exists()) { - System.out.println(_("dontExist")); - } else { - cheminXSL += cheminXSLtmp; - String other = ""; - do { - System.out.println(_("other?")); - other = lire(); - } while (!other.matches("y|n|o")); - if (other.equals("y") || other.equals("o")) { - cheminXSL += ","; - } - else if (other.equals("n")) { - done = true; - } - } - } - - } - if (cheminXSL.length() == 0 - || !type - .matches("xhtml|docbook|xml|html|xdoc|rst|pdf|odt|rtf")) { - type = "xml"; - } - } - boolean ecraser = false; - done = false; - String cheminSortie = ""; - while (!done) { - System.out.println(_("outputFile?")); - cheminSortie = lireFile(true, true); - - File fileRST = new File(cheminSortie); - if (fileRST.exists()) { - String strEcraser = ""; - do { - System.out.println(_("overwrite?")); - strEcraser = lire(); - } while (!strEcraser.matches("y|n|o")); - if (strEcraser.equals("y") || strEcraser.equals("o")) { - done = true; - ecraser = true; - } - } else { - done = true; - } - } - String cmd = ""; - if (ecraser) { - cmd += "--force "; - } - cmd += "-t " + type; - if (cheminXSL.length() > 0) { - cmd += " -x " + cheminXSL; - } - if (cheminSortie.length() > 0) { - cmd += " -o " + cheminSortie; - } - cmd += " " + cheminRST + " "; - return cmd.split(" "); - } - - /** - * lit une ligne - * - * @return String - */ - public static String lire() { - - String ligne_lue = null; - try { - InputStreamReader isr = new InputStreamReader(System.in); - BufferedReader br = new BufferedReader(isr); - ligne_lue = br.readLine(); - } catch (IOException e) { - System.err.println(e); - } - return ligne_lue; - - } - - public static String lireFile(boolean enreg, boolean exit) - throws IOException { - String line = ""; - FileCompletion fc = new FileCompletion(enreg, exit); - if (fc.consoleAvailable()) { - line = fc.read(); - } - if (line == null) { - line = ""; - } - return line; - } - - public static void generate(String xslListOrOutType, File fileIn, - File fileOut, Overwrite overwrite) throws Exception { - generate(xslListOrOutType, fileIn, "UTF-8", fileOut, "UTF-8", overwrite); - } - - /** - * - * @param xslListOrOutType - * @param fileIn - * @param fileOut - * @param overwrite - * @throws Exception - */ - - public static void generate(String xslListOrOutType, File fileIn, - String inputEncoding, File fileOut, String outputEncoding, - Overwrite overwrite) throws Exception { - if (fileOut != null - && fileOut.exists() - && (overwrite == Overwrite.NEVER || (overwrite == Overwrite.IFNEWER && FileUtil - .isNewer(fileIn, fileOut)))) { - // System.err.println("Don't generate file " + fileOut + - // ", because already exists"); - log.info("Don't generate file " + fileOut - + ", because already exists"); - } else { - // search xsl file list to apply - String xslList = stylesheets.get(xslListOrOutType); - if (xslListOrOutType == null) { - xslList = xslListOrOutType; - } - - // parse rst file - URL url = fileIn.toURL(); - Reader in = new InputStreamReader(url.openStream(), inputEncoding); - JRSTReader jrst = new JRSTReader(); - Document doc = jrst.read(in); - - // apply xsl on rst xml document - JRSTGenerator gen = new JRSTGenerator(); - String[] xsls = StringUtil.split(xslList, ","); - for (String xsl : xsls) { - URL stylesheet = null; - File file = new File(xsl); - if (file.exists()) { - stylesheet = file.toURL(); - } else { - //stylesheet = JRST.class.getResource(xsl); - stylesheet = Resource.getURL(xsl); - } - if (stylesheet == null) { - throw new FileNotFoundException("Can't find stylesheet: " - + xsl); - } - - // add uri resolver - /*gen.setUriResolver(new URIResolver() { - public Source resolve(String href, String base) { - System.out.println("RESOLVING: href: "+href+" base: "+base); - - return null; - try { - System.out.println("RESOLVING: href: "+href+" base: "+base); - StreamSource ss = new StreamSource(new FileInputStream(new File(href))); - return ss; - } catch (FileNotFoundException e) { - e.printStackTrace(); - return null; - } - } - });*/ - - doc = gen.transform(doc, stylesheet); - } - - boolean pdf = false; - // generation PDF - if (xslListOrOutType != null) { - if (xslListOrOutType.equals("pdf")) { - pdf = true; - FopFactory fopFactory = FopFactory.newInstance(); - // OutputStream outPDF = new BufferedOutputStream(new - // FileOutputStream(new File("C:/Temp/myfile.pdf"))); - - OutputStream outPDF = null; - if (fileOut != null) { - fileOut.getAbsoluteFile().getParentFile().mkdirs(); - outPDF = new BufferedOutputStream(new FileOutputStream( - fileOut)); - } else { - outPDF = new BufferedOutputStream(System.out); - } - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - // Step 3: Construct fop with desired output format - Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, - userAgent, outPDF); - - // Step 4: Setup JAXP using identity transformer - TransformerFactory factory = TransformerFactory - .newInstance(); - Transformer transformer = factory.newTransformer(); // identity - // transformer - - // Step 5: Setup input and output for XSLT transformation - // Setup input stream - Source src = new StreamSource(new StringReader(doc.asXML())); - - // Resulting SAX events (the generated FO) must be piped - // through to FOP - Result res = new SAXResult(fop.getDefaultHandler()); - - // Step 6: Start XSLT transformation and FOP processing - transformer.transform(src, res); - - if (fileOut != null) { - outPDF.close(); - } - } - } - if (!pdf) { - // prepare the output flux - XMLWriter out = null; - if (fileOut != null) { - fileOut.getAbsoluteFile().getParentFile().mkdirs(); - - out = new XMLWriter(FileUtil.getWriter(fileOut, - outputEncoding), new OutputFormat(" ", true, - outputEncoding)); - } else { - out = new XMLWriter(System.out, new OutputFormat(" ", - true, outputEncoding)); - } - // write generated document - out.write(doc); - - if (fileOut != null) { - out.close(); - } - } - } - } - - /** - * Les options - */ - public static interface JRSTOption { - - @Option(description = "display this help and exit") - boolean isHelp(); - - @Option(description = "overwrite existing out file") - boolean isForce(); - - @Option(shortName = "c", description = "Console mode") - public boolean isConsole(); - - @Option(shortName = "x", description = "XSL file list to apply, comma separated") - public String getXslFile(); - - public boolean isXslFile(); - - @Option(shortName = "t", pattern = "xml|xhtml|docbook|html|xdoc|rst|fo|pdf", // TODO - // odt|rtf", - description = "Output type") - public String getOutType(); - - public boolean isOutType(); - - @Option(shortName = "o", description = "Output file") - public File getOutFile(); - - public boolean isOutFile(); - - @Unparsed(name = "FILE") - public File getFile(); - } - -} Copied: jrst/trunk/src/main/java/org/nuiton/jrst/JRST.java (from rev 333, jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java) =================================================================== --- jrst/trunk/src/main/java/org/nuiton/jrst/JRST.java (rev 0) +++ jrst/trunk/src/main/java/org/nuiton/jrst/JRST.java 2009-05-16 05:33:16 UTC (rev 334) @@ -0,0 +1,565 @@ +/* *##% JRst + * Copyright (C) 2004 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + +package org.nuiton.jrst; + +import static org.nuiton.i18n.I18n._; + +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.Reader; +import java.io.StringReader; +import java.lang.reflect.Method; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.sax.SAXResult; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.apps.Fop; +import org.apache.fop.apps.FopFactory; +import org.apache.fop.apps.MimeConstants; +import org.nuiton.i18n.I18n; +import org.nuiton.util.FileCompletion; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; +import org.nuiton.util.StringUtil; +import org.dom4j.Document; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.XMLWriter; + +import uk.co.flamingpenguin.jewel.cli.Cli; +import uk.co.flamingpenguin.jewel.cli.CliFactory; +import uk.co.flamingpenguin.jewel.cli.CommandLineInterface; +import uk.co.flamingpenguin.jewel.cli.Option; +import uk.co.flamingpenguin.jewel.cli.Unparsed; + +/** + * FIXME: 'JRST --help' doesn't work, but 'JRST --help toto' work :( FIXME: + * 'JRST -c' doesn't work, but 'JRST -c toto' + * + * Created: 3 nov. 06 20:56:00 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +@CommandLineInterface(application = "JRST") +public class JRST { + + public static enum Overwrite { + NEVER, IFNEWER, ALLTIME + } + + /** to use log facility, just put in your code: log.info("..."); */ + protected static Log log = LogFactory.getLog(JRST.class); + + /** XSL Stylesheet to transform RST into HTML. */ + protected static final String rst2xhtml = "/xsl/rst2xhtml.xsl"; + /** XSL Stylesheet to transform RST into Xdoc. */ + protected static final String rst2xdoc = "/xsl/rst2xdoc.xsl"; + /** XSL Stylesheet to transform RST into Docbook. */ + protected static final String rst2docbook = "/xsl/dn2dbk.xsl"; + + /** XSL Stylesheet to transform Docbook into xHTML. */ + protected static final String docbook2xhtml = "/xhtml/docbook.xsl"; + /** XSL Stylesheet to transform Docbook into javahelp. */ + protected static final String docbook2javahelp = "/javahelp/javahelp.xsl"; + /** XSL Stylesheet to transform Docbook into htmlhelp. */ + protected static final String docbook2htmlhelp = "/htmlhelp/htmlhelp.xsl"; + + /** XSL Stylesheet to transform xml into rst. */ + protected static final String rst2rst = "/xsl/xml2rst.xsl"; + + /** XSL Stylesheet to transform Docbook into ODF. */ + protected static final String docbook2odf = "/xsl/docbook2odf-0.244/docbook.xsl"; + /** XSL Stylesheet to transform Docbook into PDF. */ + protected static final String docbook2fo = "/fo/docbook.xsl"; + + /** HTML output format type */ + public static final String TYPE_HTML = "html"; + + /** XDOC output format type */ + public static final String TYPE_XDOC = "xdoc"; + + /** DOCBOOK output format type */ + public static final String TYPE_DOCBOOK = "docbook"; + + /** XHTML output format type */ + public static final String TYPE_XHTML = "xhtml"; + + /** JAVA HELP output format type */ + public static final String TYPE_JAVAHELP = "javahelp"; + + /** HTML HELP output format type */ + public static final String TYPE_HTMLHELP = "htmlhelp"; + + /** RST output format type */ + public static final String TYPE_RST = "rst"; + + /** ODT output format type */ + public static final String TYPE_ODT = "odt"; + + /** FO output format type */ + public static final String TYPE_FO = "fo"; + + /** PDF output format type */ + public static final String TYPE_PDF = "pdf"; + + /** + * key, Out type; value: chain of XSL file to provide wanted file for output + */ + protected static Map<String, String> stylesheets = null; + + static { + stylesheets = new HashMap<String, String>(); + stylesheets.put(TYPE_HTML, rst2xhtml); + stylesheets.put(TYPE_XDOC, rst2xdoc); + stylesheets.put(TYPE_DOCBOOK, rst2docbook); + stylesheets.put(TYPE_XHTML, rst2docbook + "," + docbook2xhtml); + stylesheets.put(TYPE_JAVAHELP, rst2docbook + "," + docbook2javahelp); + stylesheets.put(TYPE_HTMLHELP, rst2docbook + "," + docbook2htmlhelp); + stylesheets.put(TYPE_RST, rst2rst); + stylesheets.put(TYPE_ODT, rst2docbook + "," + docbook2odf); + stylesheets.put(TYPE_FO, rst2docbook + "," + docbook2fo); + stylesheets.put(TYPE_PDF, rst2docbook + "," + docbook2fo); + } + + /** + * + * @param args + * @throws Exception + */ + public static void main(String[] args) throws Exception { + + I18n.init(); + + if (args.length == 0) { + args = askOption(); + } + if (args == null) { + System.exit(0); + } + + JRSTOption option = CliFactory.parseArguments(JRSTOption.class, args); + + if (option.isHelp()) { + Cli<JRSTOption> cli = CliFactory.createCli(JRSTOption.class); + System.out.println(cli.getHelpMessage()); + return; + } + if (option.isConsole()) { + args = askOptionText(); + } + option = CliFactory.parseArguments(JRSTOption.class, args); + // search xsl file list to apply + String xslList = null; + if (option.isXslFile()) { + xslList = option.getXslFile(); + } else { + xslList = option.getOutType(); + } + + generate(xslList, option.getFile(), option.getOutFile(), option + .isForce() ? Overwrite.ALLTIME : Overwrite.NEVER); + } + + private static String[] askOption() throws SecurityException, + NoSuchMethodException, IOException { + String[] result = null; + try { + GraphicsEnvironment ge = GraphicsEnvironment + .getLocalGraphicsEnvironment(); + GraphicsDevice[] gs = ge.getScreenDevices(); + boolean done = false; + if (!(gs == null)) { + if (gs.length > 0) { + result = askOptionGraph(); + done = true; + } + } + if (!done) { + result = askOptionText(); + } + } catch (java.awt.HeadlessException e) { + result = askOptionText(); + } + + return result; + + } + + /** + * interface graphique + * + * @return + * @throws SecurityException + * @throws NoSuchMethodException + */ + private static String[] askOptionGraph() throws SecurityException, + NoSuchMethodException { + + Method m = JRSTOption.class.getMethod("getOutType"); + Option a = m.getAnnotation(Option.class); + JRSTInterface graph = new JRSTInterface(a.pattern()); + + // String[] result=graph.askOption(); + return graph.getCmd(); + } + + /** + * Interface textuel + * + * @return String[] + * @throws IOException + */ + private static String[] askOptionText() throws IOException { + + System.out.println(_("help?")); + Boolean done = false; + String cheminRST = ""; + while (!done) { + System.out.println(_("rstFile?")); + cheminRST = lireFile(false, false); + if (cheminRST.length() == 0) + System.exit(0); + File fileRST = new File(cheminRST); + if (!fileRST.exists()) { + System.out.println(_("dontExist")); + cheminRST = ""; + } else { + done = true; + } + } + done = false; + String type = ""; + while (!done) { + type = ""; + System.out.println(_("outputFormat?")); + type = lire(); + if (type.matches("xhtml|docbook|xml|html|xdoc|rst|pdf|odt|rtf") + || type.length() == 0) { + done = true; + } + } + String cheminXSL = ""; + if (type.length() == 0) { + done = false; + while (!done) { + System.out.println(_("xslFile?")); + String cheminXSLtmp = lireFile(false, true); + + File fileRST = new File(cheminXSLtmp); + if (cheminXSLtmp.equals("")) { + if (cheminXSL.length() != 0) { + cheminXSL = cheminXSL.substring(0, + cheminXSL.length() - 1); + } + done = true; + } else { + if (!fileRST.exists()) { + System.out.println(_("dontExist")); + } else { + cheminXSL += cheminXSLtmp; + String other = ""; + do { + System.out.println(_("other?")); + other = lire(); + } while (!other.matches("y|n|o")); + if (other.equals("y") || other.equals("o")) { + cheminXSL += ","; + } + else if (other.equals("n")) { + done = true; + } + } + } + + } + if (cheminXSL.length() == 0 + || !type + .matches("xhtml|docbook|xml|html|xdoc|rst|pdf|odt|rtf")) { + type = "xml"; + } + } + boolean ecraser = false; + done = false; + String cheminSortie = ""; + while (!done) { + System.out.println(_("outputFile?")); + cheminSortie = lireFile(true, true); + + File fileRST = new File(cheminSortie); + if (fileRST.exists()) { + String strEcraser = ""; + do { + System.out.println(_("overwrite?")); + strEcraser = lire(); + } while (!strEcraser.matches("y|n|o")); + if (strEcraser.equals("y") || strEcraser.equals("o")) { + done = true; + ecraser = true; + } + } else { + done = true; + } + } + String cmd = ""; + if (ecraser) { + cmd += "--force "; + } + cmd += "-t " + type; + if (cheminXSL.length() > 0) { + cmd += " -x " + cheminXSL; + } + if (cheminSortie.length() > 0) { + cmd += " -o " + cheminSortie; + } + cmd += " " + cheminRST + " "; + return cmd.split(" "); + } + + /** + * lit une ligne + * + * @return String + */ + public static String lire() { + + String ligne_lue = null; + try { + InputStreamReader isr = new InputStreamReader(System.in); + BufferedReader br = new BufferedReader(isr); + ligne_lue = br.readLine(); + } catch (IOException e) { + System.err.println(e); + } + return ligne_lue; + + } + + public static String lireFile(boolean enreg, boolean exit) + throws IOException { + String line = ""; + FileCompletion fc = new FileCompletion(enreg, exit); + if (fc.consoleAvailable()) { + line = fc.read(); + } + if (line == null) { + line = ""; + } + return line; + } + + public static void generate(String xslListOrOutType, File fileIn, + File fileOut, Overwrite overwrite) throws Exception { + generate(xslListOrOutType, fileIn, "UTF-8", fileOut, "UTF-8", overwrite); + } + + /** + * + * @param xslListOrOutType + * @param fileIn + * @param fileOut + * @param overwrite + * @throws Exception + */ + + public static void generate(String xslListOrOutType, File fileIn, + String inputEncoding, File fileOut, String outputEncoding, + Overwrite overwrite) throws Exception { + if (fileOut != null + && fileOut.exists() + && (overwrite == Overwrite.NEVER || (overwrite == Overwrite.IFNEWER && FileUtil + .isNewer(fileIn, fileOut)))) { + // System.err.println("Don't generate file " + fileOut + + // ", because already exists"); + log.info("Don't generate file " + fileOut + + ", because already exists"); + } else { + // search xsl file list to apply + String xslList = stylesheets.get(xslListOrOutType); + if (xslListOrOutType == null) { + xslList = xslListOrOutType; + } + + // parse rst file + URL url = fileIn.toURL(); + Reader in = new InputStreamReader(url.openStream(), inputEncoding); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + + // apply xsl on rst xml document + JRSTGenerator gen = new JRSTGenerator(); + String[] xsls = StringUtil.split(xslList, ","); + for (String xsl : xsls) { + URL stylesheet = null; + File file = new File(xsl); + if (file.exists()) { + stylesheet = file.toURL(); + } else { + //stylesheet = JRST.class.getResource(xsl); + stylesheet = Resource.getURL(xsl); + } + if (stylesheet == null) { + throw new FileNotFoundException("Can't find stylesheet: " + + xsl); + } + + // add uri resolver + /*gen.setUriResolver(new URIResolver() { + public Source resolve(String href, String base) { + System.out.println("RESOLVING: href: "+href+" base: "+base); + + return null; + try { + System.out.println("RESOLVING: href: "+href+" base: "+base); + StreamSource ss = new StreamSource(new FileInputStream(new File(href))); + return ss; + } catch (FileNotFoundException e) { + e.printStackTrace(); + return null; + } + } + });*/ + + doc = gen.transform(doc, stylesheet); + } + + boolean pdf = false; + // generation PDF + if (xslListOrOutType != null) { + if (xslListOrOutType.equals("pdf")) { + pdf = true; + FopFactory fopFactory = FopFactory.newInstance(); + // OutputStream outPDF = new BufferedOutputStream(new + // FileOutputStream(new File("C:/Temp/myfile.pdf"))); + + OutputStream outPDF = null; + if (fileOut != null) { + fileOut.getAbsoluteFile().getParentFile().mkdirs(); + outPDF = new BufferedOutputStream(new FileOutputStream( + fileOut)); + } else { + outPDF = new BufferedOutputStream(System.out); + } + + FOUserAgent userAgent = fopFactory.newFOUserAgent(); + + // Step 3: Construct fop with desired output format + Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, + userAgent, outPDF); + + // Step 4: Setup JAXP using identity transformer + TransformerFactory factory = TransformerFactory + .newInstance(); + Transformer transformer = factory.newTransformer(); // identity + // transformer + + // Step 5: Setup input and output for XSLT transformation + // Setup input stream + Source src = new StreamSource(new StringReader(doc.asXML())); + + // Resulting SAX events (the generated FO) must be piped + // through to FOP + Result res = new SAXResult(fop.getDefaultHandler()); + + // Step 6: Start XSLT transformation and FOP processing + transformer.transform(src, res); + + if (fileOut != null) { + outPDF.close(); + } + } + } + if (!pdf) { + // prepare the output flux + XMLWriter out = null; + if (fileOut != null) { + fileOut.getAbsoluteFile().getParentFile().mkdirs(); + + out = new XMLWriter(FileUtil.getWriter(fileOut, + outputEncoding), new OutputFormat(" ", true, + outputEncoding)); + } else { + out = new XMLWriter(System.out, new OutputFormat(" ", + true, outputEncoding)); + } + // write generated document + out.write(doc); + + if (fileOut != null) { + out.close(); + } + } + } + } + + /** + * Les options + */ + public static interface JRSTOption { + + @Option(description = "display this help and exit") + boolean isHelp(); + + @Option(description = "overwrite existing out file") + boolean isForce(); + + @Option(shortName = "c", description = "Console mode") + public boolean isConsole(); + + @Option(shortName = "x", description = "XSL file list to apply, comma separated") + public String getXslFile(); + + public boolean isXslFile(); + + @Option(shortName = "t", pattern = "xml|xhtml|docbook|html|xdoc|rst|fo|pdf", // TODO + // odt|rtf", + description = "Output type") + public String getOutType(); + + public boolean isOutType(); + + @Option(shortName = "o", description = "Output file") + public File getOutFile(); + + public boolean isOutFile(); + + @Unparsed(name = "FILE") + public File getFile(); + } + +} Modified: jrst/trunk/src/main/java/org/nuiton/jrst/JRSTDirective.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTDirective.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/JRSTDirective.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import org.dom4j.Element; import org.dom4j.Node; Modified: jrst/trunk/src/main/java/org/nuiton/jrst/JRSTGenerator.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTGenerator.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,11 +15,11 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.codelutin.jrst.ReStructuredText.*; +import static org.nuiton.jrst.ReStructuredText.*; import org.dom4j.Document; import org.dom4j.Element; import org.dom4j.Node; Deleted: jrst/trunk/src/main/java/org/nuiton/jrst/JRSTInterface.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/JRSTInterface.java 2009-05-16 05:33:16 UTC (rev 334) @@ -1,564 +0,0 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 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 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* - */ -package org.codelutin.jrst; - -import static org.codelutin.i18n.I18n._; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.util.LinkedList; - -import javax.swing.BoxLayout; -import javax.swing.ButtonGroup; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JDialog; -import javax.swing.JFileChooser; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.JTextField; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -import org.codelutin.util.Resource; - -/** - * JRST main interface. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class JRSTInterface extends JDialog { - - /** serialVersionUID */ - private static final long serialVersionUID = 5327326730753891936L; - - private JPanel savePanel = null; - - private JPanel formatPanel = null; - - private JPanel openPanel = null; - - private JPanel formatLigne = null; - - private JPanel xslLigne = null; - - private JComboBox formatList = null; - - private JButton boutonAnnuler = null; - - private JButton boutonConvertir = null; - - private JPanel panelPrincipal = null; - - private JPanel boutonPanel = null; - - private JButton boutonSaveLocation = null; - - private JLabel errorLbl = null; - - private JButton boutonOpenLocation = null; - - private JButton boutonXslLocation = null; - - private String[] listFormats = null; - - private JTextField saveText = null; - - private JTextField openText = null; - - private JTextField xslText = null; - - private JRadioButton format = null; - - private JRadioButton xslRadio = null; - - private LinkedList<JPanel> ListAddXslPanel = null; - - private LinkedList<JTextField> ListXslText = null; - - private LinkedList<JButton> ListXslBouton = null; - - private LinkedList<JButton> ListXslBoutonLocation = null; - private boolean ecrase = false; - private String[] commande = null; - - private ImageIcon open = Resource.getIcon("icone/open.png"); - private ImageIcon delete = Resource.getIcon("icone/cancel.png"); - private ImageIcon more = Resource.getIcon("icone/more.gif"); - - private LinkedList<Container> composantsXSL = null; - - /** - * le parametre initialise les options disponibles - * - * @param o - */ - public JRSTInterface(String o) { - - this.setFormats(o); - this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - this.setTitle("JRST"); - this.setLayout(new BorderLayout()); - this.add(getPanelPrincipal(), BorderLayout.CENTER); - Dimension dim = Toolkit.getDefaultToolkit().getScreenSize(); - this.setModal(true); // pour que JRST attende que cette fenetre soit - // ferme - this.pack(); - this.setResizable(false); - this.setLocation(dim.width / 2 - this.getWidth() / 2, dim.height / 2 - - this.getHeight() / 2); // Centrer - this.setVisible(true); - } - - private JPanel getPanelPrincipal() { - if (panelPrincipal == null) { - - panelPrincipal = new JPanel(); - panelPrincipal.setLayout(new BoxLayout(panelPrincipal, - BoxLayout.Y_AXIS)); - panelPrincipal.add(getErrorLabel()); - panelPrincipal.add(getOuvrirPanel()); - panelPrincipal.add(getSavePanel()); - panelPrincipal.add(getFormatPanel()); - // panelPrincipal.add(getConvertPanel()); - panelPrincipal.add(getBoutonPanel()); - - } - return panelPrincipal; - } - - private JLabel getErrorLabel() { - if (errorLbl == null) { - errorLbl = new JLabel(""); - } - return errorLbl; - } - - private JPanel getBoutonPanel() { - - if (boutonPanel == null) { - boutonPanel = new JPanel(); - boutonPanel.setLayout(new FlowLayout()); - boutonPanel.add(getBoutonAnnuler()); - boutonPanel.add(getBoutonConvertir()); - - } - return boutonPanel; - } - - private JButton getBoutonConvertir() { - if (boutonConvertir == null) { - boutonConvertir = new JButton(); - boutonConvertir.setText(_("btnConvert")); - boutonConvertir.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - convert(); - } - }); - } - return boutonConvertir; - } - - private JButton getBoutonAnnuler() { - if (boutonAnnuler == null) { - boutonAnnuler = new JButton(); - boutonAnnuler.setText(_("btnCancel")); - boutonAnnuler.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - annuler(); - } - }); - } - return boutonAnnuler; - } - - private JPanel getFormatPanel() { - if (formatPanel == null) { - composantsXSL = new LinkedList<Container>(); - ListAddXslPanel = new LinkedList<JPanel>(); - ListXslBouton = new LinkedList<JButton>(); - ListXslText = new LinkedList<JTextField>(); - ListXslBoutonLocation = new LinkedList<JButton>(); - formatPanel = new JPanel(); - formatPanel.setLayout(new BoxLayout(formatPanel, BoxLayout.Y_AXIS)); - ButtonGroup group = new ButtonGroup(); - group.add(getFormat()); - group.add(getXslRadio()); - formatPanel.add(getFormatLigne()); - formatPanel.add(getXslPanel()); - for (JPanel p : getListAddXslPanel()) - formatPanel.add(p); - // formatPanel.add(getAddXslPanel()); - } - return formatPanel; - } - - private LinkedList<JPanel> getListAddXslPanel() { - if (ListAddXslPanel.size() == 0) { - - ListAddXslPanel.add(ajoutXSL()); - getFormatList().setEnabled(getFormat().isSelected()); - for (Container c : composantsXSL) - c.setEnabled(!getFormat().isSelected()); - } - return ListAddXslPanel; - } - - private JPanel ajoutXSL() { - JButton b = new JButton(more); - b.setPreferredSize(new Dimension(20, 20)); - - b.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - JButton b = (JButton) e.getSource(); - if (b.getIcon() == more) - - ajout(); - else - supprimerXslLigne((JButton) e.getSource()); - } - }); - - composantsXSL.add(b); - ListXslBouton.add(b); - JTextField t = new JTextField(); - t.setColumns(40); - t.setVisible(false); - composantsXSL.add(t); - ListXslText.add(t); - JButton b2 = new JButton(open); - b2.setPreferredSize(new Dimension(30, 30)); - b2.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - openXslLocation((JButton) e.getSource()); - - } - - }); - - b2.setVisible(false); - composantsXSL.add(b2); - ListXslBoutonLocation.add(b2); - JPanel p = new JPanel(); - p.setLayout(new FlowLayout(FlowLayout.LEFT)); - p.add(b); - p.add(t); - p.add(b2); - return p; - } - - private void supprimerXslLigne(JButton button) { - boolean done = false; - for (int i = 0; i < ListXslBouton.size() && !done; i++) { - if (ListXslBouton.get(i) == button) { - done = true; - ListAddXslPanel.get(i).setVisible(false); - ListXslBouton.remove(i); - ListAddXslPanel.remove(i); - ListXslBoutonLocation.remove(i); - ListXslText.remove(i); - this.pack(); - - } - } - - } - - private void ajout() { - ListXslBoutonLocation.getLast().setVisible(true); - ListXslText.getLast().setVisible(true); - ListXslBouton.getLast().setIcon(delete); - ListAddXslPanel.add(ajoutXSL()); - formatPanel.add(ListAddXslPanel.getLast()); - this.pack(); - - } - - private JPanel getFormatLigne() { - if (formatLigne == null) { - formatLigne = new JPanel(); - formatLigne.setLayout(new FlowLayout(FlowLayout.LEADING)); - formatLigne.add(getFormat()); - formatLigne.add(getFormatList()); - - } - return formatLigne; - } - - private JPanel getXslPanel() { - if (xslLigne == null) { - xslLigne = new JPanel(); - xslLigne.setLayout(new FlowLayout(FlowLayout.TRAILING)); - xslLigne.add(getXslRadio()); - xslLigne.add(getXslText()); - xslLigne.add(getBoutonXslLocation()); - - } - return xslLigne; - } - - private JButton getBoutonXslLocation() { - if (boutonXslLocation == null) { - boutonXslLocation = new JButton(open); - boutonXslLocation.setPreferredSize(new Dimension(30, 30)); - boutonXslLocation.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - openXslLocation((JButton) e.getSource()); - } - - }); - boutonXslLocation.setEnabled(false); - ListXslBoutonLocation.add(boutonXslLocation); - composantsXSL.add(boutonXslLocation); - } - return boutonXslLocation; - } - - private void openXslLocation(JButton b) { - JFileChooser fc = new JFileChooser(System.getProperty("user.home")); - fc.showOpenDialog(this); - File file = fc.getSelectedFile(); - if (file != null) { - int i = 0; - for (JButton btmp : ListXslBoutonLocation) { - if (btmp == b) { - ListXslText.get(i).setText(file.getAbsolutePath()); - } - - i++; - } - } - } - - private JTextField getXslText() { - if (xslText == null) { - xslText = new JTextField(); - xslText.setColumns(30); - xslText.setEnabled(false); - composantsXSL.add(xslText); - ListXslText.add(xslText); - } - return xslText; - } - - private JRadioButton getFormat() { - if (format == null) { - format = new JRadioButton("Format : "); - format.setSelected(true); - format.addChangeListener(new ChangeListener() { - - public void stateChanged(ChangeEvent e) { - formatEnable(); - - } - - }); - } - return format; - } - - private JRadioButton getXslRadio() { - if (xslRadio == null) { - xslRadio = new JRadioButton(_("externalXSL")); - } - return xslRadio; - } - - private void formatEnable() { - getFormatList().setEnabled(getFormat().isSelected()); - for (Container c : composantsXSL) - c.setEnabled(!getFormat().isSelected()); - } - - private JComboBox getFormatList() { - if (formatList == null) { - formatList = new JComboBox(listFormats); - } - return formatList; - } - - private JPanel getSavePanel() { - if (savePanel == null) { - savePanel = new JPanel(); - savePanel.setLayout(new FlowLayout()); - savePanel.add(new JLabel(_("saveAs"))); - savePanel.add(getSaveText()); - savePanel.add(getBoutonSaveLocation()); - } - return savePanel; - } - - private JButton getBoutonSaveLocation() { - if (boutonSaveLocation == null) { - boutonSaveLocation = new JButton(open); - boutonSaveLocation.setPreferredSize(new Dimension(30, 30)); - boutonSaveLocation.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - openSaveLocation(); - } - - }); - } - return boutonSaveLocation; - } - - private JPanel getOuvrirPanel() { - if (openPanel == null) { - openPanel = new JPanel(); - openPanel.setLayout(new FlowLayout()); - openPanel.add(new JLabel(_("open"))); - openPanel.add(getOpenText()); - openPanel.add(getBoutonOpenLocation()); - } - return openPanel; - } - - private JTextField getSaveText() { - if (saveText == null) { - saveText = new JTextField(); - saveText.setColumns(31); - } - return saveText; - } - - private JTextField getOpenText() { - if (openText == null) { - openText = new JTextField(); - openText.setColumns(31); - } - return openText; - } - - private JButton getBoutonOpenLocation() { - if (boutonOpenLocation == null) { - boutonOpenLocation = new JButton(open); - boutonOpenLocation.setPreferredSize(new Dimension(30, 30)); - boutonOpenLocation.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - openOpenLocation(); - } - - }); - } - return boutonOpenLocation; - } - - private void openOpenLocation() { - JFileChooser fc = new JFileChooser(System.getProperty("user.home")); - fc.showOpenDialog(this); - File file = fc.getSelectedFile(); - if (file != null) { - getOpenText().setText(file.getAbsolutePath()); - } - - } - - private void openSaveLocation() { - JFileChooser fc = new JFileChooser(System.getProperty("user.home")); - fc.showSaveDialog(this); - File file = fc.getSelectedFile(); - if (file != null) { - if (file.exists()) { - int choix = askEcraser(); - if (choix == JOptionPane.YES_OPTION) { - ecrase = true; - getSaveText().setText(file.getAbsolutePath()); - } else if (choix == JOptionPane.NO_OPTION) - openSaveLocation(); - } else - getSaveText().setText(file.getAbsolutePath()); - } - - } - - public int askEcraser() { - int choix = JOptionPane.showConfirmDialog(this, _("overwriteGraph?")); - - return choix; - } - - public void setFormats(String formats) { - listFormats = formats.split("\\|"); - } - - private void annuler() { - System.exit(0); - } - - private void convert() { - boolean exit = false; - if (getOpenText().getText().equals("")) { - getErrorLabel().setText(_("openEmpty?")); - getErrorLabel().setForeground(Color.RED); - this.pack(); - } else { - if (!ecrase) { - File file = new File(getSaveText().getText()); - if (file != null) { - if (file.exists()) { - int choix = askEcraser(); - if (choix == JOptionPane.YES_OPTION) - ecrase = true; - else if (choix == JOptionPane.NO_OPTION) - exit = true; - } - } - } - if (!exit) { - String cmd = ""; - if (ecrase) - cmd += "--force "; - if (getFormat().isSelected()) - cmd += "-t " + getFormatList().getSelectedItem(); - else { - cmd += "-x "; - for (JTextField t : ListXslText) { - if (!t.getText().equals("")) - cmd += t.getText() + ","; - } - cmd = cmd.substring(0, cmd.length() - 1); - } - if (getSaveText().getText().length() > 0) - cmd += " -o " + getSaveText().getText(); - cmd += " " + getOpenText().getText() + " "; - commande = cmd.trim().split(" "); - this.dispose(); - } - } - } - - public String[] getCmd() { - return commande; - } - -} Copied: jrst/trunk/src/main/java/org/nuiton/jrst/JRSTInterface.java (from rev 333, jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java) =================================================================== --- jrst/trunk/src/main/java/org/nuiton/jrst/JRSTInterface.java (rev 0) +++ jrst/trunk/src/main/java/org/nuiton/jrst/JRSTInterface.java 2009-05-16 05:33:16 UTC (rev 334) @@ -0,0 +1,564 @@ +/* *##% JRst + * Copyright (C) 2004 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + */ +package org.nuiton.jrst; + +import static org.nuiton.i18n.I18n._; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.util.LinkedList; + +import javax.swing.BoxLayout; +import javax.swing.ButtonGroup; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JTextField; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import org.nuiton.util.Resource; + +/** + * JRST main interface. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class JRSTInterface extends JDialog { + + /** serialVersionUID */ + private static final long serialVersionUID = 5327326730753891936L; + + private JPanel savePanel = null; + + private JPanel formatPanel = null; + + private JPanel openPanel = null; + + private JPanel formatLigne = null; + + private JPanel xslLigne = null; + + private JComboBox formatList = null; + + private JButton boutonAnnuler = null; + + private JButton boutonConvertir = null; + + private JPanel panelPrincipal = null; + + private JPanel boutonPanel = null; + + private JButton boutonSaveLocation = null; + + private JLabel errorLbl = null; + + private JButton boutonOpenLocation = null; + + private JButton boutonXslLocation = null; + + private String[] listFormats = null; + + private JTextField saveText = null; + + private JTextField openText = null; + + private JTextField xslText = null; + + private JRadioButton format = null; + + private JRadioButton xslRadio = null; + + private LinkedList<JPanel> ListAddXslPanel = null; + + private LinkedList<JTextField> ListXslText = null; + + private LinkedList<JButton> ListXslBouton = null; + + private LinkedList<JButton> ListXslBoutonLocation = null; + private boolean ecrase = false; + private String[] commande = null; + + private ImageIcon open = Resource.getIcon("icone/open.png"); + private ImageIcon delete = Resource.getIcon("icone/cancel.png"); + private ImageIcon more = Resource.getIcon("icone/more.gif"); + + private LinkedList<Container> composantsXSL = null; + + /** + * le parametre initialise les options disponibles + * + * @param o + */ + public JRSTInterface(String o) { + + this.setFormats(o); + this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + this.setTitle("JRST"); + this.setLayout(new BorderLayout()); + this.add(getPanelPrincipal(), BorderLayout.CENTER); + Dimension dim = Toolkit.getDefaultToolkit().getScreenSize(); + this.setModal(true); // pour que JRST attende que cette fenetre soit + // ferme + this.pack(); + this.setResizable(false); + this.setLocation(dim.width / 2 - this.getWidth() / 2, dim.height / 2 + - this.getHeight() / 2); // Centrer + this.setVisible(true); + } + + private JPanel getPanelPrincipal() { + if (panelPrincipal == null) { + + panelPrincipal = new JPanel(); + panelPrincipal.setLayout(new BoxLayout(panelPrincipal, + BoxLayout.Y_AXIS)); + panelPrincipal.add(getErrorLabel()); + panelPrincipal.add(getOuvrirPanel()); + panelPrincipal.add(getSavePanel()); + panelPrincipal.add(getFormatPanel()); + // panelPrincipal.add(getConvertPanel()); + panelPrincipal.add(getBoutonPanel()); + + } + return panelPrincipal; + } + + private JLabel getErrorLabel() { + if (errorLbl == null) { + errorLbl = new JLabel(""); + } + return errorLbl; + } + + private JPanel getBoutonPanel() { + + if (boutonPanel == null) { + boutonPanel = new JPanel(); + boutonPanel.setLayout(new FlowLayout()); + boutonPanel.add(getBoutonAnnuler()); + boutonPanel.add(getBoutonConvertir()); + + } + return boutonPanel; + } + + private JButton getBoutonConvertir() { + if (boutonConvertir == null) { + boutonConvertir = new JButton(); + boutonConvertir.setText(_("btnConvert")); + boutonConvertir.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + convert(); + } + }); + } + return boutonConvertir; + } + + private JButton getBoutonAnnuler() { + if (boutonAnnuler == null) { + boutonAnnuler = new JButton(); + boutonAnnuler.setText(_("btnCancel")); + boutonAnnuler.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + annuler(); + } + }); + } + return boutonAnnuler; + } + + private JPanel getFormatPanel() { + if (formatPanel == null) { + composantsXSL = new LinkedList<Container>(); + ListAddXslPanel = new LinkedList<JPanel>(); + ListXslBouton = new LinkedList<JButton>(); + ListXslText = new LinkedList<JTextField>(); + ListXslBoutonLocation = new LinkedList<JButton>(); + formatPanel = new JPanel(); + formatPanel.setLayout(new BoxLayout(formatPanel, BoxLayout.Y_AXIS)); + ButtonGroup group = new ButtonGroup(); + group.add(getFormat()); + group.add(getXslRadio()); + formatPanel.add(getFormatLigne()); + formatPanel.add(getXslPanel()); + for (JPanel p : getListAddXslPanel()) + formatPanel.add(p); + // formatPanel.add(getAddXslPanel()); + } + return formatPanel; + } + + private LinkedList<JPanel> getListAddXslPanel() { + if (ListAddXslPanel.size() == 0) { + + ListAddXslPanel.add(ajoutXSL()); + getFormatList().setEnabled(getFormat().isSelected()); + for (Container c : composantsXSL) + c.setEnabled(!getFormat().isSelected()); + } + return ListAddXslPanel; + } + + private JPanel ajoutXSL() { + JButton b = new JButton(more); + b.setPreferredSize(new Dimension(20, 20)); + + b.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + JButton b = (JButton) e.getSource(); + if (b.getIcon() == more) + + ajout(); + else + supprimerXslLigne((JButton) e.getSource()); + } + }); + + composantsXSL.add(b); + ListXslBouton.add(b); + JTextField t = new JTextField(); + t.setColumns(40); + t.setVisible(false); + composantsXSL.add(t); + ListXslText.add(t); + JButton b2 = new JButton(open); + b2.setPreferredSize(new Dimension(30, 30)); + b2.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + openXslLocation((JButton) e.getSource()); + + } + + }); + + b2.setVisible(false); + composantsXSL.add(b2); + ListXslBoutonLocation.add(b2); + JPanel p = new JPanel(); + p.setLayout(new FlowLayout(FlowLayout.LEFT)); + p.add(b); + p.add(t); + p.add(b2); + return p; + } + + private void supprimerXslLigne(JButton button) { + boolean done = false; + for (int i = 0; i < ListXslBouton.size() && !done; i++) { + if (ListXslBouton.get(i) == button) { + done = true; + ListAddXslPanel.get(i).setVisible(false); + ListXslBouton.remove(i); + ListAddXslPanel.remove(i); + ListXslBoutonLocation.remove(i); + ListXslText.remove(i); + this.pack(); + + } + } + + } + + private void ajout() { + ListXslBoutonLocation.getLast().setVisible(true); + ListXslText.getLast().setVisible(true); + ListXslBouton.getLast().setIcon(delete); + ListAddXslPanel.add(ajoutXSL()); + formatPanel.add(ListAddXslPanel.getLast()); + this.pack(); + + } + + private JPanel getFormatLigne() { + if (formatLigne == null) { + formatLigne = new JPanel(); + formatLigne.setLayout(new FlowLayout(FlowLayout.LEADING)); + formatLigne.add(getFormat()); + formatLigne.add(getFormatList()); + + } + return formatLigne; + } + + private JPanel getXslPanel() { + if (xslLigne == null) { + xslLigne = new JPanel(); + xslLigne.setLayout(new FlowLayout(FlowLayout.TRAILING)); + xslLigne.add(getXslRadio()); + xslLigne.add(getXslText()); + xslLigne.add(getBoutonXslLocation()); + + } + return xslLigne; + } + + private JButton getBoutonXslLocation() { + if (boutonXslLocation == null) { + boutonXslLocation = new JButton(open); + boutonXslLocation.setPreferredSize(new Dimension(30, 30)); + boutonXslLocation.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + openXslLocation((JButton) e.getSource()); + } + + }); + boutonXslLocation.setEnabled(false); + ListXslBoutonLocation.add(boutonXslLocation); + composantsXSL.add(boutonXslLocation); + } + return boutonXslLocation; + } + + private void openXslLocation(JButton b) { + JFileChooser fc = new JFileChooser(System.getProperty("user.home")); + fc.showOpenDialog(this); + File file = fc.getSelectedFile(); + if (file != null) { + int i = 0; + for (JButton btmp : ListXslBoutonLocation) { + if (btmp == b) { + ListXslText.get(i).setText(file.getAbsolutePath()); + } + + i++; + } + } + } + + private JTextField getXslText() { + if (xslText == null) { + xslText = new JTextField(); + xslText.setColumns(30); + xslText.setEnabled(false); + composantsXSL.add(xslText); + ListXslText.add(xslText); + } + return xslText; + } + + private JRadioButton getFormat() { + if (format == null) { + format = new JRadioButton("Format : "); + format.setSelected(true); + format.addChangeListener(new ChangeListener() { + + public void stateChanged(ChangeEvent e) { + formatEnable(); + + } + + }); + } + return format; + } + + private JRadioButton getXslRadio() { + if (xslRadio == null) { + xslRadio = new JRadioButton(_("externalXSL")); + } + return xslRadio; + } + + private void formatEnable() { + getFormatList().setEnabled(getFormat().isSelected()); + for (Container c : composantsXSL) + c.setEnabled(!getFormat().isSelected()); + } + + private JComboBox getFormatList() { + if (formatList == null) { + formatList = new JComboBox(listFormats); + } + return formatList; + } + + private JPanel getSavePanel() { + if (savePanel == null) { + savePanel = new JPanel(); + savePanel.setLayout(new FlowLayout()); + savePanel.add(new JLabel(_("saveAs"))); + savePanel.add(getSaveText()); + savePanel.add(getBoutonSaveLocation()); + } + return savePanel; + } + + private JButton getBoutonSaveLocation() { + if (boutonSaveLocation == null) { + boutonSaveLocation = new JButton(open); + boutonSaveLocation.setPreferredSize(new Dimension(30, 30)); + boutonSaveLocation.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + openSaveLocation(); + } + + }); + } + return boutonSaveLocation; + } + + private JPanel getOuvrirPanel() { + if (openPanel == null) { + openPanel = new JPanel(); + openPanel.setLayout(new FlowLayout()); + openPanel.add(new JLabel(_("open"))); + openPanel.add(getOpenText()); + openPanel.add(getBoutonOpenLocation()); + } + return openPanel; + } + + private JTextField getSaveText() { + if (saveText == null) { + saveText = new JTextField(); + saveText.setColumns(31); + } + return saveText; + } + + private JTextField getOpenText() { + if (openText == null) { + openText = new JTextField(); + openText.setColumns(31); + } + return openText; + } + + private JButton getBoutonOpenLocation() { + if (boutonOpenLocation == null) { + boutonOpenLocation = new JButton(open); + boutonOpenLocation.setPreferredSize(new Dimension(30, 30)); + boutonOpenLocation.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + openOpenLocation(); + } + + }); + } + return boutonOpenLocation; + } + + private void openOpenLocation() { + JFileChooser fc = new JFileChooser(System.getProperty("user.home")); + fc.showOpenDialog(this); + File file = fc.getSelectedFile(); + if (file != null) { + getOpenText().setText(file.getAbsolutePath()); + } + + } + + private void openSaveLocation() { + JFileChooser fc = new JFileChooser(System.getProperty("user.home")); + fc.showSaveDialog(this); + File file = fc.getSelectedFile(); + if (file != null) { + if (file.exists()) { + int choix = askEcraser(); + if (choix == JOptionPane.YES_OPTION) { + ecrase = true; + getSaveText().setText(file.getAbsolutePath()); + } else if (choix == JOptionPane.NO_OPTION) + openSaveLocation(); + } else + getSaveText().setText(file.getAbsolutePath()); + } + + } + + public int askEcraser() { + int choix = JOptionPane.showConfirmDialog(this, _("overwriteGraph?")); + + return choix; + } + + public void setFormats(String formats) { + listFormats = formats.split("\\|"); + } + + private void annuler() { + System.exit(0); + } + + private void convert() { + boolean exit = false; + if (getOpenText().getText().equals("")) { + getErrorLabel().setText(_("openEmpty?")); + getErrorLabel().setForeground(Color.RED); + this.pack(); + } else { + if (!ecrase) { + File file = new File(getSaveText().getText()); + if (file != null) { + if (file.exists()) { + int choix = askEcraser(); + if (choix == JOptionPane.YES_OPTION) + ecrase = true; + else if (choix == JOptionPane.NO_OPTION) + exit = true; + } + } + } + if (!exit) { + String cmd = ""; + if (ecrase) + cmd += "--force "; + if (getFormat().isSelected()) + cmd += "-t " + getFormatList().getSelectedItem(); + else { + cmd += "-x "; + for (JTextField t : ListXslText) { + if (!t.getText().equals("")) + cmd += t.getText() + ","; + } + cmd = cmd.substring(0, cmd.length() - 1); + } + if (getSaveText().getText().length() > 0) + cmd += " -o " + getSaveText().getText(); + cmd += " " + getOpenText().getText() + " "; + commande = cmd.trim().split(" "); + this.dispose(); + } + } + } + + public String[] getCmd() { + return commande; + } + +} Modified: jrst/trunk/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/JRSTLexer.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Deleted: jrst/trunk/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/JRSTReader.java 2009-05-16 05:33:16 UTC (rev 334) @@ -1,2290 +0,0 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 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 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ - -/* * - * JRSTReader.java - * - * Created: 27 oct. 06 00:15:34 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - -package org.codelutin.jrst; - -import static org.codelutin.i18n.I18n._; -import static org.codelutin.jrst.ReStructuredText.ADDRESS; -import static org.codelutin.jrst.ReStructuredText.ADMONITION; -import static org.codelutin.jrst.ReStructuredText.ATTRIBUTION; -import static org.codelutin.jrst.ReStructuredText.AUTHOR; -import static org.codelutin.jrst.ReStructuredText.AUTHORS; -import static org.codelutin.jrst.ReStructuredText.BLOCK_QUOTE; -import static org.codelutin.jrst.ReStructuredText.BULLET_LIST; -import static org.codelutin.jrst.ReStructuredText.COLSPEC; -import static org.codelutin.jrst.ReStructuredText.COMMENT; -import static org.codelutin.jrst.ReStructuredText.CONTACT; -import static org.codelutin.jrst.ReStructuredText.COPYRIGHT; -import static org.codelutin.jrst.ReStructuredText.DATE; -import static org.codelutin.jrst.ReStructuredText.DECORATION; -import static org.codelutin.jrst.ReStructuredText.DEFINITION; -import static org.codelutin.jrst.ReStructuredText.DEFINITION_LIST; -import static org.codelutin.jrst.ReStructuredText.DEFINITION_LIST_ITEM; -import static org.codelutin.jrst.ReStructuredText.DESCRIPTION; -import static org.codelutin.jrst.ReStructuredText.DOCINFO; -import static org.codelutin.jrst.ReStructuredText.DOCTEST_BLOCK; -import static org.codelutin.jrst.ReStructuredText.DOCUMENT; -import static org.codelutin.jrst.ReStructuredText.EMPHASIS; -import static org.codelutin.jrst.ReStructuredText.ENTRY; -import static org.codelutin.jrst.ReStructuredText.ENUMERATED_LIST; -import static org.codelutin.jrst.ReStructuredText.FIELD; -import static org.codelutin.jrst.ReStructuredText.FIELD_BODY; -import static org.codelutin.jrst.ReStructuredText.FIELD_LIST; -import static org.codelutin.jrst.ReStructuredText.FIELD_NAME; -import static org.codelutin.jrst.ReStructuredText.FOOTER; -import static org.codelutin.jrst.ReStructuredText.FOOTNOTE; -import static org.codelutin.jrst.ReStructuredText.FOOTNOTE_REFERENCE; -import static org.codelutin.jrst.ReStructuredText.FOOTNOTE_SYMBOL; -import static org.codelutin.jrst.ReStructuredText.HEADER; -import static org.codelutin.jrst.ReStructuredText.IMAGE; -import static org.codelutin.jrst.ReStructuredText.LINE; -import static org.codelutin.jrst.ReStructuredText.LINE_BLOCK; -import static org.codelutin.jrst.ReStructuredText.LIST_ITEM; -import static org.codelutin.jrst.ReStructuredText.LITERAL; -import static org.codelutin.jrst.ReStructuredText.LITERAL_BLOCK; -import static org.codelutin.jrst.ReStructuredText.OPTION; -import static org.codelutin.jrst.ReStructuredText.OPTION_ARGUMENT; -import static org.codelutin.jrst.ReStructuredText.OPTION_GROUP; -import static org.codelutin.jrst.ReStructuredText.OPTION_LIST; -import static org.codelutin.jrst.ReStructuredText.OPTION_LIST_ITEM; -import static org.codelutin.jrst.ReStructuredText.OPTION_STRING; -import static org.codelutin.jrst.ReStructuredText.ORGANIZATION; -import static org.codelutin.jrst.ReStructuredText.PARAGRAPH; -import static org.codelutin.jrst.ReStructuredText.REFERENCE; -import static org.codelutin.jrst.ReStructuredText.REGEX_ANONYMOUS_HYPERLINK_REFERENCE; -import static org.codelutin.jrst.ReStructuredText.REGEX_EMAIL; -import static org.codelutin.jrst.ReStructuredText.REGEX_EMPHASIS; -import static org.codelutin.jrst.ReStructuredText.REGEX_FOOTNOTE_REFERENCE; -import static org.codelutin.jrst.ReStructuredText.REGEX_HYPERLINK_REFERENCE; -import static org.codelutin.jrst.ReStructuredText.REGEX_INLINE_REFERENCE; -import static org.codelutin.jrst.ReStructuredText.REGEX_LITERAL; -import static org.codelutin.jrst.ReStructuredText.REGEX_REFERENCE; -import static org.codelutin.jrst.ReStructuredText.REGEX_STRONG; -import static org.codelutin.jrst.ReStructuredText.REGEX_SUBSTITUTION_REFERENCE; -import static org.codelutin.jrst.ReStructuredText.REVISION; -import static org.codelutin.jrst.ReStructuredText.ROW; -import static org.codelutin.jrst.ReStructuredText.SECTION; -import static org.codelutin.jrst.ReStructuredText.SIDEBAR; -import static org.codelutin.jrst.ReStructuredText.STATUS; -import static org.codelutin.jrst.ReStructuredText.STRONG; -import static org.codelutin.jrst.ReStructuredText.SUBSTITUTION_DEFINITION; -import static org.codelutin.jrst.ReStructuredText.SUBTITLE; -import static org.codelutin.jrst.ReStructuredText.TABLE; -import static org.codelutin.jrst.ReStructuredText.TARGET; -import static org.codelutin.jrst.ReStructuredText.TBODY; -import static org.codelutin.jrst.ReStructuredText.TERM; -import static org.codelutin.jrst.ReStructuredText.TGROUP; -import static org.codelutin.jrst.ReStructuredText.THEAD; -import static org.codelutin.jrst.ReStructuredText.TITLE; -import static org.codelutin.jrst.ReStructuredText.TOPIC; -import static org.codelutin.jrst.ReStructuredText.TRANSITION; -import static org.codelutin.jrst.ReStructuredText.VERSION; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringReader; -import java.net.URL; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.jrst.directive.ContentDirective; -import org.codelutin.jrst.directive.DateDirective; -import org.codelutin.jrst.directive.ImageDirective; -import org.codelutin.jrst.directive.SectnumDirective; -import org.codelutin.util.StringUtil; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.DocumentHelper; -import org.dom4j.Element; -import org.dom4j.Node; -import org.dom4j.VisitorSupport; - -/* - * - * <pre> +--------------------------------------------------------------------+ | - * document [may begin with a title, subtitle, decoration, docinfo] | | - * +--------------------------------------+ | | sections [each begins with a - * title] | - * +-----------------------------+-------------------------+------------+ | - * [body elements:] | (sections) | | | - literal | - lists | | - hyperlink - * +------------+ | | blocks | - tables | | targets | | para- | - doctest | - - * block | foot- | - sub. defs | | graphs | blocks | quotes | notes | - comments | - * +---------+-----------+----------+-------+--------------+ | [text]+ | [text] | - * (body elements) | [text] | | (inline - * +-----------+------------------+--------------+ | markup) | +---------+ - * </pre> - * - * - * Inline support: http://docutils.sourceforge.net/docs/user/rst/quickref.html - * - * <li> STRUCTURAL ELEMENTS: document, section, topic, sidebar <li> STRUCTURAL - * SUBELEMENTS: title, subtitle, decoration, docinfo, transition <li> docinfo: - * address, author, authors, contact, copyright, date, field, organization, - * revision, status, version <li> decoration: footer, header <li> BODY ELEMENTS: - * admonition, attention, block_quote, bullet_list, caution, citation, comment, - * compound, container, danger, definition_list, doctest_block, enumerated_list, - * error, field_list, figure, footnote, hint, image, important, line_block, - * literal_block, note, option_list, paragraph, pending, raw, rubric, - * substitution_definition, system_message, table, target, tip, warning <li> - * SIMPLE BODY ELEMENTS: comment, doctest_block, image, literal_block, - * paragraph, pending, raw, rubric, substitution_definition, target <li> - * COMPOUND BODY ELEMENTS: admonition, attention, block_quote, bullet_list, - * caution, citation, compound, container, danger, definition_list, - * enumerated_list, error, field_list, figure, footnote, hint, important, - * line_block, note, option_list, system_message, table, tip, warning <li> BODY - * SUBELEMENTS: attribution, caption, classifier, colspec, field_name, label, - * line, option_argument, option_string, term definition, definition_list_item, - * description, entry, field, field_body, legend, list_item, option, - * option_group, option_list_item, row, tbody, tgroup, thead <li> INLINE - * ELEMENTS: abbreviation, acronym, citation_reference, emphasis, - * footnote_reference, generated, image, inline, literal, problematic, - * reference, strong, subscript, substitution_reference, superscript, target, - * title_reference, raw - * - * <pre> DOCUMENT :: ( (title, subtitle?)?, decoration?, (docinfo, - * transition?)?, STRUCTURE.MODEL; ) decoration :: (header?, footer?) header, - * footer, definition, description, attention, caution, danger, error, hint, - * important, note, tip, warning :: (BODY.ELEMENTS;)+ transition :: EMPTY - * docinfo :: (BIBLIOGRAPHIC.ELEMENTS;)+ BIBLIOGRAPHIC.ELEMENTS :: author | - * authors | organization | contact | address | version | revision | status | - * date | copyright | field authors :: ( (author)+ ) field :: (field_name, - * field_body) field_body, list_item :: (BODY.ELEMENTS;)* STRUCTURE.MODEL :: ( ( - * (BODY.ELEMENTS; | topic | sidebar)+, transition? )*, ( (section), - * (transition?, (section) )* )? ) BODY.ELEMENTS :: paragraph | compound | - * container | literal_block | doctest_block | line_block | block_quote | table | - * figure | image | footnote | citation | rubric | bullet_list | enumerated_list | - * definition_list | field_list | option_list | attention | caution | danger | - * error | hint | important | note | tip | warning | admonition | reference | - * target | substitution_definition | comment | pending | system_message | raw - * topic :: (title?, (BODY.ELEMENTS;)+) sidebar :: (title, subtitle?, - * (BODY.ELEMENTS; | topic)+) section :: (title, STRUCTURE.MODEL;) line_block :: - * (line | line_block)+ block_quote:: ((BODY.ELEMENTS;)+, attribution?) - * bullet_list, enumerated_list :: (list_item +) definition_list :: - * (definition_list_item +) definition_list_item :: (term, classifier?, - * definition) field_list :: (field +) option_list :: (option_list_item +) - * option_list_item :: (option_string, option_argument *, description) - * option_string, option_argument :: (#PCDATA) admonition :: (title, - * (BODY.ELEMENTS;)+) - * - * title, subtitle, author, organization, contact, address, version, revision, - * status, date, copyright, field_name, paragraph, compound, container, - * literal_block, doctest_block, attribution, line, term, classifier :: - * TEXT.MODEL; - * - * TEXT.MODEL :: (#PCDATA | INLINE.ELEMENTS;)* INLINE.ELEMENTS :: emphasis | - * strong | literal | reference | footnote_reference | citation_reference | - * substitution_reference | title_reference | abbreviation | acronym | subscript | - * superscript | inline | problematic | generated | target | image | raw - * emphasis :: '*' #PCDATA '*' strong :: '**' #PCDATA '**' literal :: '``' - * #PCDATA '``' footnote_reference :: '[' ([0-9]+|#) ']' citation_reference :: - * '[' [a-zA-Z]+ ']' - * - * </pre> - */ - -/** - * Le principe est d'utiliser les methodes peek* {@link JRSTLexer} pour - * prendre l'element que l'on attend, si la methode retourne null ou un autre - * element et bien c que ce n'est pas le bon choix, cela veut dire que l'element - * courant est fini d'etre lu (plus de paragraphe dans la section par exemple) - * ou qu'il y a une erreur dans le fichier en entre. - * - * On construit un arbre XML representant le RST au fur et a mesure, on peut - * ensuite appliquer une feuille de style ou autre chose avec - * {@link JRSTGenerator} - * - * - * Tous les elements ont un attribut level qui permet de savoir on il est dans - * la hierarchie. Le Document a le level -1001, et les sections/titres on pour - * level les valeurs 1000, -999, -998, ... - * - * de cette facon les methods isUpperLevel et isSameLevel fonctionne pour tous - * les elements de la meme facon - * - * <pre> - * abbreviation - * acronym - * address (done) - * admonition (done) - * attention (done) - * attribution - * author (done) - * authors (done) - * block_quote (done) - * bullet_list (done) - * caption - * caution (done) - * citation - * citation_reference - * classifier (done) - * colspec (done) - * comment - * compound - * contact (done) - * container - * copyright (done) - * danger (done) - * date (done) - * decoration (done) - * definition (done) - * definition_list (done) - * definition_list_item (done) - * description (done) - * docinfo (done) - * doctest_block (done) - * document (done) - * emphasis (done) - * entry (done) - * enumerated_list (done) - * error (done) - * field (done) - * field_body (done) - * field_list (done) - * field_name (done) - * figure - * footer (done) - * footnote (done) - * footnote_reference (done) - * generated - * header (done) - * hint (done) - * image (done) - * important (done) - * inline - * label - * legend - * line (done) - * line_block (done) - * list_item (done) - * literal (done) - * literal_block (done) - * note (done) - * option (done) - * option_argument (done) - * option_group (done) - * option_list (done) - * option_list_item (done) - * option_string (done) - * organization (done) - * paragraph (done) - * pending - * problematic - * raw - * reference (done) - * revision (done) - * row (done) - * rubric - * section (done) - * sidebar (done) - * status (done) - * strong (done) - * subscript - * substitution_definition - * substitution_reference - * subtitle (done) - * superscript - * system_message - * table (done) - * target (done) - * tbody (done) - * term (done) - * tgroup (done) - * thead (done) - * tip (done) - * title (done) - * title_reference - * topic (done) - * transition (done) - * version (done) - * warning (done) - * </pre> - * - * Created: 27 oct. 06 00:15:34 - * - * @author poussin, letellier - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class JRSTReader { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(JRSTReader.class); - - protected boolean ERROR_MISSING_ITEM = false; - - protected static int MAX_SECTION_DEPTH = -1000; - - protected static Map<String, JRSTDirective> defaultDirectives = null; - - protected Map<String, JRSTDirective> directives = new HashMap<String, JRSTDirective>(); - - private boolean sectnum = false; - - private Element footer; - - private int idMax = 0; - - private int symbolMax = 0; - - private int symbolMaxRef = 0; - - private LinkedList<Integer> lblFootnotes = new LinkedList<Integer>(); - - private LinkedList<Integer> lblFootnotesRef = new LinkedList<Integer>(); - - private LinkedList<Element> eFootnotes = new LinkedList<Element>(); - - private LinkedList<Element> eTarget = new LinkedList<Element>(); - - private LinkedList<Element> eTargetAnonymous = new LinkedList<Element>(); - - private LinkedList<Element> eTargetAnonymousCopy = new LinkedList<Element>(); - - private LinkedList<Element> eTitle = new LinkedList<Element>(); - - static { - defaultDirectives = new HashMap<String, JRSTDirective>(); - defaultDirectives.put(IMAGE, new ImageDirective()); - defaultDirectives.put(DATE, new DateDirective()); - defaultDirectives.put("time", new DateDirective()); - defaultDirectives.put("contents", new ContentDirective()); - // defaultDirectives.put("calc", new CalcDirective()); - defaultDirectives.put("sectnum", new SectnumDirective()); - // TODO put here all other directive - } - - /** - * - */ - public JRSTReader() { - } - - /** - * @param name - * @return the defaultDirectives - */ - public static JRSTDirective getDefaultDirective(String name) { - return defaultDirectives.get(name); - } - - /** - * @param name - * @param directive the defaultDirectives to set - */ - public static void addDefaultDirectives(String name, JRSTDirective directive) { - JRSTReader.defaultDirectives.put(name, directive); - } - - /** - * @param name - * @return the defaultDirectives - */ - public JRSTDirective getDirective(String name) { - return directives.get(name); - } - - /** - * @param name - * @param directive the defaultDirectives to set - */ - public void addDirectives(String name, JRSTDirective directive) { - directives.put(name, directive); - } - - /** - * On commence par decouper tout le document en Element, puis on construit - * l'article a partir de ces elements. - * - * @param reader - * @return le document cree - * @throws Exception - */ - public Document read(Reader reader) throws Exception { - JRSTLexer lexer = new JRSTLexer(reader); - try { - Element root = composeDocument(lexer); - - Document result = DocumentHelper.createDocument(); - result.setRootElement(root); - - root.accept(new VisitorSupport() { - public void visit(Element e) { - // remove all level attribute - e.addAttribute("level", null); - // Constrution du sommaire - String type = e.attributeValue("type"); - if (type != null) { - if (type.equals("contents")) { - composeContents(e); - e.addAttribute("type", null); - } - } - - if ("true".equalsIgnoreCase(e.attributeValue("inline"))) { - e.addAttribute("inline", null); - try { - inline(e); - } catch (DocumentException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't inline text for " + e, eee); - } - } - } - } - }); - - return result; - } catch (Exception eee) { - log.error(_("JRST parsing error line %d char %s:\n%s", lexer - .getLineNumber(), lexer.getCharNumber(), lexer - .readNotBlanckLine())); - throw eee; - } - } - - /** - * - * exemple : - * - * - * <pre> - * ..contents : Sommaire - * depth: 3 - * </pre> - * - * - * depth sert a limiter la profondeur du sommaire - * - * - * @param Element - * - */ - private void composeContents(Element e) { - Element result = DocumentHelper.createElement(TOPIC); - String option = e.getText(); - int depth = -1; - // depth: 3 - Pattern pattern = Pattern.compile("\\s*\\:depth\\:\\s*\\p{Digit}+"); - Matcher matcher = pattern.matcher(option); - if (matcher.matches()) { - pattern = Pattern.compile("\\p{Digit}+"); - matcher = pattern.matcher(matcher.group()); - if (matcher.find()) { - depth = Integer.parseInt(matcher.group()); - } - } - int levelInit = 0; - try { - levelInit = Integer.parseInt(eTitle.getFirst().attributeValue( - "level")); - } catch (NumberFormatException eee) { - log.error("Can't parse level in: " - + eTitle.getFirst().asXML(), eee); - return; - } - - LinkedList<Element> title = new LinkedList<Element>(); - // on rajoute les refid - for (int i = 0; i < eTitle.size(); i++) { - idMax++; - eTitle.get(i).addAttribute("refid", "id" + idMax); - } - // on enleve les titres limites par depth - for (Element el : eTitle) { - int level = Integer.parseInt(el.attributeValue("level")); - level = level - levelInit; - el.addAttribute("level", "" + level); - if (depth == -1) { - title.add(el); - } - else { - if (depth > level) { - title.add(el); - } - } - } - e.addAttribute("class", "contents"); - String titleValue = e.attributeValue("value"); - e.addAttribute("value", null); - String value = titleValue.trim().toLowerCase(); - // sans titre c "contents" par default - if (value.matches("\\s*")) { - value = "contents"; - titleValue = "Contents"; - } - e.addAttribute("id", value); - e.addAttribute("name", value); - result.addElement("title").setText(titleValue); - // on compose les lignes - result.add(composeLineContent(title, "")); - e.setText(""); - e.appendContent(result); - } - - /** - * @param LinkedList - * <Element> title, String num - * @return Element - */ - private Element composeLineContent(LinkedList<Element> title, String num) { - Element result = DocumentHelper.createElement(BULLET_LIST); - if (sectnum) { - result.addAttribute("class", "auto-toc"); - } - Element item = null; - int cnt = 0; - while (!title.isEmpty()) { - - Element e = title.getFirst(); - int level = Integer.parseInt(e.attributeValue("level")); - LinkedList<Element> child = new LinkedList<Element>(); - - if (level <= 0) { - cnt++; - title.removeFirst(); - item = result.addElement(LIST_ITEM); - Element para = item.addElement(PARAGRAPH); - Element reference = para.addElement(REFERENCE); - String text = e.getText(); - String id = e.attributeValue("refid"); - reference.addAttribute("id", id); - reference.addAttribute("refid", text.replaceAll("\\W+", " ") - .trim().toLowerCase().replaceAll("\\W+", "-")); - // si l'on doit les numeroter - if (sectnum) { - Element generated = reference.addElement("generated") - .addAttribute("class", "sectnum"); - generated.setText(num + cnt + " "); - for (int i = 0; i < eTitle.size(); i++) { - if (eTitle.get(i).attributeValue("refid").equals(id)) { - Element generatedTitle = eTitle.get(i).addElement( - "generated"); - generatedTitle.addAttribute("class", "sectnum"); - generatedTitle.setText(num + cnt + " "); - } - - } - } - reference.setText(text.replaceAll("_", "").trim()); - - } else { - do { - e.addAttribute("level", "" + (level - 1)); - child.add(e); - title.removeFirst(); - if (!title.isEmpty()) { - e = title.getFirst(); - level = Integer.parseInt(e.attributeValue("level")); - } - } while (!title.isEmpty() && level > 0); - String numTmp = ""; - // numerotation - if (sectnum) { - numTmp = num + cnt + "."; - } - if (item != null) { - item.add(composeLineContent(child, numTmp)); // Appel - // recursif - } else { - result.add(composeLineContent(child, numTmp)); // Appel - // recursif - } - } - } - return result; - } - - /** - * @param lexer - * @return Element - * @throws Exception - */ - private Element composeDocument(JRSTLexer lexer) throws Exception { - Element result = DocumentHelper.createElement(DOCUMENT); - result.addAttribute("level", String.valueOf(MAX_SECTION_DEPTH - 1)); - - Element item = null; - - // skip blank line - skipBlankLine(lexer); - - // les liens anonymes - LinkedList<Element> items = lexer.refTarget(); - for (Element e : items) { - eTarget.add(e); - - } - - // le header - item = lexer.peekHeader(); - if (itemEquals(HEADER, item)) { - Element decoration = result.addElement(DECORATION); - Element header = decoration.addElement(HEADER); - header.addAttribute("inline", "true").setText(item.getText()); - } - - // le footer - item = lexer.peekFooter(); - if (itemEquals(FOOTER, item)) { - footer = DocumentHelper.createElement(DECORATION); - Element header = footer.addElement(FOOTER); - header.addAttribute("inline", "true").setText(item.getText()); - } - - // les hyperlinks - LinkedList<Element> listItem = lexer.peekTargetAnonymous(); - if (listItem != null) { - for (Element e : listItem) { - Element anonym = DocumentHelper.createElement(TARGET); - anonym.addAttribute("anonymous", "1"); - idMax++; - anonym.addAttribute("id", "id" + idMax); - anonym.addAttribute("refuri", e.attributeValue("refuri") - .trim()); - eTargetAnonymous.add(anonym); - eTargetAnonymousCopy.add(anonym); - } - } - - // les eléments a enlever (deja parser : header, footer...) - item = lexer.peekRemove(); - if (itemEquals("remove", item)) { - lexer.remove(); - } - - // le titre du doc - item = lexer.peekTitle(); - if (itemEquals(TITLE, item)) { - lexer.remove(); - Element title = result.addElement(TITLE); - String txt = item.getText(); - result.addAttribute("id", txt.replaceAll("[(\\W+)_]", " ") - .toLowerCase().trim().replaceAll("\\s+", "-")); - result.addAttribute("name", txt.toLowerCase().replaceAll( - "[(\\W+)_&&[^\\:]]+", " ").trim()); - copyLevel(item, title); - title.addAttribute("inline", "true").setText(txt.trim()); - } - - // skip blank line - skipBlankLine(lexer); - - // le sous titre du doc - item = lexer.peekTitle(); - if (itemEquals(TITLE, item)) { - lexer.remove(); - Element subtitle = result.addElement(SUBTITLE); - String txt = item.getText(); - subtitle.addAttribute("id", txt.replaceAll("[(\\W+)_]", " ") - .toLowerCase().trim().replaceAll("\\s+", "-")); - subtitle.addAttribute("name", txt.toLowerCase().replaceAll( - "[(\\W+)_]", " ").trim()); - copyLevel(item, subtitle); - DocumentHelper.createElement("footnotes"); - subtitle.addAttribute("inline", "true").setText(txt.trim()); - } - - // skip blank line - skipBlankLine(lexer); - - // les infos du doc - item = lexer.peekDocInfo(); - Element documentinfo = null; - while (itemEquals(DOCINFO, item) || itemEquals(FIELD_LIST, item)) { - - if (documentinfo == null) { - documentinfo = result.addElement(DOCINFO); - } - skipBlankLine(lexer); - if (itemEquals(FIELD_LIST, item)) { - Element field = composeFieldItemList(lexer); - documentinfo.add(field); - } else { - if ("author".equalsIgnoreCase(item.attributeValue("type"))) { - documentinfo.addElement(AUTHOR).addAttribute("inline", - "true").setText(item.getText()); - } else if ("date".equalsIgnoreCase(item.attributeValue("type"))) { - documentinfo.addElement(DATE) - .addAttribute("inline", "true").setText( - item.getText().trim()); - } else if ("organization".equalsIgnoreCase(item - .attributeValue("type"))) { - documentinfo.addElement(ORGANIZATION).addAttribute( - "inline", "true").setText(item.getText().trim()); - } else if ("contact".equalsIgnoreCase(item - .attributeValue("type"))) { - documentinfo.addElement(CONTACT).addAttribute("inline", - "true").setText(item.getText().trim()); - } else if ("address".equalsIgnoreCase(item - .attributeValue("type"))) { - documentinfo.addElement(ADDRESS).addAttribute("inline", - "true").setText(item.getText().trim()); - } else if ("version".equalsIgnoreCase(item - .attributeValue("type"))) { - documentinfo.addElement(VERSION).addAttribute("inline", - "true").setText(item.getText().trim()); - } else if ("revision".equalsIgnoreCase(item - .attributeValue("type"))) { - documentinfo.addElement(REVISION).addAttribute("inline", - "true").setText(item.getText().trim()); - } else if ("status".equalsIgnoreCase(item - .attributeValue("type"))) { - documentinfo.addElement(STATUS).addAttribute("inline", - "true").setText(item.getText().trim()); - } else if ("copyright".equalsIgnoreCase(item - .attributeValue("type"))) { - documentinfo.addElement(COPYRIGHT).addAttribute("inline", - "true").setText(item.getText().trim()); - } else if ("authors".equalsIgnoreCase(item - .attributeValue("type"))) { - Element authors = documentinfo.addElement(AUTHORS); - int t = 0; - String line = item.getText(); - for (int i = 0; i < line.length(); i++) { - if (line.charAt(i) == ';' || line.charAt(i) == ',') { - authors.addElement(AUTHOR).addAttribute("inline", - "true") - .setText(line.substring(t, i).trim()); - t = i + 1; - } - - } - authors.addElement(AUTHOR).addAttribute("inline", "true") - .setText(line.substring(t, line.length()).trim()); - } - lexer.remove(); - } - // skip blank line - // skipBlankLine(lexer); - item = lexer.peekDocInfo(); - - } - - // l'abstract du doc - item = lexer.peekTitle(); - while (itemNotEquals(TITLE, item) && !lexer.eof()) { - composeBody(lexer, result); - item = lexer.peekTitle(); - } - - // les sections - item = lexer.peekTitle(); - while (itemEquals(TITLE, item, true, lexer.eof())) { - Element section = composeSection(lexer); - result.add(section); - item = lexer.peekTitle(); - } - - // on ajoute le footer a la fin - if (footer != null) { - result.add(footer); - } - - return result; - } - - /** - * - * skip blank line - * - * - * @param lexer - * @throws DocumentException - * @throws IOException - */ - private void skipBlankLine(JRSTLexer lexer) throws IOException, - DocumentException { - Element item = lexer.peekBlankLine(); - // skip blank line - while (itemEquals(JRSTLexer.BLANK_LINE, item)) { - // go to the next element - lexer.remove(); - item = lexer.peekBlankLine(); - } - } - - /** - * * - * - * Corps du document - * - * - * @param lexer - * @param root - * @return Element - * @throws DocumentException - * @throws IOException - */ - private Element composeBody(JRSTLexer lexer, Element parent) - throws Exception { - - Element item = lexer.peekTitleOrBodyElement(); - if (item == null && !lexer.eof()) { - item = lexer.peekTitleOrBodyElement(); - } - - while (!lexer.eof() && itemNotEquals(TITLE, item) - && isUpperLevel(item, parent)) { - if (itemEquals(JRSTLexer.BLANK_LINE, item)) { - // go t o the next element - lexer.remove(); - } else if (itemEquals("remove", item)) { - lexer.remove(); - } else if (itemEquals("include", item)) { - lexer.remove(); - Element list = composeInclude(item); - parent.add(list); - } else if (itemEquals(DOCTEST_BLOCK, item)) { - lexer.remove(); - Element list = composeDoctestBlock(item); - parent.add(list); - } else if (itemEquals(ADMONITION, item)) { - lexer.remove(); - Element list = composeAdmonition(item); - parent.add(list); - } else if (itemEquals(SIDEBAR, item)) { - lexer.remove(); - Element list = composeSidebar(item); - parent.add(list); - } else if (itemEquals(TOPIC, item)) { - lexer.remove(); - Element list = composeTopic(item); - parent.add(list); - } else if (itemEquals(TRANSITION, item)) { - lexer.remove(); - Element para = parent.addElement(TRANSITION); - copyLevel(item, para); - } else if (itemEquals(PARAGRAPH, item)) { - lexer.remove(); - Element para = parent.addElement(PARAGRAPH); - copyLevel(item, para); - para.addAttribute("inline", "true").setText(item.getText()); - } else if (itemEquals(JRSTLexer.DIRECTIVE, item)) { - lexer.remove(); - Node directive = composeDirective(item); - parent.add(directive); - } else if (itemEquals(SUBSTITUTION_DEFINITION, item)) { - lexer.remove(); - Element subst = composeSubstitutionDefinition(item); - parent.add(subst); - } else if (itemEquals(LITERAL_BLOCK, item)) { - lexer.remove(); - Element para = parent.addElement(LITERAL_BLOCK); - copyLevel(item, para); - para.setText(item.getText()); - } else if (itemEquals(JRSTLexer.TABLE, item)) { - lexer.remove(); - Element table = composeTable(item); - parent.add(table); - // Element para = parent.addElement(TABLE); - // copyLevel(item, para); - // para.setText(item.getText()); - } else if (itemEquals(LINE_BLOCK, item)) { - lexer.remove(); - Element list = composeLineBlock(lexer, item); - parent.add(list); - } else if (itemEquals(BULLET_LIST, item)) { - Element list = composeBulletList(lexer); - parent.add(list); - } else if (itemEquals(ENUMERATED_LIST, item)) { - Element list = composeEnumeratedList(lexer); - parent.add(list); - } else if (itemEquals(DEFINITION_LIST, item)) { - Element list = composeDefinitionList(lexer); - parent.add(list); - } else if (itemEquals(FIELD_LIST, item)) { - Element list = composeFieldList(lexer); - parent.add(list); - } else if (itemEquals(BLOCK_QUOTE, item)) { - lexer.remove(); - Element list = composeBlockQuote(item); - parent.add(list); - } else if (itemEquals(OPTION_LIST, item)) { - Element list = composeOptionList(lexer); - parent.add(list); - } else if (itemEquals(TARGET, item)) { - lexer.remove(); - Element list = composeTarget(item); - parent.add(list); - } else if (itemEquals("targetAnonymous", item)) { - lexer.remove(); - Element list = composeTargetAnonymous(item); - parent.add(list); - } else if (itemEquals("footnotes", item)) { - lexer.remove(); - Element[] list = composeFootnote(item); - for (Element l : list) { - parent.add(l); - } - } else if (itemEquals(COMMENT, item)) { - lexer.remove(); - Element list = composeComment(item); - parent.add(list); - } - - else { - if (ERROR_MISSING_ITEM) { - throw new DocumentException("Unknow item type: " - + item.getName()); - } else { - lexer.remove(); - } - } - - // Pour afficher le "PseudoXML" - // if (item!=null) System.out.println(item.asXML()); - - item = lexer.peekTitleOrBodyElement(); - } - - return parent; - } - - /** - * - * include un document rst - * - * - * <pre> - * .. include:: doc.rst - * </pre> - * - * - * include un document literal (code...) - * - * - * <pre> - * .. include:: literal - * doc.rst - * </pre> - * - * @param item - * @return Element - * @throws Exception - */ - private Element composeInclude(Element item) throws Exception { - String option = item.attributeValue("option"); - String path = item.getText(); - Element result = null; - if (option.equals("literal")) { - result = DocumentHelper.createElement(LITERAL_BLOCK); - FileReader reader = new FileReader(path); - BufferedReader bf = new BufferedReader(reader); - String line = ""; - String lineTmp = bf.readLine(); - while (lineTmp != null) { - line += '\n' + lineTmp; - lineTmp = bf.readLine(); - } - result.setText(line); - } else { - File fileIn = new File(path); - URL url = fileIn.toURI().toURL(); - Reader in = new InputStreamReader(url.openStream()); - - Document doc = newJRSTReader(in); - - result = doc.getRootElement(); - } - return result; - } - - /** - * <pre> - * .. - * So this block is not "lost", - * despite its indentation. - * </pre> - * - * @param item - * @return Element - */ - private Element composeComment(Element item) { - - return item; - } - - /** - * <pre> - * __ http://truc.html - * </pre> - * - * @param item - * @return Element - */ - private Element composeTargetAnonymous(Element item) { - Element result = null; - result = eTargetAnonymousCopy.getFirst(); - eTargetAnonymousCopy.removeFirst(); - return result; - } - - /** - * <pre _ target: target.html </pre> - * - * @param item - * @return Element - */ - private Element composeTarget(Element item) { - Element result = null; - for (Element e : eTarget) { - if (e.attributeValue("id").equals(item.attributeValue("id"))) { - result = e; - } - } - return result; - } - - /** - * <pre> - * .. [#] This is a footnote - * </pre> - * - * @param item - * @return Element - * @throws Exception - */ - private Element[] composeFootnote(Element item) throws Exception { - Element[] result = null; - if (itemEquals("footnotes", item)) { - List<Element> footnotes = (List<Element>) item - .selectNodes(FOOTNOTE); - result = new Element[footnotes.size()]; - int cnt = 0; - for (Element footnote : footnotes) { - result[cnt] = DocumentHelper.createElement(FOOTNOTE); - Element efootnote = DocumentHelper.createElement(FOOTNOTE); - int labelMax = 0; - - for (int i = 0; i < lblFootnotes.size(); i++) { - int lbl = lblFootnotes.get(i); - labelMax = Math.max(lbl, labelMax); - } - - boolean[] labels = new boolean[labelMax]; - for (int i = 0; i < labels.length; i++) { - labels[i] = false; - } - for (int i = 0; i < lblFootnotes.size(); i++) { - labels[lblFootnotes.get(i) - 1] = true; - } - idMax++; - String name = null; - String id = ""; - String label = null; - String type = footnote.attributeValue("type"); - if (type.equals("autoNum") || type.equals("autoNumLabel")) { - result[cnt].addAttribute("auto", "1"); - } - if (type.equals("autoSymbol")) { - result[cnt].addAttribute("auto", "*"); - } - result[cnt].addAttribute("backrefs", "id" + idMax); - efootnote.addAttribute("backrefs", "id" + idMax); - if (type.equals("num") || type.equals("autoNumLabel")) { - name = footnote.attributeValue("name"); - if (type.equals("autoNumLabel")) { - id = name; - } - else { - label = name; - } - } - if (type.equals("autoNum") || type.equals("autoNumLabel")) { - boolean done = false; - - for (int i = 0; i < labels.length && !done; i++) { - if (!labels[i]) { - done = true; - label = "" + (i + 1); - } - } - if (!done) { - label = "" + (labels.length + 1); - } - if (type.equals("autoNum")) { - name = label; - } - } - if (type.equals("autoSymbol")) { - - int nb = Math.abs(symbolMax / 10) + 1; - char symbol = FOOTNOTE_SYMBOL.charAt(symbolMax % 10); - label = ""; - for (int j = 0; j < nb; j++) { - label += symbol; - } - symbolMax++; - - } - result[cnt].addAttribute("id", "" + id); - efootnote.addAttribute("id", "" + id); - if (!type.equals("autoSymbol")) { - result[cnt].addAttribute("name", "" + name); - efootnote.addAttribute("name", "" + name); - } - result[cnt].addElement("label").setText("" + label); - efootnote.addAttribute("label", "" + label); - if (!type.equals("autoSymbol")) { - lblFootnotes.add(Integer.parseInt(label)); - } - efootnote.addAttribute("type", type); - eFootnotes.add(efootnote); - String text = footnote.getText(); - Document doc = newJRSTReader(new StringReader(text)); - result[cnt].appendContent(doc.getRootElement()); - - cnt++; - } - } - for (int i = 0; i < result.length; i++) { - if (result[i].attributeValue("id").equals("")) { - idMax++; - result[i].addAttribute("id", "id" + idMax); - (eFootnotes.get(i)).addAttribute("id", "id" + idMax); - } - - } - - return result; - } - - /** - * <pre> - * -a command-line option "a" -1 file, --one=file, --two file Multiple - * options with arguments. - * </pre> - * - * @param lexer - * @return Element - * @throws Exception - * @throws DocumentException - */ - private Element composeOptionList(JRSTLexer lexer) - throws DocumentException, Exception { - Element item = lexer.peekOption(); - Element result = DocumentHelper.createElement(OPTION_LIST); - while (itemEquals(OPTION_LIST, item)) { - lexer.remove(); - Element optionListItem = result.addElement(OPTION_LIST_ITEM); - Element optionGroup = optionListItem.addElement(OPTION_GROUP); - List<Element> option = (List<Element>) item.selectNodes("option"); - for (Element e : option) { - Element eOption = optionGroup.addElement(OPTION); - eOption.addElement(OPTION_STRING).setText( - e.attributeValue(OPTION_STRING)); - if (e.attributeValue("delimiterExiste").equals("true")) { - eOption.addElement(OPTION_ARGUMENT).addAttribute( - "delimiter", e.attributeValue("delimiter")) - .setText(e.attributeValue(OPTION_ARGUMENT)); - } - } - Element description = optionListItem.addElement(DESCRIPTION); - - String text = item.getText(); - Document doc = newJRSTReader(new StringReader(text)); - description.appendContent(doc.getRootElement()); - - item = lexer.peekOption(); - } - return result; - } - - /** - * <pre> - * .. topic:: Title - * - * Body. - * </pre> - * - * @param Element - * item - * @return Element - * @throws Exception - */ - - private Element composeTopic(Element item) throws Exception { - Element result = null; - result = DocumentHelper.createElement(TOPIC); - result.addElement(TITLE).addAttribute("inline", "true").setText( - item.attributeValue(TITLE)); - String text = item.getText(); - Document doc = newJRSTReader(new StringReader(text)); - result.appendContent(doc.getRootElement()); - - return result; - } - - /** - * <pre> - * .. sidebar:: Title - * :subtitle: If Desired - * - * Body. - * </pre> - * - * @param Element - * @return Element - * @throws Exception - */ - - private Element composeSidebar(Element item) throws Exception { - Element result = null; - result = DocumentHelper.createElement(SIDEBAR); - result.addElement(TITLE).addAttribute("inline", "true").setText( - item.attributeValue(TITLE)); - if (item.attributeValue("subExiste").equals("true")) { - result.addElement(SUBTITLE).addAttribute("inline", "true").setText( - item.attributeValue(SUBTITLE)); - } - - String text = item.getText(); - Document doc = newJRSTReader(new StringReader(text)); - result.appendContent(doc.getRootElement()); - - return result; - } - - /** - * <pre> - * | line block - * | - * | indent - * </pre> - * - * @param lexer - * @param item - * @return Element - * @throws Exception - */ - private Element composeLineBlock(JRSTLexer lexer, Element item) - throws Exception { - Element result = null; - result = DocumentHelper.createElement(LINE_BLOCK); - List<Element> lines = (List<Element>) item.selectNodes(LINE); - int[] levels = new int[lines.size()]; - int cnt = 0; - for (Element l : lines) { - levels[cnt] = Integer.parseInt(l.attributeValue("level")); - cnt++; - } - cnt = 0; - boolean[] lineDone = new boolean[lines.size()]; - for (int i = 0; i < lineDone.length; i++) { - lineDone[i] = false; - } - for (Element l : lines) { - if (levels[cnt] == 0) { - result.addElement(LINE).addAttribute("inline", "true").setText( - l.getText()); - } - else { - if (!lineDone[cnt]) { - Element newItem = DocumentHelper.createElement(LINE_BLOCK); - Boolean done = false; - for (int i = cnt; i < lines.size() && !done; i++) { - if (levels[i] > 0) { - Element eLine = newItem.addElement("line"); - eLine.addAttribute("level", "" + (levels[i] - 1)); - eLine.setText(lines.get(i).getText()); - lineDone[i] = true; - } else { - done = true; - } - - } - Element eLineBlock = result.addElement(LINE_BLOCK); - // Appel recursif - eLineBlock.appendContent(composeLineBlock(lexer, newItem)); - } - } - cnt++; - - } - return result; - } - - /** - * <pre> - * >>> print 'this is a Doctest block' - * this is a Doctest block - * </pre> - * - * @param Element - * @return Element - */ - private Element composeDoctestBlock(Element item) { - return item; - } - - /** - * <pre> - * As a great paleontologist once said, - * - * This theory, that is mine, is mine. - * - * -- Anne Elk (Miss) - * </pre> - * - * @param Element - * @return Element - * @throws Exception - * - */ - private Element composeBlockQuote(Element item) throws Exception { - Element result = null; - result = DocumentHelper.createElement(BLOCK_QUOTE); - - String text = item.getText(); - Document doc = newJRSTReader(new StringReader(text)); - result.appendContent(doc.getRootElement()); - String sAttribution = item.attributeValue(ATTRIBUTION); - if (sAttribution != null) { - Element attribution = result.addElement(ATTRIBUTION); - attribution.setText(sAttribution); - attribution.addAttribute("inline", "true"); - } - return result; - } - - /** - * <pre> - * .. admonition:: And, by the way... - * - * You can make up your own admonition too. - * </pre> - * - * @param Element - * @return Element - * @throws Exception - * - */ - private Element composeAdmonition(Element item) throws Exception { - Element result = null; - if (item.attributeValue("type").equalsIgnoreCase(ADMONITION)) { - result = DocumentHelper.createElement(ADMONITION); - String title = item.attributeValue(TITLE); - String admonitionClass = "admonition_" + title; - admonitionClass = admonitionClass.toLowerCase().replaceAll( - "\\p{Punct}", ""); - admonitionClass = admonitionClass.replace(' ', '-'); - admonitionClass = admonitionClass.replace('\n', '-'); - result.addAttribute("class", admonitionClass); - result.addElement(TITLE).addAttribute("inline", "true").setText( - title.trim()); - } else { - result = DocumentHelper.createElement(item.attributeValue("type") - .toLowerCase()); - } - - String text = item.getText(); - Document doc = newJRSTReader(new StringReader(text)); - result.appendContent(doc.getRootElement()); - return result; - } - - /** - * parse all directives - * - * @param Element - * @return Node - */ - private Node composeDirective(Element item) { - Node result = item; - String type = item.attributeValue(JRSTLexer.DIRECTIVE_TYPE); - if (type.equals("sectnum")) { - sectnum = true; - } - JRSTDirective directive = getDirective(type); - if (directive == null) { - directive = getDefaultDirective(type); - } - if (directive != null) { - result = directive.parse(item); - } else { - log.warn("Unknow directive type '" + type + "' in: " + item); - } - return result; - } - - /** - * <pre> - * .. |biohazard| image:: biohazard.png - * </pre> - * - * @param Element - * @return Element - */ - private Element composeSubstitutionDefinition(Element item) { - Element result = item; - Element child = (Element) item.selectSingleNode("*"); - Node newChild = composeDirective(child); - result.remove(child); // remove old after composeDirective, because - // directive can be used this parent - result.add(newChild); - return result; - } - - /** - * - * Complexe Table - * - * - * <pre> - * +------------------------+------------+---------------------+ - * | body row 3 | Cells may | - Table cells | - * +------------------------+ span rows. | - contain | - * | body row 4 | | - body elements. | - * +------------------------+------------+---------------------+ - * </pre> - * - * - * And simple table - * - * - * <pre> - * ===== ===== ====== - * Inputs Output - * ============ ====== - * A B A or B - * ------------ ------ - * A B A or B - * ===== ===== ====== - * </pre> - * - * @param Element - * @return Element - * - */ - private Element composeTable(Element item) throws Exception { - - Element result = DocumentHelper.createElement(TABLE); - - int tableWidth = Integer.parseInt(item - .attributeValue(JRSTLexer.TABLE_WIDTH)); - - TreeSet<Integer> beginCellList = new TreeSet<Integer>(); - - for (Element cell : (List<Element>) item.selectNodes(JRSTLexer.ROW - + "/" + JRSTLexer.CELL)) { - Integer begin = Integer.valueOf(cell - .attributeValue(JRSTLexer.CELL_INDEX_START)); - beginCellList.add(begin); - } - - int[] beginCell = new int[beginCellList.size() + 1]; // + 1 to put - // table width - // to simulate - // new cell - int[] lengthCell = new int[beginCellList.size()]; - - int cellNumber = 0; - for (int b : beginCellList) { - beginCell[cellNumber] = b; - if (cellNumber > 0) { - lengthCell[cellNumber - 1] = beginCell[cellNumber] - - beginCell[cellNumber - 1]; - } - cellNumber++; - } - beginCell[cellNumber] = tableWidth; - lengthCell[cellNumber - 1] = beginCell[cellNumber] - - beginCell[cellNumber - 1]; - - Element tgroup = result.addElement(TGROUP).addAttribute("cols", - String.valueOf(cellNumber)); - for (int width : lengthCell) { - tgroup.addElement(COLSPEC).addAttribute("colwidth", - String.valueOf(width)); - } - - Element rowList = null; - if ("true".equals(item.attributeValue(JRSTLexer.TABLE_HEADER))) { - rowList = tgroup.addElement(THEAD); - } else { - rowList = tgroup.addElement(TBODY); - } - List<Element> rows = (List<Element>) item.selectNodes(JRSTLexer.ROW); - for (int r = 0; r < rows.size(); r++) { - Element row = rowList.addElement(ROW); - List<Element> cells = (List<Element>) rows.get(r).selectNodes( - JRSTLexer.CELL); - for (int c = 0; c < cells.size(); c++) { - Element cell = cells.get(c); - // si la cellule a ete utilise pour un regroupement vertical on - // la passe - if (!"true".equals(cell.attributeValue("used"))) { - Element entry = row.addElement(ENTRY); - String text = ""; - - // on regroupe les cellules verticalement - int morerows = -1; - Element tmpCell = null; - String cellStart = cell - .attributeValue(JRSTLexer.CELL_INDEX_START); - do { - morerows++; - tmpCell = (Element) rows.get(r + morerows) - .selectSingleNode( - JRSTLexer.CELL + "[@" - + JRSTLexer.CELL_INDEX_START - + "=" + cellStart + "]"); - text += tmpCell.getText(); - // on marque la cellule comme utilise - tmpCell.addAttribute("used", "true"); - } while (!"true".equals(tmpCell - .attributeValue(JRSTLexer.CELL_END))); - - if (morerows > 0) { - entry - .addAttribute("morerows", String - .valueOf(morerows)); - } - - // on compte le nombre de cellules regroupees - // horizontalement - int morecols = 0; - tmpCell = cells.get(c + morecols); - int cellEnd = Integer.parseInt(tmpCell - .attributeValue(JRSTLexer.CELL_INDEX_END)); - while (cellEnd + 1 != beginCell[c + morecols + 1]) { - morecols++; - // tmpCell = cells.get(c + morecols); - // cellEnd = - // Integer.parseInt(tmpCell.attributeValue(JRSTLexer. - // CELL_INDEX_END)); - } - if (morecols > 0) { - entry - .addAttribute("morecols", String - .valueOf(morecols)); - } - // parse entry text in table - Document doc = newJRSTReader(new StringReader(text)); - entry.appendContent(doc.getRootElement()); - } - } - if ("true".equals(rows.get(r).attributeValue( - JRSTLexer.ROW_END_HEADER))) { - rowList = tgroup.addElement(TBODY); - } - } - - return result; - } - - /** - * - * items begin with "-", "+", or "*" - * - * - * <pre> - * * aaa - * - bbb - * * ccc - * - ddd - * + eee - * </pre> - * - * @param lexer - * @return Element - * @throws Exception - */ - private Element composeBulletList(JRSTLexer lexer) throws Exception { - Element item = lexer.peekBulletList(); - Element result = DocumentHelper.createElement(BULLET_LIST); - copyLevel(item, result); - result.addAttribute("bullet", item.attributeValue("bullet")); - while (itemEquals(BULLET_LIST, item) && isSameLevel(item, result) - && hasSameAttribute(item, result, "bullet")) { - lexer.remove(); - Element bullet = result.addElement(LIST_ITEM); - copyLevel(item, bullet); - bullet.addElement(PARAGRAPH).addAttribute("inline", "true") - .setText(item.getText()); - composeBody(lexer, bullet); - - item = lexer.peekBulletList(); - } - return result; - } - - /** - * <pre> - * 3. et meme - * * #. pour voir - * * I) de tout - * (a) pour tout - * (#) vraiment tout - * </pre> - * - * @param lexer - * @return Element - * @throws Exception - */ - private Element composeEnumeratedList(JRSTLexer lexer) throws Exception { - Element item = lexer.peekEnumeratedList(); - Element result = DocumentHelper.createElement(ENUMERATED_LIST); - copyLevel(item, result); - String enumType = item.attributeValue("enumtype"); - if (!enumType.equals("arabic")) { - result.addAttribute("start", item.attributeValue("start")); - } - result.addAttribute("prefix", item.attributeValue("prefix")); - result.addAttribute("suffix", item.attributeValue("suffix")); - result.addAttribute("enumtype", enumType); - while (itemEquals(ENUMERATED_LIST, item) - && isSameLevel(item, result) - && hasSameAttribute(item, result, "prefix", "suffix") - && ("auto".equals(item.attributeValue("enumtype")) || hasSameAttribute( - item, result, "enumtype"))) { - lexer.remove(); - Element e = result.addElement(LIST_ITEM); - copyLevel(item, e); - e.addElement(PARAGRAPH).addAttribute("inline", "true").setText( - item.getText()); - composeBody(lexer, e); - - item = lexer.peekEnumeratedList(); - } - return result; - } - - /** - * <pre> - * le mot : la classe - * la definition - * </pre> - * - * @param lexer - * @return Element - * @throws Exception - */ - private Element composeDefinitionList(JRSTLexer lexer) throws Exception { - Element item = lexer.peekBodyElement(); - Element result = DocumentHelper.createElement(DEFINITION_LIST); - copyLevel(item, result); - while (itemEquals(DEFINITION_LIST, item) && isSameLevel(item, result)) { - lexer.remove(); - Element def = result.addElement(DEFINITION_LIST_ITEM); - copyLevel(item, def); - - Element term = def.addElement(TERM); - copyLevel(item, term); - term.addAttribute("inline", "true").setText( - item.attributeValue("term")); - - String[] classifiers = StringUtil.split(item - .attributeValue("classifiers"), " : "); - for (String classifierText : classifiers) { - Element classifier = def.addElement("classifier"); - copyLevel(item, classifier); - classifier.addAttribute("inline", "true").setText( - classifierText); - } - - Element definition = def.addElement(DEFINITION); - definition.addElement(PARAGRAPH).addAttribute("inline", "true") - .setText(item.getText()); - copyLevel(item, definition); - - composeBody(lexer, definition); - - item = lexer.peekBodyElement(); - } - return result; - } - - /** - * <pre> - * :un peu: de field - * ca ne fait pas - * de mal - * </pre> - * - * @param lexer - * @return Element - * @throws Exception - */ - private Element composeFieldList(JRSTLexer lexer) throws Exception { - Element item = lexer.peekBodyElement(); - Element result = DocumentHelper.createElement(FIELD_LIST); - copyLevel(item, result); - while (itemEquals(FIELD_LIST, item) && isSameLevel(item, result)) { - Element field = composeFieldItemList(lexer); - result.add(field); - item = lexer.peekBodyElement(); - } - return result; - } - - /** - * <pre> - * :field1: avec un - * petit texte - * - et meme un - * - debut - * - de list - * </pre> - * - * @param lexer - * @return Element - * @throws Exception - */ - private Element composeFieldItemList(JRSTLexer lexer) throws Exception { - Element item = lexer.peekFieldList(); - if (itemEquals(FIELD_LIST, item)) { - lexer.remove(); - Element field = DocumentHelper.createElement(FIELD); - copyLevel(item, field); - Element fieldName = field.addElement(FIELD_NAME); - copyLevel(item, fieldName); - fieldName.addAttribute("inline", "true").setText( - item.attributeValue("name")); - Element fieldBody = field.addElement(FIELD_BODY); - fieldBody.addElement(PARAGRAPH).addAttribute("inline", "true") - .setText(item.getText()); - copyLevel(item, fieldBody); - composeBody(lexer, fieldBody); - - return field; - } else { - throw new DocumentException("Waiting for " + FIELD_LIST - + " and found " + item.getName()); - } - } - - /** - * <pre> - * DEFINITIONS - * ----------- - * </pre> - * - * @param lexer - * @return Element - * @throws Exception - */ - private Element composeSection(JRSTLexer lexer) throws Exception { - Element result = DocumentHelper.createElement(SECTION); - Element firstTitle = null; - - Element item = null; - - // le titre de la section - item = lexer.peekTitle(); - if (itemEquals(TITLE, item, true, lexer.eof())) { - lexer.remove(); - firstTitle = item; - Element title = result.addElement(TITLE); - copyLevel(item, result); - copyLevel(item, title); - title.addAttribute("inline", "true").setText(item.getText().trim()); - result.addAttribute("id", item.getText().replaceAll("\\W+", " ") - .trim().toLowerCase().replaceAll("\\W+", "-")); - result.addAttribute("name", item.getText().toLowerCase().trim()); - eTitle.add(title); - } - - // le contenu de la section - item = lexer.peekTitle(); - while (itemNotEquals(TITLE, item) && !lexer.eof()) { - composeBody(lexer, result); - item = lexer.peekTitle(); - } - - // les sous sections - item = lexer.peekTitle(); - while (itemEquals(TITLE, item) && isUpperLevel(item, firstTitle)) { - Element section = composeSection(lexer); - result.add(section); - item = lexer.peekTitle(); - } - - return result; - } - - /** - * Indique si la sous section est bien une sous section, c-a-d dire que son - * level est superieur a celui de la section - * - * @param item - * @param firstTitle - * @return boolean - * @throws DocumentException - */ - private boolean isUpperLevel(Element subSection, Element section) - throws DocumentException { - // if (!(itemEquals(SECTION, subSection) && itemEquals(SECTION, - // section)) - // || itemEquals(DOCUMENT, section) || itemEquals(SECTION, section)) { - // // all element is upper than Document or section - // return true; - // } - int subSectionLevel = Integer.parseInt(subSection - .attributeValue("level")); - int sectionLevel = Integer.parseInt(section.attributeValue("level")); - boolean result = subSectionLevel > sectionLevel; - return result; - } - - /** - * Indique si les deux elements sont au meme niveau - * - * @param item - * @param firstTitle - * @return boolean - * @throws DocumentException - */ - private boolean isSameLevel(Element subSection, Element section) - throws DocumentException { - // if (itemEquals(DOCUMENT, section) || itemEquals(SECTION, section)) { - // // all element is upper than Document or section - // return false; - // } - int subSectionLevel = Integer.parseInt(subSection - .attributeValue("level")); - int sectionLevel = Integer.parseInt(section.attributeValue("level")); - boolean result = subSectionLevel == sectionLevel; - return result; - } - - /** - * @param Element - * e1 - * @param Element - * e2 - * @param String - * ... attnames - * @return boolean - */ - private boolean hasSameAttribute(Element e1, Element e2, String... attnames) { - boolean result = true; - for (String attname : attnames) { - String a1 = e1.attributeValue(attname); - String a2 = e2.attributeValue(attname); - if (!ObjectUtils.equals(a1, a2)) { - result = false; - break; - } - } - return result; - } - - /** - * @param Element - * from - * @param Element - * to - * @throws DocumentException - */ - private void copyLevel(Element from, Element to) throws DocumentException { - String level = from.attributeValue("level"); - if (level == null) { - throw new DocumentException("Element without level: " + from); - } - to.addAttribute("level", level); - } - - /** - * @param String - * name - * @param Element - * e - * @return boolean - * @throws DocumentException - */ - private boolean itemEquals(String name, Element e) throws DocumentException { - boolean result = itemEquals(name, e, false, false); - return result; - } - - /** - * @param String - * name - * @param Element - * e - * @param throwError - * @param eof - * @return boolean - * @throws DocumentException - */ - private boolean itemEquals(String name, Element e, boolean throwError, - boolean eof) throws DocumentException { - boolean result = e != null && name.equals(e.getName()); - if (ERROR_MISSING_ITEM && !result && throwError && !eof) { - throw new DocumentException("Malformed document waiting " + name - + " and found " + (e != null ? e.getName() : "null")); - } - return result; - } - - /** - * @param String - * name - * @param Element - * e - * @return boolean - */ - private boolean itemNotEquals(String name, Element e) { - boolean result = e == null || !name.equals(e.getName()); - return result; - } - - private Document newJRSTReader(Reader r) throws Exception { - JRSTReader reader = new JRSTReader(); - reader.setVariable(idMax, symbolMax, symbolMaxRef, lblFootnotes, - lblFootnotesRef, eFootnotes, eTarget, eTargetAnonymous, - eTargetAnonymousCopy); - - return reader.read(r); - - } - - /** - * - * Initialises les variables d'environements par ex, les hyperlinks peuvent - * etre referencer dans tous le document - * - * - * @param idMax - * @param symbolMax - * @param symbolMaxRef - * @param lblFootnotes - * @param lblFootnotesRef - * @param eFootnotes - * @param eTarget - * @param eTargetAnonymous - * @param eTargetAnonymousCopy - */ - public void setVariable(int idMax, int symbolMax, int symbolMaxRef, - LinkedList<Integer> lblFootnotes, - LinkedList<Integer> lblFootnotesRef, - LinkedList<Element> eFootnotes, LinkedList<Element> eTarget, - LinkedList<Element> eTargetAnonymous, - LinkedList<Element> eTargetAnonymousCopy) { - this.idMax = idMax; - this.symbolMax = symbolMax; - this.symbolMaxRef = symbolMaxRef; - this.lblFootnotes = lblFootnotes; - this.lblFootnotesRef = lblFootnotesRef; - this.eFootnotes = eFootnotes; - this.eTarget = eTarget; - this.eTargetAnonymous = eTargetAnonymous; - this.eTargetAnonymousCopy = eTargetAnonymousCopy; - } - - /** - * Parse text in element and replace text with parse result - * - * @param Element - * e - * @throws DocumentException - */ - private void inline(Element e) throws DocumentException { - String text = e.getText(); - - text = StringEscapeUtils.escapeXml(text); - // search all LITERAL and replace it with special mark - // this prevent substitution in literal, example **something** must not - // change in literal - Map<String, String> temporaries = new HashMap<String, String>(); - Matcher matcher = REGEX_LITERAL.matcher(text); - int index = 0; - while (matcher.find()) { - int start = matcher.start(); - int end = matcher.end(); - String literal = "<" + LITERAL + ">" + matcher.group(1) + "</" - + LITERAL + ">"; - String key = "literal" + index++; - temporaries.put(key, literal); - text = text.substring(0, start) + "<tmp>" + key + "</tmp>" - + text.substring(end); - matcher = REGEX_LITERAL.matcher(text); - } - // search all REGEX_INLINE_REFERENCE and replace it with special mark - // this prevent substitution of URL with REGEX_REFERENCE. Use same - // mechanisme as literal for that - matcher = REGEX_INLINE_REFERENCE.matcher(text); - index = 0; - while (matcher.find()) { - int start = matcher.start(); - int end = matcher.end(); - Element ref = DocumentHelper.createElement(REFERENCE); - ref.addAttribute("refuri", matcher.group(2)); - ref.setText(matcher.group(1)); - String key = "inlineReference" + index++; - temporaries.put(key, ref.asXML()); - text = text.substring(0, start) + "<tmp>" + key + "</tmp>" - + text.substring(end); - matcher = REGEX_INLINE_REFERENCE.matcher(text); - - } - // do all substitution inline - text = REGEX_EMAIL.matcher(text).replaceAll( - "$1<" + REFERENCE + " refuri='mailto:$2'>$2</" + REFERENCE - + ">$3"); - text = REGEX_STRONG.matcher(text).replaceAll( - "<" + STRONG + ">$1</" + STRONG + ">"); - text = REGEX_EMPHASIS.matcher(text).replaceAll( - "<" + EMPHASIS + ">$1</" + EMPHASIS + ">"); - text = REGEX_REFERENCE.matcher(text).replaceAll( - "<" + REFERENCE + " refuri='$1'>$1</" + REFERENCE + ">$2"); - // _[#]truc - matcher = REGEX_FOOTNOTE_REFERENCE.matcher(text); - while (matcher.find()) { - String txtDebut = text.substring(0, matcher.start()); - String txtFin = text.substring(matcher.end() + 1, text.length()); - Element footnote = DocumentHelper.createElement(FOOTNOTE_REFERENCE); - String sFootnote = matcher.group(); - boolean done = false; - for (int i = 0; i < sFootnote.length() && !done; i++) { - if (sFootnote.charAt(i) == ']') { - String id = sFootnote.substring(1, i); - if (id.equals("*")) { - int nb = Math.abs(symbolMaxRef / 10) + 1; - char symbol = FOOTNOTE_SYMBOL.charAt(symbolMaxRef % 10); - String label = ""; - for (int j = 0; j < nb; j++) { - label += symbol; - } - symbolMaxRef++; - footnote.addAttribute("auto", "*"); - for (int j = 0; j < eFootnotes.size(); j++) { - Element eFootnote = eFootnotes.get(j); - if (eFootnote.attributeValue("label").equals(label)) { - - footnote.addAttribute("id", eFootnote - .attributeValue("backrefs")); - footnote.addAttribute("refid", eFootnote - .attributeValue("id")); - - } - } - footnote.setText(label); - - } else if (id.matches("[1-9]+")) { - - for (int j = 0; j < eFootnotes.size(); j++) { - Element eFootnote = eFootnotes.get(j); - if (eFootnote.attributeValue("label").equals(id)) { - footnote.addAttribute("id", eFootnote - .attributeValue("backrefs")); - footnote.addAttribute("refid", eFootnote - .attributeValue("id")); - } - } - footnote.setText(id); - lblFootnotesRef.add(Integer.parseInt(id)); - - } else if (id.equals("#")) { - int lblMax = 0; - for (int j = 0; j < lblFootnotesRef.size(); j++) { - lblMax = Math.max(lblMax, lblFootnotesRef.get(j)); - } - - boolean[] lbls = new boolean[lblMax]; - for (int j = 0; j < lbls.length; j++) { - lbls[j] = false; - } - for (int j = 0; j < lblFootnotesRef.size(); j++) { - lbls[lblFootnotesRef.get(j) - 1] = true; - } - boolean valide = false; - do { - boolean trouve = false; - String label = null; - for (int j = 0; j < lbls.length && !trouve; j++) { - - if (!lbls[j]) { - trouve = true; - label = "" + (j + 1); - } - } - if (!trouve) { - label = "" + (lbls.length + 1); - } - footnote.addAttribute("auto", "1"); - for (int j = 0; j < eFootnotes.size(); j++) { - Element eFootnote = eFootnotes.get(j); - if (eFootnote.attributeValue("label").equals( - label)) { - if (!(eFootnote.attributeValue("type") - .equals("autoNumLabel"))) { - footnote.addAttribute("id", eFootnote - .attributeValue("backrefs")); - footnote.addAttribute("refid", - eFootnote.attributeValue("id")); - footnote.setText(label); - lblFootnotesRef.add(Integer - .parseInt(label)); - valide = true; - } else { - valide = false; - lbls[Integer.parseInt(label) - 1] = true; - } - } - } - } while (!valide); - - } - - else { - footnote.addAttribute("auto", "1"); - - String name = id.substring(1); - boolean trouve = false; - for (int j = 0; j < eFootnotes.size() && !trouve; j++) { - Element eFootnote = eFootnotes.get(j); - if (eFootnote.attributeValue("name").equals(name)) { - footnote.addAttribute("id", eFootnote - .attributeValue("backrefs")); - footnote.addAttribute("refid", eFootnote - .attributeValue("id")); - String label = eFootnote - .attributeValue("label"); - footnote.setText(label); - lblFootnotesRef.add(Integer.parseInt(label)); - trouve = true; - } - } - - footnote.addAttribute("name", name); - } - done = true; - } - } - text = txtDebut + footnote.asXML() + txtFin; - matcher = REGEX_FOOTNOTE_REFERENCE.matcher(text); - } - // .. __http://truc.html - matcher = REGEX_ANONYMOUS_HYPERLINK_REFERENCE.matcher(text); - while (matcher.find()) { - String txtDebut = text.substring(0, matcher.start()); - String txtFin = text.substring(matcher.end(), text.length()); - String ref = text.substring(matcher.start(), matcher.end() - 2); - ref = ref.replaceAll("`", ""); - Element anonym = DocumentHelper.createElement("reference"); - anonym.addAttribute("anonymous", "1"); - anonym.addAttribute("name", ref.trim()); - if (!eTargetAnonymous.isEmpty()) { - Element target = eTargetAnonymous.getFirst(); - eTargetAnonymous.removeFirst(); - anonym.addAttribute("refuri", target.attributeValue("refuri")); - } - anonym.setText(ref); - text = txtDebut + anonym.asXML() + txtFin; - matcher = REGEX_ANONYMOUS_HYPERLINK_REFERENCE.matcher(text); - } - // .. _truc: http://truc.html - matcher = REGEX_HYPERLINK_REFERENCE.matcher(text); - while (matcher.find()) { - String txtDebut = text.substring(0, matcher.start()); - String txtFin = text.substring(matcher.end(), text.length()); - String ref = text.substring(matcher.start(), matcher.end() - 1); - - ref = ref.replaceAll("('|_)", ""); - ref = ref.replaceAll("[\\W&&[^-]]", " ").trim(); - Element hyper = DocumentHelper.createElement("reference"); - hyper.addAttribute("name", ref); - boolean trouve = false; - for (int i = 0; i < eTarget.size() && !trouve; i++) { - Element el = eTarget.get(i); - String refTmp = ref.replaceAll("\\s", "-").toLowerCase(); - if (el.attributeValue("id").equalsIgnoreCase(refTmp)) { - hyper.addAttribute("refuri", el.attributeValue("refuri")); - trouve = true; - } - } - if (!trouve) { - hyper.addAttribute("refid", ref); - } - hyper.setText(ref); - text = txtDebut + hyper.asXML() + " " + txtFin; - matcher = REGEX_HYPERLINK_REFERENCE.matcher(text); - - } - - // substitution reference - matcher = REGEX_SUBSTITUTION_REFERENCE.matcher(text); - int begin = 0; - while (matcher.find(begin)) { - String start = text.substring(0, matcher.start()); - String end = text.substring(matcher.end()); - String ref = matcher.group(1); - - Node subst = e.selectSingleNode("//" + SUBSTITUTION_DEFINITION - + "[@name='" + ref + "']/child::node()"); - - if (subst == null) { - text = start + "|" + ref + "|"; - } else { - text = start + subst.asXML(); - } - - begin = text.length(); - text += end; - matcher = REGEX_SUBSTITUTION_REFERENCE.matcher(text); - - } - // undo substitution in LITERAL - Pattern p = Pattern.compile("<tmp>([^<>]+)</tmp>"); - - matcher = p.matcher(text); - while (matcher.find()) { - String start = text.substring(0, matcher.start()); - String end = text.substring(matcher.end()); - - String tempKey = matcher.group(1); - text = start + temporaries.get(tempKey) + end; - matcher = p.matcher(text); - } - - String resultElementText = text.trim(); - Element result = DocumentHelper.parseText( - "<TMP>" + resultElementText + "</TMP>").getRootElement(); - - e.setText(""); - e.appendContent(result); - } -} Copied: jrst/trunk/src/main/java/org/nuiton/jrst/JRSTReader.java (from rev 333, jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java) =================================================================== --- jrst/trunk/src/main/java/org/nuiton/jrst/JRSTReader.java (rev 0) +++ jrst/trunk/src/main/java/org/nuiton/jrst/JRSTReader.java 2009-05-16 05:33:16 UTC (rev 334) @@ -0,0 +1,2291 @@ +/* *##% JRst + * Copyright (C) 2004 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + +/* * + * JRSTReader.java + * + * Created: 27 oct. 06 00:15:34 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ + +package org.nuiton.jrst; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.jrst.ReStructuredText.ADDRESS; +import static org.nuiton.jrst.ReStructuredText.ADMONITION; +import static org.nuiton.jrst.ReStructuredText.ATTRIBUTION; +import static org.nuiton.jrst.ReStructuredText.AUTHOR; +import static org.nuiton.jrst.ReStructuredText.AUTHORS; +import static org.nuiton.jrst.ReStructuredText.BLOCK_QUOTE; +import static org.nuiton.jrst.ReStructuredText.BULLET_LIST; +import static org.nuiton.jrst.ReStructuredText.COLSPEC; +import static org.nuiton.jrst.ReStructuredText.COMMENT; +import static org.nuiton.jrst.ReStructuredText.CONTACT; +import static org.nuiton.jrst.ReStructuredText.COPYRIGHT; +import static org.nuiton.jrst.ReStructuredText.DATE; +import static org.nuiton.jrst.ReStructuredText.DECORATION; +import static org.nuiton.jrst.ReStructuredText.DEFINITION; +import static org.nuiton.jrst.ReStructuredText.DEFINITION_LIST; +import static org.nuiton.jrst.ReStructuredText.DEFINITION_LIST_ITEM; +import static org.nuiton.jrst.ReStructuredText.DESCRIPTION; +import static org.nuiton.jrst.ReStructuredText.DOCINFO; +import static org.nuiton.jrst.ReStructuredText.DOCTEST_BLOCK; +import static org.nuiton.jrst.ReStructuredText.DOCUMENT; +import static org.nuiton.jrst.ReStructuredText.EMPHASIS; +import static org.nuiton.jrst.ReStructuredText.ENTRY; +import static org.nuiton.jrst.ReStructuredText.ENUMERATED_LIST; +import static org.nuiton.jrst.ReStructuredText.FIELD; +import static org.nuiton.jrst.ReStructuredText.FIELD_BODY; +import static org.nuiton.jrst.ReStructuredText.FIELD_LIST; +import static org.nuiton.jrst.ReStructuredText.FIELD_NAME; +import static org.nuiton.jrst.ReStructuredText.FOOTER; +import static org.nuiton.jrst.ReStructuredText.FOOTNOTE; +import static org.nuiton.jrst.ReStructuredText.FOOTNOTE_REFERENCE; +import static org.nuiton.jrst.ReStructuredText.FOOTNOTE_SYMBOL; +import static org.nuiton.jrst.ReStructuredText.HEADER; +import static org.nuiton.jrst.ReStructuredText.IMAGE; +import static org.nuiton.jrst.ReStructuredText.LINE; +import static org.nuiton.jrst.ReStructuredText.LINE_BLOCK; +import static org.nuiton.jrst.ReStructuredText.LIST_ITEM; +import static org.nuiton.jrst.ReStructuredText.LITERAL; +import static org.nuiton.jrst.ReStructuredText.LITERAL_BLOCK; +import static org.nuiton.jrst.ReStructuredText.OPTION; +import static org.nuiton.jrst.ReStructuredText.OPTION_ARGUMENT; +import static org.nuiton.jrst.ReStructuredText.OPTION_GROUP; +import static org.nuiton.jrst.ReStructuredText.OPTION_LIST; +import static org.nuiton.jrst.ReStructuredText.OPTION_LIST_ITEM; +import static org.nuiton.jrst.ReStructuredText.OPTION_STRING; +import static org.nuiton.jrst.ReStructuredText.ORGANIZATION; +import static org.nuiton.jrst.ReStructuredText.PARAGRAPH; +import static org.nuiton.jrst.ReStructuredText.REFERENCE; +import static org.nuiton.jrst.ReStructuredText.REGEX_ANONYMOUS_HYPERLINK_REFERENCE; +import static org.nuiton.jrst.ReStructuredText.REGEX_EMAIL; +import static org.nuiton.jrst.ReStructuredText.REGEX_EMPHASIS; +import static org.nuiton.jrst.ReStructuredText.REGEX_FOOTNOTE_REFERENCE; +import static org.nuiton.jrst.ReStructuredText.REGEX_HYPERLINK_REFERENCE; +import static org.nuiton.jrst.ReStructuredText.REGEX_INLINE_REFERENCE; +import static org.nuiton.jrst.ReStructuredText.REGEX_LITERAL; +import static org.nuiton.jrst.ReStructuredText.REGEX_REFERENCE; +import static org.nuiton.jrst.ReStructuredText.REGEX_STRONG; +import static org.nuiton.jrst.ReStructuredText.REGEX_SUBSTITUTION_REFERENCE; +import static org.nuiton.jrst.ReStructuredText.REVISION; +import static org.nuiton.jrst.ReStructuredText.ROW; +import static org.nuiton.jrst.ReStructuredText.SECTION; +import static org.nuiton.jrst.ReStructuredText.SIDEBAR; +import static org.nuiton.jrst.ReStructuredText.STATUS; +import static org.nuiton.jrst.ReStructuredText.STRONG; +import static org.nuiton.jrst.ReStructuredText.SUBSTITUTION_DEFINITION; +import static org.nuiton.jrst.ReStructuredText.SUBTITLE; +import static org.nuiton.jrst.ReStructuredText.TABLE; +import static org.nuiton.jrst.ReStructuredText.TARGET; +import static org.nuiton.jrst.ReStructuredText.TBODY; +import static org.nuiton.jrst.ReStructuredText.TERM; +import static org.nuiton.jrst.ReStructuredText.TGROUP; +import static org.nuiton.jrst.ReStructuredText.THEAD; +import static org.nuiton.jrst.ReStructuredText.TITLE; +import static org.nuiton.jrst.ReStructuredText.TOPIC; +import static org.nuiton.jrst.ReStructuredText.TRANSITION; +import static org.nuiton.jrst.ReStructuredText.VERSION; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.net.URL; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jrst.directive.ContentDirective; +import org.nuiton.jrst.directive.DateDirective; +import org.nuiton.jrst.directive.ImageDirective; +import org.nuiton.jrst.directive.SectnumDirective; +import org.nuiton.util.StringUtil; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.dom4j.Node; +import org.dom4j.VisitorSupport; + +/* + * + * <pre> +--------------------------------------------------------------------+ | + * document [may begin with a title, subtitle, decoration, docinfo] | | + * +--------------------------------------+ | | sections [each begins with a + * title] | + * +-----------------------------+-------------------------+------------+ | + * [body elements:] | (sections) | | | - literal | - lists | | - hyperlink + * +------------+ | | blocks | - tables | | targets | | para- | - doctest | - + * block | foot- | - sub. defs | | graphs | blocks | quotes | notes | - comments | + * +---------+-----------+----------+-------+--------------+ | [text]+ | [text] | + * (body elements) | [text] | | (inline + * +-----------+------------------+--------------+ | markup) | +---------+ + * </pre> + * + * + * Inline support: http://docutils.sourceforge.net/docs/user/rst/quickref.html + * + * <li> STRUCTURAL ELEMENTS: document, section, topic, sidebar <li> STRUCTURAL + * SUBELEMENTS: title, subtitle, decoration, docinfo, transition <li> docinfo: + * address, author, authors, contact, copyright, date, field, organization, + * revision, status, version <li> decoration: footer, header <li> BODY ELEMENTS: + * admonition, attention, block_quote, bullet_list, caution, citation, comment, + * compound, container, danger, definition_list, doctest_block, enumerated_list, + * error, field_list, figure, footnote, hint, image, important, line_block, + * literal_block, note, option_list, paragraph, pending, raw, rubric, + * substitution_definition, system_message, table, target, tip, warning <li> + * SIMPLE BODY ELEMENTS: comment, doctest_block, image, literal_block, + * paragraph, pending, raw, rubric, substitution_definition, target <li> + * COMPOUND BODY ELEMENTS: admonition, attention, block_quote, bullet_list, + * caution, citation, compound, container, danger, definition_list, + * enumerated_list, error, field_list, figure, footnote, hint, important, + * line_block, note, option_list, system_message, table, tip, warning <li> BODY + * SUBELEMENTS: attribution, caption, classifier, colspec, field_name, label, + * line, option_argument, option_string, term definition, definition_list_item, + * description, entry, field, field_body, legend, list_item, option, + * option_group, option_list_item, row, tbody, tgroup, thead <li> INLINE + * ELEMENTS: abbreviation, acronym, citation_reference, emphasis, + * footnote_reference, generated, image, inline, literal, problematic, + * reference, strong, subscript, substitution_reference, superscript, target, + * title_reference, raw + * + * <pre> DOCUMENT :: ( (title, subtitle?)?, decoration?, (docinfo, + * transition?)?, STRUCTURE.MODEL; ) decoration :: (header?, footer?) header, + * footer, definition, description, attention, caution, danger, error, hint, + * important, note, tip, warning :: (BODY.ELEMENTS;)+ transition :: EMPTY + * docinfo :: (BIBLIOGRAPHIC.ELEMENTS;)+ BIBLIOGRAPHIC.ELEMENTS :: author | + * authors | organization | contact | address | version | revision | status | + * date | copyright | field authors :: ( (author)+ ) field :: (field_name, + * field_body) field_body, list_item :: (BODY.ELEMENTS;)* STRUCTURE.MODEL :: ( ( + * (BODY.ELEMENTS; | topic | sidebar)+, transition? )*, ( (section), + * (transition?, (section) )* )? ) BODY.ELEMENTS :: paragraph | compound | + * container | literal_block | doctest_block | line_block | block_quote | table | + * figure | image | footnote | citation | rubric | bullet_list | enumerated_list | + * definition_list | field_list | option_list | attention | caution | danger | + * error | hint | important | note | tip | warning | admonition | reference | + * target | substitution_definition | comment | pending | system_message | raw + * topic :: (title?, (BODY.ELEMENTS;)+) sidebar :: (title, subtitle?, + * (BODY.ELEMENTS; | topic)+) section :: (title, STRUCTURE.MODEL;) line_block :: + * (line | line_block)+ block_quote:: ((BODY.ELEMENTS;)+, attribution?) + * bullet_list, enumerated_list :: (list_item +) definition_list :: + * (definition_list_item +) definition_list_item :: (term, classifier?, + * definition) field_list :: (field +) option_list :: (option_list_item +) + * option_list_item :: (option_string, option_argument *, description) + * option_string, option_argument :: (#PCDATA) admonition :: (title, + * (BODY.ELEMENTS;)+) + * + * title, subtitle, author, organization, contact, address, version, revision, + * status, date, copyright, field_name, paragraph, compound, container, + * literal_block, doctest_block, attribution, line, term, classifier :: + * TEXT.MODEL; + * + * TEXT.MODEL :: (#PCDATA | INLINE.ELEMENTS;)* INLINE.ELEMENTS :: emphasis | + * strong | literal | reference | footnote_reference | citation_reference | + * substitution_reference | title_reference | abbreviation | acronym | subscript | + * superscript | inline | problematic | generated | target | image | raw + * emphasis :: '*' #PCDATA '*' strong :: '**' #PCDATA '**' literal :: '``' + * #PCDATA '``' footnote_reference :: '[' ([0-9]+|#) ']' citation_reference :: + * '[' [a-zA-Z]+ ']' + * + * </pre> + */ + +/** + * Le principe est d'utiliser les methodes peek* {@link JRSTLexer} pour + * prendre l'element que l'on attend, si la methode retourne null ou un autre + * element et bien c que ce n'est pas le bon choix, cela veut dire que l'element + * courant est fini d'etre lu (plus de paragraphe dans la section par exemple) + * ou qu'il y a une erreur dans le fichier en entre. + * + * On construit un arbre XML representant le RST au fur et a mesure, on peut + * ensuite appliquer une feuille de style ou autre chose avec + * {@link JRSTGenerator} + * + * + * Tous les elements ont un attribut level qui permet de savoir on il est dans + * la hierarchie. Le Document a le level -1001, et les sections/titres on pour + * level les valeurs 1000, -999, -998, ... + * + * de cette facon les methods isUpperLevel et isSameLevel fonctionne pour tous + * les elements de la meme facon + * + * <pre> + * abbreviation + * acronym + * address (done) + * admonition (done) + * attention (done) + * attribution + * author (done) + * authors (done) + * block_quote (done) + * bullet_list (done) + * caption + * caution (done) + * citation + * citation_reference + * classifier (done) + * colspec (done) + * comment + * compound + * contact (done) + * container + * copyright (done) + * danger (done) + * date (done) + * decoration (done) + * definition (done) + * definition_list (done) + * definition_list_item (done) + * description (done) + * docinfo (done) + * doctest_block (done) + * document (done) + * emphasis (done) + * entry (done) + * enumerated_list (done) + * error (done) + * field (done) + * field_body (done) + * field_list (done) + * field_name (done) + * figure + * footer (done) + * footnote (done) + * footnote_reference (done) + * generated + * header (done) + * hint (done) + * image (done) + * important (done) + * inline + * label + * legend + * line (done) + * line_block (done) + * list_item (done) + * literal (done) + * literal_block (done) + * note (done) + * option (done) + * option_argument (done) + * option_group (done) + * option_list (done) + * option_list_item (done) + * option_string (done) + * organization (done) + * paragraph (done) + * pending + * problematic + * raw + * reference (done) + * revision (done) + * row (done) + * rubric + * section (done) + * sidebar (done) + * status (done) + * strong (done) + * subscript + * substitution_definition + * substitution_reference + * subtitle (done) + * superscript + * system_message + * table (done) + * target (done) + * tbody (done) + * term (done) + * tgroup (done) + * thead (done) + * tip (done) + * title (done) + * title_reference + * topic (done) + * transition (done) + * version (done) + * warning (done) + * </pre> + * + * Created: 27 oct. 06 00:15:34 + * + * @author poussin, letellier + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class JRSTReader { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(JRSTReader.class); + + protected boolean ERROR_MISSING_ITEM = false; + + protected static int MAX_SECTION_DEPTH = -1000; + + protected static Map<String, JRSTDirective> defaultDirectives = null; + + protected Map<String, JRSTDirective> directives = new HashMap<String, JRSTDirective>(); + + private boolean sectnum = false; + + private Element footer; + + private int idMax = 0; + + private int symbolMax = 0; + + private int symbolMaxRef = 0; + + private LinkedList<Integer> lblFootnotes = new LinkedList<Integer>(); + + private LinkedList<Integer> lblFootnotesRef = new LinkedList<Integer>(); + + private LinkedList<Element> eFootnotes = new LinkedList<Element>(); + + private LinkedList<Element> eTarget = new LinkedList<Element>(); + + private LinkedList<Element> eTargetAnonymous = new LinkedList<Element>(); + + private LinkedList<Element> eTargetAnonymousCopy = new LinkedList<Element>(); + + private LinkedList<Element> eTitle = new LinkedList<Element>(); + + static { + defaultDirectives = new HashMap<String, JRSTDirective>(); + defaultDirectives.put(IMAGE, new ImageDirective()); + defaultDirectives.put(DATE, new DateDirective()); + defaultDirectives.put("time", new DateDirective()); + defaultDirectives.put("contents", new ContentDirective()); + // defaultDirectives.put("calc", new CalcDirective()); + defaultDirectives.put("sectnum", new SectnumDirective()); + // TODO put here all other directive + } + + /** + * + */ + public JRSTReader() { + } + + /** + * @param name + * @return the defaultDirectives + */ + public static JRSTDirective getDefaultDirective(String name) { + return defaultDirectives.get(name); + } + + /** + * @param name + * @param directive the defaultDirectives to set + */ + public static void addDefaultDirectives(String name, JRSTDirective directive) { + JRSTReader.defaultDirectives.put(name, directive); + } + + /** + * @param name + * @return the defaultDirectives + */ + public JRSTDirective getDirective(String name) { + return directives.get(name); + } + + /** + * @param name + * @param directive the defaultDirectives to set + */ + public void addDirectives(String name, JRSTDirective directive) { + directives.put(name, directive); + } + + /** + * On commence par decouper tout le document en Element, puis on construit + * l'article a partir de ces elements. + * + * @param reader + * @return le document cree + * @throws Exception + */ + public Document read(Reader reader) throws Exception { + JRSTLexer lexer = new JRSTLexer(reader); + try { + Element root = composeDocument(lexer); + + Document result = DocumentHelper.createDocument(); + result.setRootElement(root); + + root.accept(new VisitorSupport() { + @Override + public void visit(Element e) { + // remove all level attribute + e.addAttribute("level", null); + // Constrution du sommaire + String type = e.attributeValue("type"); + if (type != null) { + if (type.equals("contents")) { + composeContents(e); + e.addAttribute("type", null); + } + } + + if ("true".equalsIgnoreCase(e.attributeValue("inline"))) { + e.addAttribute("inline", null); + try { + inline(e); + } catch (DocumentException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't inline text for " + e, eee); + } + } + } + } + }); + + return result; + } catch (Exception eee) { + log.error(_("JRST parsing error line %d char %s:\n%s", lexer + .getLineNumber(), lexer.getCharNumber(), lexer + .readNotBlanckLine())); + throw eee; + } + } + + /** + * + * exemple : + * + * + * <pre> + * ..contents : Sommaire + * depth: 3 + * </pre> + * + * + * depth sert a limiter la profondeur du sommaire + * + * + * @param Element + * + */ + private void composeContents(Element e) { + Element result = DocumentHelper.createElement(TOPIC); + String option = e.getText(); + int depth = -1; + // depth: 3 + Pattern pattern = Pattern.compile("\\s*\\:depth\\:\\s*\\p{Digit}+"); + Matcher matcher = pattern.matcher(option); + if (matcher.matches()) { + pattern = Pattern.compile("\\p{Digit}+"); + matcher = pattern.matcher(matcher.group()); + if (matcher.find()) { + depth = Integer.parseInt(matcher.group()); + } + } + int levelInit = 0; + try { + levelInit = Integer.parseInt(eTitle.getFirst().attributeValue( + "level")); + } catch (NumberFormatException eee) { + log.error("Can't parse level in: " + + eTitle.getFirst().asXML(), eee); + return; + } + + LinkedList<Element> title = new LinkedList<Element>(); + // on rajoute les refid + for (int i = 0; i < eTitle.size(); i++) { + idMax++; + eTitle.get(i).addAttribute("refid", "id" + idMax); + } + // on enleve les titres limites par depth + for (Element el : eTitle) { + int level = Integer.parseInt(el.attributeValue("level")); + level = level - levelInit; + el.addAttribute("level", "" + level); + if (depth == -1) { + title.add(el); + } + else { + if (depth > level) { + title.add(el); + } + } + } + e.addAttribute("class", "contents"); + String titleValue = e.attributeValue("value"); + e.addAttribute("value", null); + String value = titleValue.trim().toLowerCase(); + // sans titre c "contents" par default + if (value.matches("\\s*")) { + value = "contents"; + titleValue = "Contents"; + } + e.addAttribute("id", value); + e.addAttribute("name", value); + result.addElement("title").setText(titleValue); + // on compose les lignes + result.add(composeLineContent(title, "")); + e.setText(""); + e.appendContent(result); + } + + /** + * @param LinkedList + * <Element> title, String num + * @return Element + */ + private Element composeLineContent(LinkedList<Element> title, String num) { + Element result = DocumentHelper.createElement(BULLET_LIST); + if (sectnum) { + result.addAttribute("class", "auto-toc"); + } + Element item = null; + int cnt = 0; + while (!title.isEmpty()) { + + Element e = title.getFirst(); + int level = Integer.parseInt(e.attributeValue("level")); + LinkedList<Element> child = new LinkedList<Element>(); + + if (level <= 0) { + cnt++; + title.removeFirst(); + item = result.addElement(LIST_ITEM); + Element para = item.addElement(PARAGRAPH); + Element reference = para.addElement(REFERENCE); + String text = e.getText(); + String id = e.attributeValue("refid"); + reference.addAttribute("id", id); + reference.addAttribute("refid", text.replaceAll("\\W+", " ") + .trim().toLowerCase().replaceAll("\\W+", "-")); + // si l'on doit les numeroter + if (sectnum) { + Element generated = reference.addElement("generated") + .addAttribute("class", "sectnum"); + generated.setText(num + cnt + " "); + for (int i = 0; i < eTitle.size(); i++) { + if (eTitle.get(i).attributeValue("refid").equals(id)) { + Element generatedTitle = eTitle.get(i).addElement( + "generated"); + generatedTitle.addAttribute("class", "sectnum"); + generatedTitle.setText(num + cnt + " "); + } + + } + } + reference.setText(text.replaceAll("_", "").trim()); + + } else { + do { + e.addAttribute("level", "" + (level - 1)); + child.add(e); + title.removeFirst(); + if (!title.isEmpty()) { + e = title.getFirst(); + level = Integer.parseInt(e.attributeValue("level")); + } + } while (!title.isEmpty() && level > 0); + String numTmp = ""; + // numerotation + if (sectnum) { + numTmp = num + cnt + "."; + } + if (item != null) { + item.add(composeLineContent(child, numTmp)); // Appel + // recursif + } else { + result.add(composeLineContent(child, numTmp)); // Appel + // recursif + } + } + } + return result; + } + + /** + * @param lexer + * @return Element + * @throws Exception + */ + private Element composeDocument(JRSTLexer lexer) throws Exception { + Element result = DocumentHelper.createElement(DOCUMENT); + result.addAttribute("level", String.valueOf(MAX_SECTION_DEPTH - 1)); + + Element item = null; + + // skip blank line + skipBlankLine(lexer); + + // les liens anonymes + LinkedList<Element> items = lexer.refTarget(); + for (Element e : items) { + eTarget.add(e); + + } + + // le header + item = lexer.peekHeader(); + if (itemEquals(HEADER, item)) { + Element decoration = result.addElement(DECORATION); + Element header = decoration.addElement(HEADER); + header.addAttribute("inline", "true").setText(item.getText()); + } + + // le footer + item = lexer.peekFooter(); + if (itemEquals(FOOTER, item)) { + footer = DocumentHelper.createElement(DECORATION); + Element header = footer.addElement(FOOTER); + header.addAttribute("inline", "true").setText(item.getText()); + } + + // les hyperlinks + LinkedList<Element> listItem = lexer.peekTargetAnonymous(); + if (listItem != null) { + for (Element e : listItem) { + Element anonym = DocumentHelper.createElement(TARGET); + anonym.addAttribute("anonymous", "1"); + idMax++; + anonym.addAttribute("id", "id" + idMax); + anonym.addAttribute("refuri", e.attributeValue("refuri") + .trim()); + eTargetAnonymous.add(anonym); + eTargetAnonymousCopy.add(anonym); + } + } + + // les eléments a enlever (deja parser : header, footer...) + item = lexer.peekRemove(); + if (itemEquals("remove", item)) { + lexer.remove(); + } + + // le titre du doc + item = lexer.peekTitle(); + if (itemEquals(TITLE, item)) { + lexer.remove(); + Element title = result.addElement(TITLE); + String txt = item.getText(); + result.addAttribute("id", txt.replaceAll("[(\\W+)_]", " ") + .toLowerCase().trim().replaceAll("\\s+", "-")); + result.addAttribute("name", txt.toLowerCase().replaceAll( + "[(\\W+)_&&[^\\:]]+", " ").trim()); + copyLevel(item, title); + title.addAttribute("inline", "true").setText(txt.trim()); + } + + // skip blank line + skipBlankLine(lexer); + + // le sous titre du doc + item = lexer.peekTitle(); + if (itemEquals(TITLE, item)) { + lexer.remove(); + Element subtitle = result.addElement(SUBTITLE); + String txt = item.getText(); + subtitle.addAttribute("id", txt.replaceAll("[(\\W+)_]", " ") + .toLowerCase().trim().replaceAll("\\s+", "-")); + subtitle.addAttribute("name", txt.toLowerCase().replaceAll( + "[(\\W+)_]", " ").trim()); + copyLevel(item, subtitle); + DocumentHelper.createElement("footnotes"); + subtitle.addAttribute("inline", "true").setText(txt.trim()); + } + + // skip blank line + skipBlankLine(lexer); + + // les infos du doc + item = lexer.peekDocInfo(); + Element documentinfo = null; + while (itemEquals(DOCINFO, item) || itemEquals(FIELD_LIST, item)) { + + if (documentinfo == null) { + documentinfo = result.addElement(DOCINFO); + } + skipBlankLine(lexer); + if (itemEquals(FIELD_LIST, item)) { + Element field = composeFieldItemList(lexer); + documentinfo.add(field); + } else { + if ("author".equalsIgnoreCase(item.attributeValue("type"))) { + documentinfo.addElement(AUTHOR).addAttribute("inline", + "true").setText(item.getText()); + } else if ("date".equalsIgnoreCase(item.attributeValue("type"))) { + documentinfo.addElement(DATE) + .addAttribute("inline", "true").setText( + item.getText().trim()); + } else if ("organization".equalsIgnoreCase(item + .attributeValue("type"))) { + documentinfo.addElement(ORGANIZATION).addAttribute( + "inline", "true").setText(item.getText().trim()); + } else if ("contact".equalsIgnoreCase(item + .attributeValue("type"))) { + documentinfo.addElement(CONTACT).addAttribute("inline", + "true").setText(item.getText().trim()); + } else if ("address".equalsIgnoreCase(item + .attributeValue("type"))) { + documentinfo.addElement(ADDRESS).addAttribute("inline", + "true").setText(item.getText().trim()); + } else if ("version".equalsIgnoreCase(item + .attributeValue("type"))) { + documentinfo.addElement(VERSION).addAttribute("inline", + "true").setText(item.getText().trim()); + } else if ("revision".equalsIgnoreCase(item + .attributeValue("type"))) { + documentinfo.addElement(REVISION).addAttribute("inline", + "true").setText(item.getText().trim()); + } else if ("status".equalsIgnoreCase(item + .attributeValue("type"))) { + documentinfo.addElement(STATUS).addAttribute("inline", + "true").setText(item.getText().trim()); + } else if ("copyright".equalsIgnoreCase(item + .attributeValue("type"))) { + documentinfo.addElement(COPYRIGHT).addAttribute("inline", + "true").setText(item.getText().trim()); + } else if ("authors".equalsIgnoreCase(item + .attributeValue("type"))) { + Element authors = documentinfo.addElement(AUTHORS); + int t = 0; + String line = item.getText(); + for (int i = 0; i < line.length(); i++) { + if (line.charAt(i) == ';' || line.charAt(i) == ',') { + authors.addElement(AUTHOR).addAttribute("inline", + "true") + .setText(line.substring(t, i).trim()); + t = i + 1; + } + + } + authors.addElement(AUTHOR).addAttribute("inline", "true") + .setText(line.substring(t, line.length()).trim()); + } + lexer.remove(); + } + // skip blank line + // skipBlankLine(lexer); + item = lexer.peekDocInfo(); + + } + + // l'abstract du doc + item = lexer.peekTitle(); + while (itemNotEquals(TITLE, item) && !lexer.eof()) { + composeBody(lexer, result); + item = lexer.peekTitle(); + } + + // les sections + item = lexer.peekTitle(); + while (itemEquals(TITLE, item, true, lexer.eof())) { + Element section = composeSection(lexer); + result.add(section); + item = lexer.peekTitle(); + } + + // on ajoute le footer a la fin + if (footer != null) { + result.add(footer); + } + + return result; + } + + /** + * + * skip blank line + * + * + * @param lexer + * @throws DocumentException + * @throws IOException + */ + private void skipBlankLine(JRSTLexer lexer) throws IOException, + DocumentException { + Element item = lexer.peekBlankLine(); + // skip blank line + while (itemEquals(JRSTLexer.BLANK_LINE, item)) { + // go to the next element + lexer.remove(); + item = lexer.peekBlankLine(); + } + } + + /** + * * + * + * Corps du document + * + * + * @param lexer + * @param root + * @return Element + * @throws DocumentException + * @throws IOException + */ + private Element composeBody(JRSTLexer lexer, Element parent) + throws Exception { + + Element item = lexer.peekTitleOrBodyElement(); + if (item == null && !lexer.eof()) { + item = lexer.peekTitleOrBodyElement(); + } + + while (!lexer.eof() && itemNotEquals(TITLE, item) + && isUpperLevel(item, parent)) { + if (itemEquals(JRSTLexer.BLANK_LINE, item)) { + // go t o the next element + lexer.remove(); + } else if (itemEquals("remove", item)) { + lexer.remove(); + } else if (itemEquals("include", item)) { + lexer.remove(); + Element list = composeInclude(item); + parent.add(list); + } else if (itemEquals(DOCTEST_BLOCK, item)) { + lexer.remove(); + Element list = composeDoctestBlock(item); + parent.add(list); + } else if (itemEquals(ADMONITION, item)) { + lexer.remove(); + Element list = composeAdmonition(item); + parent.add(list); + } else if (itemEquals(SIDEBAR, item)) { + lexer.remove(); + Element list = composeSidebar(item); + parent.add(list); + } else if (itemEquals(TOPIC, item)) { + lexer.remove(); + Element list = composeTopic(item); + parent.add(list); + } else if (itemEquals(TRANSITION, item)) { + lexer.remove(); + Element para = parent.addElement(TRANSITION); + copyLevel(item, para); + } else if (itemEquals(PARAGRAPH, item)) { + lexer.remove(); + Element para = parent.addElement(PARAGRAPH); + copyLevel(item, para); + para.addAttribute("inline", "true").setText(item.getText()); + } else if (itemEquals(JRSTLexer.DIRECTIVE, item)) { + lexer.remove(); + Node directive = composeDirective(item); + parent.add(directive); + } else if (itemEquals(SUBSTITUTION_DEFINITION, item)) { + lexer.remove(); + Element subst = composeSubstitutionDefinition(item); + parent.add(subst); + } else if (itemEquals(LITERAL_BLOCK, item)) { + lexer.remove(); + Element para = parent.addElement(LITERAL_BLOCK); + copyLevel(item, para); + para.setText(item.getText()); + } else if (itemEquals(JRSTLexer.TABLE, item)) { + lexer.remove(); + Element table = composeTable(item); + parent.add(table); + // Element para = parent.addElement(TABLE); + // copyLevel(item, para); + // para.setText(item.getText()); + } else if (itemEquals(LINE_BLOCK, item)) { + lexer.remove(); + Element list = composeLineBlock(lexer, item); + parent.add(list); + } else if (itemEquals(BULLET_LIST, item)) { + Element list = composeBulletList(lexer); + parent.add(list); + } else if (itemEquals(ENUMERATED_LIST, item)) { + Element list = composeEnumeratedList(lexer); + parent.add(list); + } else if (itemEquals(DEFINITION_LIST, item)) { + Element list = composeDefinitionList(lexer); + parent.add(list); + } else if (itemEquals(FIELD_LIST, item)) { + Element list = composeFieldList(lexer); + parent.add(list); + } else if (itemEquals(BLOCK_QUOTE, item)) { + lexer.remove(); + Element list = composeBlockQuote(item); + parent.add(list); + } else if (itemEquals(OPTION_LIST, item)) { + Element list = composeOptionList(lexer); + parent.add(list); + } else if (itemEquals(TARGET, item)) { + lexer.remove(); + Element list = composeTarget(item); + parent.add(list); + } else if (itemEquals("targetAnonymous", item)) { + lexer.remove(); + Element list = composeTargetAnonymous(item); + parent.add(list); + } else if (itemEquals("footnotes", item)) { + lexer.remove(); + Element[] list = composeFootnote(item); + for (Element l : list) { + parent.add(l); + } + } else if (itemEquals(COMMENT, item)) { + lexer.remove(); + Element list = composeComment(item); + parent.add(list); + } + + else { + if (ERROR_MISSING_ITEM) { + throw new DocumentException("Unknow item type: " + + item.getName()); + } else { + lexer.remove(); + } + } + + // Pour afficher le "PseudoXML" + // if (item!=null) System.out.println(item.asXML()); + + item = lexer.peekTitleOrBodyElement(); + } + + return parent; + } + + /** + * + * include un document rst + * + * + * <pre> + * .. include:: doc.rst + * </pre> + * + * + * include un document literal (code...) + * + * + * <pre> + * .. include:: literal + * doc.rst + * </pre> + * + * @param item + * @return Element + * @throws Exception + */ + private Element composeInclude(Element item) throws Exception { + String option = item.attributeValue("option"); + String path = item.getText(); + Element result = null; + if (option.equals("literal")) { + result = DocumentHelper.createElement(LITERAL_BLOCK); + FileReader reader = new FileReader(path); + BufferedReader bf = new BufferedReader(reader); + String line = ""; + String lineTmp = bf.readLine(); + while (lineTmp != null) { + line += '\n' + lineTmp; + lineTmp = bf.readLine(); + } + result.setText(line); + } else { + File fileIn = new File(path); + URL url = fileIn.toURI().toURL(); + Reader in = new InputStreamReader(url.openStream()); + + Document doc = newJRSTReader(in); + + result = doc.getRootElement(); + } + return result; + } + + /** + * <pre> + * .. + * So this block is not "lost", + * despite its indentation. + * </pre> + * + * @param item + * @return Element + */ + private Element composeComment(Element item) { + + return item; + } + + /** + * <pre> + * __ http://truc.html + * </pre> + * + * @param item + * @return Element + */ + private Element composeTargetAnonymous(Element item) { + Element result = null; + result = eTargetAnonymousCopy.getFirst(); + eTargetAnonymousCopy.removeFirst(); + return result; + } + + /** + * <pre _ target: target.html </pre> + * + * @param item + * @return Element + */ + private Element composeTarget(Element item) { + Element result = null; + for (Element e : eTarget) { + if (e.attributeValue("id").equals(item.attributeValue("id"))) { + result = e; + } + } + return result; + } + + /** + * <pre> + * .. [#] This is a footnote + * </pre> + * + * @param item + * @return Element + * @throws Exception + */ + private Element[] composeFootnote(Element item) throws Exception { + Element[] result = null; + if (itemEquals("footnotes", item)) { + List<Element> footnotes = (List<Element>) item + .selectNodes(FOOTNOTE); + result = new Element[footnotes.size()]; + int cnt = 0; + for (Element footnote : footnotes) { + result[cnt] = DocumentHelper.createElement(FOOTNOTE); + Element efootnote = DocumentHelper.createElement(FOOTNOTE); + int labelMax = 0; + + for (int i = 0; i < lblFootnotes.size(); i++) { + int lbl = lblFootnotes.get(i); + labelMax = Math.max(lbl, labelMax); + } + + boolean[] labels = new boolean[labelMax]; + for (int i = 0; i < labels.length; i++) { + labels[i] = false; + } + for (int i = 0; i < lblFootnotes.size(); i++) { + labels[lblFootnotes.get(i) - 1] = true; + } + idMax++; + String name = null; + String id = ""; + String label = null; + String type = footnote.attributeValue("type"); + if (type.equals("autoNum") || type.equals("autoNumLabel")) { + result[cnt].addAttribute("auto", "1"); + } + if (type.equals("autoSymbol")) { + result[cnt].addAttribute("auto", "*"); + } + result[cnt].addAttribute("backrefs", "id" + idMax); + efootnote.addAttribute("backrefs", "id" + idMax); + if (type.equals("num") || type.equals("autoNumLabel")) { + name = footnote.attributeValue("name"); + if (type.equals("autoNumLabel")) { + id = name; + } + else { + label = name; + } + } + if (type.equals("autoNum") || type.equals("autoNumLabel")) { + boolean done = false; + + for (int i = 0; i < labels.length && !done; i++) { + if (!labels[i]) { + done = true; + label = "" + (i + 1); + } + } + if (!done) { + label = "" + (labels.length + 1); + } + if (type.equals("autoNum")) { + name = label; + } + } + if (type.equals("autoSymbol")) { + + int nb = Math.abs(symbolMax / 10) + 1; + char symbol = FOOTNOTE_SYMBOL.charAt(symbolMax % 10); + label = ""; + for (int j = 0; j < nb; j++) { + label += symbol; + } + symbolMax++; + + } + result[cnt].addAttribute("id", "" + id); + efootnote.addAttribute("id", "" + id); + if (!type.equals("autoSymbol")) { + result[cnt].addAttribute("name", "" + name); + efootnote.addAttribute("name", "" + name); + } + result[cnt].addElement("label").setText("" + label); + efootnote.addAttribute("label", "" + label); + if (!type.equals("autoSymbol")) { + lblFootnotes.add(Integer.parseInt(label)); + } + efootnote.addAttribute("type", type); + eFootnotes.add(efootnote); + String text = footnote.getText(); + Document doc = newJRSTReader(new StringReader(text)); + result[cnt].appendContent(doc.getRootElement()); + + cnt++; + } + } + for (int i = 0; i < result.length; i++) { + if (result[i].attributeValue("id").equals("")) { + idMax++; + result[i].addAttribute("id", "id" + idMax); + (eFootnotes.get(i)).addAttribute("id", "id" + idMax); + } + + } + + return result; + } + + /** + * <pre> + * -a command-line option "a" -1 file, --one=file, --two file Multiple + * options with arguments. + * </pre> + * + * @param lexer + * @return Element + * @throws Exception + * @throws DocumentException + */ + private Element composeOptionList(JRSTLexer lexer) + throws DocumentException, Exception { + Element item = lexer.peekOption(); + Element result = DocumentHelper.createElement(OPTION_LIST); + while (itemEquals(OPTION_LIST, item)) { + lexer.remove(); + Element optionListItem = result.addElement(OPTION_LIST_ITEM); + Element optionGroup = optionListItem.addElement(OPTION_GROUP); + List<Element> option = (List<Element>) item.selectNodes("option"); + for (Element e : option) { + Element eOption = optionGroup.addElement(OPTION); + eOption.addElement(OPTION_STRING).setText( + e.attributeValue(OPTION_STRING)); + if (e.attributeValue("delimiterExiste").equals("true")) { + eOption.addElement(OPTION_ARGUMENT).addAttribute( + "delimiter", e.attributeValue("delimiter")) + .setText(e.attributeValue(OPTION_ARGUMENT)); + } + } + Element description = optionListItem.addElement(DESCRIPTION); + + String text = item.getText(); + Document doc = newJRSTReader(new StringReader(text)); + description.appendContent(doc.getRootElement()); + + item = lexer.peekOption(); + } + return result; + } + + /** + * <pre> + * .. topic:: Title + * + * Body. + * </pre> + * + * @param Element + * item + * @return Element + * @throws Exception + */ + + private Element composeTopic(Element item) throws Exception { + Element result = null; + result = DocumentHelper.createElement(TOPIC); + result.addElement(TITLE).addAttribute("inline", "true").setText( + item.attributeValue(TITLE)); + String text = item.getText(); + Document doc = newJRSTReader(new StringReader(text)); + result.appendContent(doc.getRootElement()); + + return result; + } + + /** + * <pre> + * .. sidebar:: Title + * :subtitle: If Desired + * + * Body. + * </pre> + * + * @param Element + * @return Element + * @throws Exception + */ + + private Element composeSidebar(Element item) throws Exception { + Element result = null; + result = DocumentHelper.createElement(SIDEBAR); + result.addElement(TITLE).addAttribute("inline", "true").setText( + item.attributeValue(TITLE)); + if (item.attributeValue("subExiste").equals("true")) { + result.addElement(SUBTITLE).addAttribute("inline", "true").setText( + item.attributeValue(SUBTITLE)); + } + + String text = item.getText(); + Document doc = newJRSTReader(new StringReader(text)); + result.appendContent(doc.getRootElement()); + + return result; + } + + /** + * <pre> + * | line block + * | + * | indent + * </pre> + * + * @param lexer + * @param item + * @return Element + * @throws Exception + */ + private Element composeLineBlock(JRSTLexer lexer, Element item) + throws Exception { + Element result = null; + result = DocumentHelper.createElement(LINE_BLOCK); + List<Element> lines = (List<Element>) item.selectNodes(LINE); + int[] levels = new int[lines.size()]; + int cnt = 0; + for (Element l : lines) { + levels[cnt] = Integer.parseInt(l.attributeValue("level")); + cnt++; + } + cnt = 0; + boolean[] lineDone = new boolean[lines.size()]; + for (int i = 0; i < lineDone.length; i++) { + lineDone[i] = false; + } + for (Element l : lines) { + if (levels[cnt] == 0) { + result.addElement(LINE).addAttribute("inline", "true").setText( + l.getText()); + } + else { + if (!lineDone[cnt]) { + Element newItem = DocumentHelper.createElement(LINE_BLOCK); + Boolean done = false; + for (int i = cnt; i < lines.size() && !done; i++) { + if (levels[i] > 0) { + Element eLine = newItem.addElement("line"); + eLine.addAttribute("level", "" + (levels[i] - 1)); + eLine.setText(lines.get(i).getText()); + lineDone[i] = true; + } else { + done = true; + } + + } + Element eLineBlock = result.addElement(LINE_BLOCK); + // Appel recursif + eLineBlock.appendContent(composeLineBlock(lexer, newItem)); + } + } + cnt++; + + } + return result; + } + + /** + * <pre> + * >>> print 'this is a Doctest block' + * this is a Doctest block + * </pre> + * + * @param Element + * @return Element + */ + private Element composeDoctestBlock(Element item) { + return item; + } + + /** + * <pre> + * As a great paleontologist once said, + * + * This theory, that is mine, is mine. + * + * -- Anne Elk (Miss) + * </pre> + * + * @param Element + * @return Element + * @throws Exception + * + */ + private Element composeBlockQuote(Element item) throws Exception { + Element result = null; + result = DocumentHelper.createElement(BLOCK_QUOTE); + + String text = item.getText(); + Document doc = newJRSTReader(new StringReader(text)); + result.appendContent(doc.getRootElement()); + String sAttribution = item.attributeValue(ATTRIBUTION); + if (sAttribution != null) { + Element attribution = result.addElement(ATTRIBUTION); + attribution.setText(sAttribution); + attribution.addAttribute("inline", "true"); + } + return result; + } + + /** + * <pre> + * .. admonition:: And, by the way... + * + * You can make up your own admonition too. + * </pre> + * + * @param Element + * @return Element + * @throws Exception + * + */ + private Element composeAdmonition(Element item) throws Exception { + Element result = null; + if (item.attributeValue("type").equalsIgnoreCase(ADMONITION)) { + result = DocumentHelper.createElement(ADMONITION); + String title = item.attributeValue(TITLE); + String admonitionClass = "admonition_" + title; + admonitionClass = admonitionClass.toLowerCase().replaceAll( + "\\p{Punct}", ""); + admonitionClass = admonitionClass.replace(' ', '-'); + admonitionClass = admonitionClass.replace('\n', '-'); + result.addAttribute("class", admonitionClass); + result.addElement(TITLE).addAttribute("inline", "true").setText( + title.trim()); + } else { + result = DocumentHelper.createElement(item.attributeValue("type") + .toLowerCase()); + } + + String text = item.getText(); + Document doc = newJRSTReader(new StringReader(text)); + result.appendContent(doc.getRootElement()); + return result; + } + + /** + * parse all directives + * + * @param Element + * @return Node + */ + private Node composeDirective(Element item) { + Node result = item; + String type = item.attributeValue(JRSTLexer.DIRECTIVE_TYPE); + if (type.equals("sectnum")) { + sectnum = true; + } + JRSTDirective directive = getDirective(type); + if (directive == null) { + directive = getDefaultDirective(type); + } + if (directive != null) { + result = directive.parse(item); + } else { + log.warn("Unknow directive type '" + type + "' in: " + item); + } + return result; + } + + /** + * <pre> + * .. |biohazard| image:: biohazard.png + * </pre> + * + * @param Element + * @return Element + */ + private Element composeSubstitutionDefinition(Element item) { + Element result = item; + Element child = (Element) item.selectSingleNode("*"); + Node newChild = composeDirective(child); + result.remove(child); // remove old after composeDirective, because + // directive can be used this parent + result.add(newChild); + return result; + } + + /** + * + * Complexe Table + * + * + * <pre> + * +------------------------+------------+---------------------+ + * | body row 3 | Cells may | - Table cells | + * +------------------------+ span rows. | - contain | + * | body row 4 | | - body elements. | + * +------------------------+------------+---------------------+ + * </pre> + * + * + * And simple table + * + * + * <pre> + * ===== ===== ====== + * Inputs Output + * ============ ====== + * A B A or B + * ------------ ------ + * A B A or B + * ===== ===== ====== + * </pre> + * + * @param Element + * @return Element + * + */ + private Element composeTable(Element item) throws Exception { + + Element result = DocumentHelper.createElement(TABLE); + + int tableWidth = Integer.parseInt(item + .attributeValue(JRSTLexer.TABLE_WIDTH)); + + TreeSet<Integer> beginCellList = new TreeSet<Integer>(); + + for (Element cell : (List<Element>) item.selectNodes(JRSTLexer.ROW + + "/" + JRSTLexer.CELL)) { + Integer begin = Integer.valueOf(cell + .attributeValue(JRSTLexer.CELL_INDEX_START)); + beginCellList.add(begin); + } + + int[] beginCell = new int[beginCellList.size() + 1]; // + 1 to put + // table width + // to simulate + // new cell + int[] lengthCell = new int[beginCellList.size()]; + + int cellNumber = 0; + for (int b : beginCellList) { + beginCell[cellNumber] = b; + if (cellNumber > 0) { + lengthCell[cellNumber - 1] = beginCell[cellNumber] + - beginCell[cellNumber - 1]; + } + cellNumber++; + } + beginCell[cellNumber] = tableWidth; + lengthCell[cellNumber - 1] = beginCell[cellNumber] + - beginCell[cellNumber - 1]; + + Element tgroup = result.addElement(TGROUP).addAttribute("cols", + String.valueOf(cellNumber)); + for (int width : lengthCell) { + tgroup.addElement(COLSPEC).addAttribute("colwidth", + String.valueOf(width)); + } + + Element rowList = null; + if ("true".equals(item.attributeValue(JRSTLexer.TABLE_HEADER))) { + rowList = tgroup.addElement(THEAD); + } else { + rowList = tgroup.addElement(TBODY); + } + List<Element> rows = (List<Element>) item.selectNodes(JRSTLexer.ROW); + for (int r = 0; r < rows.size(); r++) { + Element row = rowList.addElement(ROW); + List<Element> cells = (List<Element>) rows.get(r).selectNodes( + JRSTLexer.CELL); + for (int c = 0; c < cells.size(); c++) { + Element cell = cells.get(c); + // si la cellule a ete utilise pour un regroupement vertical on + // la passe + if (!"true".equals(cell.attributeValue("used"))) { + Element entry = row.addElement(ENTRY); + String text = ""; + + // on regroupe les cellules verticalement + int morerows = -1; + Element tmpCell = null; + String cellStart = cell + .attributeValue(JRSTLexer.CELL_INDEX_START); + do { + morerows++; + tmpCell = (Element) rows.get(r + morerows) + .selectSingleNode( + JRSTLexer.CELL + "[@" + + JRSTLexer.CELL_INDEX_START + + "=" + cellStart + "]"); + text += tmpCell.getText(); + // on marque la cellule comme utilise + tmpCell.addAttribute("used", "true"); + } while (!"true".equals(tmpCell + .attributeValue(JRSTLexer.CELL_END))); + + if (morerows > 0) { + entry + .addAttribute("morerows", String + .valueOf(morerows)); + } + + // on compte le nombre de cellules regroupees + // horizontalement + int morecols = 0; + tmpCell = cells.get(c + morecols); + int cellEnd = Integer.parseInt(tmpCell + .attributeValue(JRSTLexer.CELL_INDEX_END)); + while (cellEnd + 1 != beginCell[c + morecols + 1]) { + morecols++; + // tmpCell = cells.get(c + morecols); + // cellEnd = + // Integer.parseInt(tmpCell.attributeValue(JRSTLexer. + // CELL_INDEX_END)); + } + if (morecols > 0) { + entry + .addAttribute("morecols", String + .valueOf(morecols)); + } + // parse entry text in table + Document doc = newJRSTReader(new StringReader(text)); + entry.appendContent(doc.getRootElement()); + } + } + if ("true".equals(rows.get(r).attributeValue( + JRSTLexer.ROW_END_HEADER))) { + rowList = tgroup.addElement(TBODY); + } + } + + return result; + } + + /** + * + * items begin with "-", "+", or "*" + * + * + * <pre> + * * aaa + * - bbb + * * ccc + * - ddd + * + eee + * </pre> + * + * @param lexer + * @return Element + * @throws Exception + */ + private Element composeBulletList(JRSTLexer lexer) throws Exception { + Element item = lexer.peekBulletList(); + Element result = DocumentHelper.createElement(BULLET_LIST); + copyLevel(item, result); + result.addAttribute("bullet", item.attributeValue("bullet")); + while (itemEquals(BULLET_LIST, item) && isSameLevel(item, result) + && hasSameAttribute(item, result, "bullet")) { + lexer.remove(); + Element bullet = result.addElement(LIST_ITEM); + copyLevel(item, bullet); + bullet.addElement(PARAGRAPH).addAttribute("inline", "true") + .setText(item.getText()); + composeBody(lexer, bullet); + + item = lexer.peekBulletList(); + } + return result; + } + + /** + * <pre> + * 3. et meme + * * #. pour voir + * * I) de tout + * (a) pour tout + * (#) vraiment tout + * </pre> + * + * @param lexer + * @return Element + * @throws Exception + */ + private Element composeEnumeratedList(JRSTLexer lexer) throws Exception { + Element item = lexer.peekEnumeratedList(); + Element result = DocumentHelper.createElement(ENUMERATED_LIST); + copyLevel(item, result); + String enumType = item.attributeValue("enumtype"); + if (!enumType.equals("arabic")) { + result.addAttribute("start", item.attributeValue("start")); + } + result.addAttribute("prefix", item.attributeValue("prefix")); + result.addAttribute("suffix", item.attributeValue("suffix")); + result.addAttribute("enumtype", enumType); + while (itemEquals(ENUMERATED_LIST, item) + && isSameLevel(item, result) + && hasSameAttribute(item, result, "prefix", "suffix") + && ("auto".equals(item.attributeValue("enumtype")) || hasSameAttribute( + item, result, "enumtype"))) { + lexer.remove(); + Element e = result.addElement(LIST_ITEM); + copyLevel(item, e); + e.addElement(PARAGRAPH).addAttribute("inline", "true").setText( + item.getText()); + composeBody(lexer, e); + + item = lexer.peekEnumeratedList(); + } + return result; + } + + /** + * <pre> + * le mot : la classe + * la definition + * </pre> + * + * @param lexer + * @return Element + * @throws Exception + */ + private Element composeDefinitionList(JRSTLexer lexer) throws Exception { + Element item = lexer.peekBodyElement(); + Element result = DocumentHelper.createElement(DEFINITION_LIST); + copyLevel(item, result); + while (itemEquals(DEFINITION_LIST, item) && isSameLevel(item, result)) { + lexer.remove(); + Element def = result.addElement(DEFINITION_LIST_ITEM); + copyLevel(item, def); + + Element term = def.addElement(TERM); + copyLevel(item, term); + term.addAttribute("inline", "true").setText( + item.attributeValue("term")); + + String[] classifiers = StringUtil.split(item + .attributeValue("classifiers"), " : "); + for (String classifierText : classifiers) { + Element classifier = def.addElement("classifier"); + copyLevel(item, classifier); + classifier.addAttribute("inline", "true").setText( + classifierText); + } + + Element definition = def.addElement(DEFINITION); + definition.addElement(PARAGRAPH).addAttribute("inline", "true") + .setText(item.getText()); + copyLevel(item, definition); + + composeBody(lexer, definition); + + item = lexer.peekBodyElement(); + } + return result; + } + + /** + * <pre> + * :un peu: de field + * ca ne fait pas + * de mal + * </pre> + * + * @param lexer + * @return Element + * @throws Exception + */ + private Element composeFieldList(JRSTLexer lexer) throws Exception { + Element item = lexer.peekBodyElement(); + Element result = DocumentHelper.createElement(FIELD_LIST); + copyLevel(item, result); + while (itemEquals(FIELD_LIST, item) && isSameLevel(item, result)) { + Element field = composeFieldItemList(lexer); + result.add(field); + item = lexer.peekBodyElement(); + } + return result; + } + + /** + * <pre> + * :field1: avec un + * petit texte + * - et meme un + * - debut + * - de list + * </pre> + * + * @param lexer + * @return Element + * @throws Exception + */ + private Element composeFieldItemList(JRSTLexer lexer) throws Exception { + Element item = lexer.peekFieldList(); + if (itemEquals(FIELD_LIST, item)) { + lexer.remove(); + Element field = DocumentHelper.createElement(FIELD); + copyLevel(item, field); + Element fieldName = field.addElement(FIELD_NAME); + copyLevel(item, fieldName); + fieldName.addAttribute("inline", "true").setText( + item.attributeValue("name")); + Element fieldBody = field.addElement(FIELD_BODY); + fieldBody.addElement(PARAGRAPH).addAttribute("inline", "true") + .setText(item.getText()); + copyLevel(item, fieldBody); + composeBody(lexer, fieldBody); + + return field; + } else { + throw new DocumentException("Waiting for " + FIELD_LIST + + " and found " + item.getName()); + } + } + + /** + * <pre> + * DEFINITIONS + * ----------- + * </pre> + * + * @param lexer + * @return Element + * @throws Exception + */ + private Element composeSection(JRSTLexer lexer) throws Exception { + Element result = DocumentHelper.createElement(SECTION); + Element firstTitle = null; + + Element item = null; + + // le titre de la section + item = lexer.peekTitle(); + if (itemEquals(TITLE, item, true, lexer.eof())) { + lexer.remove(); + firstTitle = item; + Element title = result.addElement(TITLE); + copyLevel(item, result); + copyLevel(item, title); + title.addAttribute("inline", "true").setText(item.getText().trim()); + result.addAttribute("id", item.getText().replaceAll("\\W+", " ") + .trim().toLowerCase().replaceAll("\\W+", "-")); + result.addAttribute("name", item.getText().toLowerCase().trim()); + eTitle.add(title); + } + + // le contenu de la section + item = lexer.peekTitle(); + while (itemNotEquals(TITLE, item) && !lexer.eof()) { + composeBody(lexer, result); + item = lexer.peekTitle(); + } + + // les sous sections + item = lexer.peekTitle(); + while (itemEquals(TITLE, item) && isUpperLevel(item, firstTitle)) { + Element section = composeSection(lexer); + result.add(section); + item = lexer.peekTitle(); + } + + return result; + } + + /** + * Indique si la sous section est bien une sous section, c-a-d dire que son + * level est superieur a celui de la section + * + * @param item + * @param firstTitle + * @return boolean + * @throws DocumentException + */ + private boolean isUpperLevel(Element subSection, Element section) + throws DocumentException { + // if (!(itemEquals(SECTION, subSection) && itemEquals(SECTION, + // section)) + // || itemEquals(DOCUMENT, section) || itemEquals(SECTION, section)) { + // // all element is upper than Document or section + // return true; + // } + int subSectionLevel = Integer.parseInt(subSection + .attributeValue("level")); + int sectionLevel = Integer.parseInt(section.attributeValue("level")); + boolean result = subSectionLevel > sectionLevel; + return result; + } + + /** + * Indique si les deux elements sont au meme niveau + * + * @param item + * @param firstTitle + * @return boolean + * @throws DocumentException + */ + private boolean isSameLevel(Element subSection, Element section) + throws DocumentException { + // if (itemEquals(DOCUMENT, section) || itemEquals(SECTION, section)) { + // // all element is upper than Document or section + // return false; + // } + int subSectionLevel = Integer.parseInt(subSection + .attributeValue("level")); + int sectionLevel = Integer.parseInt(section.attributeValue("level")); + boolean result = subSectionLevel == sectionLevel; + return result; + } + + /** + * @param Element + * e1 + * @param Element + * e2 + * @param String + * ... attnames + * @return boolean + */ + private boolean hasSameAttribute(Element e1, Element e2, String... attnames) { + boolean result = true; + for (String attname : attnames) { + String a1 = e1.attributeValue(attname); + String a2 = e2.attributeValue(attname); + if (!ObjectUtils.equals(a1, a2)) { + result = false; + break; + } + } + return result; + } + + /** + * @param Element + * from + * @param Element + * to + * @throws DocumentException + */ + private void copyLevel(Element from, Element to) throws DocumentException { + String level = from.attributeValue("level"); + if (level == null) { + throw new DocumentException("Element without level: " + from); + } + to.addAttribute("level", level); + } + + /** + * @param String + * name + * @param Element + * e + * @return boolean + * @throws DocumentException + */ + private boolean itemEquals(String name, Element e) throws DocumentException { + boolean result = itemEquals(name, e, false, false); + return result; + } + + /** + * @param String + * name + * @param Element + * e + * @param throwError + * @param eof + * @return boolean + * @throws DocumentException + */ + private boolean itemEquals(String name, Element e, boolean throwError, + boolean eof) throws DocumentException { + boolean result = e != null && name.equals(e.getName()); + if (ERROR_MISSING_ITEM && !result && throwError && !eof) { + throw new DocumentException("Malformed document waiting " + name + + " and found " + (e != null ? e.getName() : "null")); + } + return result; + } + + /** + * @param String + * name + * @param Element + * e + * @return boolean + */ + private boolean itemNotEquals(String name, Element e) { + boolean result = e == null || !name.equals(e.getName()); + return result; + } + + private Document newJRSTReader(Reader r) throws Exception { + JRSTReader reader = new JRSTReader(); + reader.setVariable(idMax, symbolMax, symbolMaxRef, lblFootnotes, + lblFootnotesRef, eFootnotes, eTarget, eTargetAnonymous, + eTargetAnonymousCopy); + + return reader.read(r); + + } + + /** + * + * Initialises les variables d'environements par ex, les hyperlinks peuvent + * etre referencer dans tous le document + * + * + * @param idMax + * @param symbolMax + * @param symbolMaxRef + * @param lblFootnotes + * @param lblFootnotesRef + * @param eFootnotes + * @param eTarget + * @param eTargetAnonymous + * @param eTargetAnonymousCopy + */ + public void setVariable(int idMax, int symbolMax, int symbolMaxRef, + LinkedList<Integer> lblFootnotes, + LinkedList<Integer> lblFootnotesRef, + LinkedList<Element> eFootnotes, LinkedList<Element> eTarget, + LinkedList<Element> eTargetAnonymous, + LinkedList<Element> eTargetAnonymousCopy) { + this.idMax = idMax; + this.symbolMax = symbolMax; + this.symbolMaxRef = symbolMaxRef; + this.lblFootnotes = lblFootnotes; + this.lblFootnotesRef = lblFootnotesRef; + this.eFootnotes = eFootnotes; + this.eTarget = eTarget; + this.eTargetAnonymous = eTargetAnonymous; + this.eTargetAnonymousCopy = eTargetAnonymousCopy; + } + + /** + * Parse text in element and replace text with parse result + * + * @param Element + * e + * @throws DocumentException + */ + private void inline(Element e) throws DocumentException { + String text = e.getText(); + + text = StringEscapeUtils.escapeXml(text); + // search all LITERAL and replace it with special mark + // this prevent substitution in literal, example **something** must not + // change in literal + Map<String, String> temporaries = new HashMap<String, String>(); + Matcher matcher = REGEX_LITERAL.matcher(text); + int index = 0; + while (matcher.find()) { + int start = matcher.start(); + int end = matcher.end(); + String literal = "<" + LITERAL + ">" + matcher.group(1) + "</" + + LITERAL + ">"; + String key = "literal" + index++; + temporaries.put(key, literal); + text = text.substring(0, start) + "<tmp>" + key + "</tmp>" + + text.substring(end); + matcher = REGEX_LITERAL.matcher(text); + } + // search all REGEX_INLINE_REFERENCE and replace it with special mark + // this prevent substitution of URL with REGEX_REFERENCE. Use same + // mechanisme as literal for that + matcher = REGEX_INLINE_REFERENCE.matcher(text); + index = 0; + while (matcher.find()) { + int start = matcher.start(); + int end = matcher.end(); + Element ref = DocumentHelper.createElement(REFERENCE); + ref.addAttribute("refuri", matcher.group(2)); + ref.setText(matcher.group(1)); + String key = "inlineReference" + index++; + temporaries.put(key, ref.asXML()); + text = text.substring(0, start) + "<tmp>" + key + "</tmp>" + + text.substring(end); + matcher = REGEX_INLINE_REFERENCE.matcher(text); + + } + // do all substitution inline + text = REGEX_EMAIL.matcher(text).replaceAll( + "$1<" + REFERENCE + " refuri='mailto:$2'>$2</" + REFERENCE + + ">$3"); + text = REGEX_STRONG.matcher(text).replaceAll( + "<" + STRONG + ">$1</" + STRONG + ">"); + text = REGEX_EMPHASIS.matcher(text).replaceAll( + "<" + EMPHASIS + ">$1</" + EMPHASIS + ">"); + text = REGEX_REFERENCE.matcher(text).replaceAll( + "<" + REFERENCE + " refuri='$1'>$1</" + REFERENCE + ">$2"); + // _[#]truc + matcher = REGEX_FOOTNOTE_REFERENCE.matcher(text); + while (matcher.find()) { + String txtDebut = text.substring(0, matcher.start()); + String txtFin = text.substring(matcher.end() + 1, text.length()); + Element footnote = DocumentHelper.createElement(FOOTNOTE_REFERENCE); + String sFootnote = matcher.group(); + boolean done = false; + for (int i = 0; i < sFootnote.length() && !done; i++) { + if (sFootnote.charAt(i) == ']') { + String id = sFootnote.substring(1, i); + if (id.equals("*")) { + int nb = Math.abs(symbolMaxRef / 10) + 1; + char symbol = FOOTNOTE_SYMBOL.charAt(symbolMaxRef % 10); + String label = ""; + for (int j = 0; j < nb; j++) { + label += symbol; + } + symbolMaxRef++; + footnote.addAttribute("auto", "*"); + for (int j = 0; j < eFootnotes.size(); j++) { + Element eFootnote = eFootnotes.get(j); + if (eFootnote.attributeValue("label").equals(label)) { + + footnote.addAttribute("id", eFootnote + .attributeValue("backrefs")); + footnote.addAttribute("refid", eFootnote + .attributeValue("id")); + + } + } + footnote.setText(label); + + } else if (id.matches("[1-9]+")) { + + for (int j = 0; j < eFootnotes.size(); j++) { + Element eFootnote = eFootnotes.get(j); + if (eFootnote.attributeValue("label").equals(id)) { + footnote.addAttribute("id", eFootnote + .attributeValue("backrefs")); + footnote.addAttribute("refid", eFootnote + .attributeValue("id")); + } + } + footnote.setText(id); + lblFootnotesRef.add(Integer.parseInt(id)); + + } else if (id.equals("#")) { + int lblMax = 0; + for (int j = 0; j < lblFootnotesRef.size(); j++) { + lblMax = Math.max(lblMax, lblFootnotesRef.get(j)); + } + + boolean[] lbls = new boolean[lblMax]; + for (int j = 0; j < lbls.length; j++) { + lbls[j] = false; + } + for (int j = 0; j < lblFootnotesRef.size(); j++) { + lbls[lblFootnotesRef.get(j) - 1] = true; + } + boolean valide = false; + do { + boolean trouve = false; + String label = null; + for (int j = 0; j < lbls.length && !trouve; j++) { + + if (!lbls[j]) { + trouve = true; + label = "" + (j + 1); + } + } + if (!trouve) { + label = "" + (lbls.length + 1); + } + footnote.addAttribute("auto", "1"); + for (int j = 0; j < eFootnotes.size(); j++) { + Element eFootnote = eFootnotes.get(j); + if (eFootnote.attributeValue("label").equals( + label)) { + if (!(eFootnote.attributeValue("type") + .equals("autoNumLabel"))) { + footnote.addAttribute("id", eFootnote + .attributeValue("backrefs")); + footnote.addAttribute("refid", + eFootnote.attributeValue("id")); + footnote.setText(label); + lblFootnotesRef.add(Integer + .parseInt(label)); + valide = true; + } else { + valide = false; + lbls[Integer.parseInt(label) - 1] = true; + } + } + } + } while (!valide); + + } + + else { + footnote.addAttribute("auto", "1"); + + String name = id.substring(1); + boolean trouve = false; + for (int j = 0; j < eFootnotes.size() && !trouve; j++) { + Element eFootnote = eFootnotes.get(j); + if (eFootnote.attributeValue("name").equals(name)) { + footnote.addAttribute("id", eFootnote + .attributeValue("backrefs")); + footnote.addAttribute("refid", eFootnote + .attributeValue("id")); + String label = eFootnote + .attributeValue("label"); + footnote.setText(label); + lblFootnotesRef.add(Integer.parseInt(label)); + trouve = true; + } + } + + footnote.addAttribute("name", name); + } + done = true; + } + } + text = txtDebut + footnote.asXML() + txtFin; + matcher = REGEX_FOOTNOTE_REFERENCE.matcher(text); + } + // .. __http://truc.html + matcher = REGEX_ANONYMOUS_HYPERLINK_REFERENCE.matcher(text); + while (matcher.find()) { + String txtDebut = text.substring(0, matcher.start()); + String txtFin = text.substring(matcher.end(), text.length()); + String ref = text.substring(matcher.start(), matcher.end() - 2); + ref = ref.replaceAll("`", ""); + Element anonym = DocumentHelper.createElement("reference"); + anonym.addAttribute("anonymous", "1"); + anonym.addAttribute("name", ref.trim()); + if (!eTargetAnonymous.isEmpty()) { + Element target = eTargetAnonymous.getFirst(); + eTargetAnonymous.removeFirst(); + anonym.addAttribute("refuri", target.attributeValue("refuri")); + } + anonym.setText(ref); + text = txtDebut + anonym.asXML() + txtFin; + matcher = REGEX_ANONYMOUS_HYPERLINK_REFERENCE.matcher(text); + } + // .. _truc: http://truc.html + matcher = REGEX_HYPERLINK_REFERENCE.matcher(text); + while (matcher.find()) { + String txtDebut = text.substring(0, matcher.start()); + String txtFin = text.substring(matcher.end(), text.length()); + String ref = text.substring(matcher.start(), matcher.end() - 1); + + ref = ref.replaceAll("('|_)", ""); + ref = ref.replaceAll("[\\W&&[^-]]", " ").trim(); + Element hyper = DocumentHelper.createElement("reference"); + hyper.addAttribute("name", ref); + boolean trouve = false; + for (int i = 0; i < eTarget.size() && !trouve; i++) { + Element el = eTarget.get(i); + String refTmp = ref.replaceAll("\\s", "-").toLowerCase(); + if (el.attributeValue("id").equalsIgnoreCase(refTmp)) { + hyper.addAttribute("refuri", el.attributeValue("refuri")); + trouve = true; + } + } + if (!trouve) { + hyper.addAttribute("refid", ref); + } + hyper.setText(ref); + text = txtDebut + hyper.asXML() + " " + txtFin; + matcher = REGEX_HYPERLINK_REFERENCE.matcher(text); + + } + + // substitution reference + matcher = REGEX_SUBSTITUTION_REFERENCE.matcher(text); + int begin = 0; + while (matcher.find(begin)) { + String start = text.substring(0, matcher.start()); + String end = text.substring(matcher.end()); + String ref = matcher.group(1); + + Node subst = e.selectSingleNode("//" + SUBSTITUTION_DEFINITION + + "[@name='" + ref + "']/child::node()"); + + if (subst == null) { + text = start + "|" + ref + "|"; + } else { + text = start + subst.asXML(); + } + + begin = text.length(); + text += end; + matcher = REGEX_SUBSTITUTION_REFERENCE.matcher(text); + + } + // undo substitution in LITERAL + Pattern p = Pattern.compile("<tmp>([^<>]+)</tmp>"); + + matcher = p.matcher(text); + while (matcher.find()) { + String start = text.substring(0, matcher.start()); + String end = text.substring(matcher.end()); + + String tempKey = matcher.group(1); + text = start + temporaries.get(tempKey) + end; + matcher = p.matcher(text); + } + + String resultElementText = text.trim(); + Element result = DocumentHelper.parseText( + "<TMP>" + resultElementText + "</TMP>").getRootElement(); + + e.setText(""); + e.appendContent(result); + } +} Modified: jrst/trunk/src/main/java/org/nuiton/jrst/ReStructuredText.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/ReStructuredText.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/ReStructuredText.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import java.util.regex.Pattern; Modified: jrst/trunk/src/main/java/org/nuiton/jrst/directive/ContentDirective.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/directive/ContentDirective.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/directive/ContentDirective.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.jrst.directive; +package org.nuiton.jrst.directive; -import org.codelutin.jrst.JRSTDirective; +import org.nuiton.jrst.JRSTDirective; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.dom4j.Node; @@ -36,6 +36,7 @@ /* * @see org.codelutin.jrst.JRSTDirective#parse(org.dom4j.Element) */ + @Override public Node parse(Element e) { Element result = DocumentHelper.createElement("topic").addAttribute( "value", e.attributeValue("value")); Modified: jrst/trunk/src/main/java/org/nuiton/jrst/directive/DateDirective.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/directive/DateDirective.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/directive/DateDirective.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst.directive; +package org.nuiton.jrst.directive; -import org.codelutin.jrst.JRSTDirective; +import org.nuiton.jrst.JRSTDirective; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.dom4j.Node; @@ -42,6 +42,7 @@ /* * @see org.codelutin.jrst.JRSTDirective#parse(org.dom4j.Element) */ + @Override public Node parse(Element e) { // String format = e.attributeValue(JRSTLexer.DIRECTIVE_VALUE); Modified: jrst/trunk/src/main/java/org/nuiton/jrst/directive/ImageDirective.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/directive/ImageDirective.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/directive/ImageDirective.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,12 +15,12 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst.directive; +package org.nuiton.jrst.directive; -import org.codelutin.jrst.JRSTDirective; -import org.codelutin.jrst.JRSTLexer; -import static org.codelutin.jrst.ReStructuredText.IMAGE; -import static org.codelutin.jrst.ReStructuredText.SUBSTITUTION_DEFINITION; +import org.nuiton.jrst.JRSTDirective; +import org.nuiton.jrst.JRSTLexer; +import static org.nuiton.jrst.ReStructuredText.IMAGE; +import static org.nuiton.jrst.ReStructuredText.SUBSTITUTION_DEFINITION; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.dom4j.Node; @@ -47,6 +47,7 @@ * * @see org.codelutin.jrst.JRSTDirective#parse(org.dom4j.Element) */ + @Override public Node parse(Element e) { Element result = DocumentHelper.createElement(IMAGE); Modified: jrst/trunk/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/directive/SectnumDirective.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.jrst.directive; +package org.nuiton.jrst.directive; -import org.codelutin.jrst.JRSTDirective; +import org.nuiton.jrst.JRSTDirective; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.dom4j.Node; @@ -36,6 +36,7 @@ /* * @see org.codelutin.jrst.JRSTDirective#parse(org.dom4j.Element) */ + @Override public Node parse(Element e) { Element result = DocumentHelper.createElement("sectnum"); return result; Copied: jrst/trunk/src/test/java/org/nuiton (from rev 332, jrst/trunk/src/test/java/org/codelutin) Property changes on: jrst/trunk/src/test/java/org/nuiton ___________________________________________________________________ Name: svn:mergeinfo + Modified: jrst/trunk/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/AdvancedReaderTest.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import java.io.BufferedWriter; import java.io.File; Modified: jrst/trunk/src/test/java/org/nuiton/jrst/Compare.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/Compare.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/test/java/org/nuiton/jrst/Compare.java 2009-05-16 05:33:16 UTC (rev 334) @@ -16,7 +16,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.jrst; +package org.nuiton.jrst; import java.io.File; import java.io.IOException; @@ -33,7 +33,6 @@ import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JTextArea; -import org.codelutin.jrst.JRSTReader; import org.custommonkey.xmlunit.DetailedDiff; import org.custommonkey.xmlunit.XMLUnit; import org.dom4j.Document; Modified: jrst/trunk/src/test/java/org/nuiton/jrst/GutterColor.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/GutterColor.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/test/java/org/nuiton/jrst/GutterColor.java 2009-05-16 05:33:16 UTC (rev 334) @@ -16,7 +16,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.jrst; +package org.nuiton.jrst; import java.awt.Color; import java.awt.Dimension; Modified: jrst/trunk/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/JRSTGeneratorTest.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import java.io.File; Modified: jrst/trunk/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/JRSTReaderTest.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2009-05-16 05:33:16 UTC (rev 334) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst; +package org.nuiton.jrst; import junit.framework.TestCase; import org.dom4j.Document; Modified: jrst/trunk/src/test/java/org/nuiton/jrst/ThreadRedirection.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/ThreadRedirection.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/test/java/org/nuiton/jrst/ThreadRedirection.java 2009-05-16 05:33:16 UTC (rev 334) @@ -16,7 +16,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.jrst; +package org.nuiton.jrst; import java.io.BufferedReader; import java.io.IOException; Modified: jrst/trunk/src/test/java/org/nuiton/jrst/XMLCaseTest.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/XMLCaseTest.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/test/java/org/nuiton/jrst/XMLCaseTest.java 2009-05-16 05:33:16 UTC (rev 334) @@ -16,7 +16,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.jrst; +package org.nuiton.jrst; import org.custommonkey.xmlunit.DetailedDiff; import org.custommonkey.xmlunit.XMLTestCase;

1 0

r333 - in jrst/trunk: . src/main/java/org/codelutin/jrst src/site src/site/resources
by tchemit＠users.labs.libre-entreprise.org 16 May '09

16 May '09

Author: tchemit Date: 2009-05-16 05:21:13 +0000 (Sat, 16 May 2009) New Revision: 333 Modified: jrst/trunk/pom.xml jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java jrst/trunk/src/site/resources/en-redirect.html jrst/trunk/src/site/resources/fr-redirect.html jrst/trunk/src/site/site.xml jrst/trunk/src/site/site_en.xml Log: migrate to nuiton part One Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/pom.xml 2009-05-16 05:21:13 UTC (rev 333) @@ -8,9 +8,9 @@  <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.5.4</version> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>jrst</artifactId> @@ -24,9 +24,9 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -50,7 +50,7 @@ <dependency> <groupId>sdoc</groupId> <artifactId>sdoc</artifactId> - <version>0.5.0-beta</version> + <version>0.5.0-beta-patchcl</version> <scope>test</scope> </dependency> <dependency> @@ -76,6 +76,14 @@ <artifactId>docbook-xsl</artifactId> <version>1.72.0</version> </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.6</version> + <scope>test</scope> + </dependency> + </dependencies>  @@ -92,18 +100,15 @@ <packaging>jar</packaging> <properties> -  - <labs.id>54</labs.id> -  - <labs.project>jrst</labs.project> -  <maven.site.locales>fr,en</maven.site.locales> - - <lutinutil.version>1.0.6</lutinutil.version> <maven.jar.main.class>org.codelutin.jrst.JRST</maven.jar.main.class> + +  + <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/jrst/htdocs/nuiton</site.deploy.url> + </properties> <developers> @@ -148,9 +153,9 @@  <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>0.12</version> + <version>1.0.0-SNAPSHOT</version> <executions> <execution> <goals> @@ -159,13 +164,6 @@ </goals> </execution> </executions> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> - </dependency> - </dependencies> </plugin> <plugin> @@ -174,7 +172,6 @@ <archive> <manifest> <addClasspath>true</addClasspath> -  <classpathPrefix>lib/</classpathPrefix> </manifest> </archive> @@ -193,29 +190,6 @@ </executions> </plugin> -  -  - - </plugins> <pluginManagement> @@ -223,12 +197,11 @@ <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.5</version> <configuration> <quiet>true</quiet> <links> <link>http://java.sun.com/javase/6/docs/api/</link> - <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link> + <link>http://lutinutil.labs.libre-entreprise.org/nuiton-utils/apidocs/</link> </links> </configuration> </plugin> @@ -251,7 +224,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </dependency> </dependencies> </plugin> @@ -264,18 +237,13 @@    - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> -  +  <repositories> <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <id>nuiton-repository</id> + <name>NuitonRepository</name> + <url>${repository.home.url}</url> <snapshots> <enabled>true</enabled> <checksumPolicy>warn</checksumPolicy> @@ -300,23 +268,6 @@ <build> <plugins> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.8</version> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>license</goal> - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> -  <plugin> <artifactId>maven-assembly-plugin</artifactId> Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-05-16 05:21:13 UTC (rev 333) @@ -17,7 +17,7 @@ package org.codelutin.jrst; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; @@ -49,11 +49,11 @@ import org.apache.fop.apps.Fop; import org.apache.fop.apps.FopFactory; import org.apache.fop.apps.MimeConstants; -import org.codelutin.i18n.I18n; -import org.codelutin.util.FileCompletion; -import org.codelutin.util.FileUtil; -import org.codelutin.util.Resource; -import org.codelutin.util.StringUtil; +import org.nuiton.i18n.I18n; +import org.nuiton.util.FileCompletion; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; +import org.nuiton.util.StringUtil; import org.dom4j.Document; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java 2009-05-16 05:21:13 UTC (rev 333) @@ -17,7 +17,7 @@ */ package org.codelutin.jrst; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; import java.awt.Color; @@ -45,7 +45,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; /** * JRST main interface. Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java 2009-05-16 05:21:13 UTC (rev 333) @@ -29,7 +29,7 @@ package org.codelutin.jrst; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import static org.codelutin.jrst.ReStructuredText.ADDRESS; import static org.codelutin.jrst.ReStructuredText.ADMONITION; import static org.codelutin.jrst.ReStructuredText.ATTRIBUTION; @@ -130,7 +130,7 @@ import org.codelutin.jrst.directive.DateDirective; import org.codelutin.jrst.directive.ImageDirective; import org.codelutin.jrst.directive.SectnumDirective; -import org.codelutin.util.StringUtil; +import org.nuiton.util.StringUtil; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; @@ -449,6 +449,7 @@ result.setRootElement(root); root.accept(new VisitorSupport() { + @Override public void visit(Element e) { // remove all level attribute e.addAttribute("level", null); Modified: jrst/trunk/src/site/resources/en-redirect.html =================================================================== --- jrst/trunk/src/site/resources/en-redirect.html 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/site/resources/en-redirect.html 2009-05-16 05:21:13 UTC (rev 333) @@ -2,6 +2,6 @@ <head> <title>JRst</title> </head> -<body onload="window.location.href = '/jrst/en'">Veuillez patientez pendant la redirection...</body> +<body onload="window.location.href = '/nuiton/jrst/en'">Veuillez patientez pendant la redirection...</body> </html> \ No newline at end of file Modified: jrst/trunk/src/site/resources/fr-redirect.html =================================================================== --- jrst/trunk/src/site/resources/fr-redirect.html 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/site/resources/fr-redirect.html 2009-05-16 05:21:13 UTC (rev 333) @@ -2,6 +2,6 @@ <head> <title>JRst</title> </head> -<body onload="window.location.href = '/jrst/';">Veuillez patientez pendant la redirection...</body> +<body onload="window.location.href = '/nuiton/jrst/';">Veuillez patientez pendant la redirection...</body> </html> \ No newline at end of file Modified: jrst/trunk/src/site/site.xml =================================================================== --- jrst/trunk/src/site/site.xml 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/site/site.xml 2009-05-16 05:21:13 UTC (rev 333) @@ -27,12 +27,13 @@ <body> <links> - <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/maven-jrst-plugin/"/> - <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/> + <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/nuiton/maven-jrst-plugin/"/> + <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/doxia-module-jrst/"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Nuiton" href="http://www.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> - <item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/fr-redirect.html"/> - <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/en-redirect.html"/> + <item name="[fr" href="http://jrst.labs.libre-entreprise.org/nuiton/jrst/fr-redirect.html"/> + <item name="en]" href="http://jrst.labs.libre-entreprise.org/nuiton/jrst/en-redirect.html"/> </links> <menu name="Utilisateur"> @@ -51,15 +52,15 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" name="Bundle sans sources (zip)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" name="Bundle complêt (zip)"/> </menu> Modified: jrst/trunk/src/site/site_en.xml =================================================================== --- jrst/trunk/src/site/site_en.xml 2009-05-11 06:20:23 UTC (rev 332) +++ jrst/trunk/src/site/site_en.xml 2009-05-16 05:21:13 UTC (rev 333) @@ -25,12 +25,13 @@ <body> <links> - <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/maven-jrst-plugin/"/> - <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/> + <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/nuiton/maven-jrst-plugin/"/> + <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/doxia-module-jrst/"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Nuiton" href="http://www.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> - <item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/fr-redirect.html"/> - <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/en-redirect.html"/> + <item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/nuiton/fr-redirect.html"/> + <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/nuiton/en-redirect.html"/> </links> <menu name="User"> @@ -50,15 +51,15 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" name="Bundle sans sources (zip)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" name="Bundle complêt (zip)"/> </menu>

1 0

r332 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 06:20:23 +0000 (Mon, 11 May 2009) New Revision: 332 Modified: maven-jrst-plugin/trunk/pom.xml Log: push back scm generic values Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-05-11 06:15:08 UTC (rev 331) +++ maven-jrst-plugin/trunk/pom.xml 2009-05-11 06:20:23 UTC (rev 332) @@ -48,7 +48,7 @@   <name>Maven JRST Plugin</name> - <version>1.0.0-SNAPSHOT</version> + <version>0.8.6</version> <description> Maven2 plugin to generate reStructuredText file into xDoc. </description> @@ -125,9 +125,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-jrst-plug…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm>

1 0

r331 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 06:15:08 +0000 (Mon, 11 May 2009) New Revision: 331 Modified: maven-jrst-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-05-11 06:15:05 UTC (rev 330) +++ maven-jrst-plugin/trunk/pom.xml 2009-05-11 06:15:08 UTC (rev 331) @@ -48,7 +48,7 @@   <name>Maven JRST Plugin</name> - <version>0.8.6</version> + <version>1.0.0-SNAPSHOT</version> <description> Maven2 plugin to generate reStructuredText file into xDoc. </description> @@ -125,9 +125,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.6</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.6</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-jrst-plug…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-jrst-plug…</url> </scm>

1 0

r330 - maven-jrst-plugin/tags
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 06:15:05 +0000 (Mon, 11 May 2009) New Revision: 330 Added: maven-jrst-plugin/tags/0.8.6/ Log: [maven-scm] copy for tag 0.8.6 Copied: maven-jrst-plugin/tags/0.8.6 (from rev 329, maven-jrst-plugin/trunk)

1 0

r329 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 06:14:59 +0000 (Mon, 11 May 2009) New Revision: 329 Modified: maven-jrst-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.8.6 Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-05-11 06:14:13 UTC (rev 328) +++ maven-jrst-plugin/trunk/pom.xml 2009-05-11 06:14:59 UTC (rev 329) @@ -48,7 +48,7 @@   <name>Maven JRST Plugin</name> - <version>0.8.6-SNAPSHOT</version> + <version>0.8.6</version> <description> Maven2 plugin to generate reStructuredText file into xDoc. </description> @@ -125,9 +125,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.6</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.6</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-jrst-plug…</url> </scm>

1 0

r328 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 06:14:13 +0000 (Mon, 11 May 2009) New Revision: 328 Modified: maven-jrst-plugin/trunk/pom.xml Log: * bump versions (lutinproject, lutinutil, jrst, maven-i18n-plugin, maven-license-switcher-plugin) * use doxia-modules-jrst instead of maven-jrst-plugin * improve download section on site Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-05-11 06:12:51 UTC (rev 327) +++ maven-jrst-plugin/trunk/pom.xml 2009-05-11 06:14:13 UTC (rev 328) @@ -92,28 +92,6 @@ </executions> </plugin> -  -  - </plugins> <pluginManagement>

1 0