Use a post-processing pass to add bookmarks

marijnh · marijnh · commit 207ca935eda6 · 2015-04-21T14:34:23.000+02:00
Also add them to h2 and h3 tags
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ html: $(foreach CHAP,$(CHAPTERS),html/$(CHAP).html) html/js/chapter_info.js html
       $(patsubst img/%.svg,img/generated/%.png,$(SVGS))
 
 html/%.html: %.txt asciidoc_html.conf
-	PATH=node_modules/codemirror/bin:$(PATH) asciidoc -f asciidoc_html.conf --backend=html5 -o $@ $<
+	PATH=node_modules/codemirror/bin:$(PATH) asciidoc -f asciidoc_html.conf --backend=html5 -o - $< | node bin/addmarks > $@
 	node bin/build_code.js $<
 
 html/js/chapter_info.js: $(foreach CHAP,$(CHAPTERS),$(CHAP).txt) code/solutions/* bin/chapter_info.js
diff --git a/asciidoc_html.conf b/asciidoc_html.conf
@@ -47,7 +47,7 @@ options=sectionbody
 </pre>
 
 [source-filter-style]
-source-style=template="source-highlight-block",presubs=(),postsubs=("callouts",),posattrs=("style","language","src_numbered","src_tab"),filter="./bin/blockfilter --bookmark -s {language}"
+source-style=template="source-highlight-block",presubs=(),postsubs=("callouts",),posattrs=("style","language","src_numbered","src_tab"),filter="./bin/blockfilter -s {language}"
 
 [blockdef-listing]
 template::[source-filter-style]
@@ -100,7 +100,7 @@ template::[source-filter-style]
 |
 
 [paradef-default]
-normal-style=template="paragraph",filter="./bin/parafilter"
+normal-style=template="paragraph"
 
 [paragraph]
 <p{id? id="{id}"}>
diff --git a/bin/addmarks b/bin/addmarks
@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+
+var input = ""
+process.stdin.resume()
+process.stdin.on("data", function(chunk) {
+  input += chunk.toString("utf8")
+})
+
+process.stdin.on("end", function() {
+  var re = /<(p|pre\ data-language|h[23])\b[^>]*>/g, m
+  var pos = 0
+  while (m = re.exec(input)) {
+    var tag = m[1].match(/^\w+/)[0]
+    var start = m.index + m[0].length
+    var end = input.indexOf("</" + tag + ">", start)
+    re.lastIndex = end + 3 + tag.length
+
+    var type, toHash = toPlainText(input.slice(start, end))
+    if (tag == "pre") {
+      type = "c"
+    } else if (tag == "p") {
+      type = "p"
+      toHash = startAndEnd(toHash)
+    } else {
+      type = "h"
+    }
+    var mark = type + "_" + hash(toHash)
+    var bookmark = "<a class=" + type + "_ident id=\"" + mark + "\" href=\"#" + mark + "\"></a>"
+    process.stdout.write(input.slice(pos, start) + bookmark)
+    pos = start
+  }
+  process.stdout.write(input.slice(pos))
+})
+
+function hash(string) {
+  var sum = require("crypto").createHash("sha1");
+  sum.update(string);
+  return sum.digest("base64").slice(0, 10);
+}
+
+function toPlainText(text) {
+  return text.replace(/<[^>]+>|&[^;]+;/g, "");
+}
+
+function startAndEnd(text) {
+  var words = text.split(/\W+/);
+  if (!words[0]) words.shift();
+  if (!words[words.length - 1]) words.pop();
+  if (words.length <= 6) return words.join(" ");
+  return words.slice(0, 3).join(" ") + " " + words.slice(words.length - 3).join(" ");
+}
diff --git a/bin/parafilter b/bin/parafilter
diff --git a/html/css/ejs.css b/html/css/ejs.css
@@ -59,12 +59,7 @@ pre[data-language=javascript] {
   cursor: pointer;
 }
 
-pre.cm-s-default, p {
-  margin-right: -30px;
-  padding-right: 30px;
-}
-
-p:hover a.p_ident:after, pre:hover a.c_ident:after {
+p:hover a.p_ident:after, pre:hover a.c_ident:after, h2:hover a.h_ident:after, h3:hover a.h_ident:after {
   content: "¶";
   color: #888;
   font-size: 80%;
@@ -99,6 +94,11 @@ h3 {
   font-size: 100%;
 }
 
+pre.cm-s-default, p, h2, h3 {
+  margin-right: -30px;
+  padding-right: 30px;
+}
+
 a, a:visited, a:active {
   text-decoration: none;
   color: #467;
