v0.6.0

src/main/webapp/config/query-configs/compare-refs.xsl

@@ -3,7 +3,7 @@
     xmlns:q="quenya"
     exclude-result-prefixes="q">
 
-    <xsl:variable name="working" select="'PE18'"/>
+    <xsl:variable name="working" select="'PE19'"/>
 
     <xsl:key name="ref" match="ref" use="concat(@v, '::', @source)"/>
     <xsl:param name="old-data"/>

src/main/webapp/config/query-configs/search.xq

@@ -70,6 +70,7 @@ declare function local:lang-order($lang as xs:string) as xs:string {
         <option value="anywhere">Match anywhere</option>
         <option value="start">Match start</option>
         <option value="end">Match end</option>
+        <option value="interior">Match interior</option>
     </select> &#160;|&#160;
     <select id="partsOfSpeechSelect" onchange="doSearch()">
         <option value="">Parts of Speech</option>

src/main/webapp/config/query-configs/word-page.xq

@@ -599,11 +599,10 @@ if ($gloss-refs) then (
     for $gloss in $glosses
     let $refs := for $i in $gloss-refs[lower-case(@gloss)=$gloss] order by translate($i/@mark, '-', '→') return $i
     let $value := $word/@v/string()
-    let $gloss-css := c:derive-css($refs[1])
     order by $gloss
     return
         <li>
-           { if ($gloss-css) then <span class="{$gloss-css}">{c:print-gloss($refs[1])}</span> else c:print-gloss($refs[1])}
+           {c:print-gloss-no-space($refs[1])}
            {local:print-ref-set($refs, <ref-set v="{$value}"/>)}
         </li>
     } </ul>

src/main/webapp/general/eldamo-schema.xsd

@@ -409,6 +409,7 @@
       <xs:enumeration value="kh"/>   <!-- Khuzdul -->
       <xs:enumeration value="khx"/>  <!-- Khuzdhul, External -->
       <xs:enumeration value="lem"/>  <!-- Lemberin -->
+      <xs:enumeration value="lin"/>  <!-- Lindarin -->
       <xs:enumeration value="ln"/>   <!-- Late Noldorin -->
       <xs:enumeration value="lon"/>  <!-- Late Old Noldorin -->
       <xs:enumeration value="mp"/>   <!-- Middle Primitive Elvish -->
@@ -979,7 +980,6 @@
       <xs:attribute name="rule"/>
       <xs:attribute name="speech" use="required" type="speech-list-type"/>
       <xs:attribute name="stem"/>
-      <xs:attribute name="tengwa"/>
       <xs:attribute name="tengwar"/>
       <xs:attribute name="v" use="required"/>
     </xs:complexType>

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.5.9</p>
+<p>v0.6.0</p>
+<ul>
+<li>Clean up old and out-dated phonetic artifacts.</li>
+<li>Most of the remaining data entry for PE19.</li>
+<li>First beta release!</li>
+</ul>
+<p>v0.5.9 (December 9, 2017)</p>
 <ul>
 <li>Data entry for PE18.</li>
 </ul>

src/main/webapp/index.jsp

@@ -30,14 +30,14 @@ Information about the source material used to compile this lexicon can be found
 allows you to do whatever you want with it provided you credit my work. However, these documents are based on
 the copyrighted materials of other authors, most notably those owned by the Tolkien Estate, and nothing in these
 documents should be considered a challenge to or indemnification against those copyrights.</p>
-<p>As it stands, this lexicon is currently in an early draft or “alpha” state. It includes most of the words from the
-major vocabulary lists of Tolkien’s languages: <i><a href="content/references/ref-Ety.html">The Etymologies</a></i>,
+<p>As it stands, this lexicon is currently in a draft or “beta” state. It includes nearly all of Tolkien’s published
+Elvish words most of the words, including the major vocabulary lists of Tolkien’s languages:
+<i><a href="content/references/ref-Ety.html">The Etymologies</a></i>,
 the <i><a href="content/references/ref-GL.html">Gnomish</a></i> and <i><a href="content/references/ref-QL.html">Qenya
 Lexicons</a></i>, <a href="content/references/ref-PE17.html">“Words, Phrases and Passages from <i>The Lord of the
 Rings</i>”</a> (PE17) as well as <i><a href="content/references/ref-LotR.html">The Lord of the Rings</a></i> itself.
-However, there is a great deal of published material not yet included in the data model, and the material within the
-lexicon has only undergone minimal review for errors. As such, I have barely begun the work of analyzing and comparing
-the various word forms, and any conclusions in the current version of the lexicon must be considered preliminary.</p>
+However, I have barely begun the work of analyzing and comparing the various word forms, and any conclusions in the
+current version of the lexicon must be considered preliminary.</p>
 <hr/>
 <p><b>Primary Content</b></p>
 <% } %>

src/main/webapp/js/search.js

@@ -255,6 +255,8 @@ function isMatch(word, searchText, target, position, partsOfSpeech) {
 		matcher = startMatch;
 	} else if (position == 'end') {
 		matcher = endMatch;
+	} else if (position == 'interior') {
+		matcher = interiorMatch;
 	}
 	if (matcher(word.match, searchText) && target.indexOf('word') >= 0) {
 		return true;
@@ -278,6 +280,10 @@ function endMatch(text, searchText) {
 	return text.lastIndexOf(searchText) == (text.length - searchText.length);
 }
 
+function interiorMatch(text, searchText) {
+	return containsMatch(text, searchText) && !startMatch(text, searchText) && !endMatch(text, searchText);
+}
+
 function maxPos() {
 	var result = max - 1;
 	result = result - (result % 10);