Merge pull request #171 from uli-heller/markdown.extensions

Markdown.extensions: Added STRIKETHROUGH, enhanced configuration of markdown.extensions: ALL,-HARDWRAPS
jbake-org · Feb 9, 2015 · 31adbaf · 31adbaf
2 parents 20b9ab0 + d67219e
commit 31adbaf
Showing 1 changed file with 54 additions and 29 deletions.
diff --git a/src/main/java/org/jbake/parser/MarkdownEngine.java b/src/main/java/org/jbake/parser/MarkdownEngine.java
@@ -22,42 +22,67 @@ public void processBody(final ParserContext context) {
         int extensions = Extensions.NONE;
         if (mdExts.length > 0) {
             for (int index = 0; index < mdExts.length; index++) {
-                if (mdExts[index].equals("HARDWRAPS")) {
-                    extensions |= Extensions.HARDWRAPS;
-                } else if (mdExts[index].equals("AUTOLINKS")) {
-                    extensions |= Extensions.AUTOLINKS;
-                } else if (mdExts[index].equals("FENCED_CODE_BLOCKS")) {
-                    extensions |= Extensions.FENCED_CODE_BLOCKS;
-                } else if (mdExts[index].equals("DEFINITIONS")) {
-                    extensions |= Extensions.DEFINITIONS;
-                } else if (mdExts[index].equals("ABBREVIATIONS")) {
-                    extensions |= Extensions.ABBREVIATIONS;
-                } else if (mdExts[index].equals("QUOTES")) {
-                    extensions |= Extensions.QUOTES;
-                } else if (mdExts[index].equals("SMARTS")) {
-                    extensions |= Extensions.SMARTS;
-                } else if (mdExts[index].equals("SMARTYPANTS")) {
-                    extensions |= Extensions.SMARTYPANTS;
-                } else if (mdExts[index].equals("SUPPRESS_ALL_HTML")) {
-                    extensions |= Extensions.SUPPRESS_ALL_HTML;
-                } else if (mdExts[index].equals("SUPPRESS_HTML_BLOCKS")) {
-                    extensions |= Extensions.SUPPRESS_HTML_BLOCKS;
-                } else if (mdExts[index].equals("SUPPRESS_INLINE_HTML")) {
-                    extensions |= Extensions.SUPPRESS_INLINE_HTML;
-                } else if (mdExts[index].equals("TABLES")) {
-                    extensions |= Extensions.TABLES;
-                } else if (mdExts[index].equals("WIKILINKS")) {
-                    extensions |= Extensions.WIKILINKS;
-                } else if (mdExts[index].equals("ALL")) {
-                    extensions = Extensions.ALL;
+                String ext = mdExts[index];
+                if (ext.startsWith("-")) {
+		    ext = ext.substring(1);
+                    extensions=removeExtension(extensions, extensionFor(ext));
+                } else {
+                    if (ext.startsWith("+")) {
+		      ext = ext.substring(1);
+                    }
+                    extensions=addExtension(extensions, extensionFor(ext));
                 }
             }
-
         }
 
         long maxParsingTime = context.getConfig().getLong("markdown.maxParsingTimeInMillis", PegDownProcessor.DEFAULT_MAX_PARSING_TIME);
 
         PegDownProcessor pegdownProcessor = new PegDownProcessor(extensions, maxParsingTime);
         context.setBody(pegdownProcessor.markdownToHtml(context.getBody()));
     }
+
+    private int extensionFor(String name) {
+        int extension = Extensions.NONE;
+	if (name.equals("HARDWRAPS")) {
+	    extension = Extensions.HARDWRAPS;
+        } else if (name.equals("AUTOLINKS")) {
+            extension = Extensions.AUTOLINKS;
+        } else if (name.equals("FENCED_CODE_BLOCKS")) {
+            extension = Extensions.FENCED_CODE_BLOCKS;
+        } else if (name.equals("DEFINITIONS")) {
+            extension = Extensions.DEFINITIONS;
+        } else if (name.equals("ABBREVIATIONS")) {
+            extension = Extensions.ABBREVIATIONS;
+        } else if (name.equals("QUOTES")) {
+            extension = Extensions.QUOTES;
+        } else if (name.equals("SMARTS")) {
+            extension = Extensions.SMARTS;
+        } else if (name.equals("SMARTYPANTS")) {
+            extension = Extensions.SMARTYPANTS;
+        } else if (name.equals("SUPPRESS_ALL_HTML")) {
+            extension = Extensions.SUPPRESS_ALL_HTML;
+        } else if (name.equals("SUPPRESS_HTML_BLOCKS")) {
+            extension = Extensions.SUPPRESS_HTML_BLOCKS;
+        } else if (name.equals("SUPPRESS_INLINE_HTML")) {
+            extension = Extensions.SUPPRESS_INLINE_HTML;
+        } else if (name.equals("TABLES")) {
+            extension = Extensions.TABLES;
+        } else if (name.equals("WIKILINKS")) {
+            extension = Extensions.WIKILINKS;
+	//} else if (name.equals("ANCHORLINKS")) { // not available in pegdown-1.4.2
+        //    extension = Extensions.ANCHORLINKS;
+        } else if (name.equals("STRIKETHROUGH")) {
+            extension = Extensions.STRIKETHROUGH;
+        } else if (name.equals("ALL")) {
+            extension = Extensions.ALL;
+        }
+        return extension;
+    }
+    private int addExtension(int previousExtensions, int additionalExtension) {
+	return previousExtensions | additionalExtension;
+    }
+    private int removeExtension(int previousExtensions, int unwantedExtension) {
+	return previousExtensions & (~unwantedExtension);
+    }
+
 }