From af6aefa0467762e1900da4740490deb43255e443 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Thu, 20 Dec 2012 10:53:55 +0530 Subject: [bug-fix]: Back Buttons were not put in webpages that were present in the "root" directory. This commit fixes this. modified: parsers/BackButton.java --- parsers/BackButton.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'parsers') diff --git a/parsers/BackButton.java b/parsers/BackButton.java index e504648..38e5a9e 100644 --- a/parsers/BackButton.java +++ b/parsers/BackButton.java @@ -29,14 +29,15 @@ public class BackButton implements Parser { // this method doesn't modify the filContent. public String parse(String fileContent) { StringBuilder fileBuilder = new StringBuilder(fileContent); + String fileName = PresentFile.file.getName(); /** * Back button is added only if the present directory being * parsed is not 'root'. */ - if(DirectoryInfo.level!=0) { + if(DirectoryInfo.level!=0 || !(fileName.equals("index.scruffy"))) { fileBuilder.append("\n
\n"); fileBuilder.append(" back "); }else { fileBuilder.append("./\"> back "); -- cgit v1.2.3 From 307571748a50fa6272ea13e6213e7d4d9d59c711 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Thu, 20 Dec 2012 11:03:14 +0530 Subject: SymbolMap class which was in CodeBlock.java is shifted to a dedicated file -- parsers/SymbolMap.java. added: parsers/SymbolMap.java modified: parsers/CodeBlocks.java --- parsers/CodeBlocks.java | 57 +-------------------------------------------- parsers/SymbolMap.java | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 56 deletions(-) create mode 100644 parsers/SymbolMap.java (limited to 'parsers') diff --git a/parsers/CodeBlocks.java b/parsers/CodeBlocks.java index 251c4de..75efa27 100644 --- a/parsers/CodeBlocks.java +++ b/parsers/CodeBlocks.java @@ -36,70 +36,15 @@ public class CodeBlocks implements Parser { while(matcher.find()) { replacement.delete(0,replacement.length()); replacement.append("
"); - replacement.append(lbreak.parse(quote(matcher.group(3)))); + replacement.append(lbreak.parse(symbolMap.quote(matcher.group(3)))); replacement.append("
"); matcher.appendReplacement(sbuffer,replacement.toString()); } matcher.appendTail(sbuffer); return sbuffer.toString(); } - /** - * this method quotes symbols to a HTML number. - */ - private String quote(String string) { - Pattern pattern = Pattern.compile("(\\&(amp|lt|gt|(\\#35))\\;)|(\\p{Punct})"); - Matcher matcher = pattern.matcher(string); - StringBuffer sbuffer = new StringBuffer(); - while(matcher.find()) { - if(matcher.group(4)!=null) { - matcher.appendReplacement(sbuffer, - symbolMap.get(matcher.group())); - } - } - matcher.appendTail(sbuffer); - return sbuffer.toString(); - } } -/** - * Map of Symbols & their HTML equivalent numbers. - */ -class SymbolMap extends HashMap { - public SymbolMap() { - put("!","!"); - put("\"","""); - put("#","#"); - put("$","$"); - put("%","%"); - put("&","&"); - put("'","'"); - put("(","("); - put(")",")"); - put("*","*"); - put("+","+"); - put(",",","); - put("-","-"); - put(".","."); - put("/","/"); - put(":",":"); - put(";",";"); - put("<","<"); - put("=","="); - put(">",">"); - put("?","?"); - put("@","@"); - put("[","["); - put("\\","\"); - put("]","]"); - put("^","^"); - put("_","_"); - put("`","`"); - put("{","{"); - put("|","|"); - put("}","}"); - put("~","~"); - } -} /** Special Case: diff --git a/parsers/SymbolMap.java b/parsers/SymbolMap.java new file mode 100644 index 0000000..94f1f14 --- /dev/null +++ b/parsers/SymbolMap.java @@ -0,0 +1,62 @@ + +package scruf.parsers; + +import java.util.regex.*; +import java.util.*; + +/** + * Map of Symbols & their HTML equivalent numbers. + */ +public class SymbolMap extends HashMap { + public SymbolMap() { + put("!","!"); + put("\"","""); + put("#","#"); + put("$","$"); + put("%","%"); + put("&","&"); + put("'","'"); + put("(","("); + put(")",")"); + put("*","*"); + put("+","+"); + put(",",","); + put("-","-"); + put(".","."); + put("/","/"); + put(":",":"); + put(";",";"); + put("<","<"); + put("=","="); + put(">",">"); + put("?","?"); + put("@","@"); + put("[","["); + put("\\","\"); + put("]","]"); + put("^","^"); + put("_","_"); + put("`","`"); + put("{","{"); + put("|","|"); + put("}","}"); + put("~","~"); + } + /** + * this method quotes symbols to a HTML number. + */ + public String quote(String string) { + Pattern pattern = Pattern.compile("(\\&(amp|lt|gt|(\\#35))\\;)|(\\p{Punct})"); + Matcher matcher = pattern.matcher(string); + StringBuffer sbuffer = new StringBuffer(); + while(matcher.find()) { + if(matcher.group(4)!=null) { + matcher.appendReplacement(sbuffer, + this.get(matcher.group())); + } + } + matcher.appendTail(sbuffer); + return sbuffer.toString(); + } +} + -- cgit v1.2.3 From 8843f4b84b9124502c7396a6a7cc87a7e076b779 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Thu, 20 Dec 2012 11:26:27 +0530 Subject: [bug-fix]: From now on, all the special characters in the string inside "monospace" blocks (the ones surrounded by ` character) are quoted to the corresponding HTML number. modified: parsers/WordDecoration.java --- parsers/WordDecoration.java | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'parsers') diff --git a/parsers/WordDecoration.java b/parsers/WordDecoration.java index 1df8cc6..e7cc0ac 100644 --- a/parsers/WordDecoration.java +++ b/parsers/WordDecoration.java @@ -28,13 +28,14 @@ import scruf.io.*; public class WordDecoration implements Parser { private HashMap tagMap; + private SymbolMap symbolMap; public WordDecoration() { tagMap = new HashMap(); tagMap.put("''","$7"); tagMap.put("__","$7"); tagMap.put("'''","$7"); tagMap.put("%%%","
$7
"); - tagMap.put("`","$7"); + symbolMap = new SymbolMap(); } public String parse(String fileContent) { Pattern pattern = @@ -44,10 +45,35 @@ public class WordDecoration implements Parser { StringBuffer sbuffer = new StringBuffer(); String replacement; while(matcher.find()) { - replacement = tagMap.get(matcher.group(1)); + // if the block found is a monospace block, + // get the replacement from 'monospaceBlock' + // method, else get it from the 'tagMap': + if(matcher.group(6)!=null) { + // group 7 is the string inside the word decorated + // mark up. (see the pattern above) + replacement = monospaceBlock(matcher.group(7)); + }else { + replacement = tagMap.get(matcher.group(1)); + } matcher.appendReplacement(sbuffer,replacement); } matcher.appendTail(sbuffer); return sbuffer.toString(); } + + // monopace blocks need special treatment, therefore, + // this method for its construction: + private String monospaceBlock(String content) { + // quote all special characters in the monospace + // block: + String quotedContent= symbolMap.quote(content); + + // build monospace HTML block: + StringBuilder sb = new StringBuilder(); + sb.append(""); + sb.append(quotedContent); + sb.append(""); + + return sb.toString(); + } } -- cgit v1.2.3 From 92f629c0109fd23ed5859beb8b5f126318451469 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Fri, 21 Dec 2012 09:03:05 +0530 Subject: added license text to parsers/SymbolMap.java. modified: parsers/SymbolMap.java --- parsers/SymbolMap.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'parsers') diff --git a/parsers/SymbolMap.java b/parsers/SymbolMap.java index 94f1f14..752fcf6 100644 --- a/parsers/SymbolMap.java +++ b/parsers/SymbolMap.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; -- cgit v1.2.3