Index: jrst2/src/java/org/codelutin/jrst/ReStructuredText.java
diff -u jrst2/src/java/org/codelutin/jrst/ReStructuredText.java:1.9 jrst2/src/java/org/codelutin/jrst/ReStructuredText.java:1.10
--- jrst2/src/java/org/codelutin/jrst/ReStructuredText.java:1.9	Thu May 10 16:13:49 2007
+++ jrst2/src/java/org/codelutin/jrst/ReStructuredText.java	Tue May 22 13:09:33 2007
@@ -23,9 +23,9 @@
  * Created: 27 oct. 06 11:10:30
  *
  * @author poussin
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  *
- * Last update: $Date: 2007/05/10 16:13:49 $
+ * Last update: $Date: 2007/05/22 13:09:33 $
  * by : $Author: sletellier $
  */
 
@@ -182,7 +182,7 @@
     public static final Pattern REGEX_EMPHASIS = Pattern.compile("\\*([^*(\\]_.+\\[)].+?)\\*");
     public static final Pattern REGEX_STRONG = Pattern.compile("\\*\\*(.+?)\\*\\*");
     public static final Pattern REGEX_LITERAL = Pattern.compile("``(.+?)``");
-    public static final Pattern REGEX_REFERENCE = Pattern.compile("(http://[-/%#&\\._\\w]+)([^-/%#&\\._\\w]|$)");
+    public static final Pattern REGEX_REFERENCE = Pattern.compile("(http://[-/%#&\\._\\w]+)([^-/%#&_\\w]+)");
     public static final Pattern REGEX_INLINE_REFERENCE = Pattern.compile("`(.+) ?<(http://[-/%#&\\._\\w]+)>`_");
     public static final Pattern REGEX_EMAIL = Pattern.compile("(^|[^_\\w])([-\\._\\w]+@[-\\._\\w]+)([^-\\._\\w]|$)");
     public static final Pattern REGEX_FOOTNOTE_REFERENCE = Pattern.compile("\\[(#|[0-9]|\\*)\\w*\\]_");

Index: jrst2/src/java/org/codelutin/jrst/JRSTReader.java
diff -u jrst2/src/java/org/codelutin/jrst/JRSTReader.java:1.25 jrst2/src/java/org/codelutin/jrst/JRSTReader.java:1.26
--- jrst2/src/java/org/codelutin/jrst/JRSTReader.java:1.25	Tue May 22 09:24:01 2007
+++ jrst2/src/java/org/codelutin/jrst/JRSTReader.java	Tue May 22 13:09:33 2007
@@ -23,9 +23,9 @@
  * Created: 27 oct. 06 00:15:34
  *
  * @author poussin
- * @version $Revision: 1.25 $
+ * @version $Revision: 1.26 $
  *
- * Last update: $Date: 2007/05/22 09:24:01 $
+ * Last update: $Date: 2007/05/22 13:09:33 $
  * by : $Author: sletellier $
  */
 
@@ -364,7 +364,8 @@
      * @throws IOException
      * @throws DocumentException 
      */
-    public Document read(Reader reader) throws Exception {
+    public Document read(Reader reader, int idMax) throws Exception {
+        this.idMax=idMax;
         JRSTLexer lexer = new JRSTLexer(reader);
         try {            
             Element root = composeDocument(lexer);
@@ -418,8 +419,10 @@
         }
         int levelInit = Integer.parseInt(eTitle.getFirst().attributeValue("level"));
         LinkedList<Element> title = new LinkedList<Element>();
-        for (int i=0;i<eTitle.size();i++)
-            eTitle.get(i).addAttribute("refid", "id"+(++idMax));
+        for (int i=0;i<eTitle.size();i++){
+            idMax++;
+            eTitle.get(i).addAttribute("refid", "id"+idMax);
+        }
         for (Element el : eTitle){
             int level = Integer.parseInt(el.attributeValue("level"));
             level=level-levelInit;
@@ -545,7 +548,7 @@
             result.addAttribute("id", txt.replaceAll("\\W"," ").toLowerCase().trim().replaceAll(" ", "-"));
             result.addAttribute("name", txt.toLowerCase().replaceAll("\\W", " ").trim());
             copyLevel(item, title);
-            title.addAttribute("inline", "true").setText(txt);
+            title.addAttribute("inline", "true").setText(txt.trim());
         }
         
         // skip blank line
@@ -560,7 +563,7 @@
             subtitle.addAttribute("id", txt.replaceAll("\\W"," ").toLowerCase().trim().replaceAll(" ", "-"));
             subtitle.addAttribute("name",txt.toLowerCase().replaceAll("\\W", " ").trim());
             copyLevel(item, subtitle);DocumentHelper.createElement("footnotes");
-            subtitle.addAttribute("inline", "true").setText(txt);
+            subtitle.addAttribute("inline", "true").setText(txt.trim());
         }
         
         // skip blank line
@@ -583,21 +586,21 @@
                 if ("author".equalsIgnoreCase(item.attributeValue("type"))) {
                     documentinfo.addElement(AUTHOR).addAttribute("inline", "true").setText(item.getText());
                 } else if ("date".equalsIgnoreCase(item.attributeValue("type"))) {
-                    documentinfo.addElement(DATE).addAttribute("inline", "true").setText(item.getText());
+                    documentinfo.addElement(DATE).addAttribute("inline", "true").setText(item.getText().trim());
                 } else if ("organization".equalsIgnoreCase(item.attributeValue("type"))) {
-                    documentinfo.addElement(ORGANIZATION).addAttribute("inline", "true").setText(item.getText());
+                    documentinfo.addElement(ORGANIZATION).addAttribute("inline", "true").setText(item.getText().trim());
                 } else if ("contact".equalsIgnoreCase(item.attributeValue("type"))) {
-                    documentinfo.addElement(CONTACT).addAttribute("inline", "true").setText(item.getText());
+                    documentinfo.addElement(CONTACT).addAttribute("inline", "true").setText(item.getText().trim());
                 } else if ("address".equalsIgnoreCase(item.attributeValue("type"))) {
-                    documentinfo.addElement(ADDRESS).addAttribute("inline", "true").setText(item.getText());
+                    documentinfo.addElement(ADDRESS).addAttribute("inline", "true").setText(item.getText().trim());
                 } else if ("version".equalsIgnoreCase(item.attributeValue("type"))) {
-                    documentinfo.addElement(VERSION).addAttribute("inline", "true").setText(item.getText());
+                    documentinfo.addElement(VERSION).addAttribute("inline", "true").setText(item.getText().trim());
                 } else if ("revision".equalsIgnoreCase(item.attributeValue("type"))) {
-                    documentinfo.addElement(REVISION).addAttribute("inline", "true").setText(item.getText());
+                    documentinfo.addElement(REVISION).addAttribute("inline", "true").setText(item.getText().trim());
                 } else if ("status".equalsIgnoreCase(item.attributeValue("type"))) {
-                    documentinfo.addElement(STATUS).addAttribute("inline", "true").setText(item.getText());
+                    documentinfo.addElement(STATUS).addAttribute("inline", "true").setText(item.getText().trim());
                 } else if ("copyright".equalsIgnoreCase(item.attributeValue("type"))) {
-                    documentinfo.addElement(COPYRIGHT).addAttribute("inline", "true").setText(item.getText());
+                    documentinfo.addElement(COPYRIGHT).addAttribute("inline", "true").setText(item.getText().trim());
                 } else if ("authors".equalsIgnoreCase(item.attributeValue("type"))){
                 	Element authors = documentinfo.addElement(AUTHORS);
             		int t=0;
@@ -805,7 +808,7 @@
             URL url = fileIn.toURL();
             Reader in = new InputStreamReader(url.openStream());        
             JRSTReader jrst = new JRSTReader();
-            Document doc = jrst.read(in);
+            Document doc = jrst.read(in,idMax);
             
             result = doc.getRootElement();
         }
@@ -827,8 +830,8 @@
     private Element composeTargetAnonymous(Element item) {
         Element result = DocumentHelper.createElement(TARGET);
         result.addAttribute("anonymous", "1");
-        int id = ++idMax;
-        result.addAttribute("id", "id"+id);
+        idMax++;
+        result.addAttribute("id", "id"+idMax);
         result.addAttribute("refuri", item.attributeValue("refuri").replaceAll("`|_", "").trim());
         eTargetAnonymous.add(result);
         return result;
@@ -933,7 +936,7 @@
 	    		
 	    		JRSTReader reader = new JRSTReader();
 	            String text = footnote.getText();
-	            Document doc = reader.read(new StringReader(text)); 
+	            Document doc = reader.read(new StringReader(text),idMax); 
 	            result[cnt].appendContent(doc.getRootElement());
 	    		
 	            
@@ -1007,7 +1010,7 @@
 	   		result.addElement(SUBTITLE).addAttribute("inline", "true").setText(item.attributeValue(SUBTITLE));
 		JRSTReader reader = new JRSTReader();
         String text = item.getText();
-        Document doc = reader.read(new StringReader(text)); 
+        Document doc = reader.read(new StringReader(text), idMax); 
 	    result.appendContent(doc.getRootElement());
 		
 		return result;
@@ -1080,7 +1083,7 @@
 		result=DocumentHelper.createElement(BLOCK_QUOTE);
 		JRSTReader reader = new JRSTReader();
         String text = item.getText();
-        Document doc = reader.read(new StringReader(text)); 
+        Document doc = reader.read(new StringReader(text),idMax); 
 	    result.appendContent(doc.getRootElement());
         String sAttribution = item.attributeValue(ATTRIBUTION);
         if (sAttribution != null){
@@ -1111,7 +1114,7 @@
 			result=DocumentHelper.createElement(item.attributeValue("type").toLowerCase());
         JRSTReader reader = new JRSTReader();
         String text = item.getText();
-        Document doc = reader.read(new StringReader(text));
+        Document doc = reader.read(new StringReader(text),idMax);
 	    result.appendContent(doc.getRootElement());
 	    return result;
 	}
@@ -1239,7 +1242,7 @@
                     }
                     // parse entry text in table
                     JRSTReader reader = new JRSTReader();
-                    Document doc = reader.read(new StringReader(text));
+                    Document doc = reader.read(new StringReader(text),idMax);
                     entry.appendContent(doc.getRootElement());
                 }
             }
@@ -1280,11 +1283,13 @@
     private Element composeEnumeratedList(JRSTLexer lexer) throws Exception {
         Element item = lexer.peekEnumeratedList();
         Element result = DocumentHelper.createElement(ENUMERATED_LIST);
-        copyLevel(item, result);        
-        result.addAttribute("start", item.attributeValue("start"));
+        copyLevel(item, result);
+        String enumType = item.attributeValue("enumtype");
+        if (!enumType.equals("arabic"))
+            result.addAttribute("start", item.attributeValue("start"));
         result.addAttribute("prefix", item.attributeValue("prefix"));
         result.addAttribute("suffix", item.attributeValue("suffix"));
-        result.addAttribute("enumtype", item.attributeValue("enumtype"));
+        result.addAttribute("enumtype",enumType );
         while (itemEquals(ENUMERATED_LIST, item) && isSameLevel(item, result) &&
                 hasSameAttribute(item, result, "prefix", "suffix") &&
                 ("auto".equals(item.attributeValue("enumtype")) ||
@@ -1705,8 +1710,8 @@
             anonym.addAttribute("anonymous","1");
             anonym.addAttribute("name", ref.trim());
             if (!eTargetAnonymous.isEmpty()){
-                Element target = eTargetAnonymous.getLast();
-                eTargetAnonymous.removeLast();
+                Element target = eTargetAnonymous.getFirst();
+                eTargetAnonymous.removeFirst();
                 anonym.addAttribute("refuri", target.attributeValue("refuri"));
             }
             anonym.setText(ref);
@@ -1719,17 +1724,20 @@
             String txtFin=text.substring(matcher.end(),text.length());
             String ref = text.substring(matcher.start(), matcher.end()-1);
             ref = ref.replaceAll("&apos;", "");
-            ref = ref.replaceAll("\\W", " ").trim();
+            ref = ref.replaceAll("[\\W&&[^-]]", " ").trim();
             Element hyper = DocumentHelper.createElement("reference");
             hyper.addAttribute("name", ref);
-            for (Element el : eTarget){
-                if (el.attributeValue("id").equalsIgnoreCase(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)){
                     hyper.addAttribute("refuri",el.attributeValue("refuri"));
+                    trouve=true;
                 }
-                else
-                    hyper.addAttribute("refid",ref);
             }
-            
+            if (!trouve)
+                hyper.addAttribute("refid",ref);
             hyper.setText(ref);
             text=txtDebut+hyper.asXML()+txtFin;
             matcher = REGEX_HYPERLINK_REFERENCE.matcher(text);

Index: jrst2/src/java/org/codelutin/jrst/JRSTLexer.java
diff -u jrst2/src/java/org/codelutin/jrst/JRSTLexer.java:1.22 jrst2/src/java/org/codelutin/jrst/JRSTLexer.java:1.23
--- jrst2/src/java/org/codelutin/jrst/JRSTLexer.java:1.22	Tue May 22 09:24:01 2007
+++ jrst2/src/java/org/codelutin/jrst/JRSTLexer.java	Tue May 22 13:09:33 2007
@@ -23,9 +23,9 @@
  * Created: 28 oct. 06 00:44:20
  *
  * @author poussin
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.23 $
  *
- * Last update: $Date: 2007/05/22 09:24:01 $
+ * Last update: $Date: 2007/05/22 13:09:33 $
  * by : $Author: sletellier $
  */
 
@@ -1859,9 +1859,8 @@
 					   			if (line!=null){
 					   				if (line.matches("^\\s*\\.\\.\\s\\[(#|[0-9]|\\*).*\\]\\s.+$")){
 					   					bLine=true;
-					   				}else if (line.matches("\\s*")){
-                                        text+="\n"+line;
-					   					line = in.readLine();
+					   				}else {
+                                        
 					   					int level = level(line);
 						   				if (levelAv<level){
 							   				String[] lines =in.readWhile("(^ {"+level+"}.*)|(\\s*)");
@@ -1870,6 +1869,17 @@
 								   				text += "\n"+l.trim();
 								   			
 							   			}
+                                        else if (line.matches("\\s*")){
+                                            line = in.readLine();
+                                            level = level(line);
+                                            if (levelAv<level){
+                                                String[] lines =in.readWhile("(^ {"+level+"}.*)|(\\s*)");
+                                                text+="\n"+line.trim();
+                                                for (String l : lines)
+                                                    text += "\n"+l.trim();
+                                                
+                                            }
+                                        }
 					   				}
 					   				if (!bLine){
 					   					in.skipBlankLines();

Index: jrst2/src/java/org/codelutin/jrst/JRST.java
diff -u jrst2/src/java/org/codelutin/jrst/JRST.java:1.6 jrst2/src/java/org/codelutin/jrst/JRST.java:1.7
--- jrst2/src/java/org/codelutin/jrst/JRST.java:1.6	Thu May 10 10:18:41 2007
+++ jrst2/src/java/org/codelutin/jrst/JRST.java	Tue May 22 13:09:33 2007
@@ -23,9 +23,9 @@
  * Created: 3 nov. 06 20:56:00
  *
  * @author poussin
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
  *
- * Last update: $Date: 2007/05/10 10:18:41 $
+ * Last update: $Date: 2007/05/22 13:09:33 $
  * by : $Author: sletellier $
  */
 
@@ -150,7 +150,7 @@
             URL url = fileIn.toURL();
             Reader in = new InputStreamReader(url.openStream());        
             JRSTReader jrst = new JRSTReader();
-            Document doc = jrst.read(in);       
+            Document doc = jrst.read(in,0);       
             
             // apply xsl on rst xml document
             JRSTGenerator gen = new JRSTGenerator();