slightly shady paragraphs

diff --git a/README.md b/README.md
index 4328dcb..b4e5b41 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # pinopress
 
 **pinopress** is a modular makefile based static blog generator. that means you run the build script once and every page is generated beforehand.
+**pinopress** also focuses on extensibility, you can hook your own shell scripts into the build process to easily add any new features.
 
 built in features include markdown generated blog articles, and a rss feed.
 

diff --git a/modules/md b/modules/md
index 3ce8979..7831638 100755 (executable)
--- a/modules/md
+++ b/modules/md
@@ -13,6 +13,9 @@
     }
 }
 
+# html style comments (this will also work inside code blocks - unintended)
+/<!--(.*)-->/d
+
 # special html characters
 s/\&/\&amp\;/g
 s/</\&lt\;/g
@@ -27,8 +30,9 @@ s/>/\&gt\;/g
         # if it is the first one, add READING to hold space
         s/.*/READING/
         x
-        # write opening tag
-        s/.*/<code>/
+        # write opening tag (also concat with next line)
+        N
+        s/.*\n(.*)/<pre><code>\1/
         b
     }
     # if its the second ```, we are done
@@ -36,7 +40,8 @@ s/>/\&gt\;/g
     s/.*//
     x
     # then write closing tag
-    s/.*/<\\code>/
+    s/.*/<\/code><\/pre>/
+    b
 }
 
 # if we aren't reading ```, but hold space has READING in it
@@ -50,9 +55,6 @@ x
 x
 
 
-# html style comments
-/<!--(.*)-->/d
-
 # horizontal rule
 s/^\s*-{3,}\s*$/<hr\/>/
 
@@ -70,7 +72,7 @@ s/(^|[^\\~])~{2}([^~]+)~{2}([^~]|$)/\1<del>\2<\/del>\3/g
 s/!\[(.*)\]\((.*)\)/<img src="\2" alt="\1"\/>/g
 
 # links
-s/\[(.*)\]\((.*)\)/<a href="\1">\2<\/a>/g
+s/\[(.*)\]\((.*)\)/<a href="\2">\1<\/a>/g
 s/\[(.*)\]/<a href="\1">\1<\/a>/g
 
 # headers
@@ -79,11 +81,19 @@ s/^#{5} (.*)/<h5>\1<\/h5>/
 s/^#{4} (.*)/<h4>\1<\/h4>/
 s/^#{3} (.*)/<h3>\1<\/h3>/
 s/^#{2} (.*)/<h2>\1<\/h2>/
-s/^#} (.*)/<h1>\1<\/h1>/
+s/^# (.*)/<h1>\1<\/h1>/
 
-# paragraphs
-
-# /./{H;$!d} ; x ; s/^/\n<p>/ ; s/$/\n<\/p>/
+# lists
 
 
+# paragraphs (blocks of text separated by one or more blank lines)
+/./ {
+    H
+    $!d
+}
+x
+/(^$|^\s+$)/ !{
+    s/^/\n<p>/
+    s/$/\n<\/p>/
+}
 

diff --git a/modules/md-test b/modules/md-test
index 8f52d8f..3f20b0c 100644 (file)
--- a/modules/md-test
+++ b/modules/md-test
@@ -56,6 +56,13 @@ write
 code here
 ```
 
+```
+this is
+a code
+block
+write
+code here
+```
 ```
 another
 code

diff --git a/pinopress b/pinopress
index 3469586..3623b2f 100755 (executable)
--- a/pinopress
+++ b/pinopress
@@ -69,6 +69,7 @@ $(BUILD_DIR)/$(ARTICLE_PATH)/%.html: $(SRC_DIR)/%.md
        echo "parsing $<"
        $(export_common)
        $(call export_article,"$<")
+       . ./$(MODULE_DIR)/md-header "$<"
        cat $(TEMPLATE_DIR)/head.template.html > "$@"
        # module pipeline starts here
        ./$(MODULE_DIR)/md "$^" >> "$@"