Get hyperrefs to work

marijnh · marijnh · commit d9d5882dfbc7 · 2014-07-19T00:46:09.000+02:00
diff --git a/04_data.txt b/04_data.txt
@@ -33,7 +33,7 @@ introduced earlier in the text.
 
 ifdef::tex_target[]
 
-The online coding sandbox for the book (http://eloquentjavascript.net/code[_eloquentjavascript.net/code_)
+The online coding sandbox for the book (http://eloquentjavascript.net/code[_eloquentjavascript.net/code_])
 will automatically load the needed code when you are running a
 specific example. If you decide to work through the examples in
 another environment, be sure to start from the full code for this
diff --git a/Makefile b/Makefile
@@ -42,3 +42,6 @@ book.pdf: tex/book/book.tex $(foreach CHAP,$(CHAPTERS),tex/$(CHAP).tex)
 pdfonce:
 	cd tex/book && xelatex book.tex
 	mv tex/book/book.pdf .
+
+texclean:
+	rm -f tex/book/book.aux tex/book/book.idx tex/book/book.log tex/book/book.out tex/book/book.tbc tex/book/book.toc
diff --git a/asciidoc_latex.conf b/asciidoc_latex.conf
@@ -30,11 +30,14 @@ subscript=_!..braceleft..!|!..braceright..!
 `=#monospaced
 
 [link-inlinemacro]
-!..backslash..!hyperlink!..braceleft..!{target}!..braceright..!!..braceleft..!{0}!..braceright..!
+!..backslash..!hyperref[{target}]!..braceleft..!{0}!..braceright..!
 
 [indexsee-inlinemacro]
 !..backslash..!index!..braceleft..!{1}|see!..braceleft..!{2}!..braceright..!!..braceright..!
 
+[http-inlinemacro]
+!..backslash..!href!..braceleft..!http:{target}!..braceright..!!..braceleft..!{0}!..braceright..!
+
 [blockdef-solution]
 delimiter=^!!solution!!$
 template=solution
@@ -52,9 +55,6 @@ source-style=template="codeblock"
 [texonly-inlinemacro]
 {text}
 
-[http-inlinemacro]
-{0}
-
 [image-blockmacro]
 \vskip 1.5ex
 \includegraphics[width={width=10cm}]\{{target}\}
@@ -94,6 +94,7 @@ template::[openblock]
 
 [header]
 \chapter\{{doctitle}\}
+{docid?\label\{{docid}\}}
 
 [sect1]
 \section\{{title}\}
diff --git a/bin/clean_latex.js b/bin/clean_latex.js
@@ -18,7 +18,7 @@ process.stdin.on("data", function(chunk) {
 });
 process.stdin.on("end", function() {
   checkUnicode(input);
-  input = input.replace(/(\n\n\\end{Code})|(\n{3,})|(_why,)|(\\chapter\{Introduction\})|\\hyperlink\{((?:[^{]|\\_\{\})+)\}/g, function(all, codeSpace, manyBlanks, why, intro, link) {
+  input = input.replace(/(\n\n\\end{Code})|(\n{3,})|(_why,)|(\\chapter\{Introduction\})|\\hyperref\[((?:[^\]]|\\_\{\})+)\]/g, function(all, codeSpace, manyBlanks, why, intro, link) {
     if (codeSpace)
       return codeSpace.slice(1);
     if (manyBlanks)
@@ -28,7 +28,7 @@ process.stdin.on("end", function() {
     if (intro)
       return "\\chapter*{Introduction}";
     if (link)
-      return "\\hyperlink{" + link.replace(/\\_\{\}/g, "_") + "}";
+      return "\\hyperref[" + link.replace(/\\_\{\}/g, "_") + "]";
   });
   input = input.replace(/({\\hspace\*\{.+?\}\\itshape``)\s*([^]+?)\s*('')/g, "$1$2$3");
 
diff --git a/bin/pre_latex.js b/bin/pre_latex.js
@@ -11,6 +11,8 @@ process.stdin.on("data", function(chunk) {
   input += chunk;
 });
 process.stdin.on("end", function() {
+  var docid = /($|\n)\[\[(.*?)\]\]\n= /.exec(input);
+  if (docid) input = ":docid: " + docid[2] + "\n" + input;
   process.stdout.write(input.replace(/\n===? (.*?) ===?|”([.,:;])|\nimage::img\/(.+?)\.(svg)|link:[^\.]+\.html#(.*?)\[/g, function(match, title, quoted, imgName, imgType, link) {
     if (title) { // Section title, must be converted to title case
       var kind = /^\n(=*)/.exec(match)[1];
diff --git a/tex/book/book.tex b/tex/book/book.tex
@@ -1,5 +1,4 @@
 \documentclass[cfonts]{nostarch}
-\usepackage{lipsum}
 \usepackage{natbib}
 \usepackage{nshyper}
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`\documentclass[cfonts]{nostarch}`
`2`		`-\usepackage{lipsum}`
`3`	`2`	`\usepackage{natbib}`
`4`	`3`	`\usepackage{nshyper}`
`5`	`4`