X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=modules%2Fmd;h=0decfa6888a4f98014ab62b8a2a1f9fec4a0d794;hb=1f9da3846f8e78cac52ea5a4c3840dfc391dca53;hp=1a4ae985169816964b6bca6fecaecccd145d1c06;hpb=d9e98960c517be5806c756518f46827cf59d0471;p=pinopress.git

diff --git a/modules/md b/modules/md
index 1a4ae98..0decfa6 100755
--- a/modules/md
+++ b/modules/md
@@ -6,9 +6,14 @@
 ##      md [md_filepath]
 
 # remove document meta
-/^-- \w+: .+$/d
+## matches block of -- at top of file
+1,/^([^-]|-[^-]|^$)/ {
+    /^([^-]|-[^-]|^$)/ !{
+        /^-- ?/d
+    }
+}
 
-# html style comments
+# html style comments (this will also work inside code blocks - unintended)
 /<!--(.*)-->/d
 
 # special html characters
@@ -16,6 +21,40 @@ s/\&/\&amp\;/g
 s/</\&lt\;/g
 s/>/\&gt\;/g
 
+# code blocks
+/^ *```/ {
+    x
+    # check if hold space contains READING
+    # this is to see if this is the first ``` we read or no
+    /^ *READING/ !{
+        # if it is the first one, add READING to hold space
+        s/.*/READING/
+        x
+        # write opening tag (also concat with next line)
+        N
+        s/.*\n(.*)/<pre><code>\1/
+        b
+    }
+    # if its the second ```, we are done
+    # first clear hold
+    s/.*//
+    x
+    # then write closing tag
+    s/.*/<\/code><\/pre>/
+    b
+}
+
+# if we aren't reading ```, but hold space has READING in it
+# that means we are currently processing a block, just ignore and
+# keep going
+x
+/^ *READING/ {
+    x
+    b
+}
+x
+
+
 # horizontal rule
 s/^\s*-{3,}\s*$/<hr\/>/
 
@@ -33,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
@@ -42,13 +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>/
-
-# code block
-
-# paragraphs
+s/^# (.*)/<h1>\1<\/h1>/
 
-# /./{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>/
+}