diff options
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/CodeBlocks.java | 7 | ||||
| -rw-r--r-- | parsers/Footer.java | 1 | ||||
| -rw-r--r-- | parsers/ParserList.java | 3 | ||||
| -rw-r--r-- | parsers/QuoteSpecialText.java | 46 |
4 files changed, 52 insertions, 5 deletions
diff --git a/parsers/CodeBlocks.java b/parsers/CodeBlocks.java index 2c47099..64e8841 100644 --- a/parsers/CodeBlocks.java +++ b/parsers/CodeBlocks.java @@ -25,7 +25,7 @@ import java.util.regex.*; public class CodeBlocks implements Parser { public String parse(String fileContent) { - Pattern pattern = Pattern.compile("(\\#\\#\\#)(.+?)(\\1)", + Pattern pattern = Pattern.compile("(\\#\\#\\#)(\\n+)(.+?)(\\n+)(\\1)", Pattern.DOTALL); Matcher matcher = pattern.matcher(fileContent); LineBreak lbreak = new LineBreak(); @@ -34,7 +34,7 @@ public class CodeBlocks implements Parser { while(matcher.find()) { replacement.delete(0,replacement.length()); replacement.append("<div class=\"code\">"); - replacement.append(quote(lbreak.parse(matcher.group(2)))); + replacement.append(lbreak.parse(quote(matcher.group(3)))); replacement.append("</div>"); matcher.appendReplacement(sbuffer,replacement.toString()); } @@ -53,9 +53,8 @@ public class CodeBlocks implements Parser { StringBuffer sbuffer = new StringBuffer(); String rep; while(matcher.find()) { - rep = "\\\\\\"+matcher.group(); + rep = "\\\\\\"+matcher.group(); matcher.appendReplacement(sbuffer,rep); - } matcher.appendTail(sbuffer); return sbuffer.toString(); diff --git a/parsers/Footer.java b/parsers/Footer.java index 6c1db65..f8d85ae 100644 --- a/parsers/Footer.java +++ b/parsers/Footer.java @@ -33,6 +33,7 @@ public class Footer implements Parser { footer = "\n<footer>"+matcher.group(1)+"</footer>\n"; matcher.appendReplacement(sbuffer,footer); } + matcher.appendTail(sbuffer); return sbuffer.toString(); } } diff --git a/parsers/ParserList.java b/parsers/ParserList.java index f57a6b8..85e3d17 100644 --- a/parsers/ParserList.java +++ b/parsers/ParserList.java @@ -28,15 +28,16 @@ public class ParserList { public ParserList() { parsers = new ArrayList<Parser>(); // add Parsers. NOTE: parser order is significant. + parsers.add(new QuoteSpecialText()); parsers.add(new DocumentName()); parsers.add(new DocumentDate()); parsers.add(new WordDecoration()); parsers.add(new CodeBlocks()); parsers.add(new Headings()); - parsers.add(new Paragraphs()); parsers.add(new Links()); parsers.add(new Images()); parsers.add(new Footer()); + parsers.add(new Paragraphs()); parsers.add(new BackButton()); parsers.add(new Header()); } diff --git a/parsers/QuoteSpecialText.java b/parsers/QuoteSpecialText.java new file mode 100644 index 0000000..165ffa9 --- /dev/null +++ b/parsers/QuoteSpecialText.java @@ -0,0 +1,46 @@ +/*+ + * Copyright 2012 rsiddharth + * Email: <rsiddharth@ninthfloor.org> + * + * This file is part of Scruf. + * + * Scruf is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + + +package scruf.parsers; + +import java.util.*; +import java.util.regex.*; + +public class QuoteSpecialText implements Parser { + Map<String,String> qmap; + public QuoteSpecialText() { + qmap = new HashMap<String,String>(); + qmap.put("&","&"); + qmap.put("<","<"); + qmap.put(">",">"); + } + public String parse(String fileContent) { + Pattern pattern = Pattern.compile("(\\&)|(\\<)|(\\>)"); + Matcher matcher = pattern.matcher(fileContent); + StringBuffer sbuffer = new StringBuffer(); + while(matcher.find()) { + matcher.appendReplacement(sbuffer, + qmap.get(matcher.group())); + } + matcher.appendTail(sbuffer); + return sbuffer.toString(); + } +} |