Skip to content

Commit

Permalink
v0.8.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
pfstrack committed May 12, 2024
1 parent bfed942 commit 978f471
Show file tree
Hide file tree
Showing 8 changed files with 2,005 additions and 743 deletions.
2,718 changes: 1,986 additions & 732 deletions src/data/eldamo-data.xml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/main/webapp/config/query-configs/search.xq
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ button {{ border-radius: 4px; background-color: #EEE; border: 1px solid #444 }}
<option value="n|s|ns">Sindarin/Noldorin (1930+)</option>
<option value="mp|p|np">Later Primitive (1930+)</option>
<option value="" disabled="disabled">─────────────</option>
<option value="q|s|p">All Late Elvish (1950-73)</option>
<option value="mq|n|mp">All Middle Elvish (1930-50)</option>
<option value="eq|en|g|ep">All Early Elvish (1910-30)</option>
<option value="q|aq|van|s|os|p|t|at|nan|norths|av">All Late Elvish (1950-73)</option>
<option value="mq|maq|lin|n|on|mp|mt|ilk|dan|lem">All Middle Elvish (1930-50)</option>
<option value="eq|en|g|et|ep">All Early Elvish (1910-30)</option>
<option value="" disabled="disabled">─────────────</option> {
for $lang in //language[@id][not(@id=('np', 'ns', 'nq'))]
order by local:lang-order($lang/@id)
Expand Down
6 changes: 5 additions & 1 deletion src/main/webapp/general/version-history.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
<p>[<a href="../index.html">Home</a>]</p>
<hr>
<h1>Version History</h1>
<p>v0.8.9.1</p>
<p>v0.8.9.2</p>
<ul>
<li>Finished dictionary entries for semantic category 9 = Physical Acts and Materials.</li>
</ul>
<p>v0.8.9.1 (March 17, 2024)</p>
<ul>
<li>Caught up on the backlog of neologisms missing from v0.8.9.</li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/intro-quenya/eldamo-intro-quenya-02.html
Original file line number Diff line number Diff line change
Expand Up @@ -1377,7 +1377,7 @@ <h2><a id="c2-5-1"></a>2.5.1 Love and Marriage</h2>

<p>After the “Time of Children”, the marriage was less intimate than it was in the beginning, and it became more like close friendship once the desire for children waned. In fact, it was not unusual for long-married Elves to live apart for extended periods, as their interests drew them in different directions. Elves could also have close friendships (<i>melmë</i>) with people other than their spouse.</p>

<p>It is not clear how much of this idealized view of marriage was reflected in the actual lives of Elves. In times of strife, marriage could be delayed, as well as childrearing after marriage. It was the act of child bearing itself that taxed their spirits, so that Elves who refrained from having children remained fertile long into their lives, though those who lived millenia without childbearing would eventually lose that capacity. It was also possible that some Elves would never find a suitable mate, either because one could not be found, or because the one they loved did not share their feelings.</p>
<p>It is not clear how much of this idealized view of marriage was reflected in the actual lives of Elves. In times of strife, marriage could be delayed, as well as childrearing after marriage. It was the act of child bearing itself that taxed their spirits, so that Elves who refrained from having children remained fertile long into their lives, though those who lived millenia without childbearing would eventually lose that capacity. It was possible that some Elves would never find a suitable mate, either because one could not be found, or because the one they loved did not share their feelings.</p>

<p>It was also possible for Elves to have unhealthy marriages, though they still remained permanent. The best known example is the union of Eöl and Aredhel, where Eöl trapped Aredhel into marriage. But even there Tolkien said “It is not said that Aredhel was wholly unwilling, nor that her life in Nan Elmoth was hateful to her for many years” (S/133). Tolkien also said that “Even when in after days, as the histories reveal, many of the Eldar in Middle-earth became corrupted, and their hearts darkened by the shadow that lies upon Arda, seldom is any tale told of deeds of lust among them” (MR/210).</p>

Expand Down Expand Up @@ -1436,7 +1436,7 @@ <h2><a id="c2-5-2"></a>2.5.2 Vocabulary: Love and Family</h2>
<ul>
<li>Note ¹: Quenya distinguishes legitimate sexual desire <i>yermë</i> (which is always accompanied by <i>melmë</i> “love”) from illegitimate sexual desire or “lust” <i>mailë</i>.</li>
<li>Note ²: The Elvish notion of “love” distinguishes close emotional love (<i>mel-</i>) used with both lovers and close friends, and less emotional “love” (!<i>nil-</i>) used of more casual friends as well as things one is devoted to such as an art, science or nation. In his own writing, Tolkien did not use <i>nil-</i> as a Quenya verb, so strictly speaking this is a neologism, though Tolkien often gave its ancient root √<i>NDIL</i> this verbal sense (Let/386; PE17/152).</li>
<li>Note ³: Tolkien translated the Elvish word <i>nos(së)</i> as “family”, and it is often used as such in Elvish writing, but Tolkien also translated it as “clan, kindred”, indicating it more specifically means an “extended family” or even a “house” as in <i>nossë Finwëo</i> “the house of Finwë” including all his descendents. For a “nuclear family” (father, mother and children) I personally use the neologism !<i>orendë</i>, inspired by Tolkien’s word ᴱQ. <i>soresta</i> “family = together kin” from the 1910s (PE12/85).</li>
<li>Note ³: Tolkien translated the Elvish word <i>nos(së)</i> as “family”, and it is often used as such in (Neo) Quenya writing, but Tolkien also translated it as “clan, kindred”, indicating it more specifically means an “extended family” or even a “house” as in <i>nossë Finwëo</i> “the house of Finwë” including all his descendents. For a “nuclear family” (father, mother and children) I personally use the neologism !<i>orendë</i>, inspired by Tolkien’s word ᴱQ. <i>soresta</i> “family = together kin” from the 1910s (PE12/85).</li>
</ul>

<p>The words !<i>nil-</i> and !<i>orendë</i> are our first examples of neologisms in this course: new Elvish words invented by fans (only one of which, <i>orendë</i>, is the invention of the course’s author). The exclamation mark “!” before vocabulary words indicates they are neologisms. This particular pair of neologisms is included here because we know that the contrasting words <i>mel-</i> (“to love deeply and emotionally”) and <i>nossë</i> (“extended family”) had particular meanings in Tolkien’s writings, but we don’t know the Quenya words for the opposing terms (“to love less emotionally” and “nuclear family”).</p>
Expand Down Expand Up @@ -1813,7 +1813,7 @@ <h2><a id="c2-8-1"></a>2.8.1 Chapter Vocabulary</h2>
</ul>

<ul>
<li>Note ¹: Tolkien translated the Elvish word <i>nos(së)</i> as “family”, and it is often used as such in Elvish writing, but Tolkien also translated it as “clan, kindred”, indicating it more specifically means an “extended family” or even a “house” as in <i>nossë Finwëo</i> “the house of Finwë” including all his descendents. For a “nuclear family” (father, mother and children) I personally use the neologism !<i>orendë</i>, inspired by Tolkien’s word ᴱQ. <i>soresta</i> “family = together kin” from the 1910s (PE12/85).</li>
<li>Note ¹: Tolkien translated the Elvish word <i>nos(së)</i> as “family”, and it is often used as such in (Neo) Quenya writing, but Tolkien also translated it as “clan, kindred”, indicating it more specifically means an “extended family” or even a “house” as in <i>nossë Finwëo</i> “the house of Finwë” including all his descendents. For a “nuclear family” (father, mother and children) I personally use the neologism !<i>orendë</i>, inspired by Tolkien’s word ᴱQ. <i>soresta</i> “family = together kin” from the 1910s (PE12/85).</li>
</ul>

<p><b><u>Miscellaneous:</u></b></p>
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/intro-quenya/eldamo-intro-quenya-06.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ <h2><a id="c6-1-1"></a>6.1.1 Elision - Vowel Loss</h2>
<li>With two-syllable prepositions like <i>ara</i> “beside”: <i>ar’ i mindon</i> “beside the tower”.</li>
<li>With an uninflected aorist verb preceding the definite article <i>i</i>: <i>i atan mat’ i massa</i> “the man eats the bread”.</li>
<li>With the directional suffixes <i>-nna</i>, <i>-llo</i> and <i>-sse</i>: <i>márenn’ alassëo</i> “to the home of happiness”.</li>
<li>With long adjectives preceding the noun they modify: <i>vanim’ ambarónë</i> “a beautiful dawn”.</li>
<li>With long adjectives preceding the noun they modify: <i>vanim’ atan</i> “a beautiful man”.</li>
</ul>

<p><span class="advanced-topic">Speculative:</span> For the last two cases, elision seem to be most likely in longer words if the result does not put the stressed syllables of the two words next to each other: <i>márENN’ aLASsëo</i> and <i>VAnim’ ambaRÓnë</i> are fine, but <i>hrestann’ ailino</i> is problematic because the two stressed syllables would be adjacent: <i>hrestANN’ AIlino</i>. In such cases I think elision is unlikely: <i>hrestanna ailino</i> “to the shore of a lake”. But <i>hrestann’ ailinyo</i> (<i>hrestANN’ aiLINyo</i>) “to the shore of his lake” is more likely to have elision because the stress patterns are amenable to it.</p>
Expand Down Expand Up @@ -289,7 +289,7 @@ <h2><a id="c6-1-5"></a>6.1.5 Section Summary</h2>
<li>Two-syllable prepositions like <i>ara</i> “beside”: <i>ar’ i mindon</i> “beside the tower”.</li>
<li>An uninflected aorist verb preceding the definite article <i>i</i>: <i>i atan mat’ i massa</i> “the man eats the bread”.</li>
<li>The directional suffixes <i>-nna</i>, <i>-llo</i> and <i>-sse</i>: <i>márenn’ alassëo</i> “to the home of happiness”.</li>
<li>Long adjectives preceding the noun they modify: <i>vanim’ ambarónë</i> “a beautiful dawn”.</li>
<li>Long adjectives preceding the noun they modify: <i>vanim’ atan</i> “a beautiful man”.</li>
</ul></li>
<li><b>Final syllable reductions:</b> Long vowels in final syllables can be shortened when:
<ul>
Expand Down Expand Up @@ -1529,7 +1529,7 @@ <h2><a id="c6-7-2"></a>6.7.2 Grammar Summary</h2>
<li>Two-syllable prepositions like <i>ara</i> “beside”: <i>ar’ i mindon</i> “beside the tower”.</li>
<li>An uninflected aorist verb preceding the definite article <i>i</i>: <i>i atan mat’ i massa</i> “the man eats the bread”.</li>
<li>The directional suffixes <i>-nna</i>, <i>-llo</i> and <i>-sse</i>: <i>márenn’ alassëo</i> “to the home of happiness”.</li>
<li>Long adjectives preceding the noun they modify: <i>vanim’ ambarónë</i> “a beautiful dawn”.</li>
<li>Long adjectives preceding the noun they modify: <i>vanim’ atan</i> “a beautiful man”.</li>
</ul></li>
<li><b>Final syllable reductions:</b> Long vowels in final syllables can be shortened when:
<ul>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/intro-quenya/eldamo-intro-quenya-12.html
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ <h1><a id="c12-1"></a>12.1 Pronunciation Summary</h1>
<li>Two-syllable prepositions like <i>ara</i> “beside”: <i>ar’ i mindon</i> “beside the tower”.</li>
<li>An uninflected aorist verb preceding the definite article <i>i</i>: <i>i atan mat’ i massa</i> “the man eats the bread”.</li>
<li>The directional suffixes <i>-nna</i>, <i>-llo</i> and <i>-sse</i>: <i>márenn’ alassëo</i> “to the home of happiness”.</li>
<li>Long adjectives preceding the noun they modify: <i>vanim’ ambarónë</i> “a beautiful dawn”.</li>
<li>Long adjectives preceding the noun they modify: <i>vanim’ atan</i> “a beautiful man”.</li>
</ul></li>
<li><b>Final syllable reductions:</b> Long vowels in final syllables can be shortened when:
<ul>
Expand Down
2 changes: 2 additions & 0 deletions src/main/webapp/js/search-adv.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ function convertLang(lang, speech) {
converted = 'ᴺ✶';
else if (lang === 'mq')
converted = 'ᴹQ. ';
else if (lang === 'maq')
converted = 'ᴹAQ. ';
else if (lang === 'nq')
converted = 'ᴺQ. ';
else if (lang === 'mt')
Expand Down
2 changes: 2 additions & 0 deletions src/main/webapp/js/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ function convertLang(lang, speech) {
converted = 'ᴺ✶';
else if (lang === 'mq')
converted = 'ᴹQ. ';
else if (lang === 'maq')
converted = 'ᴹAQ. ';
else if (lang === 'nq')
converted = 'ᴺQ. ';
else if (lang === 'mt')
Expand Down

0 comments on commit 978f471

Please sign in to comment.