From adebc48afd5b4e25a8be9982cee3d854dd3ceb86 Mon Sep 17 00:00:00 2001
From: lagleki <gleki.is.my.name@gmail.com>
Date: Tue, 27 Aug 2019 23:53:02 -0700
Subject: [PATCH 1/4] Revert "remove 'Unlike -nai contradictory negation,
 scalar negation of tenses is not limited to PU and FAhA:'"

This reverts commit f651c90c12501e2c5afa87f762bf009002d1dcdb.

From c956e0073d2f5960f048b18adb3606c35dbf6664 Mon Sep 17 00:00:00 2001
From: lagleki <gleki.is.my.name@gmail.com>
Date: Fri, 22 Nov 2019 04:45:03 -0800
Subject: [PATCH 2/4] #386 for this branch

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 9459d4ba2..0bf2836c7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1
+GekLojban-1.2.1

From 5d8b5c07c414b4f2860ea9078056913b4294518a Mon Sep 17 00:00:00 2001
From: lagleki <gleki.is.my.name@gmail.com>
Date: Fri, 22 Nov 2019 06:03:34 -0800
Subject: [PATCH 3/4] for this branch only: \#380

---
 .env             |  3 +++
 scripts/merge.sh | 14 +++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 000000000..82ed52766
--- /dev/null
+++ b/.env
@@ -0,0 +1,3 @@
+VERSION="geklojban-1.2.1"
+TITLE=The Complete GekLojban Languag
+PUBLISHER=An Illogical Language Group Publication
diff --git a/scripts/merge.sh b/scripts/merge.sh
index 3cf99fc69..4e1b76e61 100755
--- a/scripts/merge.sh
+++ b/scripts/merge.sh
@@ -34,13 +34,21 @@ ofile="$BUILDDIR/cll.xml"
 
 cp scripts/header.xml "$ofile"
 
-version=$(cat VERSION)
+read_var() {
+    VAR=$(grep $1 $2 | xargs)
+    IFS="=" read -ra VAR <<< "$VAR"
+    echo ${VAR[1]}
+}
+
+version=$(read_var VERSION .env)
+publisher=$(read_var PUBLISHER .env)
+title=$(read_var TITLE .env)
 datestamp=$(date +%Y-%m-%d)
 
 echo "
 
 <info>
-<title>The Complete Lojban Language</title>
+<title>$title</title>
 <author>
 <personname>
 <firstname>John</firstname>
@@ -53,7 +61,7 @@ Version $version, Generated $datestamp
 </releaseinfo>
 <othercredit>
 <orgname>
-A Logical Language Group Publication
+$publisher
 </orgname>
 </othercredit>
 </info>

From 01111413c55804d3649c22df35b33de169d7f424 Mon Sep 17 00:00:00 2001
From: lagleki <gleki.is.my.name@gmail.com>
Date: Fri, 22 Nov 2019 18:41:14 +0300
Subject: [PATCH 4/4] 17.4 doesn't describe a word for quotation mark

remove indexterm for it
---
 chapters/17.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapters/17.xml b/chapters/17.xml
index 502da7edb..041a78322 100644
--- a/chapters/17.xml
+++ b/chapters/17.xml
@@ -320,7 +320,7 @@
     <quote>&amp;</quote>, based on the cmavo 
     <valsi>joi</valsi> meaning 
     <quote>mixed and</quote>. Many more such lerfu words will probably be invented in future.</para>
-    <para> <indexterm type="general"><primary>&quot;</primary><secondary>&quot;</secondary><tertiary>word for</tertiary></indexterm>  <indexterm type="general"><primary>&quot;.&quot;</primary><secondary>word for</secondary></indexterm>  <indexterm type="general"><primary>syllable break</primary><secondary>word for</secondary></indexterm>  <indexterm type="general"><primary>pause</primary><secondary>word for</secondary></indexterm>  <indexterm type="general"><primary>syllable break</primary><secondary>symbol for</secondary></indexterm>  <indexterm type="general"><primary>pause</primary><secondary>symbol for</secondary></indexterm> The 
+    <para><indexterm type="general"><primary>&quot;.&quot;</primary><secondary>word for</secondary></indexterm>  <indexterm type="general"><primary>syllable break</primary><secondary>word for</secondary></indexterm>  <indexterm type="general"><primary>pause</primary><secondary>word for</secondary></indexterm>  <indexterm type="general"><primary>syllable break</primary><secondary>symbol for</secondary></indexterm>  <indexterm type="general"><primary>pause</primary><secondary>symbol for</secondary></indexterm> The 
     <letteral>.</letteral> and 
     <letteral>,</letteral> characters used in Lojbanic writing to represent pause and syllable break respectively have been assigned the lerfu words