v0.8.4.2

pfstrack · Dec 11, 2022 · 976d164 · 976d164
1 parent 524516c
commit 976d164
Show file tree

Hide file tree

Showing 17 changed files with 1,604 additions and 1,206 deletions.
diff --git a/src/data/eldamo-data.xml b/src/data/eldamo-data.xml
diff --git a/src/main/webapp/config/query-configs/categories-index.xq b/src/main/webapp/config/query-configs/categories-index.xq
@@ -12,7 +12,6 @@ declare variable $lang-name := $lang/@name/string();
 <link type="text/css" rel="stylesheet" href="../../css/global.css" />
 
 <script src="../../js/glaemscribe.min.js"></script>
-<script src="../../js/tengwar_ds.cst.js"></script>
 <script src="../../js/tengwar_ds_eldamar.cst.js"></script>
 <script src="../../js/quenya.glaem.js"></script>
 <script src="../../js/sindarin-beleriand.glaem.js"></script>

diff --git a/src/main/webapp/config/query-configs/deprecation-index.xq b/src/main/webapp/config/query-configs/deprecation-index.xq
@@ -12,7 +12,6 @@ declare variable $lang-name := $lang/@name/string();
 <link type="text/css" rel="stylesheet" href="../../css/global.css" />
 
 <script src="../../js/glaemscribe.min.js"></script>
-<script src="../../js/tengwar_ds.cst.js"></script>
 <script src="../../js/tengwar_ds_eldamar.cst.js"></script>
 <script src="../../js/quenya.glaem.js"></script>
 <script src="../../js/sindarin-beleriand.glaem.js"></script>

diff --git a/src/main/webapp/config/query-configs/neologism-index.xq b/src/main/webapp/config/query-configs/neologism-index.xq
@@ -12,7 +12,6 @@ declare variable $lang-name := $lang/@name/string();
 <link type="text/css" rel="stylesheet" href="../../css/global.css" />
 
 <script src="../../js/glaemscribe.min.js"></script>
-<script src="../../js/tengwar_ds.cst.js"></script>
 <script src="../../js/tengwar_ds_eldamar.cst.js"></script>
 <script src="../../js/quenya.glaem.js"></script>
 <script src="../../js/sindarin-beleriand.glaem.js"></script>

diff --git a/src/main/webapp/config/query-configs/root-index.xq b/src/main/webapp/config/query-configs/root-index.xq
@@ -13,7 +13,6 @@ declare variable $secondary-word := <control show-link="y"/>;
 <link type="text/css" rel="stylesheet" href="../../css/global.css" />
 
 <script src="../../js/glaemscribe.min.js"></script>
-<script src="../../js/tengwar_ds.cst.js"></script>
 <script src="../../js/tengwar_ds_eldamar.cst.js"></script>
 <script src="../../js/quenya.glaem.js"></script>
 <script src="../../js/sindarin-beleriand.glaem.js"></script>

diff --git a/src/main/webapp/config/query-configs/vocabulary-index.xq b/src/main/webapp/config/query-configs/vocabulary-index.xq
@@ -23,7 +23,6 @@ declare variable $lang-name := $lang/@name/string();
 <link type="text/css" rel="stylesheet" href="../../css/global.css" />
 
 <script src="../../js/glaemscribe.min.js"></script>
-<script src="../../js/tengwar_ds.cst.js"></script>
 <script src="../../js/tengwar_ds_eldamar.cst.js"></script>
 <script src="../../js/quenya.glaem.js"></script>
 <script src="../../js/sindarin-beleriand.glaem.js"></script>

diff --git a/src/main/webapp/config/query-configs/word-index.xq b/src/main/webapp/config/query-configs/word-index.xq
@@ -12,7 +12,6 @@ declare variable $lang-name := $lang/@name/string();
 <link type="text/css" rel="stylesheet" href="../../css/global.css" />
 
 <script src="../../js/glaemscribe.min.js"></script>
-<script src="../../js/tengwar_ds.cst.js"></script>
 <script src="../../js/tengwar_ds_eldamar.cst.js"></script>
 <script src="../../js/quenya.glaem.js"></script>
 <script src="../../js/sindarin-beleriand.glaem.js"></script>

diff --git a/src/main/webapp/config/query-configs/word-page.xq b/src/main/webapp/config/query-configs/word-page.xq
@@ -320,7 +320,6 @@ declare variable $allow-neo-nav :=
 <link type="text/css" rel="stylesheet" href="../../css/global.css" />
 
 <script src="../../js/glaemscribe.min.js"></script>
-<script src="../../js/tengwar_ds.cst.js"></script>
 <script src="../../js/tengwar_ds_eldamar.cst.js"></script>
 <script src="../../js/quenya.glaem.js"></script>
 <script src="../../js/sindarin-beleriand.glaem.js"></script>

diff --git a/src/main/webapp/css/global.css b/src/main/webapp/css/global.css
@@ -112,3 +112,5 @@ hr { border: none; height: 1px; color: #000; background-color: #000; }
 .advanced-topic {
  background-color: #CCCCCC
 }
+
+.advanced-topic blockquote { margin-left: 0.75em; margin-right: 0em; padding-left: 0.50em; border-left: 0.25em solid #999; }
diff --git a/src/main/webapp/general/version-history.html b/src/main/webapp/general/version-history.html
@@ -10,7 +10,13 @@
 <p>[<a href="../index.html">Home</a>]</p>
 <hr>
 <h1>Version History</h1>
-<p>v0.8.4.1</p>
+<p>v0.8.4.2</p>
+<ul>
+<li>Minor release as I worked on Eldamo Introductory Quenya Chapters 1-6.</li>
+<li>Updated grammar entries to reflect my new preference for assimilative partitive plurals: <i>atanéli</i> &gt;&gt; <i>atalli</i>.</li>
+<li>Upgraded to Glaemscribe 1.3.1.</li>
+</ul>
+<p>v0.8.4.1 (October 14, 2022)</p>
 <ul>
 <li>Minor release to fix a build issue.</li>
 <li>Introduced spelling convention <i>öa</i> to make pronunciation clearer.</li>

diff --git a/src/main/webapp/js/glaemscribe.min.js b/src/main/webapp/js/glaemscribe.min.js
diff --git a/src/main/webapp/js/quenya.glaem.js b/src/main/webapp/js/quenya.glaem.js
diff --git a/src/main/webapp/js/sindarin-beleriand.glaem.js b/src/main/webapp/js/sindarin-beleriand.glaem.js
diff --git a/src/main/webapp/js/sindarin-classical.glaem.js b/src/main/webapp/js/sindarin-classical.glaem.js
diff --git a/src/main/webapp/js/tengwar_ds.cst.js b/src/main/webapp/js/tengwar_ds.cst.js
diff --git a/src/main/webapp/js/tengwar_ds_eldamar.cst.js b/src/main/webapp/js/tengwar_ds_eldamar.cst.js
diff --git a/src/main/webapp/js/transcribe.js b/src/main/webapp/js/transcribe.js
@@ -38,7 +38,7 @@ String.prototype.replaceAll = function(search, replacement) {
 
 function postprocessTranscription(result) {
  // Quenya transcription fixes
- result = result.replaceAll('=', ' =').replaceAll('À', ' À') // ',', '?'
+ result = result.replaceAll('-', ' -').replaceAll('=', ' =').replaceAll('À', ' À').replaceAll('Á', ' Á')  // ',', '?'
 
  // Mode of Beleriand transcription fixes
  // result = result.replaceAll(']d', '‡d').replaceAll(']s', '‡s').replaceAll(']g', '‡g').replaceAll(']a', '‡a') // a(ch|g|ng|c) - PE22/36
@@ -80,8 +80,8 @@ function transcribeSpans() {
  for (var i = 0; i < anchors.length; i++) {
  var a = anchors[i];
  if (a.name) continue;
- if (a.href.indexOf('#') > 0) continue;
- if (!(a.href.indexOf('word') > 0) && !(a.href.indexOf('search'))) continue;
+ if (a.href.indexOf('#') > 0) continue;
+ if (!(a.href.indexOf('word') > 0) && !(a.href.indexOf('search') > 0)) continue;
  a.href = a.href + "?neo";
  }
  } else {