v0.8.7

pfstrack · Jul 1, 2023 · b47b39e · b47b39e
1 parent 773525c
commit b47b39e
Show file tree

Hide file tree

Showing 13 changed files with 1,854 additions and 780 deletions.
diff --git a/src/data/eldamo-data.xml b/src/data/eldamo-data.xml
diff --git a/src/main/webapp/config/query-configs/search-adv.xq b/src/main/webapp/config/query-configs/search-adv.xq
@@ -160,13 +160,16 @@ in Tolkien’s original texts. You can only search the Elvish (or other language
 result may appear multiple times if there are multiple references matching it. Where a given reference appears many
 times in a particular work, however, sometimes only notable or initial references are included or a reference to the
 index.</p>
-<p><b>Match Diacritics:</b> By default this advanced search is by exact match (c matches only c and k matches only k)
-including matching punctation (-, !, ?, etc.), but ignores diacritics (u matches ū, ŭ, ū). For exact matches on
-diacritics as well, choose “match diacritics”.</p>
-<p><b>Regular Expressions:</b> Prefixing a search by “regex=” allows you to match using regular expressions for very
-advanced searches. For example “regex=^t” matches words beginning with “t” and “regex=^t” matches words ending with
-“t”. An internet search can be used to find documentation on “JavaScript regular expressions”, which is what this
-engine uses.</p>
+<p><b>Match Diacritics:</b> By default this advanced search is by exact match (c matches only c and k matches only k),
+but ignores diacritics (u matches ū, ŭ, ū). For exact matches on diacritics as well, choose “match diacritics”.</p>
+<p><b>Regular Expressions:</b> This search supports regular expressions, allowing you to specify more advanced
+matching criteria. For example “^t” matches words that begin with t, “t$” matches words that end with t, and
+“.t.” matches t preceded and followed by at least one more character (in other words, in the interior of the word).
+Quite complex searches are possible, such as “rd[aeiouy]” which matches “rd” followed by any (Sindarin) vowel, which
+would exclude “rdh”. An internet search can be used to find documentation on “JavaScript Regular Expressions”,
+which is what this search engine uses. A good regex summary can be found at
+<a href="https://www.rexegg.com/regex-quickstart.html" target="_blank">https://www.rexegg.com/regex-quickstart.html</a>
+and here is a good tutorial: <a href="https://regexone.com" target="_blank">https://regexone.com</a>.</p>
 <p><b>Inflection Search:</b> TBD - A future version of the advanced search will allow searches for inflected forms
 (e.g. past tenses).</p>
 </div>

diff --git a/src/main/webapp/elvish-composition-archive/ellanto/ceraib-serthir.html b/src/main/webapp/elvish-composition-archive/ellanto/ceraib-serthir.html
@@ -0,0 +1,118 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
+<link rel="stylesheet" type="text/css" href="../css/global.css"></link>
+<title>A Lirulin by Luinyelle</title>
+
+</head>
+<body>
+
+<p>
+<span class="archive-nav"><a href="../index.html">Home</a></span>
+<span class="archive-nav"><a href="../index.html#ellanto">Ellanto</a></span>
+</p>
+
+<h1>Ceraib Serthir†</h1>
+
+<p>Translated by Ellanto from the Japanese folktale「かさじぞう」as found in Eri Banno et al., Genki: An Integrated Course in Elementary Japanese, Third Edition, vol. 1 (Tokyo: The Japan Times Publishing, 2020), pp. 344–45.</p>
+
+<hr/>
+
+<p><i>M’in oer anann ’wenwin, iardir a chardis ammórer v’in eryd. i-’Ardir ah i-’ardis agórer geraib v’i mâr dín. Iestor abor; i-lóran ’wain iestatha. Ach, an iardir a chardis ebíner geleb, aich ebíner gremmig iestor.‡ Eth i-dâd ethíler bangad geraib a-ñgeded gremmig.</i></p>
+
+<p><i>Iardir avamp i-cheraib, ta evin na ’obel a-mbangad hain; ach alphen law-eñgent i-cheraib. Iardir dinnast.</i></p>
+
+<p><i>Iardir dammin badrel n’i mâr mo imrad and. Loss dhannol ovrast.</i></p>
+
+<p><i>“A! Serthir!”</i></p>
+
+<p><i>Eneg serthir adórer vi loss.</i></p>
+
+<p><i>Iardir mabent: “Serthir, ló-felir ring?”</i></p>
+
+<p><i>i-Serthir law-ebenner allad.</i></p>
+
+<p><i>“Listo, iuitho i-cheraib hin.”</i></p>
+
+<p><i>Ta iardir sestant i-cheraib bo i-nuil serthir.</i></p>
+
+<p><i>“Min, tad, neledh, canad, leben.”</i></p>
+
+<p><i>Leben ceraib ní, ah er serthir ebin garab.</i></p>
+
+<p><i>Ethan iardir haedant i-garab ín.</i></p>
+
+<p><i>“i-Garab hen iaur, ach listo...” ebent, ta chammant i-dholl i-herthir dell.</i></p>
+
+<p><i>Io nammin n’i mâr, iardir trenor an iardis oh i-serthir.</i></p>
+
+<p><i>Iardis ebent, “Iardir, agóreg nâd vaer!”</i></p>
+
+<p><i>Mi dhû han, iardir athloe ’lim na-phen.</i></p>
+
+<p><i>“Iardir, iardir!”</i></p>
+
+<p><i>Iardir edrant i-fend, a gaedanner den! Eneg serthir adórer eth. i-Serthir odúger ovras na-chremmig iestor.</i></p>
+
+<p><i>Amor iestor odul. Iardir a chardis avanner gremmig evyr, ah i-dâd galthasser dhae.</i></p>
+
+<hr/>
+
+<h2>Kasa Jizō</h2>
+
+<p>Once upon a time, an old man and an old woman lived in the mountains. The old man and old woman were making bamboo hats in their home. Tomorrow is the New Year, a new year will begin. However, since the old man and old woman had no money, they also did not have any New Year’s mochi. The two planned to sell the hats and buy mochi.</p>
+
+<p>The old man took the hoots and went to the town to sell them. However, nobody bought the hats. The old man became sad.</p>
+
+<p>The old man went back home on foot through a long mountain road. A lot of snow was falling.</p>
+
+<p>”Ah! Jizō!”</p>
+
+<p>In the snow there stood six Jizō.</p>
+
+<p>The old man asked “Jizō, aren’t you / isn’t it cold?”</p>
+
+<p>The Jizō said nothing.</p>
+
+<p>”Here, please use these hats.”</p>
+
+<p>The old man put the hats on top of the heads of the Jizō.</p>
+
+<p>”One, two, three, four, five.”</p>
+
+<p>There were five hats. One of the Jizō had no hat.</p>
+
+<p>The old man took off his own hat.</p>
+
+<p>”This hat is old, but please,” he said, and put it on the Jizō’s head.</p>
+
+<p>Returning home, the old man told the old woman about the Jizō.</p>
+
+<p>The old woman said “Old man, you did a good thing!”</p>
+
+<p>Late that night, the old man heard someone’s voice.</p>
+
+<p>”Old man, old man.”</p>
+
+<p>The old man opened the door, and was surprised. There stood six Jizō. The Jizō brought/held a lot of New Year’s mochi.</p>
+
+<p>The morning of the New Year came. The old man and the old woman ate a lot of mochi. The two were very happy.</p>
+
+<hr/>
+
+<p>Notes:</p>
+
+<p>List of verbs in order of appearance (without repetition): *ᵐbar- (⪤Q. mar-), car-, iesta-, pen-, thel-, ᵐbanga-, ᵑged-, mab-, men-, *dinna-[1], dammen-, pad-, danna-, ovra-, tar-, mabed-, fel-, ped-, iuitha-, sesta-, haeda-, hamma-, ⁿdammen-, trenar-, lhae-, edra-, gaeda-, tog-, tol-,mad-, galtha-.</p>
+
+<p>[†] <i>Serthir</i> &gt; √SAR + √TIR lit. “stone-watcher” is my rendering of 地蔵 (Jizō)/Kṣitigarbha. It is not meant as a literal translation, simply my attempt to capture the concept, and its significance in Japanese culture, in a simple and appealing Sindarin compound.</p>
+
+<p>[‡] <i>crammeg iestor</i> i.e. “New Year’s mochi”, mochi eaten for the New Year.</p>
+
+<p>[1] <i>dinna-</i> &gt; √DIM·ta- “to become sad”, cf. thinna-.</p>
+
+<p>© 2023, Ellanto.</p>
+
+<p>This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+
+</body>
+</html>
diff --git a/src/main/webapp/elvish-composition-archive/index.html b/src/main/webapp/elvish-composition-archive/index.html
@@ -8,7 +8,7 @@
 
 <h1>Elvish Composition Archive</h1>
 
-<p>Version 0.1.3 - March 3, 2023 [Eldamo Mirror]</p>
+<p>Version 0.1.4 - June 25, 2023 [Eldamo Mirror]</p>
 
 <p>This web page and its content are a mirror of the <i>Elvish Composition Archive</i>: a collection of works in Tolkien’s Elvish languages, Quenya and Sindarin. Content is organized alphabetically by <a href="#authors">author</a>. If you want to get (or even host) your own copy of the archive, see the section on <a href="#licensing">mirrors, downloads and licensing</a>. If you want to contribute to the archive, see the section on <a href="#submissions">submissions</a>.</p>
 
@@ -17,10 +17,17 @@ <h2><a id="authors"></a>Compositions by Author</h2>
 <p>Each author’s compositions are organized in chronological order of composition, with an indication of which Elvish language(s) they use. Note that the date of composition may not reflect when the composition was added to the archive. Because the works here are the writings of multiple authors, they do not necessarily represent a common vision of the Elvish languages, or the vision of Tolkien himself.</p>
 
 <ul>
+<li><a href="#ellanto">Ellanto</a></li>
 <li><a href="#luinyelle">Luinyelle</a></li>
 <li><a href="#vyacheslav-stepanov">Vyacheslav Stepanov</a></li>
 </ul>
 
+<h3><a id="#ellanto"></a>Ellanto</h3>
+
+<ul>
+<li><a href="ellanto/ceraib-serthir.html">Ceraib Serthir</a> (Sindarin, 2023)</li>
+</ul>
+
 <h3><a id="luinyelle"></a>Luinyelle</h3>
 
 <ul>

diff --git a/src/main/webapp/general/version-history.html b/src/main/webapp/general/version-history.html
@@ -10,7 +10,12 @@
 <p>[<a href="../index.html">Home</a>]</p>
 <hr>
 <h1>Version History</h1>
-<p>v0.8.6</p>
+<p>v0.8.7</p>
+<ul>
+<li>Dictionary entries for semantic category 6 = Clothing and Adornment.</li>
+<li>More entries from PE17/139-142 with the help of Gilruin.</li>
+</ul>
+<p>v0.8.6 (May 26, 2023)</p>
 <ul>
 <li>Dictionary entries for semantic category 6 = Clothing and Adornment.</li>
 <li>More entries from PE17/139-142 with the help of Gilruin.</li>
@@ -26,7 +31,7 @@ <h1>Version History</h1>
 <ul>
 <li>Finished Eldamo Introductory Quenya Chapters 7-15.</li>
 </ul>
-<p>v0.8.4.2</p>
+<p>v0.8.4.2 (Dec 11, 2022)</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>

diff --git a/src/main/webapp/intro-quenya/eldamo-intro-quenya-03.html b/src/main/webapp/intro-quenya/eldamo-intro-quenya-03.html
@@ -114,7 +114,7 @@ <h2><a id="c3-1-1"></a>3.1.1 Quenya Consonants</h2>
 
 <p>Note that Tolkien consistently use the <i>ñ</i> sign for a back-nasal (IPA [ŋ]), and not for a palatal nasal as seen in Spanish spelling (IPA [ɲ]). Thus Quenya <i>ñ</i> is a “ng” sound as heard at the end of words like “sing” and not a Spanish-style “enye”. Note that this Spanish sound <u>does</u> occur in Quenya, but is spelled <i>ny</i> (see below).</p>
 
-<p><a id="c3-1-1-2"></a><b>3.1.1.2 Voiceless Consonants:</b> This last group of consonants in the list above are voiceless sounds that can be tricky for English speakers. Tolkien described voiceless <i>hr</i> and <i>hr</i> in Appendix E of <i>The Lord of the Rings</i>:</p>
+<p><a id="c3-1-1-2"></a><b>3.1.1.2 Voiceless Consonants:</b> This last group of consonants in the list above are voiceless sounds that can be tricky for English speakers. Tolkien described voiceless <i>hl</i> and <i>hr</i> in Appendix E of <i>The Lord of the Rings</i>:</p>
 
 <blockquote>LH represents this sound [L] when voiceless (usually derived from initial <i>sl-</i>). In (archaic) Quenya this is written <i>hl</i>, but was in the Third Age usually pronounced as <i>l</i>.</blockquote>
 

diff --git a/src/main/webapp/intro-quenya/eldamo-intro-quenya-05.html b/src/main/webapp/intro-quenya/eldamo-intro-quenya-05.html
@@ -1206,7 +1206,7 @@ <h2><a id="c5-5-2"></a>5.5.2 <i>la</i>-negation</h2>
 <p><a id="c5-5-2-2"></a><b>5.5.2.2 Verb negation with <i>lá</i>:</b> The quasi-verb <i>lá-</i> is also used to negate other verbs. In this case only the form <i>lá</i> is used along with the subject pronoun suffix (if appropriate), but without any verb tense: the verb tense is on the negated verb instead. For example:</p>
 
 <ul>
-<li><i>lás masta massa</i> “he/she is not baking bread”.</li>
+<li><i>lás mastëa massa</i> “he/she is not baking bread”.</li>
 <li><i>i atan lá cambë macil</i> “the man did not receive a sword”.</li>
 <li><i>lán menuva i ostonna enar</i> “I will not go to the city tomorrow”.</li>
 </ul>

diff --git a/src/main/webapp/intro-quenya/eldamo-intro-quenya-08.html b/src/main/webapp/intro-quenya/eldamo-intro-quenya-08.html
@@ -773,7 +773,7 @@ <h1><a id="c8-4"></a>8.4 Guided Reading: Namárië Prose</h1>
 <ul class="vocab-list">
 <li><b>ai</b> <i>interj.</i> “ah, alas”</li>
 <li><b>oromar</b> (<b>oromard-</b>) <i>n.</i> “lofty hall”</li>
-<li><b>únotima</b> <i>adj.</i> “numberless, (lit.) uncountable” ¹</li>
+<li><b>únótima</b> <i>adj.</i> “numberless, (lit.) uncountable” ¹</li>
 <li><b>yén</b> <i>n.</i> “Elvish long year (144 solar years)”</li>
 </ul>
 
@@ -814,7 +814,7 @@ <h1><a id="c8-4"></a>8.4 Guided Reading: Namárië Prose</h1>
 
 <p><b>First phrase:</b> <i>Ai! Lassi lantar laurië súrinen.</i> The text begins with the interjection <i>Ai!</i> “Alas!”, a cry of lamentation. The subject of the first phrase is <i>lassi</i> “leaves” with the verb <i>lantar</i> “fall” in the plural to agree with it. This is followed by the adjective <i>laurië</i>, the plural of <i>laurëa</i> “golden” again in agreement with plurality of the subject. Since the adjective follows the verb, it is being used adverbially: “golden[ly]”, the colour of the leaves perhaps indicating they are falling in autumn. This is followed by instrumental <i>súrinen</i> “by (means of) wind”. The <i>i</i> in this last word is because the stem form of <i>súrë</i> “wind” is <i>súri-</i> and it is not a plural form; the plural would be <i>súr<u>í</u>nen</i> “by (means of) wind<u>s</u>”. Thus “Ah! Leaves fall golden[ly] by (means of) wind”.</p>
 
-<p><b>Second phrase:</b> <i>Yéni únótimë ve aldaron rámar.</i> The second phrase is descriptive of the falling leaves and the circumstances of their fall. In particular they have fallen over <i>yéni únotimë</i> “long years uncountable”, where <i>únotima</i> “uncountable” is plural to agree with its noun. A <i>yén</i> is an Elvish long year, equal to 144 solar years, a common time unit among the immortal Elves. The remainder of the phrase also describes the leaves: <i>ve aldaron rámar</i> “like trees’ wings”. Thus “long years uncountable as trees’ wings”. In context, the falling leaves are like the wings of trees and are a metaphor for the numberless years.</p>
+<p><b>Second phrase:</b> <i>Yéni únótimë ve aldaron rámar.</i> The second phrase is descriptive of the falling leaves and the circumstances of their fall. In particular they have fallen over <i>yéni únótimë</i> “long years uncountable”, where <i>únótima</i> “uncountable” is plural to agree with its noun. A <i>yén</i> is an Elvish long year, equal to 144 solar years, a common time unit among the immortal Elves. The remainder of the phrase also describes the leaves: <i>ve aldaron rámar</i> “like trees’ wings”. Thus “long years uncountable as trees’ wings”. In context, the falling leaves are like the wings of trees and are a metaphor for the numberless years.</p>
 
 <p><b>Third phrase:</b> <i>Yéni avánier ve lintë yuldar.</i> The subject of the third phrase is <i>yéni</i> “long years” with the verb <i>avánier</i> “have departed”, plural to agree with the subject. Their passing is <i>ve lintë yuldar</i> “like swift drinks”, or put more poetically “like swift draughts”. Here <i>linta</i> “swift” is made plural to agree with <i>yuldar</i> “draughts”. Thus “long years have departed like swift draughts”, or more appropriately for years: “long years have passed like swift draughts”.</p>
 
@@ -985,7 +985,7 @@ <h2><a id="c8-5-1"></a>8.5.1 Chapter Vocabulary</h2>
 <ul class="vocab-list">
 <li><b>ai</b> <i>interj.</i> “ah, alas”</li>
 <li><b>oromar</b> (<b>oromard-</b>) <i>n.</i> “lofty hall”</li>
-<li><b>únotima</b> <i>adj.</i> “numberless, (lit.) uncountable” ¹</li>
+<li><b>únótima</b> <i>adj.</i> “numberless, (lit.) uncountable” ¹</li>
 <li><b>yén</b> <i>n.</i> “Elvish long year (144 solar years)”</li>
 </ul>
 

diff --git a/src/main/webapp/intro-quenya/eldamo-intro-quenya-11.html b/src/main/webapp/intro-quenya/eldamo-intro-quenya-11.html
@@ -509,7 +509,7 @@ <h1><a id="c11-3"></a>11.3 More Noun Classes</h1>
 <p>As with the discussion of advanced verb classes in <a href="eldamo-intro-quenya-08.html#c8-1">Chapter 8, Section 8.1</a>, the information below can be considered an advanced topic. These advanced declensions draw heavily on Raccoon’s research in his <i>Tenguesta Goldorinwa</i>, most notably his examination of <a href="https://feophan.github.io/tenguesta_ngoldorinwa/morph/nou/">Noun Declensions</a>, though I do not agree with him on all the particulars. All of the following can be considered optional. If you stick with the simpler system of noun cases described earlier in the course, you will still be correct most of the time.</p>
 </div>
 
-<p>Note that in the tables below, the “long” nouns are those that trigger prosodic lengthening (see <a href="eldamo-intro-quenya-06.html#c6-1-3">Chapter 6, Section §6.1.3</a>), namely those with three or more syllables whose second-to-last syllable is light: a short vowel followed by zero or one consonant. For example, for purposes of prosodic lengthening <i>lícuma</i> “candle” counts as a long a-noun, but <i>mahalma</i> “throne” and <i>tincotéma</i> “t-series” do not. In addition, entries whose form significantly differs from normal declensions are marked in <b><i>bold</i></b> with a footnote explaining the variation.</p>
+<p>Note that in the tables below, the “long” nouns are those that trigger prosodic lengthening (see <a href="eldamo-intro-quenya-06.html#c6-1-3">Chapter 6, Section §6.1.3</a>), namely those with three or more syllables whose second-to-last syllable is light: having a short vowel followed by zero or one consonant. For example, for purposes of prosodic lengthening <i>lícuma</i> “candle” counts as a long a-noun, but <i>mahalma</i> “throne” and <i>tincotéma</i> “t-series” do not. In addition, entries whose form significantly differs from normal declensions are marked in <b><i>bold</i></b> with a footnote explaining the variation.</p>
 
 <h2><a id="c11-3-1"></a>11.3.1 a-nouns and o-nouns</h2>
 
@@ -1279,7 +1279,7 @@ <h2><a id="c11-3-8"></a>11.3.8 Vocabulary: Law and Society</h2>
 <ul class="vocab-list">
 <li><b>caimasan</b> (<b>caimasamb-</b>) <i>n.</i> “bedroom”</li>
 <li><b>filit</b> (<b>filic-</b>) <i>n.</i> “sparrow, small bird”</li>
-<li><b>hiswa</b> <i>adj.</i> “grey [of weather]”</li>
+<li><b>hiswa</b> [<b>þ</b>] <i>adj.</i> “grey [of weather]”</li>
 <li>^<b>hó</b> <i>n.</i> “owl”</li>
 <li><b>imbilat</b> <i>n.</i> “deep valley” ²</li>
 <li><b>lícuma</b> <i>n.</i> “candle”</li>
@@ -1398,7 +1398,7 @@ <h2><a id="c11-4-1"></a>11.4.1 Chapter Vocabulary</h2>
 <ul class="vocab-list">
 <li><b>caimasan</b> (<b>caimasamb-</b>) <i>n.</i> “bedroom”</li>
 <li><b>filit</b> (<b>filic-</b>) <i>n.</i> “sparrow, small bird”</li>
-<li><b>hiswa</b> <i>adj.</i> “grey [of weather]”</li>
+<li><b>hiswa</b> [<b>þ</b>] <i>adj.</i> “grey [of weather]”</li>
 <li>^<b>hó</b> <i>n.</i> “owl”</li>
 <li><b>imbilat</b> <i>n.</i> “deep valley” ¹</li>
 <li><b>lícuma</b> <i>n.</i> “candle”</li>

diff --git a/src/main/webapp/intro-quenya/eldamo-intro-quenya-13.html b/src/main/webapp/intro-quenya/eldamo-intro-quenya-13.html
@@ -328,7 +328,7 @@
 <li><b>hína</b> <i>n.</i> “child”<ul><li>irregular plural <b>híni</b> “children”</li></ul></li>
 <li><b>hir-</b> <i>v.</i> “to find”<ul><li><i>pa.t.</i> *<b>hirnë</b> “found”</li></ul></li>
 <li><b>Hísimë</b> [<b>þ</b>] <i>n.</i> “November, *Misty”</li>
-<li><b>hiswa</b> <i>adj.</i> “grey [of weather]”</li>
+<li><b>hiswa</b> [<b>þ</b>] <i>adj.</i> “grey [of weather]”</li>
 <li>^<b>hlaiwa</b> <i>adj.</i> “sick”</li>
 <li>#<b>hlar-</b> <i>v.</i> “to hear”<ul><li><i>pa.t.</i> ^<b>hlassë</b> “heard”</li></ul></li>
 <li><b>hlas</b> (<b>hlar-</b>) <i>n.</i> “ear”</li>
@@ -1035,7 +1035,7 @@
 <li><b>undómë</b> <i>n.</i> “twilight, dusk”</li>
 <li><b>undu</b> <i>adv.</i> “down, beneath”</li>
 <li><b>ungwë</b> <i>n.</i> “spider’s web”</li>
-<li><b>únotima</b> <i>adj.</i> “numberless, (lit.) uncountable”</li>
+<li><b>únótima</b> <i>adj.</i> “numberless, (lit.) uncountable”</li>
 <li><b>unquë</b> <i>n.</i> “a hollow”</li>
 <li><b>úra</b> <i>adj.</i> “hot [unpleasantly]”</li>
 <li><b>úrë</b> <i>n.</i> “heat”</li>