From d92b5847d401cb6efff2ff67210af1b54a62fd52 Mon Sep 17 00:00:00 2001
From: Pelle Nilsson <perni@lysator.liu.se>
Date: Sat, 29 Jun 2013 22:21:06 +0200
Subject: [PATCH] Added option (-o static) to make static HTML output.

---
 expected/bgg.html               |  8 ++++----
 expected/codewords.html         | 18 +++++++++---------
 expected/counters.html          | 14 +++++++-------
 expected/format.html            |  6 +++---
 expected/items.html             | 24 ++++++++++++------------
 expected/letter.html            |  2 +-
 expected/references.html        | 10 +++++-----
 expected/trade.html             |  4 ++--
 expected/unreachable.html       | 10 +++++-----
 expected/withdemo.html          | 10 +++++-----
 expected/withoutdemo.html       | 16 ++++++++--------
 options/static/html/script.html |  0
 templates/html/begin.html       |  2 +-
 templates/html/script.html      |  1 +
 templates/html/section.html     |  2 +-
 templates/html/take.html        |  2 +-
 16 files changed, 65 insertions(+), 64 deletions(-)
 create mode 100644 options/static/html/script.html
 create mode 100644 templates/html/script.html

diff --git a/expected/bgg.html b/expected/bgg.html
index d610fde..7400699 100644
--- a/expected/bgg.html
+++ b/expected/bgg.html
@@ -53,7 +53,7 @@ href="#section3">3</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section2">
@@ -63,7 +63,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(2, document.getElementById('section2'));
 }
 </script><div class="section" id="section3">
@@ -74,7 +74,7 @@ href="#section2">2</a>. This section has an image to show the syntax for doing t
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(3, document.getElementById('section3'));
 }
 </script><div class="section" id="section4">
@@ -86,7 +86,7 @@ href="#section3">3</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(4, document.getElementById('section4'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/codewords.html b/expected/codewords.html
index 1531e28..7088547 100644
--- a/expected/codewords.html
+++ b/expected/codewords.html
@@ -41,7 +41,7 @@ href="#section2">2</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section2">
@@ -53,7 +53,7 @@ href="#section9">9</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(2, document.getElementById('section2'));
 }
 </script><div class="section" id="section3">
@@ -63,7 +63,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(3, document.getElementById('section3'));
 }
 </script><div class="section" id="section4">
@@ -77,7 +77,7 @@ href="#section8">8</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(4, document.getElementById('section4'));
 }
 </script><div class="section" id="section5">
@@ -87,7 +87,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(5, document.getElementById('section5'));
 }
 </script><div class="section" id="section6">
@@ -100,7 +100,7 @@ href="#section4">4</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(6, document.getElementById('section6'));
 }
 </script><div class="section" id="section7">
@@ -113,7 +113,7 @@ href="#section1">1</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(7, document.getElementById('section7'));
 }
 </script><div class="section" id="section8">
@@ -125,7 +125,7 @@ href="#section4">4</a> (xor test).
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(8, document.getElementById('section8'));
 }
 </script><div class="section" id="section9">
@@ -140,7 +140,7 @@ href="#section4">4</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(9, document.getElementById('section9'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/counters.html b/expected/counters.html
index 177c295..5038ab2 100644
--- a/expected/counters.html
+++ b/expected/counters.html
@@ -53,7 +53,7 @@ href="#section6">6</a> to lose some Life Points.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section2">
@@ -63,7 +63,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(2, document.getElementById('section2'));
 }
 </script><div class="section" id="section3">
@@ -74,7 +74,7 @@ href="#section7">7</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(3, document.getElementById('section3'));
 }
 </script><div class="section" id="section4">
@@ -85,7 +85,7 @@ href="#section7">7</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(4, document.getElementById('section4'));
 }
 </script><div class="section" id="section5">
@@ -98,7 +98,7 @@ href="#section6">6</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(5, document.getElementById('section5'));
 }
 </script><div class="section" id="section6">
@@ -110,7 +110,7 @@ href="#section7">7</a> to get some Gold.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(6, document.getElementById('section6'));
 }
 </script><div class="section" id="section7">
@@ -129,7 +129,7 @@ href="#section4">4</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(7, document.getElementById('section7'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/format.html b/expected/format.html
index 24b652c..3988542 100644
--- a/expected/format.html
+++ b/expected/format.html
@@ -53,7 +53,7 @@ href="#section3">3</a>. <img src="testimage.png" class="sectionimage"></img>
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section2">
@@ -63,7 +63,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(2, document.getElementById('section2'));
 }
 </script><div class="section" id="section3">
@@ -73,7 +73,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(3, document.getElementById('section3'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/items.html b/expected/items.html
index 5d0a1b9..8b26261 100644
--- a/expected/items.html
+++ b/expected/items.html
@@ -44,7 +44,7 @@ href="#section2">2</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section2">
@@ -59,7 +59,7 @@ href="#section7">7</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(2, document.getElementById('section2'));
 }
 </script><div class="section" id="section3">
@@ -69,7 +69,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(3, document.getElementById('section3'));
 }
 </script><div class="section" id="section4">
@@ -80,7 +80,7 @@ href="#section3">3</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(4, document.getElementById('section4'));
 }
 </script><div class="section" id="section5">
@@ -93,7 +93,7 @@ href="#section3">3</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(5, document.getElementById('section5'));
 }
 </script><div class="section" id="section6">
@@ -107,7 +107,7 @@ href="#section12">12</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(6, document.getElementById('section6'));
 }
 </script><div class="section" id="section7">
@@ -121,7 +121,7 @@ href="#section12">12</a> either way.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(7, document.getElementById('section7'));
 }
 </script><div class="section" id="section8">
@@ -133,7 +133,7 @@ href="#section12">12</a> to confirm stick can not be picked up again even if the
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(8, document.getElementById('section8'));
 }
 </script><div class="section" id="section9">
@@ -149,7 +149,7 @@ href="#section8">8</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(9, document.getElementById('section9'));
 }
 </script><div class="section" id="section10">
@@ -161,7 +161,7 @@ href="#section5">5</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(10, document.getElementById('section10'));
 }
 </script><div class="section" id="section11">
@@ -174,7 +174,7 @@ href="#section12">12</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(11, document.getElementById('section11'));
 }
 </script><div class="section" id="section12">
@@ -192,7 +192,7 @@ href="#section9">9</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(12, document.getElementById('section12'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/letter.html b/expected/letter.html
index 096a732..996b724 100644
--- a/expected/letter.html
+++ b/expected/letter.html
@@ -39,7 +39,7 @@
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/references.html b/expected/references.html
index 6f8342d..a99a319 100644
--- a/expected/references.html
+++ b/expected/references.html
@@ -49,7 +49,7 @@ href="#section399">399</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section397">
@@ -59,7 +59,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(397, document.getElementById('section397'));
 }
 </script><div class="section" id="section398">
@@ -69,7 +69,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(398, document.getElementById('section398'));
 }
 </script><div class="section" id="section399">
@@ -82,7 +82,7 @@ href="#section398">398</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(399, document.getElementById('section399'));
 }
 </script><div class="section" id="section400">
@@ -93,7 +93,7 @@ href="#section397">397</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(400, document.getElementById('section400'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/trade.html b/expected/trade.html
index 93e0d79..5668d92 100644
--- a/expected/trade.html
+++ b/expected/trade.html
@@ -65,7 +65,7 @@ href="#section2">2</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section2">
@@ -75,7 +75,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(2, document.getElementById('section2'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/unreachable.html b/expected/unreachable.html
index b4cec1d..39fb5d4 100644
--- a/expected/unreachable.html
+++ b/expected/unreachable.html
@@ -40,7 +40,7 @@ href="#section6">6</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section2">
@@ -50,7 +50,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(2, document.getElementById('section2'));
 }
 </script><div class="section" id="section3">
@@ -60,7 +60,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(3, document.getElementById('section3'));
 }
 </script><div class="section" id="section5">
@@ -70,7 +70,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(5, document.getElementById('section5'));
 }
 </script><div class="section" id="section6">
@@ -80,7 +80,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(6, document.getElementById('section6'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/withdemo.html b/expected/withdemo.html
index f2d1120..66e4dd6 100644
--- a/expected/withdemo.html
+++ b/expected/withdemo.html
@@ -42,7 +42,7 @@ href="#section2">2</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section2">
@@ -53,7 +53,7 @@ href="#section4">4</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(2, document.getElementById('section2'));
 }
 </script><div class="section" id="section3">
@@ -63,7 +63,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(3, document.getElementById('section3'));
 }
 </script><div class="section" id="section4">
@@ -75,7 +75,7 @@ href="#section2">2</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(4, document.getElementById('section4'));
 }
 </script><div class="section" id="section5">
@@ -86,7 +86,7 @@ href="#section3">3</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(5, document.getElementById('section5'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/expected/withoutdemo.html b/expected/withoutdemo.html
index 1e5d83a..b093cd6 100644
--- a/expected/withoutdemo.html
+++ b/expected/withoutdemo.html
@@ -42,7 +42,7 @@ href="#section8">8</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(1, document.getElementById('section1'));
 }
 </script><div class="section" id="section2">
@@ -52,7 +52,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(2, document.getElementById('section2'));
 }
 </script><div class="section" id="section3">
@@ -63,7 +63,7 @@ href="#section5">5</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(3, document.getElementById('section3'));
 }
 </script><div class="section" id="section4">
@@ -73,7 +73,7 @@ if (this.gamebook) {
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(4, document.getElementById('section4'));
 }
 </script><div class="section" id="section5">
@@ -85,7 +85,7 @@ href="#section2">2</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(5, document.getElementById('section5'));
 }
 </script><div class="section" id="section6">
@@ -98,7 +98,7 @@ href="#section2">2</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(6, document.getElementById('section6'));
 }
 </script><div class="section" id="section7">
@@ -109,7 +109,7 @@ href="#section4">4</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(7, document.getElementById('section7'));
 }
 </script><div class="section" id="section8">
@@ -120,7 +120,7 @@ href="#section6">6</a>.
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(8, document.getElementById('section8'));
 }
 </script>     <div id="counters" class="counters">
diff --git a/options/static/html/script.html b/options/static/html/script.html
new file mode 100644
index 0000000..e69de29
diff --git a/templates/html/begin.html b/templates/html/begin.html
index 5ed1fad..e7af9ee 100644
--- a/templates/html/begin.html
+++ b/templates/html/begin.html
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
 #include "viewport"
     <title>%(title)s</title>
-    <script type="text/javascript" src="gamebookformatplay.js"></script>
+#include "script"
     <link rel="stylesheet" href="gamebookformat.css"
           type="text/css" />
     <script>
diff --git a/templates/html/script.html b/templates/html/script.html
new file mode 100644
index 0000000..4c5813d
--- /dev/null
+++ b/templates/html/script.html
@@ -0,0 +1 @@
+    <script type="text/javascript" src="gamebookformatplay.js"></script>
diff --git a/templates/html/section.html b/templates/html/section.html
index d560046..05af34d 100644
--- a/templates/html/section.html
+++ b/templates/html/section.html
@@ -5,7 +5,7 @@
 </div>
 </div>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.addSection(%(nr)d, document.getElementById('section%(nr)d'));
 }
 </script>
\ No newline at end of file
diff --git a/templates/html/take.html b/templates/html/take.html
index d1d8ad3..91b1f56 100644
--- a/templates/html/take.html
+++ b/templates/html/take.html
@@ -1,6 +1,6 @@
 <span class="itemtake">%(inner)s</span>
 <script>
-if (this.gamebook) {
+if (typeof gamebook !== 'undefined') {
    gamebook.takeItem(%(nr)d, "%(inner)s");
 }
 </script>
\ No newline at end of file