From 42a846f59d7b6971ff1111544df089a9ff0f6570 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Thu, 25 Oct 2012 02:04:52 +0530 Subject: modified: parsers/CodeBlocks.java parsers/Paragraphs.java --- parsers/Paragraphs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'parsers/Paragraphs.java') diff --git a/parsers/Paragraphs.java b/parsers/Paragraphs.java index 02d6de6..2a619b3 100644 --- a/parsers/Paragraphs.java +++ b/parsers/Paragraphs.java @@ -27,7 +27,7 @@ public class Paragraphs implements Parser { * give the paragraph that is identified htmlTagPattern * and see whether the "paragraph" that is actually * deducted is some other html block like

(heading) - * or
, etcetera. "matcher.find()" has + * or
, etcetera. If "matcher.find()" has * actually found a html block then we don't need to do * the conversion. */ -- cgit v1.2.3 From 0b6cabd40f2cb5978e69977f483d9ce30a3d2360 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Thu, 25 Oct 2012 02:48:09 +0530 Subject: removed: notes writefile added: COPYING -- gpl text (full) modified: Initialization.java Scruf.java conversion/CanConvert.java conversion/ConvertDirectory.java conversion/ConvertFile.java conversion/FileSieve.java index/IndexCreator.java io/PresentFile.java io/ReadFile.java io/WriteFile.java license/Liberate.java parsers/BackButton.java parsers/CodeBlocks.java parsers/DocumentName.java parsers/Footer.java parsers/Header.java parsers/Headings.java parsers/Images.java parsers/LineBreak.java parsers/Links.java parsers/NullIt.java parsers/Paragraphs.java parsers/ParserList.java parsers/WordDecoration.java styling/StyleChecker.java >> All the .java files were 'baptized' for 100% software freedom. todo -- minor edit. license/gpl -- minor edit again. --- parsers/Paragraphs.java | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'parsers/Paragraphs.java') diff --git a/parsers/Paragraphs.java b/parsers/Paragraphs.java index 2a619b3..cc86b4b 100644 --- a/parsers/Paragraphs.java +++ b/parsers/Paragraphs.java @@ -1,3 +1,24 @@ +/*+ + * Copyright 2012 rsiddharth + * Email: + * + * 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 . + */ + + package scruf.parsers; import java.util.regex.*; @@ -45,4 +66,4 @@ public class Paragraphs implements Parser { matcher.appendTail(sbuffer); return sbuffer.toString(); } -} \ No newline at end of file +} -- cgit v1.2.3 From 8ea18f49eb5ed2034c1903c9e50aa6c3cbb0f896 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Fri, 26 Oct 2012 21:38:13 +0530 Subject: modified: index/IndexCreator.java Structural modification. parsers/CodeBlocks.java replacement string was edited. @@ -33,7 +33,7 @@ - replacement.append("
"); + replacement.append("
"); 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("`","$7"); + tagMap.put("`","$7"); unknown: parsers/DocumentDate.java (will add it in next commit) --- parsers/Paragraphs.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'parsers/Paragraphs.java') 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 = "

\n$0

\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); -- cgit v1.2.3 From 76c496db007519125bd478ad81afb9763db7259c Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Fri, 26 Oct 2012 21:48:35 +0530 Subject: added: parsers/DocumentDate.java modified: parsers/Paragraphs.java --- parsers/Paragraphs.java | 1 - 1 file changed, 1 deletion(-) (limited to 'parsers/Paragraphs.java') diff --git a/parsers/Paragraphs.java b/parsers/Paragraphs.java index 2229d35..29a546a 100644 --- a/parsers/Paragraphs.java +++ b/parsers/Paragraphs.java @@ -26,7 +26,6 @@ import java.util.regex.*; public class Paragraphs implements Parser { private String paragraph = "

\n$0

\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 -- cgit v1.2.3