summaryrefslogtreecommitdiffstats
path: root/parsers
diff options
context:
space:
mode:
Diffstat (limited to 'parsers')
-rw-r--r--parsers/BackButton.java2
-rw-r--r--parsers/Footer.java2
-rw-r--r--parsers/Header.java4
-rw-r--r--parsers/Paragraphs.java42
-rw-r--r--parsers/ParserList.java2
5 files changed, 34 insertions, 18 deletions
diff --git a/parsers/BackButton.java b/parsers/BackButton.java
index e20b640..8bf645f 100644
--- a/parsers/BackButton.java
+++ b/parsers/BackButton.java
@@ -15,7 +15,7 @@ public class BackButton implements Parser {
button.append("./\"> back ");
}
button.append("</a>\n");
- button.append("</div>");
+ button.append("</div>\n");
PresentFile.backButton = button.toString();
return fileContent;
}
diff --git a/parsers/Footer.java b/parsers/Footer.java
index d949017..568d0e7 100644
--- a/parsers/Footer.java
+++ b/parsers/Footer.java
@@ -8,7 +8,7 @@ public class Footer implements Parser {
Matcher matcher = pattern.matcher(fileContent);
StringBuffer sbuffer = new StringBuffer();
while(matcher.find()) {
- PresentFile.footer = "<footer>"+matcher.group(1)+"</footer>\n";
+ PresentFile.footer = "\n<footer>"+matcher.group(1)+"</footer>\n";
fileContent = new NullIt().nullIt(fileContent,matcher.group());
}
diff --git a/parsers/Header.java b/parsers/Header.java
index 946613a..10fed98 100644
--- a/parsers/Header.java
+++ b/parsers/Header.java
@@ -33,9 +33,9 @@ public class Header implements Parser {
sbuilder.append(PresentFile.backButton);
sbuilder.append("</article>\n");
// add "powered by scruf" at bottom of page.
- sbuilder.append("<div class=\"scruf\">\n");
+ sbuilder.append("\n<div class=\"scruf\">\n");
sbuilder.append("powered by scruf");
- sbuilder.append("</div>");
+ sbuilder.append("\n</div>\n");
// Close body tag
sbuilder.append("\n</body>\n");
sbuilder.append("</html>\n");
diff --git a/parsers/Paragraphs.java b/parsers/Paragraphs.java
index 295d14a..9b257a2 100644
--- a/parsers/Paragraphs.java
+++ b/parsers/Paragraphs.java
@@ -3,26 +3,42 @@ package scruf.parsers;
import java.util.regex.*;
public class Paragraphs implements Parser {
- private String paragraph = "<p>\n $5</p>\n";
+ private String paragraph = "<p>\n $0</p>\n";
public String parse(String fileContent) {
/**
- * This regex contains two parts seperated by a '|';
- * the first part is regex for a html Heading (See Heading.java)
- * and the second part is the regex for a paragraph. For an input,
- * if the first part of the regex is matched, then it is necessarily
- * a Heading, so, we ignore it; but if the second part of the regex is
- * matched for an input, then it is a paragraph, so, we put the necessary
- * tags in place.
+ * This regex contains two parts seperated by a '|'; the first
+ * part is regex for a html Heading (See Heading.java) and the
+ * second part is the regex for a paragraph. For an input, if
+ * the first part of the regex is matched, then it is
+ * necessarily a Heading, so, we ignore it; but if the second
+ * part of the regex is matched for an input, then it is a
+ * paragraph, so, we put the necessary tags in place.
*/
- Pattern pattern = Pattern.compile("((\\={10,})\\n(.+?)\\n(\\2))|((^.+$\\n)+)",Pattern.MULTILINE);
+ Pattern pattern = Pattern.compile("(^.+$\\n)+",Pattern.MULTILINE);
+ /**
+ * This htmlTagPattern has a regex to deduct a html tag.
+ */
+ Pattern htmlTagPattern = Pattern.compile("^\\<.+?\\>\\n");
Matcher matcher = pattern.matcher(fileContent);
+ Matcher htmlTag;
StringBuffer sbuffer = new StringBuffer();
while(matcher.find()) {
- // group 1 contains the regex for the Heading, so
- // if that is null, then it means that we have actually
- // found a paragraph.
- if(matcher.group(1)==null)
+ /**
+ * give the paragraph that is indentified htmlTagPattern
+ * and see whether the "paragraph" that is actuall
+ * deducted is some other html block like <h1> (heading)
+ * or <blockquote>, etcetera. "matcher.find()" has
+ * actually found a html block then we don't need to do
+ * the conversion.
+ */
+ htmlTag = htmlTagPattern.matcher(matcher.group());
+ /**
+ * if "matcher.find()" _has not_ deducted a html block,
+ * then we do the conversion.
+ */
+ if(!htmlTag.find()) {
matcher.appendReplacement(sbuffer,paragraph);
+ }
}
matcher.appendTail(sbuffer);
return sbuffer.toString();
diff --git a/parsers/ParserList.java b/parsers/ParserList.java
index f5c1ebf..aff198d 100644
--- a/parsers/ParserList.java
+++ b/parsers/ParserList.java
@@ -10,8 +10,8 @@ public class ParserList {
parsers.add(new DocumentName());
parsers.add(new WordDecoration());
parsers.add(new CodeBlocks());
- parsers.add(new Paragraphs());
parsers.add(new Headings());
+ parsers.add(new Paragraphs());
parsers.add(new Links());
parsers.add(new Images());
parsers.add(new Footer());