Author: jpages Date: 2012-05-16 11:23:38 +0200 (Wed, 16 May 2012) New Revision: 664 Url: http://nuiton.org/repositories/revision/jrst/664 Log: Nettoyage du code (commentaires inutiles, etc...) Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-16 09:05:50 UTC (rev 663) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-16 09:23:38 UTC (rev 664) @@ -109,7 +109,7 @@ /** 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|htmlInnerBody|xdoc|fo|pdf|odt|rtf|latex|s5|xetex"; + 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"; @@ -405,7 +405,6 @@ if (file.exists()) { stylesheet = file.toURI().toURL(); } else { - //stylesheet = JRST.class.getResource(xsl); stylesheet = Resource.getURL(xsl); } if (stylesheet == null) { @@ -437,8 +436,6 @@ // Name of the main Python script final String runner = "__run__"; - //log.info(out); - /* Transformation of the __run__ URL into a path that python will use For example the URL is : jar:file:/home/user/.m2/repository/org/nuiton/jrst/docutils/1.6-SNAPSHOT/docutils-1.6-SNAPSHOT.jar!/__run__.py Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2012-05-16 09:05:50 UTC (rev 663) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2012-05-16 09:23:38 UTC (rev 664) @@ -135,64 +135,4 @@ JRST.generate(JRST.TYPE_XML, in, out, JRST.Overwrite.ALLTIME); } - - /* - @Test - public void generateHtml() throws Exception { - - File in = getTestFile("text.rst"); - File out = getOutputTestFile("jrst-RstToHtml2.html"); - - JRST.generate(JRST.Docutils_Formats.HTML.name(), in, out, JRST.Overwrite.ALLTIME); - } - - @Test - public void generateOdt() throws Exception { - - File in = getTestFile("text.rst"); - File out = getOutputTestFile("jrst-RstToOdt.odt"); - - JRST.generate(JRST.Docutils_Formats.ODT.name(), in, out, JRST.Overwrite.ALLTIME); - } - */ - - /* Does not work for 'text.rst', cause this message with rst2latex : - "Cells that span multiple rows *and* columns are not supported" - @Test - public void generateLatex() throws Exception { - - File in = getTestFile("test4.rst"); - File out = getOutputTestFile("jrst-RstToLatex.tex"); - - JRST.generate(JRST.Docutils_Formats.LATEX.name(), in, out, JRST.Overwrite.ALLTIME); - } */ - - /* Does not work for 'text.rst', the header causes an 'NotImplementedError' - @Test - public void generateMan() throws Exception { - - File in = getTestFile("test4.rst"); - File out = getOutputTestFile("jrst-RstToMan.man"); - - JRST.generate(JRST.Docutils_Formats.MAN.name(), in, out, JRST.Overwrite.ALLTIME); - } */ - /* - @Test - public void generateS5() throws Exception { - - File in = getTestFile("text.rst"); - File out = getOutputTestFile("jrst-RstToS5.s5"); - - JRST.generate(JRST.Docutils_Formats.S5.name(), in, out, JRST.Overwrite.ALLTIME); - } - - @Test - public void generatePDF() throws Exception { - - File in = getTestFile("text.rst"); - - File out = getOutputTestFile("jrst-RstToPDF.pdf"); - - JRST.generate(JRST.TYPE_PDF, in, out, JRST.Overwrite.ALLTIME); - } */ } \ No newline at end of file Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java 2012-05-16 09:05:50 UTC (rev 663) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java 2012-05-16 09:23:38 UTC (rev 664) @@ -55,9 +55,6 @@ public void testAdmonitionInList() throws Exception { File in = getBugTestFile("testAdminitionInList1787.rst"); File out = getOutputTestFile("jrst-testAdminitionInList1787.html"); - -// log.info("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + in.getPath()); -// log.info("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + out.getPath()); // out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME);