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

r599 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org June 9, 2011

June 9, 2011

Author: tchemit Date: 2011-06-09 10:55:20 +0200 (Thu, 09 Jun 2011) New Revision: 599 Url: http://nuiton.org/repositories/revision/jrst/599 Log: go to version 1.4 Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-06-07 20:08:38 UTC (rev 598) +++ trunk/doxia-module-jrst/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-06-07 20:08:38 UTC (rev 598) +++ trunk/jrst/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2011-06-07 20:08:38 UTC (rev 598) +++ trunk/jrst-doc/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2011-06-07 20:08:38 UTC (rev 598) +++ trunk/maven-jrst-plugin/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-07 20:08:38 UTC (rev 598) +++ trunk/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> <modules> <module>jrst</module>

1 0

r598 - trunk
by tchemit＠users.nuiton.org June 7, 2011

June 7, 2011

Author: tchemit Date: 2011-06-07 22:08:38 +0200 (Tue, 07 Jun 2011) New Revision: 598 Url: http://nuiton.org/repositories/revision/jrst/598 Log: Update mavenpom4redmineAndCentral to 2.5.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-01 09:30:30 UTC (rev 597) +++ trunk/pom.xml 2011-06-07 20:08:38 UTC (rev 598) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <artifactId>jrst</artifactId>

1 0

r597 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst test/resources
by kcardineaud＠users.nuiton.org June 1, 2011

June 1, 2011

Author: kcardineaud Date: 2011-06-01 11:30:30 +0200 (Wed, 01 Jun 2011) New Revision: 597 Url: http://nuiton.org/repositories/revision/jrst/597 Log: #1563 Problem with footnote Added: trunk/jrst/src/test/resources/testFootnote.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-05-30 12:52:32 UTC (rev 596) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-06-01 09:30:30 UTC (rev 597) @@ -2185,7 +2185,7 @@ 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()); + String txtFin = text.substring(matcher.end()-1, text.length()-1); Element footnote = DocumentHelper.createElement(FOOTNOTE_REFERENCE); String sFootnote = matcher.group(); boolean done = false; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-05-30 12:52:32 UTC (rev 596) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-01 09:30:30 UTC (rev 597) @@ -180,5 +180,28 @@ Assert.assertTrue(actualXml.contains(xmlexpected)); } + + @Test + public void testFootnote() throws Exception { + URL url = JRSTReaderTest.class.getResource("/testFootnote.rst"); + Reader in = new InputStreamReader(url.openStream()); + I18n.init(new ClassPathI18nInitializer(), Locale.UK); + + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + + + String xmlexpected = + "<footnote_reference ids=\"id1\" refid=\"id2\">1</footnote_reference>" + + "</paragraph><footnote backrefs=\"id1\" ids=\"id2\" name=\"1\"><label>1</label>"; + + String actualXml = doc.asXML(); + log.warn("Result :\n" + actualXml); + log.warn("Expected :\n" + xmlexpected); + + Assert.assertTrue(actualXml.contains(xmlexpected)); + } + + } Added: trunk/jrst/src/test/resources/testFootnote.rst =================================================================== --- trunk/jrst/src/test/resources/testFootnote.rst (rev 0) +++ trunk/jrst/src/test/resources/testFootnote.rst 2011-06-01 09:30:30 UTC (rev 597) @@ -0,0 +1,3 @@ +test [1]_ + +.. [1] There are ``*-wide.txt`` variants for each of these character.

1 0

r596 - in trunk: doxia-module-jrst/src/site jrst/src/site jrst-doc/src/site src/site
by echatellier＠users.nuiton.org May 30, 2011

May 30, 2011

Author: echatellier Date: 2011-05-30 14:52:32 +0200 (Mon, 30 May 2011) New Revision: 596 Url: http://nuiton.org/repositories/revision/jrst/596 Log: Fix redmine download links Modified: trunk/doxia-module-jrst/src/site/site_en.xml trunk/doxia-module-jrst/src/site/site_fr.xml trunk/jrst-doc/src/site/site_en.xml trunk/jrst-doc/src/site/site_fr.xml trunk/jrst/src/site/site_en.xml trunk/jrst/src/site/site_fr.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/doxia-module-jrst/src/site/site_en.xml =================================================================== --- trunk/doxia-module-jrst/src/site/site_en.xml 2011-05-27 12:06:47 UTC (rev 595) +++ trunk/doxia-module-jrst/src/site/site_en.xml 2011-05-30 12:52:32 UTC (rev 596) @@ -57,7 +57,7 @@ <menu name="Community"> <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> - <item name="Downloads" href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Downloads" href="http://nuiton.org/projects/jrst/files"/> <item name="Continuous integration" href="http://hudson.nuiton.org/hudson/job/jrst"/> <item name="Code analysis" Modified: trunk/doxia-module-jrst/src/site/site_fr.xml =================================================================== --- trunk/doxia-module-jrst/src/site/site_fr.xml 2011-05-27 12:06:47 UTC (rev 595) +++ trunk/doxia-module-jrst/src/site/site_fr.xml 2011-05-30 12:52:32 UTC (rev 596) @@ -57,7 +57,7 @@ href="http://nuiton.org/projects/jrst/issues"/> <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> <item name="Téléchargements" - href="http://nuiton.org/projects/list_files/jrst"/> + href="http://nuiton.org/projects/jrst/files"/> <item name="Intégration continue" href="http://hudson.nuiton.org/hudson/job/jrst"/> <item name="Analyse du code" Modified: trunk/jrst/src/site/site_en.xml =================================================================== --- trunk/jrst/src/site/site_en.xml 2011-05-27 12:06:47 UTC (rev 595) +++ trunk/jrst/src/site/site_en.xml 2011-05-30 12:52:32 UTC (rev 596) @@ -49,7 +49,7 @@ <menu name="Community"> <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> - <item name="Downloads" href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Downloads" href="http://nuiton.org/projects/jrst/files"/> <item name="Continuous integration" href="http://hudson.nuiton.org/hudson/job/jrst"/> <item name="Code analysis" Modified: trunk/jrst/src/site/site_fr.xml =================================================================== --- trunk/jrst/src/site/site_fr.xml 2011-05-27 12:06:47 UTC (rev 595) +++ trunk/jrst/src/site/site_fr.xml 2011-05-30 12:52:32 UTC (rev 596) @@ -61,7 +61,7 @@ href="http://nuiton.org/projects/jrst/issues"/> <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> <item name="Téléchargements" - href="http://nuiton.org/projects/list_files/jrst"/> + href="http://nuiton.org/projects/jrst/files"/> <item name="Intégration continue" href="http://hudson.nuiton.org/hudson/job/jrst"/> <item name="Analyse du code" @@ -71,4 +71,4 @@ <menu ref="reports"/> </body> -</project> \ No newline at end of file +</project> Modified: trunk/jrst-doc/src/site/site_en.xml =================================================================== --- trunk/jrst-doc/src/site/site_en.xml 2011-05-27 12:06:47 UTC (rev 595) +++ trunk/jrst-doc/src/site/site_en.xml 2011-05-30 12:52:32 UTC (rev 596) @@ -71,7 +71,7 @@ <menu name="Community"> <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> - <item name="Downloads" href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Downloads" href="http://nuiton.org/projects/jrst/files"/> <item name="Continuous integration" href="http://hudson.nuiton.org/hudson/job/jrst"/> <item name="Code analysis" Modified: trunk/jrst-doc/src/site/site_fr.xml =================================================================== --- trunk/jrst-doc/src/site/site_fr.xml 2011-05-27 12:06:47 UTC (rev 595) +++ trunk/jrst-doc/src/site/site_fr.xml 2011-05-30 12:52:32 UTC (rev 596) @@ -73,7 +73,7 @@ href="http://nuiton.org/projects/jrst/issues"/> <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> <item name="Téléchargements" - href="http://nuiton.org/projects/list_files/jrst"/> + href="http://nuiton.org/projects/jrst/files"/> <item name="Intégration continue" href="http://hudson.nuiton.org/hudson/job/jrst"/> <item name="Analyse du code" @@ -81,4 +81,4 @@ </menu> </body> -</project> \ No newline at end of file +</project> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2011-05-27 12:06:47 UTC (rev 595) +++ trunk/src/site/site_en.xml 2011-05-30 12:52:32 UTC (rev 596) @@ -53,7 +53,7 @@ <menu name="Community"> <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> - <item name="Downloads" href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Downloads" href="http://nuiton.org/projects/jrst/files"/> <item name="Continuous integration" href="http://hudson.nuiton.org/hudson/job/jrst"/> <item name="Code analysis" href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> </menu> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-05-27 12:06:47 UTC (rev 595) +++ trunk/src/site/site_fr.xml 2011-05-30 12:52:32 UTC (rev 596) @@ -56,7 +56,7 @@ href="http://nuiton.org/projects/jrst/issues"/> <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> <item name="Téléchargements" - href="http://nuiton.org/projects/list_files/jrst"/> + href="http://nuiton.org/projects/jrst/files"/> <item name="Intégration continue" href="http://hudson.nuiton.org/hudson/job/jrst"/> <item name="Analyse du code"

1 0

r595 - trunk/jrst/src/main/resources/xsl
by kcardineaud＠users.nuiton.org May 27, 2011

May 27, 2011

Author: kcardineaud Date: 2011-05-27 14:06:47 +0200 (Fri, 27 May 2011) New Revision: 595 Url: http://nuiton.org/repositories/revision/jrst/595 Log: add <p> tag into <li> tag for literal blocks Modified: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl Modified: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2011-05-27 11:59:14 UTC (rev 594) +++ trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2011-05-27 12:06:47 UTC (rev 595) @@ -213,7 +213,7 @@ </xsl:template> <xsl:template match="list_item"> - <li><xsl:apply-templates/></li> + <li><p><xsl:apply-templates/></p></li> </xsl:template> <xsl:template match="field_list">

1 0

r594 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst test/resources
by kcardineaud＠users.nuiton.org May 27, 2011

May 27, 2011

Author: kcardineaud Date: 2011-05-27 13:59:14 +0200 (Fri, 27 May 2011) New Revision: 594 Url: http://nuiton.org/repositories/revision/jrst/594 Log: #1551 Litteral bloc into list not taken into account Added: trunk/jrst/src/test/resources/testLiteral.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-05-26 09:39:53 UTC (rev 593) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-05-27 11:59:14 UTC (rev 594) @@ -1967,6 +1967,7 @@ Element result = null; // in.skipBlankLines(); + String line = in.readLine(); if (line != null) { Pattern pattern = Pattern @@ -2003,9 +2004,36 @@ prefix).addAttribute(SUFFIX, suffix) .addAttribute(ENUMTYPE, enumtype); + if (line.endsWith(": ::")) { + line = line.substring(0, line.length() - " ::".length()); + in.unread("::", true); + + } else if (line.endsWith("::")) { + line = line.substring(0, line.length() - ":".length()); // keep + // one + // : + in.unread("::", true); + } + + if (!in.eof()) { String[] content = readBlock(level + 1); - line += " " + joinBlock(content); + String tempLine = " " + joinBlock(content); + + if (tempLine.endsWith(": ::")) { + tempLine = tempLine.substring(0, tempLine.length() - " ::".length()); + in.unread("::", true); + + } else if (tempLine.endsWith("::")) { + tempLine = tempLine.substring(0, tempLine.length() - ":".length()); // keep + // one + // : + in.unread("::", true); + } + + line+=tempLine; + + } String text = line.substring(begin).trim(); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-05-26 09:39:53 UTC (rev 593) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-05-27 11:59:14 UTC (rev 594) @@ -159,5 +159,26 @@ Assert.assertTrue(actualXml.contains(xmlexpected)); } + @Test + public void testLiteral() throws Exception { + URL url = JRSTReaderTest.class.getResource("/testLiteral.rst"); + Reader in = new InputStreamReader(url.openStream()); + I18n.init(new ClassPathI18nInitializer(), Locale.UK); + + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + + + String xmlexpected = + "<literal_block>refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com"; + + String actualXml = doc.asXML(); + log.warn("Result :\n" + actualXml); + log.warn("Expected :\n" + xmlexpected); + + Assert.assertTrue(actualXml.contains(xmlexpected)); + } + + } Added: trunk/jrst/src/test/resources/testLiteral.rst =================================================================== --- trunk/jrst/src/test/resources/testLiteral.rst (rev 0) +++ trunk/jrst/src/test/resources/testLiteral.rst 2011-05-27 11:59:14 UTC (rev 594) @@ -0,0 +1,6 @@ +1. Déployer le war de l'application dans le serveur d'application. Pour Tomcat 6, + placer le war ou un lien symbolique vers celui-ci dans le répertoire webapps. + +2. Editer la configuration de base. Créez un fichier de configuration nommé:: + + refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com \ No newline at end of file

1 0

r593 - trunk/jrst/src/main/java/org/nuiton/jrst
by bpoussin＠users.nuiton.org May 26, 2011

May 26, 2011

Author: bpoussin Date: 2011-05-26 11:39:53 +0200 (Thu, 26 May 2011) New Revision: 593 Url: http://nuiton.org/repositories/revision/jrst/593 Log: add static method to know mime type of generated file Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-05-26 09:39:18 UTC (rev 592) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-05-26 09:39:53 UTC (rev 593) @@ -166,6 +166,10 @@ * key, Out type; value: chain of XSL file to provide wanted file for output */ protected static Map<String, String> stylesheets; + /** + * Mime type associated with type + */ + protected static Map<String, String> mimeType; static { stylesheets = new HashMap<String, String>(); @@ -180,8 +184,30 @@ //stylesheets.put(TYPE_ODT, rst2docbook + "," + docbook2odf); stylesheets.put(TYPE_FO, rst2docbook + "," + docbook2fo); stylesheets.put(TYPE_PDF, rst2docbook + "," + docbook2fo); + + mimeType = new HashMap<String, String>(); + mimeType.put(TYPE_HTML, "text/html"); + mimeType.put(TYPE_HTML_INNER_BODY, "text/html"); + mimeType.put(TYPE_XDOC, "text/xml"); + mimeType.put(TYPE_DOCBOOK, "text/xml"); + mimeType.put(TYPE_XHTML, "text/html"); + mimeType.put(TYPE_JAVAHELP, "text/plain"); + mimeType.put(TYPE_HTMLHELP, "text/html"); + mimeType.put(TYPE_RST, "text/plain"); + mimeType.put(TYPE_ODT, "application/vnd.oasis.opendocument.text"); + mimeType.put(TYPE_FO, "text/xml"); + mimeType.put(TYPE_PDF, "application/pdf"); + } + static public String getMimeType(String generationType) { + String result = mimeType.get(generationType); + if (result == null) { + result = "application/octet-stream"; + } + return result; + } + /** * Main method. *

1 0

r592 - trunk/jrst/src/main/resources/xsl
by bpoussin＠users.nuiton.org May 26, 2011

May 26, 2011

Author: bpoussin Date: 2011-05-26 11:39:18 +0200 (Thu, 26 May 2011) New Revision: 592 Url: http://nuiton.org/repositories/revision/jrst/592 Log: put generation in global div tag Modified: trunk/jrst/src/main/resources/xsl/rst2xhtmlInnerBody.xsl Modified: trunk/jrst/src/main/resources/xsl/rst2xhtmlInnerBody.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/rst2xhtmlInnerBody.xsl 2011-05-25 15:42:23 UTC (rev 591) +++ trunk/jrst/src/main/resources/xsl/rst2xhtmlInnerBody.xsl 2011-05-26 09:39:18 UTC (rev 592) @@ -32,7 +32,9 @@ <xsl:import href="rst2xhtml.xsl"/> <xsl:template match="/document"> - <xsl:apply-templates /> + <div> + <xsl:apply-templates /> + </div> </xsl:template> </xsl:transform>

1 0

r591 - in trunk/jrst/src/main: java/org/nuiton/jrst resources/xsl
by bpoussin＠users.nuiton.org May 25, 2011

May 25, 2011

Author: bpoussin Date: 2011-05-25 17:42:23 +0200 (Wed, 25 May 2011) New Revision: 591 Url: http://nuiton.org/repositories/revision/jrst/591 Log: add xsl to tranform to HTML but only inner body elements (useful to integrate html result in another page) Added: trunk/jrst/src/main/resources/xsl/rst2xhtmlInnerBody.xsl Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-05-25 15:21:53 UTC (rev 590) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-05-25 15:42:23 UTC (rev 591) @@ -107,6 +107,8 @@ /** XSL Stylesheet to transform RST into HTML. */ protected static final String rst2xhtml = "/xsl/rst2xhtml.xsl"; + /** XSL Stylesheet to transform RST into HTML (but only inner body fragment). */ + protected static final String rst2xhtmlInnerBody = "/xsl/rst2xhtmlInnerBody.xsl"; /** XSL Stylesheet to transform RST into Xdoc. */ protected static final String rst2xdoc = "/xsl/rst2xdoc.xsl"; /** XSL Stylesheet to transform RST into Docbook. */ @@ -125,11 +127,14 @@ /** XSL Stylesheet to transform Docbook into PDF. */ protected static final String docbook2fo = "/docbook/fo/docbook.xsl"; - public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|xdoc|rst|fo|pdf|odt|rtf"; + public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|htmlInnerBody|xdoc|rst|fo|pdf|odt|rtf"; /** HTML output format type */ public static final String TYPE_HTML = "html"; + /** HTML output format type */ + public static final String TYPE_HTML_INNER_BODY = "htmlInnerBody"; + /** XDOC output format type */ public static final String TYPE_XDOC = "xdoc"; @@ -165,6 +170,7 @@ static { stylesheets = new HashMap<String, String>(); stylesheets.put(TYPE_HTML, rst2xhtml); + stylesheets.put(TYPE_HTML_INNER_BODY, rst2xhtmlInnerBody); stylesheets.put(TYPE_XDOC, rst2xdoc); stylesheets.put(TYPE_DOCBOOK, rst2docbook); stylesheets.put(TYPE_XHTML, rst2docbook + "," + docbook2xhtml); Copied: trunk/jrst/src/main/resources/xsl/rst2xhtmlInnerBody.xsl (from rev 589, trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl) =================================================================== --- trunk/jrst/src/main/resources/xsl/rst2xhtmlInnerBody.xsl (rev 0) +++ trunk/jrst/src/main/resources/xsl/rst2xhtmlInnerBody.xsl 2011-05-25 15:42:23 UTC (rev 591) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<xsl:transform version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns="http://www.w3.org/TR/xhtml1/strict"> + +  + <xsl:import href="rst2xhtml.xsl"/> + + <xsl:template match="/document"> + <xsl:apply-templates /> + </xsl:template> + +</xsl:transform> +

1 0

r590 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by kcardineaud＠users.nuiton.org May 25, 2011

May 25, 2011

Author: kcardineaud Date: 2011-05-25 17:21:53 +0200 (Wed, 25 May 2011) New Revision: 590 Url: http://nuiton.org/repositories/revision/jrst/590 Log: #1546 Add some generate methodes Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-05-23 07:51:02 UTC (rev 589) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-05-25 15:21:53 UTC (rev 590) @@ -32,7 +32,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; @@ -40,6 +39,8 @@ import java.io.OutputStream; import java.io.Reader; import java.io.StringReader; +import java.io.StringWriter; +import java.io.Writer; import java.net.URL; import java.util.HashMap; import java.util.List; @@ -121,8 +122,6 @@ // /** XSL Stylesheet to transform xml into rst. */ // protected static final String rst2rst = "JRSTWriter"; - /** 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 = "/docbook/fo/docbook.xsl"; @@ -172,7 +171,7 @@ stylesheets.put(TYPE_JAVAHELP, rst2docbook + "," + docbook2javahelp); stylesheets.put(TYPE_HTMLHELP, rst2docbook + "," + docbook2htmlhelp); stylesheets.put(TYPE_RST, ""); - stylesheets.put(TYPE_ODT, rst2docbook + "," + docbook2odf); + //stylesheets.put(TYPE_ODT, rst2docbook + "," + docbook2odf); stylesheets.put(TYPE_FO, rst2docbook + "," + docbook2fo); stylesheets.put(TYPE_PDF, rst2docbook + "," + docbook2fo); } @@ -266,7 +265,7 @@ URL url = fileIn.toURI().toURL(); Reader reader = new InputStreamReader(url.openStream(), UTF_8); FileWriter writer = new FileWriter(fileOut); - String result = generate(xslListOrOutType, reader); + String result = generateString(xslListOrOutType, reader); fileOut.getAbsoluteFile().getParentFile().mkdirs(); // generation PDF @@ -319,18 +318,42 @@ * @throws Exception */ public static String generate(String xslListOrOutType, String in) throws Exception { - return generate(xslListOrOutType, new StringReader(in)); + return generateString(xslListOrOutType, new StringReader(in)); } /** + * + * @param xslListOrOutType + * @param in + * @throws Exception + */ + public static Writer generate(String xslListOrOutType, Reader in) throws Exception { + StringWriter writer = new StringWriter(); + writer.write(generateString(xslListOrOutType,in)); + return writer; + } + + + /** + * + * @param xslListOrOutType + * @param in + * @throws Exception + */ + public static StringBuffer generate(String xslListOrOutType, StringBuffer in) throws Exception { + return new StringBuffer(generate(xslListOrOutType, in.toString())); + } + + + /** * * @param xslListOrOutType * @param in * @throws Exception */ - public static String generate(String xslListOrOutType, Reader in) throws Exception { + public static String generateString(String xslListOrOutType, Reader in) throws Exception { - Document doc = generateXMl(in); + Document doc = generateXML(in); // Sortie vers rst if (xslListOrOutType.equals(TYPE_RST)){ @@ -340,7 +363,11 @@ } return doc.asXML(); } + + + + private static Document applyXsls(Document doc, String xslListOrOutType) throws IOException, FileNotFoundException, TransformerException { // search xsl file list to apply @@ -439,7 +466,7 @@ return doc; } - public static Document generateXMl(Reader in) throws Exception { + public static Document generateXML(Reader in) throws Exception { // parse rst file JRSTReader jrst = new JRSTReader(); return jrst.read(in); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java 2011-05-23 07:51:02 UTC (rev 589) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java 2011-05-25 15:21:53 UTC (rev 590) @@ -11,6 +11,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; +import java.io.FileFilter; import javax.xml.transform.TransformerException; @@ -27,8 +28,6 @@ import org.dom4j.DocumentException; import org.dom4j.io.SAXReader; import org.dom4j.io.XMLWriter; -import org.junit.Ignore; -import org.junit.Test; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.util.FileUtil; @@ -80,7 +79,13 @@ LinkedList<File> rstFilesTests = new LinkedList<File>(); //1. recuperation des fichiers de test directement dans le repertoire des fichiers rst - rstFilesTests.addAll(FileUtil.getFiles(rep)); + class NormalFileFilter implements FileFilter { + @Override + public boolean accept(File f) { + return f.isFile(); + } + } + rstFilesTests.addAll(FileUtil.getFilteredElements(rep,new NormalFileFilter(),false)); //2. boucle sur les fichiers de test Iterator<File> iteFiles = rstFilesTests.iterator(); @@ -233,7 +238,7 @@ Reader reader = new InputStreamReader(url.openStream(), JRST.UTF_8); - return JRST.generate(JRST.TYPE_HTML,reader); + return JRST.generateString(JRST.TYPE_HTML,reader); } /** @@ -247,7 +252,7 @@ URL url = source.toURI().toURL(); Reader reader = new InputStreamReader(url.openStream(), JRST.UTF_8); - return JRST.generate(JRST.TYPE_RST,reader); + return JRST.generateString(JRST.TYPE_RST,reader); } @@ -283,7 +288,7 @@ private static boolean testIfDocutils() { - File file = new File("src/test/resources/docutilsFilesTest/rstTest.rst"); + File file = new File("src/test/resources/FilesTest/rstTest.rst"); ProcessBuilder processBuilder = new ProcessBuilder(rst2xml, file.getPath()); processBuilder.redirectErrorStream(true);

1 0