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

r509 - in trunk: . jrst/src/main/resources/i18n
by tchemit＠users.nuiton.org 22 Nov '10

22 Nov '10

Author: tchemit Date: 2010-11-22 15:21:29 +0100 (Mon, 22 Nov 2010) New Revision: 509 Url: http://nuiton.org/repositories/revision/jrst/509 Log: Evolution #1089: Update I18n to 2.0 (rename also i18n bundles) clean pom Added: trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties Removed: trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties Modified: trunk/pom.xml Deleted: trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties 2010-11-21 14:30:04 UTC (rev 508) +++ trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties 2010-11-22 14:21:29 UTC (rev 509) @@ -1,20 +0,0 @@ -JRST\ parsing\ error\ line\ %d\ char\ %s\:\\n%s=JRST parsing error line %d char %s\:\\n%s -annuler=.. to cancel or return to parent directory -btnCancel=Cancel -btnConvert=Convert -dontExist=Invalid file path -entrer=Enter to display file list, or to complete path -exit=Enter "\!q" to exit -externalXSL=External(s) XSL(s) -help?=JRST --help to display help -open=Open file \: -openEmpty?=This field must be filled in. -other?=Want you add an other XSL file ?(y/n) -outputFile?=Please enter output path (empty to display in console) -outputFormat?=Please enter output format (xhtml, docbook, xml(by default), html, xdoc, rst, pdf, odt ou rtf)\n(empty to enter XSL files to use) -overwrite?=This file exists, do you want to overwrite it ? (y/n) -overwriteGraph?=This file exists, do you want to overwrite it ? -rstFile?=Please enter reStructuredText file path (empty to exit) -save=Enter "\!s" in the end of the file name to save -saveAs=Save as \: -xslFile?=Please enter XSL file path (XML output if empty) Deleted: trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties 2010-11-21 14:30:04 UTC (rev 508) +++ trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties 2010-11-22 14:21:29 UTC (rev 509) @@ -1,20 +0,0 @@ -JRST\ parsing\ error\ line\ %d\ char\ %s\:\\n%s= -annuler=.. pour annuler ou pour revenir au repertoire precedent -btnCancel=Annuler -btnConvert=Convertir -dontExist=Ce fichier n'existe pas -entrer=Entrer pour afficher la liste des fichiers, ou pour completer le chemin -exit=Saisir "\!q" pour quitter -externalXSL=XSL(s) externe(s) -help?=JRST --help pour afficher l'aide -open=Ouvrir le fichier \: -openEmpty?=Ce champ doit etre rempli. -other?=Voulez-vous ajouter un autre fichier XSL ?(o/n) -outputFile?=Veuillez saisir le chemin du fichier sortie (Laissez vide pour l'afficher dans la sortie standard) -outputFormat?=Veuillez saisir le format de sortie (xhtml, docbook, xml(par default), html, xdoc, rst, pdf, odt ou rtf)\n(Laissez vide pour specifier le ou les XSL de generations \u00E0 utiliser) -overwrite?=Ce fichier existe, etes-vous sur de vouloir ecraser le fichier ?(o/n) -overwriteGraph?=Ce fichier existe, etes-vous sur de vouloir ecraser le fichier ? -rstFile?=Veuillez saisir le chemin du fichier reStructuredText (Laissez vide pour quitter) -save=Saisir "\!s" a la fin du nom de fichier pour l'enregistrer -saveAs=Enregistrer sous \: -xslFile?=Veuillez saisir le chemin du fichier XSL (Sortie XML si vide) Copied: trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties (from rev 507, trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties) =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties (rev 0) +++ trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties 2010-11-22 14:21:29 UTC (rev 509) @@ -0,0 +1,20 @@ +JRST\ parsing\ error\ line\ %d\ char\ %s\:\\n%s=JRST parsing error line %d char %s\:\\n%s +annuler=.. to cancel or return to parent directory +btnCancel=Cancel +btnConvert=Convert +dontExist=Invalid file path +entrer=Enter to display file list, or to complete path +exit=Enter "\!q" to exit +externalXSL=External(s) XSL(s) +help?=JRST --help to display help +open=Open file \: +openEmpty?=This field must be filled in. +other?=Want you add an other XSL file ?(y/n) +outputFile?=Please enter output path (empty to display in console) +outputFormat?=Please enter output format (xhtml, docbook, xml(by default), html, xdoc, rst, pdf, odt ou rtf)\n(empty to enter XSL files to use) +overwrite?=This file exists, do you want to overwrite it ? (y/n) +overwriteGraph?=This file exists, do you want to overwrite it ? +rstFile?=Please enter reStructuredText file path (empty to exit) +save=Enter "\!s" in the end of the file name to save +saveAs=Save as \: +xslFile?=Please enter XSL file path (XML output if empty) Property changes on: trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Copied: trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties (from rev 507, trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties) =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties (rev 0) +++ trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties 2010-11-22 14:21:29 UTC (rev 509) @@ -0,0 +1,20 @@ +JRST\ parsing\ error\ line\ %d\ char\ %s\:\\n%s= +annuler=.. pour annuler ou pour revenir au repertoire precedent +btnCancel=Annuler +btnConvert=Convertir +dontExist=Ce fichier n'existe pas +entrer=Entrer pour afficher la liste des fichiers, ou pour completer le chemin +exit=Saisir "\!q" pour quitter +externalXSL=XSL(s) externe(s) +help?=JRST --help pour afficher l'aide +open=Ouvrir le fichier \: +openEmpty?=Ce champ doit etre rempli. +other?=Voulez-vous ajouter un autre fichier XSL ?(o/n) +outputFile?=Veuillez saisir le chemin du fichier sortie (Laissez vide pour l'afficher dans la sortie standard) +outputFormat?=Veuillez saisir le format de sortie (xhtml, docbook, xml(par default), html, xdoc, rst, pdf, odt ou rtf)\n(Laissez vide pour specifier le ou les XSL de generations \u00E0 utiliser) +overwrite?=Ce fichier existe, etes-vous sur de vouloir ecraser le fichier ?(o/n) +overwriteGraph?=Ce fichier existe, etes-vous sur de vouloir ecraser le fichier ? +rstFile?=Veuillez saisir le chemin du fichier reStructuredText (Laissez vide pour quitter) +save=Saisir "\!s" a la fin du nom de fichier pour l'enregistrer +saveAs=Enregistrer sous \: +xslFile?=Veuillez saisir le chemin du fichier XSL (Sortie XML si vide) Property changes on: trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Added: svn:mergeinfo + Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:30:04 UTC (rev 508) +++ trunk/pom.xml 2010-11-22 14:21:29 UTC (rev 509) @@ -50,11 +50,6 @@ <dependencyManagement> <dependencies> -  - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -161,14 +156,14 @@ <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> - <version>2.7.1</version> + <version>${xalanVersion}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>serializer</artifactId> - <version>2.7.1</version> + <version>${xalanVersion}</version> <scope>runtime</scope> </dependency> @@ -310,7 +305,7 @@ <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>Développeur</role> + <role>developer</role> </roles> </developer> </developers> @@ -332,9 +327,11 @@ <doxiaVersion>1.1.3</doxiaVersion> <nuitonUtilsVersion>1.4.1</nuitonUtilsVersion> - <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonI18nVersion>2.0</nuitonI18nVersion> + <xalanVersion>2.7.1</xalanVersion> +  - <maven.test.failure.ignore>true</maven.test.failure.ignore> +  </properties> <build> @@ -360,7 +357,8 @@  <scm> <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/jrst/trunk </developerConnection> <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm>

1 0

r508 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:30:04 +0100 (Sun, 21 Nov 2010) New Revision: 508 Url: http://nuiton.org/repositories/revision/jrst/508 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 10:17:13 UTC (rev 507) +++ trunk/pom.xml 2010-11-21 14:30:04 UTC (rev 508) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1</version> </parent> <artifactId>jrst</artifactId>

1 0

r507 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst test/resources
by vbriand＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: vbriand Date: 2010-11-19 11:17:13 +0100 (Fri, 19 Nov 2010) New Revision: 507 Url: http://nuiton.org/repositories/revision/jrst/507 Log: Special characters in hyperlinks targets are now managed correctly Added: trunk/jrst/src/test/resources/testHyperlinkTarget.rst trunk/jrst/src/test/resources/testHyperlinkTarget.xml Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 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/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-11-12 17:13:57 UTC (rev 506) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-11-19 10:17:13 UTC (rev 507) @@ -32,9 +32,12 @@ import java.io.IOException; import java.io.Reader; +import java.net.URLEncoder; +import java.text.Normalizer; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -1994,7 +1997,7 @@ endPeek(); return result; } - + public Element peekTarget() throws IOException { beginPeek(); @@ -2006,8 +2009,8 @@ Matcher matcher = Pattern.compile("\\.\\.\\s_").matcher(line); if (matcher.find()) { int i = line.indexOf(':'); - result.addAttribute("id", line.substring(matcher.end(), i) - .replaceAll("\\W", "-").toLowerCase()); + result.addAttribute("id", URLEncoder.encode(line.substring(matcher.end(), i) + .toLowerCase().replaceAll(" ", "-"), "UTF-8")); result.addAttribute("level", "" + level(line)); } } @@ -2039,9 +2042,8 @@ "" + level(line)); result.getLast().addAttribute( "id", - line.substring(matcher.end(), i) - .replaceAll("\\W", "-") - .toLowerCase()); + URLEncoder.encode(line.substring(matcher.end(), i) + .replaceAll(" ", "-").toLowerCase(), "UTF-8")); result.getLast().addAttribute( "name", line.substring(matcher.end(), i) Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-11-12 17:13:57 UTC (rev 506) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-11-19 10:17:13 UTC (rev 507) @@ -121,7 +121,10 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.StringReader; +import java.io.UnsupportedEncodingException; import java.net.URL; +import java.net.URLEncoder; +import java.text.Normalizer; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -144,6 +147,7 @@ import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; import org.dom4j.Element; +import org.dom4j.IllegalAddException; import org.dom4j.Node; import org.dom4j.VisitorSupport; @@ -479,7 +483,11 @@ if (log.isWarnEnabled()) { log.warn("Can't inline text for " + e, eee); } - } + } catch (UnsupportedEncodingException ee) { + if (log.isWarnEnabled()) { + log.warn("Unsupported encoding " + e, ee); + } + } } } }); @@ -894,7 +902,7 @@ while (!lexer.eof() && itemNotEquals(TITLE, item) && isUpperLevel(item, parent)) { if (itemEquals(JRSTLexer.BLANK_LINE, item)) { - // go t o the next element + // go to the next element lexer.remove(); } else if (itemEquals("remove", item)) { lexer.remove(); @@ -973,7 +981,12 @@ } else if (itemEquals(TARGET, item)) { lexer.remove(); Element list = composeTarget(item); - parent.add(list); + if (list != null) { + try { + parent.add(list); + } catch (IllegalAddException e) {} + } else + System.err.println("Unknown target name : \"" + item.attributeValue("id") + "\""); } else if (itemEquals("targetAnonymous", item)) { lexer.remove(); Element list = composeTargetAnonymous(item); @@ -2047,8 +2060,10 @@ * @param Element * e * @throws DocumentException + * @throws UnsupportedEncodingException */ - private void inline(Element e) throws DocumentException { + + private void inline(Element e) throws DocumentException, UnsupportedEncodingException { String text = e.getText(); text = StringEscapeUtils.escapeXml(text); @@ -2251,14 +2266,15 @@ String ref = text.substring(matcher.start(), matcher.end() - 1); ref = ref.replaceAll("('|_)", ""); - ref = ref.replaceAll("[\\W&&[^-]]", " ").trim(); + ref = StringEscapeUtils.unescapeXml(ref); + ref = ref.replaceAll("`", ""); 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)) { + String refTmp = URLEncoder.encode(ref.replaceAll("\\s", "-").toLowerCase(), "UTF-8"); + if (el.attributeValue("id").equalsIgnoreCase((refTmp))) { hyper.addAttribute("refuri", el.attributeValue("refuri")); trouve = true; } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-12 17:13:57 UTC (rev 506) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-19 10:17:13 UTC (rev 507) @@ -29,6 +29,8 @@ import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; +import java.io.BufferedReader; +import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; @@ -104,4 +106,23 @@ "</document>"; Assert.assertEquals(XMLexpected, doc.asXML()); } + + @Test + public void testHyperlinkTarget() throws Exception { + URL url = JRSTReaderTest.class.getResource("/testHyperlinkTarget.rst"); + Reader in = new InputStreamReader(url.openStream()); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + URL xmlUrl = JRSTReaderTest.class.getResource("/testHyperlinkTarget.xml"); + Reader xmlIn = new InputStreamReader(xmlUrl.openStream()); + BufferedReader reader = new BufferedReader(xmlIn); + String line = null; + StringBuilder stringBuilder = new StringBuilder(); + String ls = System.getProperty("line.separator"); + while ((line = reader.readLine()) != null) { + stringBuilder.append(line); + stringBuilder.append(ls); + } + Assert.assertEquals(stringBuilder.toString(), doc.asXML() + "\n"); + } } Added: trunk/jrst/src/test/resources/testHyperlinkTarget.rst =================================================================== --- trunk/jrst/src/test/resources/testHyperlinkTarget.rst (rev 0) +++ trunk/jrst/src/test/resources/testHyperlinkTarget.rst 2010-11-19 10:17:13 UTC (rev 507) @@ -0,0 +1,19 @@ +(External) hyperlinks, like Python_. + +.. _Python: http://www.python.org/ + +(External) hyperlinks, like Pythoné_. + +.. _Pythoné: http://www.python.org/ + +- `Module de depouillement (votecounting)`_ + +.. _Module de depouillement (votecounting): http://www.votecounting.com + +- `Module de depouillement (votecounting)!@#$%&*`_ + +.. _Module de depouillement (votecounting)!@#$%&*: http://www.votecounting.com + +- `Module de dépouillement (votecounting)`_ + +.. _Module de dépouillement (votecounting): votecounting.html Added: trunk/jrst/src/test/resources/testHyperlinkTarget.xml =================================================================== --- trunk/jrst/src/test/resources/testHyperlinkTarget.xml (rev 0) +++ trunk/jrst/src/test/resources/testHyperlinkTarget.xml 2010-11-19 10:17:13 UTC (rev 507) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<document><paragraph>(External) hyperlinks, like <reference name="Python" refuri="http://www.python.org/">Python</reference></paragraph><target id="python" name="python" refuri="http://www.python.org/"/><paragraph>(External) hyperlinks, like <reference name="Pythoné" refuri="http://www.python.org/">Pythoné</reference></paragraph><target id="python%C3%A9" name="pythoné" refuri="http://www.python.org/"/><bullet_list bullet="-"><list_item><paragraph><reference name="Module de depouillement (votecounting)" refuri="http://www.votecounting.com">Module de depouillement (votecounting)</reference></paragraph></list_item></bullet_list><target id="module-de-depouillement-%28votecounting%29" name="module de depouillement (votecounting)" refuri="http://www.votecounting.com"/><bullet_list bullet="-"><list_item><paragraph><reference name="Module de depouillement (votecounting)!@#$%&*" refuri="http://www.votecounting.com">Module de depouillement (votecounting)!@#$%&*</reference></paragraph></list_item></bullet_list><target id="module-de-depouillement-%28votecounting%29%21%40%23%24%25%26*" name="module de depouillement (votecounting)!@#$%&*" refuri="http://www.votecounting.com"/><bullet_list bullet="-"><list_item><paragraph><reference name="Module de dépouillement (votecounting)" refuri="votecounting.html">Module de dépouillement (votecounting)</reference></paragraph></list_item></bullet_list><target id="module-de-d%C3%A9pouillement-%28votecounting%29" name="module de dépouillement (votecounting)" refuri="votecounting.html"/></document> \ No newline at end of file Property changes on: trunk/jrst/src/test/resources/testHyperlinkTarget.xml ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r506 - in trunk/jrst/src/test: java/org/nuiton/jrst resources
by vbriand＠users.nuiton.org 12 Nov '10

12 Nov '10

Author: vbriand Date: 2010-11-12 18:13:57 +0100 (Fri, 12 Nov 2010) New Revision: 506 Url: http://nuiton.org/repositories/revision/jrst/506 Log: Added a test about external links. Added: trunk/jrst/src/test/resources/testExternalLink.rst Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-12 16:24:27 UTC (rev 505) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-12 17:13:57 UTC (rev 506) @@ -29,6 +29,7 @@ import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; +import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; @@ -89,4 +90,18 @@ "</document>"; Assert.assertEquals(XMLexpected, doc.asXML()); } + + @Test + public void testExternalLink() throws Exception { + URL url = JRSTReaderTest.class.getResource("/testExternalLink.rst"); + Reader in = new InputStreamReader(url.openStream()); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + String XMLexpected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + "<document>" + + "<paragraph>External hyperlinks, like <reference name=\"Python\" refuri=\"http://www.python.org/\">Python</reference></paragraph>" + + "<target id=\"python\" name=\"python\" refuri=\"http://www.python.org/\"/>" + + "</document>"; + Assert.assertEquals(XMLexpected, doc.asXML()); + } } Added: trunk/jrst/src/test/resources/testExternalLink.rst =================================================================== --- trunk/jrst/src/test/resources/testExternalLink.rst (rev 0) +++ trunk/jrst/src/test/resources/testExternalLink.rst 2010-11-12 17:13:57 UTC (rev 506) @@ -0,0 +1,3 @@ +External hyperlinks, like Python_. + +.. _Python: http://www.python.org/

1 0

r505 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by vbriand＠users.nuiton.org 12 Nov '10

12 Nov '10

Author: vbriand Date: 2010-11-12 17:24:27 +0100 (Fri, 12 Nov 2010) New Revision: 505 Url: http://nuiton.org/repositories/revision/jrst/505 Log: The files ending with \r\n and \r are now managed correctly. The temporary directory used by createTempFile in AdvancedReaderTest.java is now created before the tests so they don't fail anymore. Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-11-05 10:36:34 UTC (rev 504) +++ trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-11-12 16:24:27 UTC (rev 505) @@ -93,6 +93,7 @@ protected int readInMark; + protected boolean nlTwoCtrlChars = false; protected boolean noNlAtEOF = false; /** @@ -198,11 +199,11 @@ */ public int unread(int number) { int result = Math.min(number, nextChar); + nextChar -= result; - charNumber -= result; for (int i = nextChar; i < nextChar + result; i++) { - if (buffer.get(i) == '\n') { + if (buffer.get(i) == '\n' || (buffer.get(i) == '\r' && i + 1 < nextChar + result && buffer.get(i + 1) != '\n')) { lineNumber--; } } @@ -220,7 +221,7 @@ * @return number of unread char */ public int unread(String line, boolean addNewLine) { - int result = unread(line.length() + (addNewLine ? 1 : 0)); + int result = unread(line.length() + (addNewLine ? (nlTwoCtrlChars ? 2 : 1) : 0)); return result; } @@ -254,7 +255,7 @@ if (nextChar < buffer.size()) { result = buffer.get(nextChar++); charNumber++; - if (result == '\n') { + if ((char)result == '\n' || ((char)result == '\r' && nextChar < buffer.size() && buffer.get(nextChar) != '\n')) { lineNumber++; } } @@ -270,10 +271,19 @@ public String readLine() throws IOException { StringBuffer result = new StringBuffer(READ_AHEAD); int c = read(); - while (c != -1 && c != '\n') { + while (c != -1 && c != '\n' && c != '\r') { result.append((char) c); c = read(); } + nlTwoCtrlChars = false; + if (c == '\r') { + c = read(); + if (c != '\n' && c != -1) { + unread(1); + } else { + nlTwoCtrlChars = true; + } + } noNlAtEOF = false; if (c == -1 && result.length() >= 0) { if (c == -1 && result.length() == 0) { @@ -356,7 +366,7 @@ tmp = readLine(); } if (tmp != null) { - unread(tmp.length() + (!noNlAtEOF ? 1 : 0)); // +1 for '\n' not in line + unread(tmp.length() + (!noNlAtEOF ? (nlTwoCtrlChars ? 2 : 1) : 0)); // +1 for '\n' not in line } return result.toArray(new String[result.size()]); } @@ -376,7 +386,7 @@ tmp = readLine(); } if (tmp != null) { - unread(tmp.length() + (!noNlAtEOF ? 1 : 0)); // +1 for '\n' not in line + unread(tmp.length() + (!noNlAtEOF ? (nlTwoCtrlChars ? 2 : 1) : 0)); // +1 for '\n' not in line } return result.toArray(new String[result.size()]); } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2010-11-05 10:36:34 UTC (rev 504) +++ trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2010-11-12 16:24:27 UTC (rev 505) @@ -35,6 +35,7 @@ import org.junit.Assert; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -57,6 +58,15 @@ + "9 toto tata tutu\n"; protected File file; + + /** + * Creates the temporary directory used by createTempFile + */ + @BeforeClass + static public void createTmpDir() { + File tmp = new File(System.getProperty("java.io.tmpdir")); + tmp.mkdirs(); + } /** * setUp - create test file. @@ -64,12 +74,12 @@ */ @Before public void setUp() throws IOException { - file = File.createTempFile("test-AdvancedReader", ".txt"); - file.deleteOnExit(); + file = File.createTempFile("test-AdvancedReader", ".txt"); + file.deleteOnExit(); - Writer out = new BufferedWriter(new FileWriter(file)); - out.write(text); - out.close(); + Writer out = new BufferedWriter(new FileWriter(file)); + out.write(text); + out.close(); } /** @@ -297,5 +307,19 @@ line = in.readLine(); Assert.assertNull(line); } - + + @Test + public void testEol() throws IOException { + String tmp = text; + AdvancedReader in = new AdvancedReader(new StringReader(tmp)); + String[] linesN = in.readAll(); + tmp = tmp.replace('\n', '\r'); + in = new AdvancedReader(new StringReader(tmp)); + String[] linesR = in.readAll(); + tmp = tmp.replaceAll("\r", "\r\n"); + in = new AdvancedReader(new StringReader(tmp)); + String[] linesRN = in.readAll(); + Assert.assertArrayEquals(linesN, linesR); + Assert.assertArrayEquals(linesN, linesRN); + } }

1 0

r504 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs
by vbriand＠users.nuiton.org 05 Nov '10

05 Nov '10

Author: vbriand Date: 2010-11-05 11:36:34 +0100 (Fri, 05 Nov 2010) New Revision: 504 Url: http://nuiton.org/repositories/revision/jrst/504 Log: There is no infinite loop anymore when the file doesn't end with a \n (backslash n) Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-11-04 15:55:25 UTC (rev 503) +++ trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-11-05 10:36:34 UTC (rev 504) @@ -92,6 +92,8 @@ protected int markChar; protected int readInMark; + + protected boolean noNlAtEOF = false; /** * @@ -154,7 +156,7 @@ } /** - * ensure that have number char available and not allready read + * ensure that have number char available and not already read * * @param number ? * @throws IOException @@ -164,8 +166,10 @@ if (needed > 0) { char[] cbuf = new char[needed + READ_AHEAD]; int read = in.read(cbuf); - for (int i = 0; i < read; i++) { - buffer.add(cbuf[i]); + if (read != -1) { + for (int i = 0; i < read; i++) { + buffer.add(cbuf[i]); + } } } } @@ -241,7 +245,7 @@ /** * read one char in buffer * - * @return the next car + * @return the next char * @throws IOException pour tout pb de lecture */ public int read() throws IOException { @@ -270,8 +274,14 @@ result.append((char) c); c = read(); } - if (c == -1 && result.length() == 0) { - return null; + noNlAtEOF = false; + if (c == -1 && result.length() >= 0) { + if (c == -1 && result.length() == 0) { + return null; + } else { + noNlAtEOF = true; + return result.toString(); + } } else { return result.toString(); } @@ -346,7 +356,7 @@ tmp = readLine(); } if (tmp != null) { - unread(tmp.length() + 1); // +1 for '\n' not in line + unread(tmp.length() + (!noNlAtEOF ? 1 : 0)); // +1 for '\n' not in line } return result.toArray(new String[result.size()]); } @@ -366,7 +376,7 @@ tmp = readLine(); } if (tmp != null) { - unread(tmp.length() + 1); // +1 for '\n' not in line + unread(tmp.length() + (!noNlAtEOF ? 1 : 0)); // +1 for '\n' not in line } return result.toArray(new String[result.size()]); } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2010-11-04 15:55:25 UTC (rev 503) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2010-11-05 10:36:34 UTC (rev 504) @@ -52,9 +52,8 @@ * plus de 5s. (bug #697). * * @throws Exception if any - * //FIXME tchemit 2010-10-06 Remove Ignore when workaround will be proposed */ - @Ignore + @Test(timeout = 5000) public void testInfiniteLoop() throws Exception { URL url = JRSTReaderTest.class.getResource("/bugs/infiniteLoop.rst");

1 0

r503 - in trunk/jrst/src/test: java/org/nuiton/jrst resources
by vbriand＠users.nuiton.org 04 Nov '10

04 Nov '10

Author: vbriand Date: 2010-11-04 16:55:25 +0100 (Thu, 04 Nov 2010) New Revision: 503 Url: http://nuiton.org/repositories/revision/jrst/503 Log: Added a test for the empty table of contents Added: trunk/jrst/src/test/resources/testEmptyTableContents.rst Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-04 14:13:42 UTC (rev 502) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-04 15:55:25 UTC (rev 503) @@ -32,6 +32,9 @@ import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; + +import junit.framework.Assert; + import org.junit.Test; /** @@ -69,5 +72,21 @@ // System.out.println(out.toString()); // } } - + + @Test + public void testEmptyTableContents() throws Exception{ + URL url = JRSTReaderTest.class.getResource("/testEmptyTableContents.rst"); + Reader in = new InputStreamReader(url.openStream()); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + String XMLexpected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + "<document id=\"test\" name=\"test\">" + + "<title>Test</title>" + + "<topic class=\"contents\" id=\"table des matières\" name=\"table des matières\">" + + "<title>Table des matières</title>" + + "</topic>" + + "<paragraph>Texte</paragraph>" + + "</document>"; + Assert.assertEquals(XMLexpected, doc.asXML()); + } } Added: trunk/jrst/src/test/resources/testEmptyTableContents.rst =================================================================== --- trunk/jrst/src/test/resources/testEmptyTableContents.rst (rev 0) +++ trunk/jrst/src/test/resources/testEmptyTableContents.rst 2010-11-04 15:55:25 UTC (rev 503) @@ -0,0 +1,6 @@ +Test +---- + +.. contents:: Table des matières + +Texte \ No newline at end of file

1 0

r502 - trunk/jrst/src/main/java/org/nuiton/jrst
by vbriand＠users.nuiton.org 04 Nov '10

04 Nov '10

Author: vbriand Date: 2010-11-04 15:13:42 +0100 (Thu, 04 Nov 2010) New Revision: 502 Url: http://nuiton.org/repositories/revision/jrst/502 Log: A table of contents without title doesn't stop the file parsing anymore Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-10-29 17:19:24 UTC (rev 501) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-11-04 14:13:42 UTC (rev 502) @@ -129,6 +129,7 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.NoSuchElementException; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringEscapeUtils; @@ -524,6 +525,8 @@ } } int levelInit = 0; + boolean noTitle = false; + try { levelInit = Integer.parseInt(eTitle.getFirst().attributeValue( "level")); @@ -531,6 +534,8 @@ log.error("Can't parse level in: " + eTitle.getFirst().asXML(), eee); return; + } catch (NoSuchElementException eee) { + noTitle = true; } LinkedList<Element> title = new LinkedList<Element>(); @@ -566,7 +571,9 @@ e.addAttribute("name", value); result.addElement("title").setText(titleValue); // on compose les lignes - result.add(composeLineContent(title, "")); + if (!noTitle) { //Si il y a des titres à lier à la table des matières + result.add(composeLineContent(title, "")); + } e.setText(""); e.appendContent(result); }

1 0

r501 - trunk/jrst/src/main/resources/i18n
by vbriand＠users.nuiton.org 29 Oct '10

29 Oct '10

Author: vbriand Date: 2010-10-29 19:19:24 +0200 (Fri, 29 Oct 2010) New Revision: 501 Url: http://nuiton.org/repositories/revision/jrst/501 Log: A minor English mistake, but painful for the eyes =) Modified: trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties Modified: trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties 2010-10-29 16:42:10 UTC (rev 500) +++ trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties 2010-10-29 17:19:24 UTC (rev 501) @@ -8,12 +8,12 @@ externalXSL=External(s) XSL(s) help?=JRST --help to display help open=Open file \: -openEmpty?=This field must be fill in. +openEmpty?=This field must be filled in. other?=Want you add an other XSL file ?(y/n) -outputFile?=Please enter outpout path (empty to display in console) +outputFile?=Please enter output path (empty to display in console) outputFormat?=Please enter output format (xhtml, docbook, xml(by default), html, xdoc, rst, pdf, odt ou rtf)\n(empty to enter XSL files to use) overwrite?=This file exists, do you want to overwrite it ? (y/n) -overwriteGraph?=This file existe, do you want to overwrite it ? +overwriteGraph?=This file exists, do you want to overwrite it ? rstFile?=Please enter reStructuredText file path (empty to exit) save=Enter "\!s" in the end of the file name to save saveAs=Save as \:

1 0

r500 - trunk/jrst/src/main/java/org/nuiton/jrst
by vbriand＠users.nuiton.org 29 Oct '10

29 Oct '10

Author: vbriand Date: 2010-10-29 18:42:10 +0200 (Fri, 29 Oct 2010) New Revision: 500 Url: http://nuiton.org/repositories/revision/jrst/500 Log: https URLs are now working Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2010-10-29 08:28:59 UTC (rev 499) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2010-10-29 16:42:10 UTC (rev 500) @@ -203,9 +203,9 @@ .compile("\\*\\*(.+?)\\*\\*"); public static final Pattern REGEX_LITERAL = Pattern.compile("``([^`]+)``"); public static final Pattern REGEX_REFERENCE = Pattern - .compile("(http://[-/%#[\\&&&[^(>)]]\\._\\w:]+\\w+)((\\W|&|$)+)"); + .compile("(https?://[-/%#[\\&&&[^(>)]]\\._\\w:]+\\w+)((\\W|&|$)+)"); public static final Pattern REGEX_INLINE_REFERENCE = Pattern - .compile("`(.+) \\&lt\\;(http://[-/%#&\\._\\w:]+)(\\&gt\\;)`_"); + .compile("`(.+) \\&lt\\;(https?://[-/%#&\\._\\w:]+)(\\&gt\\;)`_"); public static final Pattern REGEX_EMAIL = Pattern .compile("(^|[^_\\w])([-\\._\\w]+(a)[-\\._\\w]+)([^-\\._\\w]|$)"); public static final Pattern REGEX_FOOTNOTE_REFERENCE = Pattern

1 0