# merged from devel branch.

removed:
  notes
  writefile
added:
  COPYING
  parsers/DocumentDate.java
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
  license/gpl
  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
  styling/style.css
  todo
pending merges:
  rsiddharth 2012-10-26 added:
    rsiddharth 2012-10-26 modified:
    rsiddharth 2012-10-25 removed:
    rsiddharth 2012-10-25 modified:
    rsiddharth 2012-10-25 Updated styling/style.css for proper formatting of monospace phrases and 
    rsiddharth 2012-10-25 [Break-through]: a code-block is properly formatted now and a

1 files changed, 25 insertions, 6 deletions

diff --git a/parsers/Paragraphs.java b/parsers/Paragraphs.java
index 02d6de6..29a546a 100644
--- a/parsers/Paragraphs.java
+++ b/parsers/Paragraphs.java
@@ -1,3 +1,24 @@
+/*+
+ *   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.regex.*;
@@ -18,7 +39,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();
@@ -27,7 +48,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 <h1> (heading)
-	     * or <blockquote>, etcetera.  "matcher.find()" has
+	     * or <blockquote>, etcetera. If "matcher.find()" has
 	     * actually found a html block then we don't need to do
 	     * the conversion.
 	     */
@@ -37,12 +58,10 @@ 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);
 	return sbuffer.toString();
     }
-}
\ No newline at end of file
+}