small changes

[phpeclipse.git] / archive / org.plog4u.wiki / src / org / plog4u / wiki / filter / WikipediaParser.java

diff --git a/archive/org.plog4u.wiki/src/org/plog4u/wiki/filter/WikipediaParser.java b/archive/org.plog4u.wiki/src/org/plog4u/wiki/filter/WikipediaParser.java
index 2e04285..08a0e3b 100644 (file)
--- a/archive/org.plog4u.wiki/src/org/plog4u/wiki/filter/WikipediaParser.java
+++ b/archive/org.plog4u.wiki/src/org/plog4u/wiki/filter/WikipediaParser.java
@@ -443,7 +443,7 @@ public class WikipediaParser {
             fResultBuffer.append("<");
             fResultBuffer.append(token.getTagName());
             fTokenStack.push(token);
-            fCurrentPosition = token.scan(fResultBuffer, fSource, fCurrentPosition - 1);
+            fCurrentPosition = token.scan(fResultBuffer, fSource, fCurrentPosition);
             fResultBuffer.append(">");
             return WikipediaFilter.TokenIgnore;
           }
@@ -700,21 +700,21 @@ public class WikipediaParser {
             copyWhite(fWhiteStart, fWhiteStartPosition, 1);
             fWhiteStart = false;
 
-            int startHeadPosition = fCurrentPosition;
+            int startHeadPosition = fCurrentPosition-1;
             if (readUntilEOL()) {
               // TODO not correct - improve this
               String head = new String(fSource, startHeadPosition, fCurrentPosition - startHeadPosition);
-              int index = head.indexOf(": ");
+              int index = head.indexOf(" : ");
               if (index > 0) {
                 fResultBuffer.append("<dl><dt>");
                 fResultBuffer.append(head.substring(0, index));
-                fResultBuffer.append("</dt><dd>");
+                fResultBuffer.append("&nbsp;</dt><dd>");
                 fResultBuffer.append(head.substring(index + 2));
                 fResultBuffer.append("</dd></dl>");
               } else {
                 fResultBuffer.append("<dl><dt>");
                 fResultBuffer.append(head);
-                fResultBuffer.append("</dt></dl>");
+                fResultBuffer.append("&nbsp;</dt></dl>");
               }
               continue;
             }
@@ -912,16 +912,17 @@ public class WikipediaParser {
             // table
             // syntax
             continue;
-          } else {
-            if (readUntilChar('}')) {
-              String macroStartTag;
-
-              macroStartTag = new String(fSource, startMacroPosition, fCurrentPosition - startMacroPosition - 1);
-              if (macroStartTag != null) {
-                createMacro(startMacroPosition, macroStartTag);
-                continue;
-              }
-            }
+//          } else {
+// SnipSnap / Radeox Macro Syntax
+//            if (readUntilChar('}')) {
+//              String macroStartTag;
+//
+//              macroStartTag = new String(fSource, startMacroPosition, fCurrentPosition - startMacroPosition - 1);
+//              if (macroStartTag != null) {
+//                createMacro(startMacroPosition, macroStartTag);
+//                continue;
+//              }
+//            }
           }
           break;
         case '<':