Author: jpages Date: 2012-04-24 16:33:35 +0200 (Tue, 24 Apr 2012) New Revision: 647 Url: http://nuiton.org/repositories/revision/jrst/647 Log: Correction AdmonitionTest et JRSTTest.generateXml Modified: branches/jrst-docutils-jython/docutils/src/main/resources/__run__.py 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/resources/text.rst Modified: branches/jrst-docutils-jython/docutils/src/main/resources/__run__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/__run__.py 2012-04-24 10:03:24 UTC (rev 646) +++ branches/jrst-docutils-jython/docutils/src/main/resources/__run__.py 2012-04-24 14:33:35 UTC (rev 647) @@ -14,8 +14,6 @@ scriptpath = lib_path + '/build/scripts-2.7' sys.path.append(scriptpath) -print (sys.argv) - # Change the order of the arguments of the script : # In the python scripts rst2*, the input file name must be the first argument typeExport = sys.argv[2] # Type of the output file 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-04-24 10:03:24 UTC (rev 646) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-04-24 14:33:35 UTC (rev 647) @@ -89,8 +89,8 @@ /** XSL Stylesheet to transform Docbook into htmlhelp. */ protected static final String docbook2htmlhelp = "/docbook/htmlhelp/htmlhelp.xsl"; -// /** XSL Stylesheet to transform xml into rst. */ -// protected static final String rst2rst = "JRSTWriter"; + /** XSL Stylesheet to transform xml into rst. */ + protected static final String xml2rst = "/xsl/xml2rst-nopy.xsl"; /** XSL Stylesheet to transform Docbook into PDF. */ protected static final String docbook2fo = "/docbook/fo/docbook.xsl"; @@ -148,7 +148,7 @@ stylesheets.put(TYPE_XHTML, rst2docbook + "," + docbook2xhtml); stylesheets.put(TYPE_JAVAHELP, rst2docbook + "," + docbook2javahelp); stylesheets.put(TYPE_HTMLHELP, rst2docbook + "," + docbook2htmlhelp); - stylesheets.put(TYPE_RST, ""); + stylesheets.put(TYPE_RST, xml2rst); //stylesheets.put(TYPE_ODT, rst2docbook + "," + docbook2odf); stylesheets.put(TYPE_FO, rst2docbook + "," + docbook2fo); stylesheets.put(TYPE_PDF, rst2docbook + "," + docbook2fo); @@ -264,43 +264,54 @@ .isNewer(fileIn, fileOut)))) { log.info("Don't generate file " + fileOut + ", because already exists"); - } else if (outputType.equals("PDF")) { - /* + } else if (outputType.equals("PDF") || outputType.equals("RST")) { + // Out + FileOutputStream outputStream = new FileOutputStream(fileOut); + OutputStreamWriter writer = new OutputStreamWriter(outputStream, outputEncoding); + // Generate - String result = generateString(Format.XML.name(), fileIn); + String result = generateString(outputType, fileIn); + fileOut.getAbsoluteFile().getParentFile().mkdirs(); // generation PDF - FopFactory fopFactory = FopFactory.newInstance(); + if (outputType.equals("pdf")) { + /* FopFactory fopFactory = FopFactory.newInstance(); + // OutputStream outPDF = new BufferedOutputStream(new + // FileOutputStream(new File("C:/Temp/myfile.pdf"))); - OutputStream outPDF = new BufferedOutputStream(new FileOutputStream(fileOut)); + OutputStream outPDF = new BufferedOutputStream(new FileOutputStream( + fileOut)); - FOUserAgent userAgent = fopFactory.newFOUserAgent(); + FOUserAgent userAgent = fopFactory.newFOUserAgent(); - // Step 3: Construct fop with desired output format - Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, - userAgent, outPDF); + // 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 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(result)); + // Step 5: Setup input and output for XSLT transformation + // Setup input stream + Source src = new StreamSource(new StringReader(result)); - // Resulting SAX events (the generated FO) must be piped - // through to FOP - Result res = new SAXResult(fop.getDefaultHandler()); + // 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); + // Step 6: Start XSLT transformation and FOP processing + transformer.transform(src, res); - outPDF.close(); - */ - + outPDF.close(); */ + } else { + // write generated document + writer.write(result); + writer.close(); + } } else { generateDocument(outputType, fileIn, fileOut); } @@ -349,14 +360,19 @@ * @throws Exception */ public static String generateString(String outputType, File in) throws Exception { + Document doc = generateXML(in); - if (!StringUtils.isEmpty(outputType)) { + // Sortie vers rst + if (outputType.equals("RST")){ + return generateRST(doc); + } else if (!StringUtils.isEmpty(outputType)) { doc = applyXsls(doc, outputType); } return doc.asXML(); } + /** * * @param doc @@ -413,7 +429,8 @@ public static File generateDocument(String outputType, File in, File out) throws Exception { - out.createNewFile(); + //If we are here, we can overwrite on the file + //out.createNewFile(); URL resource = in.getClass().getResource("/__run__.py"); String docutilsPath = resource.getPath().replaceAll("__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-04-24 10:03:24 UTC (rev 646) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2012-04-24 14:33:35 UTC (rev 647) @@ -25,7 +25,7 @@ package org.nuiton.jrst; -import java.io.File; +import java.io.*; import java.util.Arrays; import java.util.List; @@ -33,6 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.util.Resource; @@ -63,6 +64,7 @@ //Assert.assertNotNull(Resource.getURL(JRST.xml2fo)); } + @Ignore @Test public void generateRst() throws Exception { File in = new File(testWorkDir, "toRst1-in.rst"); @@ -111,7 +113,6 @@ String inLine = OUT_LINES.get(i); String outLine = (String) readLines.get(i); Assert.assertEquals(inLine, outLine); - } } Modified: branches/jrst-docutils-jython/jrst/src/test/resources/text.rst =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/resources/text.rst 2012-04-24 10:03:24 UTC (rev 646) +++ branches/jrst-docutils-jython/jrst/src/test/resources/text.rst 2012-04-24 14:33:35 UTC (rev 647) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============== Le grand titre ============== @@ -30,7 +31,7 @@ subtitle ---------- -.. include:: src/test/resources/textHeader.rst +.. include:: textHeader.rst .. sectnum:: @@ -388,8 +389,7 @@ INCLUDE ------- -.. include:: literal - src/test/resources/textLiteral.txt +.. include:: textLiteral.txt la derniere ligne.