From af62a99bf535dc45d44d8546faab938485e49c84 Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Mon, 6 May 2019 08:45:07 +0200
Subject: update_html rewrites anchors which Pandoc 1.16 doesn't process

See #43
---
 bin/update_html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/update_html b/bin/update_html
index 587ed6179..912ff1fa0 100755
--- a/bin/update_html
+++ b/bin/update_html
@@ -87,7 +87,7 @@ function render_t2t_html {
 # Render markdown into html file
 # Arguments:
 # 1. markdown source file, e.g. download/index.md
-# 2. html target filen, e.g. download/index.html
+# 2. html target file, e.g. download/index.html
 function render_md_html {
   md="$1"
   html="$2"
@@ -113,11 +113,17 @@ function render_md_html {
 
   # Final post-processing
   if [ -f "$html" ] ; then
-    sed -i.bak "s/<table/<table class=\"table\"/" "$html" && rm "$html.bak"
+    # add "table" class to tables
+    sed -i.bak "s/<table/<table class=\"table\"/" "$html"
+    # rewrite anchors that Pandoc 1.16 ignores: [content]{#anchor} -> <span id="anchor">content</span>
+    sed -i.bak -E "s/\[(.*)\]\{#(.+)\}/<span id=\"\2\">\1<\/span>/" "$html"
+    rm -f "$html.bak"
     echo "$html"
   fi
 }
 
+# Main entry point
+# Script can be run in one of two modes:
 if [ $# -gt 0 ] ; then
   # Render specific file(s) from args, ignoring dates
   for file in "$@" ; do
-- 
cgit v1.2.3


From 7a3efdfeb9171a38e594f177d0541124837d32ba Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Mon, 20 May 2019 10:36:35 +0200
Subject: Update link to RGL tutorial (now HTML version)

---
 bin/template.html | 6 +++++-
 doc/index.md      | 1 +
 index.html        | 8 ++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/template.html b/bin/template.html
index 881f3f2e3..15306e1d9 100644
--- a/bin/template.html
+++ b/bin/template.html
@@ -80,7 +80,11 @@ $body$
         <ul class="list-unstyled">
           <li><a href="https://www.youtube.com/watch?v=x1LFbDQhbso">Google Tech Talk</a></li>
           <li><a href="http://cloud.grammaticalframework.org/">GF Cloud</a></li>
-          <li><a href="$rel-root$/doc/tutorial/gf-tutorial.html">Tutorial</a></li>
+          <li>
+            <a href="$rel-root$/doc/tutorial/gf-tutorial.html">Tutorial</a>
+            /
+            <a href="$rel-root$/lib/doc/rgl-tutorial/index.html">RGL Tutorial</a>
+          </li>
           <li><a href="$rel-root$/download"><strong>Download GF</strong></a></li>
         </ul>
       </div>
diff --git a/doc/index.md b/doc/index.md
index 18c4979c1..39d2c3036 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -6,6 +6,7 @@ Perhaps you're looking for one of the following:
 
 - [Tutorial](tutorial/gf-tutorial.html). This is a hands-on introduction to grammar writing in GF.
 - [Reference Manual](gf-refman.html). A full-scale reference manual of the GF language.
+- [RGL Tutorial](../lib/doc/rgl-tutorial/index.html)
 - [RGL Synopsis](../lib/doc/synopsis/index.html). Documentation of the Resource Grammar Library, including the syntax API and lexical paradigms for each language.
 - [Shell Reference](gf-shell-reference.html). Describes the commands available in the interactive GF shell.
   Also summarizes how to run GF as a batch compiler.
diff --git a/index.html b/index.html
index 5084c92a6..decea87d6 100644
--- a/index.html
+++ b/index.html
@@ -34,7 +34,11 @@
           <img src="http://www.grammaticalframework.org/src/www/P/gf-cloud.png" style="height:30px" class="ml-2" alt="Cloud logo">
         </a>
       </li>
-      <li><a href="doc/tutorial/gf-tutorial.html">Tutorial</a></li>
+      <li>
+        <a href="doc/tutorial/gf-tutorial.html">Tutorial</a>
+        /
+        <a href="lib/doc/rgl-tutorial/index.html">RGL Tutorial</a>
+      </li>
     </ul>
 
     <a href="download/index.html" class="btn btn-primary ml-3">
@@ -363,7 +367,7 @@ least one, it may help you to get a first idea of what GF is.
     <p>
     Adding a language to the resource library takes 3 to 9
     months - contributions
-    are welcome! You can start with the <a href="doc/gf-lrec-2010.pdf">resource grammarian's tutorial</a>.
+    are welcome! You can start with the <a href="lib/doc/rgl-tutorial/index.html">resource grammarian's tutorial</a>.
     </p>
 
   </div><!-- .col-6 -->
-- 
cgit v1.2.3