Trying to get LaTeX to show the internal links

marijnh · marijnh · commit 6c7aaa6a355b · 2014-07-18T16:11:12.000+02:00
Without success, so far
diff --git a/04_data.txt b/04_data.txt
@@ -975,7 +975,8 @@ function)))As we've seen, `Math` is a grab-bag of number-related
 utility functions, such as `Math.max` (maximum), `Math.min` (minimum),
 and `Math.sqrt` (square root).
 
-[[namespace_pollution]](((namespace)))(((namespace pollution)))The
+[[namespace_pollution]]
+(((namespace)))(((namespace pollution)))The
 `Math` object is used simply as a container to group a bunch of
 related functionality. There is only one `Math` object, and it is
 almost never useful as a value. Rather, it provides a _namespace_ so
diff --git a/06_object.txt b/06_object.txt
@@ -786,7 +786,8 @@ console.log(drawTable(dataTable(MOUNTAINS)));
 //   … etcetera
 ----
 
-[[keys]]The standard `Object.keys` function returns an array of
+[[keys]]
+The standard `Object.keys` function returns an array of
 property names in an object. The top row of the table must contain
 underlined cells that give the names of the columns. Below that, the
 values of all the objects in the data set appear as normal cells—we
diff --git a/10_modules.txt b/10_modules.txt
@@ -128,7 +128,8 @@ and distributes hundreds of thousands of such libraries, allowing you to
 search for the functionality you need, and, once you find it, set up
 your project to automatically download it.
 
-[[modules_npm]](((NPM)))This service exists. It is called _NPM_ (http://npmjs.org[_npmjs.org_]).
+[[modules_npm]]
+(((NPM)))This service exists. It is called _NPM_ (http://npmjs.org[_npmjs.org_]).
 NPM consists of an online database of modules, and a tool for
 downloading and upgrading the modules your program depends on. It grew
 out of Node.js, the browser-less JavaScript environment we will discuss in
diff --git a/14_event.txt b/14_event.txt
@@ -904,7 +904,7 @@ mouse as you moved it across the page.
 
 In this exercise, I want you to implement a mouse trail. Use
 absolutely positioned `<div>` elements with a fixed size and
-background color (refer back to the link:#mouse_drawing[code] in the
+background color (refer back to the link:14_event.html#mouse_drawing[code] in the
 section on mouse click events for an example). Create twelve such
 elements, and when the mouse moves, display them in the wake of the
 mouse pointer, somehow.
diff --git a/asciidoc_html.conf b/asciidoc_html.conf
@@ -18,8 +18,8 @@ rdquo=”
 
 [macros]
 (?su)(?<!\w)indexsee:\[(?P<attrlist>[^\]]*?)\]=indexsee
-\(!html (?P<text>.*?)!\)=htmlonly
-\(!tex (?P<text>.*?)!\)=texonly
+\(!html (?P<text>(?:.|\n)*?)!\)=htmlonly
+\(!tex (?P<text>(?:.|\n)*?)!\)=texonly
 
 [replacements]
 (\w)\'(\w)=\1’\2
diff --git a/asciidoc_latex.conf b/asciidoc_latex.conf
@@ -19,8 +19,8 @@ rdquo=”
 
 [macros]
 (?su)(?<!\w)indexsee:\[(?P<attrlist>[^\]]*?)\]=indexsee
-\(!html (?P<text>.*?)!\)=htmlonly
-\(!tex (?P<text>.*?)!\)=texonly
+\(!html (?P<text>(?:.|\n)*?)!\)=htmlonly
+\(!tex (?P<text>(?:.|\n)*?)!\)=texonly
 
 [tags]
 superscript=^!..braceleft..!|!..braceright..!
@@ -29,6 +29,9 @@ subscript=_!..braceleft..!|!..braceright..!
 [quotes]
 `=#monospaced
 
+[link-inlinemacro]
+!..backslash..!hyperlink!..braceleft..!{target}!..braceright..!!..braceleft..!{0}!..braceright..!
+
 [indexsee-inlinemacro]
 !..backslash..!index!..braceleft..!{1}|see!..braceleft..!{2}!..braceright..!!..braceright..!
 
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\})/g, function(all, codeSpace, manyBlanks, why, intro) {
+  input = input.replace(/(\n\n\\end{Code})|(\n{3,})|(_why,)|(\\chapter\{Introduction\})|\\hyperlink\{((?:[^{]|\\_\{\})+)\}/g, function(all, codeSpace, manyBlanks, why, intro, link) {
     if (codeSpace)
       return codeSpace.slice(1);
     if (manyBlanks)
@@ -27,6 +27,8 @@ process.stdin.on("end", function() {
       return "\\_why,";
     if (intro)
       return "\\chapter*{Introduction}";
+    if (link)
+      return "\\hyperlink{" + 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,7 +11,7 @@ process.stdin.on("data", function(chunk) {
   input += chunk;
 });
 process.stdin.on("end", function() {
-  process.stdout.write(input.replace(/\n===? (.*?) ===?|”([.,:;])|\nimage::img\/(.+?)\.(svg)/g, function(match, title, quoted, imgName, imgType) {
+  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];
       return "\n" + kind + " " + title.split(" ").map(function(word) {
@@ -24,6 +24,8 @@ process.stdin.on("end", function() {
       return quoted + "”";
     } else if (imgName) { // Image file
       return "\nimage::" + convertImage(imgName, imgType);
+    } else if (link) {
+      return "link:" + link + "[";
     }
   }));
 });
diff --git a/tex/book/book.tex b/tex/book/book.tex
@@ -127,6 +127,8 @@
 
 \input{../20_node.tex}
 
+\input{../21_skillsharing.tex}
+
 \backmatter
 
 \nocite{*}
