From d1a3eb2f1eb59992823d8edb7f0400d67d2818f5 Mon Sep 17 00:00:00 2001 From: 53hornet <53hornet@gmail.com> Date: Tue, 10 Jul 2018 23:06:59 -0400 Subject: Updated pandoc, added TOC, added topnav include, split compiles per site --- makefile | 34 +++++++++++++++++++++++++------ md/53hor.net/db/index.md | 4 ++++ md/53hor.net/gallery/index.md | 4 ++++ md/53hor.net/include/nav.inc | 5 ++++- md/53hor.net/include/styles.css | 32 ++++++++++++++++++++++++++++++ md/53hor.net/index.md | 44 ++++++++++++++++++++++++++++++++++++++++- md/53hor.net/tidbits/index.md | 4 ++++ md/atc.53hor.net/index.md | 4 ++++ notes.txt | 10 ++++++---- 9 files changed, 129 insertions(+), 12 deletions(-) create mode 100644 md/53hor.net/include/styles.css create mode 100644 md/atc.53hor.net/index.md diff --git a/makefile b/makefile index fdadaee..b9c25a9 100644 --- a/makefile +++ b/makefile @@ -1,14 +1,36 @@ MD = $(shell find md/ -type f -name '*.md') -INC = $(shell find md/ -type f -name '*.inc') -HTML_PAGE = $(patsubst md/%.md, html/%.html, $(MD)) -HTML_INCL = $(patsubst md/%.inc, html/%.html, $(INC)) +HTML= $(patsubst md/%.md, html/%.html, $(MD)) +CSS = $(shell find md/ -type f -name '*.css') +CSS_HTML = $(patsubst md/%.css, html/%.css, $(CSS)) +53HORNET_HTML = $(patsubst md/53hor.net/%.md, html/53hor.net/%.html, $(MD)) +ATC_HTML = $(patsubst md/atc.53hor.net/%.md, html/atc.53hor.net/%.html, $(MD)) .PHONY: all -all: $(HTML_PAGE) +all: css 53hor.net atc.53hor.net -html/%.html: md/%.md +.PHONY: 53hor.net +53hor.net: $(53HORNET_HTML) + +html/53hor.net/%.html: md/53hor.net/%.md md/53hor.net/include/nav.inc + @echo "53hor.net: $< -> $@" + @mkdir -p "$(@D)" + @pandoc "$<" -f markdown -t html5 -s --toc --toc-depth=2 -B md/53hor.net/include/nav.inc -c /include/styles.css -o "$@" + +.PHONY: atc.53hor.net +atc.53hor.net: $(ATC_HTML) + +html/atc.53hor.net/%.html: md/atc.53hor.net/%.md + @echo "atc.53hor.net: $< -> $@" + @mkdir -p "$(@D)" + @pandoc "$<" -f markdown -t html5 -s --toc --toc-depth=2 -c /include/styles.css -o "$@" + +.PHONY: css +css: $(CSS_HTML) + +html/%.css: md/%.css + @echo "css: $< -> $@" @mkdir -p "$(@D)" - @pandoc "$<" -s -o "$@" + @cp "$<" "$@" clean: @rm -rf html/ diff --git a/md/53hor.net/db/index.md b/md/53hor.net/db/index.md index e69de29..a6fd4df 100644 --- a/md/53hor.net/db/index.md +++ b/md/53hor.net/db/index.md @@ -0,0 +1,4 @@ +--- +pagetitle: 53hornet - Database +--- + diff --git a/md/53hor.net/gallery/index.md b/md/53hor.net/gallery/index.md index e69de29..a6fd4df 100644 --- a/md/53hor.net/gallery/index.md +++ b/md/53hor.net/gallery/index.md @@ -0,0 +1,4 @@ +--- +pagetitle: 53hornet - Database +--- + diff --git a/md/53hor.net/include/nav.inc b/md/53hor.net/include/nav.inc index a7fc433..5150512 100644 --- a/md/53hor.net/include/nav.inc +++ b/md/53hor.net/include/nav.inc @@ -1 +1,4 @@ -nav here + diff --git a/md/53hor.net/include/styles.css b/md/53hor.net/include/styles.css new file mode 100644 index 0000000..3222b01 --- /dev/null +++ b/md/53hor.net/include/styles.css @@ -0,0 +1,32 @@ +#TOC { + position: fixed; +} + +#TOC ul { + list-style-type: none; + margin: 0; + padding: 0; + width: 25%; + position: fixed; + height: 100%; + overflow: auto; +} + +#TOC li a { + display: block; + padding: 1em 1em; + text-decoration: none; +} + +#topnav { + display: inline-block; + +} + +article { + margin-left: 25%; +} + +body { + padding: 0; +} diff --git a/md/53hor.net/index.md b/md/53hor.net/index.md index 353eead..15045e8 100644 --- a/md/53hor.net/index.md +++ b/md/53hor.net/index.md @@ -1 +1,43 @@ -the rest of the page here +--- +pagetitle: 53hornet - Home +--- + +
+ +# Welcome +In publishing and graphic design, lorem ipsum is a placeholder text commonly used to demonstrate the visual form of a document without relying on meaningful content. Replacing the actual content with placeholder text allows designers to design the form of the content before the content itself has been produced. + +Introduction + +## Chapter 1 + +dflajdfhjhdflaksdhflkjahsdflkjahsdflkjahdf +In publishing and graphic design, lorem ipsum is a placeholder text commonly used to demonstrate the visual form of a document without relying on meaningful content. Replacing the actual content with placeholder text allows designers to design the form of the content before the content itself has been produced. + +## Chapter 2 + +dflajdfhjhdflaksdhflkjahsdflkjahsdflkjahdf +In publishing and graphic design, lorem ipsum is a placeholder text commonly used to demonstrate the visual form of a document without relying on meaningful content. Replacing the actual content with placeholder text allows designers to design the form of the content before the content itself has been produced. + +## Chapter 3 + +dflajdfhjhdflaksdhflkjahsdflkjahsdflkjahdf +In publishing and graphic design, lorem ipsum is a placeholder text commonly used to demonstrate the visual form of a document without relying on meaningful content. Replacing the actual content with placeholder text allows designers to design the form of the content before the content itself has been produced. + +### Reference + +dflajdfhjhdflaksdhflkjahsdflkjahsdflkjahdf +In publishing and graphic design, lorem ipsum is a placeholder text commonly used to demonstrate the visual form of a document without relying on meaningful content. Replacing the actual content with placeholder text allows designers to design the form of the content before the content itself has been produced. + +## Chapter 4 + +dflajdfhjhdflaksdhflkjahsdflkjahsdflkjahdf +In publishing and graphic design, lorem ipsum is a placeholder text commonly used to demonstrate the visual form of a document without relying on meaningful content. Replacing the actual content with placeholder text allows designers to design the form of the content before the content itself has been produced. + +## Closing Remarks + +dflajdfhjhdflaksdhflkjahsdflkjahsdflkjahdf + +### Contact + +
diff --git a/md/53hor.net/tidbits/index.md b/md/53hor.net/tidbits/index.md index e69de29..a6fd4df 100644 --- a/md/53hor.net/tidbits/index.md +++ b/md/53hor.net/tidbits/index.md @@ -0,0 +1,4 @@ +--- +pagetitle: 53hornet - Database +--- + diff --git a/md/atc.53hor.net/index.md b/md/atc.53hor.net/index.md new file mode 100644 index 0000000..a6fd4df --- /dev/null +++ b/md/atc.53hor.net/index.md @@ -0,0 +1,4 @@ +--- +pagetitle: 53hornet - Database +--- + diff --git a/notes.txt b/notes.txt index 8b1eed5..f28fd5f 100644 --- a/notes.txt +++ b/notes.txt @@ -1,4 +1,6 @@ -- create necessary directories/subdirectories for html output -- for every subdirectory in md: - - create html from md and place in appropriate html subdir -- +Now I need to specify the different makes for each of the sites; so inside the +master makefile just have three different builds that are built with all, one for each dir. Then +inside each of those builds include the .css and .nav dedicated to that site +(the files for which are always stored in /include/. + +Need to copy any files that aren't MD into the html directory as they are. -- cgit v1.2.3