summaryrefslogtreecommitdiffstats
path: root/parsers
diff options
context:
space:
mode:
authorrsiddharth <rsiddharth@ninthfloor.org>2012-10-26 21:38:13 +0530
committerrsiddharth <rsiddharth@ninthfloor.org>2012-10-26 21:38:13 +0530
commit8ea18f49eb5ed2034c1903c9e50aa6c3cbb0f896 (patch)
tree0a55400833217ef8473f0b8a76c8ae296cc5bc4c /parsers
parent0b6cabd40f2cb5978e69977f483d9ce30a3d2360 (diff)
modified:
index/IndexCreator.java Structural modification. parsers/CodeBlocks.java replacement string was edited. @@ -33,7 +33,7 @@ - replacement.append("<div class=\\\"code\\\">"); + replacement.append("<div class=\"code\">"); parsers/DocumentName.java Structural modification. parsers/Header.java "powered by scruf" was linked. parsers/Paragraphs.java Display message. (should remove it in next commit). parsers/ParserList.java New parser -- DocumentDate parsers/WordDecoration.java replacement string was edited. @@ -34,7 +34,7 @@ - tagMap.put("`","<span class=\\\"monospace\\\">$7</span>"); + tagMap.put("`","<span class=\"monospace\">$7</span>"); unknown: parsers/DocumentDate.java (will add it in next commit)
Diffstat (limited to 'parsers')
-rw-r--r--parsers/CodeBlocks.java2
-rw-r--r--parsers/DocumentName.java18
-rw-r--r--parsers/Header.java2
-rw-r--r--parsers/Paragraphs.java7
-rw-r--r--parsers/ParserList.java1
-rw-r--r--parsers/WordDecoration.java2
6 files changed, 16 insertions, 16 deletions
diff --git a/parsers/CodeBlocks.java b/parsers/CodeBlocks.java
index b514e8d..2c47099 100644
--- a/parsers/CodeBlocks.java
+++ b/parsers/CodeBlocks.java
@@ -33,7 +33,7 @@ public class CodeBlocks implements Parser {
StringBuilder replacement = new StringBuilder();
while(matcher.find()) {
replacement.delete(0,replacement.length());
- replacement.append("<div class=\\\"code\\\">");
+ replacement.append("<div class=\"code\">");
replacement.append(quote(lbreak.parse(matcher.group(2))));
replacement.append("</div>");
matcher.appendReplacement(sbuffer,replacement.toString());
diff --git a/parsers/DocumentName.java b/parsers/DocumentName.java
index 5aa2d39..09eaf22 100644
--- a/parsers/DocumentName.java
+++ b/parsers/DocumentName.java
@@ -26,14 +26,14 @@ import scruf.io.*;
public class DocumentName implements Parser {
public String parse(String fileContent) {
- BufferedReader read =
- new BufferedReader(new StringReader(fileContent));
- try {
- PresentFile.name = read.readLine();
- }catch(IOException e) {
- System.err.println("Error reading string "+e);
- }
- fileContent = new NullIt().nullIt(fileContent,PresentFile.name);
- return fileContent;
+ BufferedReader read =
+ new BufferedReader(new StringReader(fileContent));
+ try {
+ PresentFile.name = read.readLine();
+ }catch(IOException e) {
+ System.err.println("Error reading string "+e);
+ }
+ fileContent = new NullIt().nullIt(fileContent,PresentFile.name);
+ return fileContent;
}
}
diff --git a/parsers/Header.java b/parsers/Header.java
index 1d84f11..eebec5d 100644
--- a/parsers/Header.java
+++ b/parsers/Header.java
@@ -55,7 +55,7 @@ public class Header implements Parser {
sbuilder.append("</article>\n");
// add "powered by scruf" at bottom of page.
sbuilder.append("\n<div class=\"scruf\">\n");
- sbuilder.append("powered by scruf");
+ sbuilder.append("<a href=\"/scruf/\">powered by scruf</a>");
sbuilder.append("\n</div>\n");
// Close body tag
sbuilder.append("\n</body>\n");
diff --git a/parsers/Paragraphs.java b/parsers/Paragraphs.java
index cc86b4b..2229d35 100644
--- a/parsers/Paragraphs.java
+++ b/parsers/Paragraphs.java
@@ -26,6 +26,7 @@ import java.util.regex.*;
public class Paragraphs implements Parser {
private String paragraph = "<p>\n$0</p>\n";
public String parse(String fileContent) {
+ System.out.println("Paragraph parsing...");
/**
* This regex contains two parts seperated by a '|'; the first
* part is regex for a html Heading (See Heading.java) and the
@@ -39,7 +40,7 @@ public class Paragraphs implements Parser {
/**
* This htmlTagPattern has a regex to deduct a html tag.
*/
- Pattern htmlTagPattern = Pattern.compile("^\\<.+?\\>\\n");
+ Pattern htmlTagPattern = Pattern.compile("^\\<.+?\\>(\\n?)");
Matcher matcher = pattern.matcher(fileContent);
Matcher htmlTag;
StringBuffer sbuffer = new StringBuffer();
@@ -58,9 +59,7 @@ public class Paragraphs implements Parser {
* then we do the conversion.
*/
if(!htmlTag.find()) {
- matcher.appendReplacement(sbuffer,paragraph);
- }else {
- System.out.println("MATCH$"+matcher.group()+" MATCH$$");
+ matcher.appendReplacement(sbuffer,paragraph);
}
}
matcher.appendTail(sbuffer);
diff --git a/parsers/ParserList.java b/parsers/ParserList.java
index 30b8ae6..f57a6b8 100644
--- a/parsers/ParserList.java
+++ b/parsers/ParserList.java
@@ -29,6 +29,7 @@ public class ParserList {
parsers = new ArrayList<Parser>();
// add Parsers. NOTE: parser order is significant.
parsers.add(new DocumentName());
+ parsers.add(new DocumentDate());
parsers.add(new WordDecoration());
parsers.add(new CodeBlocks());
parsers.add(new Headings());
diff --git a/parsers/WordDecoration.java b/parsers/WordDecoration.java
index 99c12ad..1df8cc6 100644
--- a/parsers/WordDecoration.java
+++ b/parsers/WordDecoration.java
@@ -34,7 +34,7 @@ public class WordDecoration implements Parser {
tagMap.put("__","<u>$7</u>");
tagMap.put("'''","<b>$7</b>");
tagMap.put("%%%","<blockquote>$7</blockquote>");
- tagMap.put("`","<span class=\\\"monospace\\\">$7</span>");
+ tagMap.put("`","<span class=\"monospace\">$7</span>");
}
public String parse(String fileContent) {
Pattern pattern =