.gitignore

@@ -2,5 +2,3 @@
 workdir
 outdir
 indir
-sample.md
-__pycache__/

main.py

@@ -29,9 +29,4 @@ def css():
     print("placeholder")
 
 def main():
-    print("placeholder")
-
-def test():
-    print(readFile.readMarkdown("/home/amber/website.sh/sample.md"))
-
-#test()
+    print("placeholder")

markdown.sh

@@ -0,0 +1,368 @@
+#!/bin/bash
+
+<<LICENSE
+MIT License
+
+Copyright (c) 2016 Chad Braun-Duin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+LICENSE
+
+# uncomment the following two lines if you have both BSD sed and GNU sed installed
+# this script is only tested to work with GNU sed which may have the command gsed
+# shopt -s expand_aliases
+# alias sed=gsed
+
+# move the original text to a temp file that can be progressively modified
+temp_file="/tmp/markdown.$$"
+cat "$@" > "$temp_file"
+
+# All of this below business is for reference-style links and images
+# We need to loop across newlines and not spaces
+IFS='
+'
+refs=$(sed -nr "/^\[.+\]: +/p" "$@")
+for ref in $refs
+do
+    ref_id=$(echo -n "$ref" | sed -nr "s/^\[(.+)\]: .*/\1/p" | tr -d '\n')
+    ref_url=$(echo -n "$ref" | sed -nr "s/^\[.+\]: (.+)/\1/p" | cut -d' ' -f1 | tr -d '\n')
+    ref_title=$(echo -n "$ref" | sed -nr "s/^\[.+\]: (.+) \"(.+)\"/\2/p" | sed 's@|@!@g' | tr -d '\n')
+
+    # reference-style image using the label
+    sed -ri "s|!\[([^]]+)\]\[($ref_id)\]|<img src=\"$ref_url\" title=\"$ref_title\" alt=\"\1\" />|gI" "$temp_file"
+    # reference-style link using the label
+    sed -ri "s|\[([^]]+)\]\[($ref_id)\]|<a href=\"$ref_url\" title=\"$ref_title\">\1</a>|gI" "$temp_file"
+
+    # implicit reference-style
+    sed -ri "s|!\[($ref_id)\]\[\]|<img src=\"$ref_url\" title=\"$ref_title\" alt=\"\1\" />|gI" "$temp_file"
+    # implicit reference-style
+    sed -ri "s|\[($ref_id)\]\[\]|<a href=\"$ref_url\" title=\"$ref_title\">\1</a>|gI" "$temp_file"
+done
+
+# delete the reference lines
+sed -ri "/^\[.+\]: +/d" "$temp_file"
+
+# blockquotes
+# use grep to find all the nested blockquotes
+while grep '^> ' "$temp_file" >/dev/null
+do
+    sed -nri '
+/^$/b blockquote
+
+H
+$ b blockquote
+b
+
+:blockquote
+x
+s/(\n+)(> .*)/\1<blockquote>\n\2\n<\/blockquote>/ # wrap the tags in a blockquote
+p
+' "$temp_file"
+
+    sed -i '1 d' "$temp_file" # cleanup superfluous first line
+
+    # cleanup blank lines and remove subsequent blockquote characters
+    sed -ri '
+/^> /s/^> (.*)/\1/
+' "$temp_file"
+done
+
+# Setext-style headers
+sed -nri '
+# Setext-style headers need to be wrapped around newlines
+/^$/ b print
+
+# else, append to holding area
+H
+$ b print
+b
+
+:print
+x
+/=+$/{
+s/\n(.*)\n=+$/\n<h1>\1<\/h1>/
+p
+b
+}
+/\-+$/{
+s/\n(.*)\n\-+$/\n<h2>\1<\/h2>/
+p
+b
+}
+p
+' "$temp_file"
+
+sed -i '1 d' "$temp_file" # cleanup superfluous first line
+
+# atx-style headers and other block styles
+sed -ri '
+/^#+ /s/ #+$// # kill all ending header characters
+/^# /s/# ([A-Za-z0-9 ]*)(.*)/<h1 id="\1">\1\2<\/h1>/g # H1
+/^#{2} /s/#{2} ([A-Za-z0-9 ]*)(.*)/<h2 id="\1">\1\2<\/h2>/g # H2
+/^#{3} /s/#{3} ([A-Za-z0-9 ]*)(.*)/<h3 id="\1">\1\2<\/h3>/g # H3
+/^#{4} /s/#{4} ([A-Za-z0-9 ]*)(.*)/<h4 id="\1">\1\2<\/h4>/g # H4
+/^#{5} /s/#{5} ([A-Za-z0-9 ]*)(.*)/<h5 id="\1">\1\2<\/h5>/g # H5
+/^#{6} /s/#{6} ([A-Za-z0-9 ]*)(.*)/<h6 id="\1">\1\2<\/h6>/g # H6
+
+/^\*\*\*+$/s/\*\*\*+/<hr \/>/ # hr with *
+/^---+$/s/---+/<hr \/>/ # hr with -
+/^___+$/s/___+/<hr \/>/ # hr with _
+
+' "$temp_file"
+
+# unordered lists
+# use grep to find all the nested lists
+while grep '^[\*\+\-] ' "$temp_file" >/dev/null
+do
+sed -nri '
+# wrap the list
+/^$/b list
+
+# wrap the li tags then add to the hold buffer
+# use uli instead of li to avoid collisions when processing nested lists
+/^[\*\+\-] /s/[\*\+\-] (.*)/<\/uli>\n<uli>\n\1/
+
+H
+$ b list # if at end of file, check for the end of a list
+b # else, branch to the end of the script
+
+# this is where a list is checked for the pattern
+:list
+# exchange the hold space into the pattern space
+x
+# look for the list items, if there wrap the ul tags
+/<uli>/{
+s/(.*)/\n<ul>\1\n<\/uli>\n<\/ul>/ # close the ul tags
+s/\n<\/uli>// # kill the first superfluous closing tag
+p
+b
+}
+p
+' "$temp_file"
+
+sed -i '1 d' "$temp_file" # cleanup superfluous first line
+
+# convert to the proper li to avoid collisions with nested lists
+sed -i 's/uli>/li>/g' "$temp_file"
+
+# prepare any nested lists
+sed -ri '/^[\*\+\-] /s/(.*)/\n\1\n/' "$temp_file"
+done
+
+# ordered lists
+# use grep to find all the nested lists
+while grep -E '^[1-9]+\. ' "$temp_file" >/dev/null
+do
+sed -nri '
+# wrap the list
+/^$/b list
+
+# wrap the li tags then add to the hold buffer
+# use oli instead of li to avoid collisions when processing nested lists
+/^[1-9]+\. /s/[1-9]+\. (.*)/<\/oli>\n<oli>\n\1/
+
+H
+$ b list # if at end of file, check for the end of a list
+b # else, branch to the end of the script
+
+:list
+# exchange the hold space into the pattern space
+x
+# look for the list items, if there wrap the ol tags
+/<oli>/{
+s/(.*)/\n<ol>\1\n<\/oli>\n<\/ol>/ # close the ol tags
+s/\n<\/oli>// # kill the first superfluous closing tag
+p
+b
+}
+p
+' "$temp_file"
+
+sed -i '1 d' "$temp_file" # cleanup superfluous first line
+
+# convert list items into proper list items to avoid collisions with nested lists
+sed -i 's/oli>/li>/g' "$temp_file"
+
+# prepare any nested lists
+sed -ri '/^[1-9]+\. /s/(.*)/\n\1\n/' "$temp_file"
+done
+
+# make escaped periods literal
+sed -ri '/^[1-9]+\\. /s/([1-9]+)\\. /\1\. /' "$temp_file"
+
+
+# code blocks
+sed -nri '
+# if at end of file, append the current line to the hold buffer and print it
+${
+H
+b code
+}
+
+# wrap the code block on any non code block lines
+/^\t| {4}/!b code
+
+# else, append to the holding buffer and do nothing
+H
+b # else, branch to the end of the script
+
+:code
+# exchange the hold space with the pattern space
+x
+# look for the code items, if there wrap the pre-code tags
+/\t| {4}/{
+s/(\t| {4})(.*)/<pre><code>\n\1\2\n<\/code><\/pre>/ # wrap the ending tags
+p
+b
+}
+p
+' "$temp_file"
+
+sed -i '1 d' "$temp_file" # cleanup superfluous first line
+
+# convert html characters inside pre-code tags into printable representations
+sed -ri '
+# get inside pre-code tags
+/^<pre><code>/{
+:inside
+n
+# if you found the end tags, branch out
+/^<\/code><\/pre>/!{
+s/&/\&amp;/g # ampersand
+s/</\&lt;/g # less than
+s/>/\&gt;/g # greater than
+b inside
+}
+}
+' "$temp_file"
+
+# remove the first tab (or 4 spaces) from the code lines
+sed -ri 's/^\t| {4}(.*)/\1/' "$temp_file"
+
+# br tags
+sed -ri '
+# if an empty line, append it to the next line, then check on whether there is two in a row
+/^$/ {
+N
+N
+/^\n{2}/s/(.*)/\n<br \/>\1/
+}
+' "$temp_file"
+
+# emphasis and strong emphasis and strikethrough
+sed -nri '
+# batch up the entire stream of text until a line break in the action
+/^$/b emphasis
+
+H
+$ b emphasis
+b
+
+:emphasis
+x
+s/\*\*(.+)\*\*/<strong>\1<\/strong>/g
+s/__([^_]+)__/<strong>\1<\/strong>/g
+s/\*([^\*]+)\*/<em>\1<\/em>/g
+s/([^\\])_([^_]+)_/\1<em>\2<\/em>/g
+s/\~\~(.+)\~\~/<strike>\1<\/strike>/g
+p
+' "$temp_file"
+
+sed -i '1 d' "$temp_file" # cleanup superfluous first line
+
+# paragraphs
+sed -nri '
+# if an empty line, check the paragraph
+/^$/ b para
+# else append it to the hold buffer
+H
+# at end of file, check paragraph
+$ b para
+# now branch to end of script
+b
+# this is where a paragraph is checked for the pattern
+:para
+# return the entire paragraph into the pattern space
+x
+# look for non block-level elements, if there - print the p tags
+/\n<(div|table|pre|p|[ou]l|h[1-6]|[bh]r|blockquote|li)/!{
+s/(\n+)(.*)/\1<p>\n\2\n<\/p>/
+p
+b
+}
+p
+' "$temp_file"
+
+sed -i '1 d' "$temp_file" # cleanup superfluous first line
+
+# cleanup area where P tags have broken nesting
+sed -nri '
+# if the line looks like like an end tag
+/^<\/(div|table|pre|p|[ou]l|h[1-6]|[bh]r|blockquote)>/{
+h
+# if EOF, print the line
+$ {
+x
+b done
+}
+# fetch the next line and check on whether or not it is a P tag
+n
+/^<\/p>/{
+G
+b done
+}
+# else, append the line to the previous line and print them both
+H
+x
+}
+:done
+p
+' "$temp_file"
+
+# inline styles and special characters
+sed -ri '
+s/<(http[s]?:\/\/.*)>/<a href=\"\1\">\1<\/a>/g # automatic links
+s/<(.*@.*\..*)>/<a href=\"mailto:\1\">\1<\/a>/g # automatic email address links
+
+# inline code
+s/([^\\])``+ *([^ ]*) *``+/\1<code>\2<\/code>/g
+s/([^\\])`([^`]*)`/\1<code>\2<\/code>/g
+
+s/!\[(.*)\]\((.*) \"(.*)\"\)/<img alt=\"\1\" src=\"\2\" title=\"\3\" \/>/g # inline image with title
+s/!\[(.*)\]\((.*)\)/<img alt=\"\1\" src=\"\2\" \/>/g # inline image without title
+
+s/\[(.*)]\((.*) "(.*)"\)/<a href=\"\2\" title=\"\3\">\1<\/a>/g # inline link with title
+s/\[(.*)]\((.*)\)/<a href=\"\2\">\1<\/a>/g # inline link
+
+# special characters
+/&.+;/!s/&/\&amp;/g # ampersand
+/<[\/a-zA-Z]/!s/</\&lt;/g# less than bracket
+
+# backslash escapes for literal characters
+s/\\\*/\*/g # asterisk
+s/\\_/_/g # underscore
+s/\\`/`/g # underscore
+s/\\#/#/g # pound or hash
+s/\\\+/\+/g # plus
+s/\\\-/\-/g # minus
+s/\\\\/\\/g # backslash
+' "$temp_file"
+
+# display and cleanup
+cat "$temp_file" && rm "$temp_file"

outline

@@ -6,13 +6,10 @@ generate html headers
 		get from seperate file?
 		title from file name?
 
-prompt for body; done
+prompt for body
+	markdown file
+	sperate by headers?
 
 write navbar, sidebar with already-made files
 	edit navbar based on url
-	css
-
-Stick it all together
-	write headers, side/navbars, body, and css
-
-build script to make one binary
+	css

readFile.py

@@ -1,26 +1,28 @@
 #!/usr/bin/python
 
-import markdown
+#html.escape will be useful
+import html
+title = ""
+
+#html_templ = """
+#<head>
+#<title>""" + Title + """</title>
+#</head>
+#
+#"""
+
 
 # Only do the <body> tag
-class readMarkdown():
+class markdown():
     outStr = ""
     mdFile = ""
 
     def __init__(self, mdFile):
         outStr = ""
-        self.mdFile = mdFile
+        self.inFile = mdFile
 
-
-    def markdown(self, mdFile):
+    def markdown(self):
         print("placeholder")
-        
-        file = open(mdFile, 'r')
-        #middleVar = file.read()
-        outStr = str(markdown.markdown(file.read()))
 
     def __str__(self):
-        return(str(outStr))
-
-# might want to find a way to diff html from a file and readMarkdown()'s output if I want to update pages
-#  Edit: just keep the original markdown files dumbass
+        return("placeholder")

requirements

@@ -1,2 +0,0 @@
-python
-python-markdown