"=|" + // Need the = because we might have to find unescaped =
"<!--|" +
"''|" +
+ "<pre>|" +
+ "<math>|" +
+ "<ref>|" +
"$)", Pattern.MULTILINE);
private static final String listChars = "*#:;";
this(wikiText, true);
}
- public WikiTokenizer(final String wikiText, final boolean isNewline) {
- this.wikiText = wikiText.replaceAll("\u2028", "\n");
+ public WikiTokenizer(String wikiText, final boolean isNewline) {
+ wikiText = wikiText.replace('\u2028', '\n');
+ wikiText = wikiText.replace('\u0085', '\n');
+ this.wikiText = wikiText;
this.matcher = wikiTokenEvent.matcher(wikiText);
justReturnedNewline = isNewline;
}
"\\[\\[|" +
"<!--|" +
"''|" +
+ "<pre>|" +
+ "<math>|" +
+ "<ref>|" +
"[\n]"
);
callback.onPlainText(tokenizer.token());
} else if (tokenizer.isMarkup()) {
callback.onMarkup(tokenizer);
- } else if (tokenizer.isWikiLink) {
+ } else if (tokenizer.isWikiLink()) {
callback.onWikiLink(tokenizer);
} else if (tokenizer.isNewline()) {
callback.onNewline(tokenizer);
if (firstUnescapedPipePos != -1) {
return trimNewlines(wikiText.substring(start + 2, firstUnescapedPipePos).trim());
}
- return trimNewlines(wikiText.substring(start + 2, end - 2).trim());
+ final int safeEnd = Math.max(start + 2, end - 2);
+ return trimNewlines(wikiText.substring(start + 2, safeEnd).trim());
}
public List<String> functionPositionArgs() {
return this;
}
- if (justReturnedNewline) {
+ if (justReturnedNewline) {
justReturnedNewline = false;
final char firstChar = wikiText.charAt(end);
return this;
}
+ if (wikiText.startsWith("<ref>", start)) {
+ end = safeIndexOf(wikiText, start, "</ref>", "\n");
+ isHtml = true;
+ return this;
+ }
+
if (wikiText.startsWith("<math>", start)) {
end = safeIndexOf(wikiText, start, "</math>", "\n");
isHtml = true;
return safeIndexOf(wikiText, start, "\n", "\n");
}
} else {
- errors.add("Pop too many error: " + wikiText.substring(start).replaceAll("\n", "\\\\n"));
+ errors.add("Pop too many error: " + wikiText.substring(start).replace("\n", "\\\\n"));
// If we were looking for a newline
return safeIndexOf(wikiText, start, "\n", "\n");
}
errors.add("Unmatched <!-- error: " + wikiText.substring(start));
return safeIndexOf(wikiText, start, "\n", "\n");
}
- } else if (matchText.equals("''")) {
+ } else if (matchText.equals("''") || (matchText.startsWith("<") && matchText.endsWith(">"))) {
// Don't care.
} else {
assert false : "Match text='" + matchText + "'";
// We were looking for the end, we got it.
return end;
}
+ errors.add("Couldn't find: " + toFind + ", "+ wikiText.substring(start));
if (firstNewline != -1) {
- errors.add("Couldn't find: " + toFind + ", "+ wikiText.substring(start));
return firstNewline;
}
return end;
while (s.endsWith("\n")) {
s = s.substring(0, s.length() - 1);
}
- return s.replaceAll("\n", " ");
+ return s.replace('\n', ' ');
}
static int safeIndexOf(final String s, final int start, final String target, final String backup) {