scruf

darn simple HTML5 doc generator
git clone git://git.ricketyspace.net/scruf.git
Log | Files | Refs | README

commit bed3dc00c9112d70966990ca66ab0a078b5ca0b5
parent 502ca4ede537f3df715f235922fb78d05dcdaa2f
Author: rsiddharth <rsiddharth@ninthfloor.org>
Date:   Thu,  6 Dec 2012 20:05:51 +0530

merged from devel branch: now scruf supports HTML5 audio tag. for other changes, see below.

added:
  parsers/Audio.java
modified:
  index/IndexCreator.java
  parsers/Images.java
  parsers/NullIt.java
  parsers/ParserList.java
  styling/style.css
pending merges:
    rsiddharth 2012-12-02 stylesheet update: formatting for audio tag. 
    rsiddharth 2012-12-02 new feature: I have added support for <audio> tags for Ogg audio.
    rsiddharth 2012-11-30 minor-fix(es) to comply with standards
    rsiddharth 2012-11-30 bug fix: parser/Nullit.java quotes the full regex before sending the

Diffstat:
index/IndexCreator.java | 2+-
parsers/Audio.java | 52++++++++++++++++++++++++++++++++++++++++++++++++++++
parsers/Images.java | 4++--
parsers/NullIt.java | 16+++++++++-------
parsers/ParserList.java | 1+
styling/style.css | 8++++++++
6 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/index/IndexCreator.java b/index/IndexCreator.java @@ -52,7 +52,7 @@ public class IndexCreator { indexContent.append(fileName); indexContent.append("|"); indexContent.append(PresentFile.name); - indexContent.append("]]\n"); + indexContent.append("]] \n"); modified=true; } } diff --git a/parsers/Audio.java b/parsers/Audio.java @@ -0,0 +1,52 @@ +/*+ + * 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.*; + +public class Audio implements Parser { + private Pattern pattern; + private Matcher matcher; + private StringBuffer sbuffer; + private String replacement; + public Audio() { + pattern = Pattern.compile("\\{\\{audio\\:(.+?\\.(ogg|ogv))\\}\\}", + Pattern.DOTALL); + replacement = "<audio controls=\"controls\">"+ + "\n<source src=\"$1\" type=\"audio/ogg\">"+ + "\n<p>[ No support for HTML5 audio tag for Ogg audio."+ + "<a href=\"$1\"> Download it</a>. ]</p>"+ + "</audio>"; + sbuffer = new StringBuffer(); + } + public String parse(String fileContent) { + matcher = pattern.matcher(fileContent); + // clear the buffer + sbuffer.delete(0,sbuffer.length()); + while(matcher.find()) { + matcher.appendReplacement(sbuffer,replacement); + } + matcher.appendTail(sbuffer); + + return sbuffer.toString(); + } +} diff --git a/parsers/Images.java b/parsers/Images.java @@ -25,7 +25,7 @@ import java.util.regex.*; public class Images implements Parser { // set of strings to build the img tag - private String openTag = "<img src=\"$1\" alt=\"$"; + private String openTag = "<img src=\"$1\" alt=\" \\[$"; private String closeTag = " />"; public String parse(String fileContent) { Pattern pattern = Pattern.compile("\\{\\{(.+?\\.(png|jpg))(\\|(.+?))?\\}\\}", Pattern.DOTALL); @@ -39,7 +39,7 @@ public class Images implements Parser { replacementString.append(openTag); // if the "title" is given add to the _img_ tag. if(matcher.group(3)!=null) { - replacementString.append("4\" title=\"$4\""); + replacementString.append("4\\] \" title=\"$4\""); } else { replacementString.append("1\""); diff --git a/parsers/NullIt.java b/parsers/NullIt.java @@ -25,12 +25,14 @@ import java.util.regex.*; public class NullIt { public String nullIt(String content,String regex) { - Pattern pattern = Pattern.compile(regex); - Matcher matcher = pattern.matcher(content); - while(matcher.find()) { - content = matcher.replaceFirst(""); - break; - } - return content; + // quote the regex. + String quotedRegex = "\\Q"+regex+"\\E"; + Pattern pattern = Pattern.compile(quotedRegex); + Matcher matcher = pattern.matcher(content); + while(matcher.find()) { + content = matcher.replaceFirst(""); + break; + } + return content; } } diff --git a/parsers/ParserList.java b/parsers/ParserList.java @@ -36,6 +36,7 @@ public class ParserList { parsers.add(new Headings()); parsers.add(new Links()); parsers.add(new Images()); + parsers.add(new Audio()); parsers.add(new Footer()); parsers.add(new Paragraphs()); parsers.add(new Source()); diff --git a/styling/style.css b/styling/style.css @@ -94,6 +94,14 @@ img { padding: 10px; } +audio { + margin-left:auto; + margin-right:auto; + display:block; + border: 1px; + padding: 10px; +} + a:link,a:visited { transition:border-bottom 0.3s, color 0.3s; -moz-transition:border-bottom 0.3s, color 0.3s;