Index: jrst2/src/java/org/codelutin/jrst/JRSTReader.java diff -u jrst2/src/java/org/codelutin/jrst/JRSTReader.java:1.31 jrst2/src/java/org/codelutin/jrst/JRSTReader.java:1.32 --- jrst2/src/java/org/codelutin/jrst/JRSTReader.java:1.31 Wed May 30 19:20:34 2007 +++ jrst2/src/java/org/codelutin/jrst/JRSTReader.java Tue Jun 5 10:17:13 2007 @@ -23,9 +23,9 @@ * Created: 27 oct. 06 00:15:34 * * @author poussin - * @version $Revision: 1.31 $ + * @version $Revision: 1.32 $ * - * Last update: $Date: 2007/05/30 19:20:34 $ + * Last update: $Date: 2007/06/05 10:17:13 $ * by : $Author: sletellier $ */ @@ -424,6 +424,7 @@ eTitle.get(i).addAttribute("refid", "id" + idMax); } for (Element el : eTitle) { + int level = Integer.parseInt(el.attributeValue("level")); level = level - levelInit; el.addAttribute("level", "" + level); @@ -480,7 +481,7 @@ reference.addAttribute("id", id); reference.addAttribute("refid", text.replaceAll("\\W+", " ") .trim().toLowerCase().replaceAll("\\W+", "-")); - reference.addAttribute("inline", "true"); + //reference.addAttribute("inline", "true"); if (sectnum) { Element generated = reference.addElement("generated") .addAttribute("class", "sectnum"); @@ -495,7 +496,7 @@ } } - reference.setText(text.trim()); + reference.setText(text.replaceAll("_", "").trim()); } else { do { @@ -1880,7 +1881,7 @@ matcher = REGEX_HYPERLINK_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(), text.length()); String ref = text.substring(matcher.start(), matcher.end() - 1); ref = ref.replaceAll("('|_)", ""); @@ -1899,7 +1900,7 @@ if (!trouve) hyper.addAttribute("refid", ref); hyper.setText(ref); - text = txtDebut + hyper.asXML() + txtFin; + text = txtDebut + hyper.asXML() +" "+ txtFin; matcher = REGEX_HYPERLINK_REFERENCE.matcher(text); }