Merge pull request #53 from Omikhleia/next-2.x

Edition 2.1 - NM entries, PDF improvements, etc.

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changes
 
+## Edition 2.1 - Oct. 16, 2021
+
+_Release_ 
+
+Target: take into account _the Nature of Middle-earth_
+
+- Lexicon content update:
+  - Added entries from NM
+  - Fixed some more PE/17 and Ety entries on the way
+- Lexicon structure overhaul:
+  - Removed numbering on sense tags (useless, as it is generated in the ouput)
+- Tooling:
+  - PDF output improvements:
+    - The list of abbreviations and references are now included.
+    - The document layout has been improved (better margins, culs-de-lampe, etc.)
+
 ## Edition 2.0 (lexicon 1.0) - Sept. 26, 2021
 
 _Release_

docs/manual/ABBREVIATIONS.md

@@ -84,6 +84,7 @@
 | _pron._ | pronoun |
 | _quant._ | quantitative (number) |
 | _rel._ | relative (pronoun) |
+| _sg._ | singular |
 | _sing._ | singulative |
 | _soft mut._ | soft mutation (lenition) |
 | _unkn._ | unknown part of speech |

docs/manual/BUILDING.md

@@ -54,7 +54,7 @@ To produce a much better version of the lexicon, several additional tasks are pe
 The provided `process.sh` script applies all the necessary steps in a row, and puts the converted
 HTML in `docs/dict-sd.html`
 
-The post-processing taks may be updated and the list below may become outdate, please check the script
+The post-processing tasks may be updated and the list below may become outdated, please check the script
 in case of doubts.
 
 But basically, for the record, the main following steps should be performed:

docs/manual/DATA_MODEL.md

@@ -87,10 +87,10 @@ The general contents of an entry are shown hereafter:
 <entry>
   <!-- Word forms (possibly nested) -->
   <!-- Optional grammatical information, usually they are rather provided with the sense -->
-  <!-- Sense (glosses or definitions)
+  <!-- Sense (glosses or definitions) -->
   <!-- Optional etymological notes -->
   <!-- Optional notes (sources, comments) -->
-  <!-- Optional related entries (secondary entries)
+  <!-- Optional related entries (secondary entries) -->
   <!-- Optional cross-reference links to other entries (analogies or synonyms, etc.) -->
 </entry>
 ```
@@ -166,7 +166,7 @@ It may additionally contain:
   </sense>
 ```
 
-Would there be several meanings for an entry, having several sense elements (numbered with an `n` attribute) is allowes.
+Would there be several meanings for an entry, having several sense elements is allowed.
 
 
 The definitions are normally included in a `<def>` element.

docs/manual/REFERENCES.md

@@ -4,28 +4,30 @@
 | ------------- | ----------- |
 | Ety | _The Etymologies_ in _The Lost Road and Other Writings_, 1987. |
 | H | _The Hobbit_. |
-| HL | _Hiswelókë_ (fanzine), 1999-2001. |
+| HL | _Hiswelókë_ (fanzine), 1999–2001. |
 | LB | _The Lays of Beleriand_, 1985. |
 | LR | _The Lost Road and Other Writings_, 1987. |
-| Lambengolmor | Lambengolmor mailing-list, 2002-2020. |
-| Letters |  _The Letters of J.R.R. Tolkien_, 1981. |
+| Lamb | Lambengolmor mailing-list, 2002–2020. |
+| Letters | _The Letters of J.R.R. Tolkien_, 1981. |
 | LotR | _The Lord of the Rings_. |
 | MC | _The Monsters and the Critics_, 1983. |
 | MR | _Morgoth’s Ring_, 1993. |
+| NM | _The Nature of Middle-earth_, 2021. |
 | PE | _Parma Eldalamberon_ (series). |
-| PM | _The Peoples of Middle-Earth_, 1996. |
+| PM | _The Peoples of Middle-earth_, 1996. |
 | RC | _The Lord of the Rings: a Reader’s Companion_, 2005. |
 | RGEO | _The Road Goes Ever On_, 1967. |
 | RS | _The Return of the Shadow_, 1988. |
 | S | _The Silmarillion_, 1977. |
 | SD | _Sauron Defeated_, 1992. |
-| Sindict | Sindict mailing-list, 2002-2011. |
+| Sindict | Sindict mailing-list, 2002–2011. |
 | TAI | _J.R.R. Tolkien: Artist and Illustrator_, 1995. |
 | TC | _A Tolkien Compass_ (first ed.), 1975. |
 | TI | _The Treason of Isengard_, 1989. |
-| TT | _Tyalië Tyelelliéva_ (fanzine), 1994-2001. |
+| TS | _Tolkien Studies_ (series). |
+| TT | _Tyalië Tyelelliéva_ (fanzine), 1994–2001. |
 | Tengwestie | _Tengwestië_ (online journal). |
-| UT | _Unfinished Tales of Númenor and Middle Earth_, 1980. |
+| UT | _Unfinished Tales of Númenor and Middle-earth_, 1980. |
 | VT | _Vinyar Tengwar_ (fanzine). |
 | WJ | _The War of the Jewels_, 1994. |
 | WR | _The War of the Ring_, 1990. |

scripts/tei2html/abbr-def.xml

@@ -16,6 +16,7 @@
     <def id="pa. t.">past tense</def>
     <def id="irreg. pa. t.">irregular past tense</def>
     <def id="pl.">plural</def>
+    <def id="sg.">singular</def>
     <def id="fut.">future tense</def>
     <def id="pres.">present tense</def>
     <def id="aor.">aorist</def>
@@ -115,6 +116,7 @@
     <item id="aor." full="aoriste">aor.</item>
     <item id="irreg. pa. t." full="passé de forme irrégulière">pas. irrég.</item>
     <item id="pl." full="pluriel">pl.</item>
+    <item id="sg." full="singulier">pl.</item>
     <item id="class pl." full="pluriel de classe">pl. de classe</item>
     <item id="coll." full="pluriel collectif">coll.</item>
     <item id="dual pl." full="duel">pl. duel</item>
@@ -286,4 +288,4 @@
     <item id="card." full="Kardinalzahl">kard.</item>
     <item id="quant." full="quantitative Zahl">quant.</item>
   </list>	
-</abbr>
+</abbr>

scripts/tei2html/tei-dict.xsl

@@ -52,7 +52,7 @@
 <xsl:template match="sense">
   <xsl:text> </xsl:text>
   <xsl:choose>
-   <xsl:when test="following-sibling::sense"><b>1.</b> </xsl:when>
+   <xsl:when test="following-sibling::sense and not(preceding-sibling::sense)"><b>1.</b> </xsl:when>
    <xsl:when test="preceding-sibling::sense">&#x25CB; <b><xsl:value-of select="count(preceding-sibling::sense) + 1"/>.</b> </xsl:when>
   </xsl:choose><xsl:apply-templates/>
 </xsl:template>

scripts/tools/biblrefs.json

@@ -1,28 +1,30 @@
 [
   { "id": "Ety", "title": "_The Etymologies_ in _The Lost Road and Other Writings_", "year": "1987", "type": "pages" },
   { "id": "H", "title": "_The Hobbit_", "year": null, "type": "chapters" },
-  { "id": "HL", "title": "_Hiswelókë_ (fanzine)", "year": "1999-2001", "type": "pages" },
+  { "id": "HL", "title": "_Hiswelókë_ (fanzine)", "year": "1999–2001", "type": "pages" },
   { "id": "LB", "title": "_The Lays of Beleriand_", "year": "1985", "type": "pages" },
   { "id": "LR", "title": "_The Lost Road and Other Writings_", "year": "1987", "type": "pages" },
-  { "id": "Lambengolmor", "title": "Lambengolmor mailing-list", "year": "2002-2020", "type": "posts" },
-  { "id": "Letters", "title": " _The Letters of J.R.R. Tolkien_", "year": "1981", "type": "pages" },
+  { "id": "Lamb", "title": "Lambengolmor mailing-list", "year": "2002–2020", "type": "posts" },
+  { "id": "Letters", "title": "_The Letters of J.R.R. Tolkien_", "year": "1981", "type": "pages" },
   { "id": "LotR", "title": "_The Lord of the Rings_", "year": null, "type": "chapters" },
   { "id": "MC", "title": "_The Monsters and the Critics_", "year": "1983", "type": "pages" },
   { "id": "MR", "title": "_Morgoth’s Ring_", "year": "1993", "type": "pages" },
+  { "id": "NM", "title": "_The Nature of Middle-earth_", "year": "2021", "type": "pages" },
   { "id": "PE", "title": "_Parma Eldalamberon_ (series)", "year": null, "type": "issue:pages" },
-  { "id": "PM", "title": "_The Peoples of Middle-Earth_", "year": "1996", "type": "pages" },
+  { "id": "PM", "title": "_The Peoples of Middle-earth_", "year": "1996", "type": "pages" },
   { "id": "RC", "title": "_The Lord of the Rings: a Reader’s Companion_", "year": "2005", "type": "pages" },
   { "id": "RGEO", "title": "_The Road Goes Ever On_", "year": "1967", "type": "pages" },
   { "id": "RS", "title": "_The Return of the Shadow_", "year": "1988", "type": "pages" },
   { "id": "S", "title": "_The Silmarillion_", "year": "1977", "type": "pages" },
   { "id": "SD", "title": "_Sauron Defeated_", "year": "1992", "type": "pages" },
-  { "id": "Sindict", "title": "Sindict mailing-list", "year": "2002-2011", "type": "posts" },
+  { "id": "Sindict", "title": "Sindict mailing-list", "year": "2002–2011", "type": "posts" },
   { "id": "TAI", "title": "_J.R.R. Tolkien: Artist and Illustrator_", "year": "1995", "type": "pages" },
   { "id": "TC", "title": "_A Tolkien Compass_ (first ed.)", "year": "1975", "type": "pages" },
   { "id": "TI", "title": "_The Treason of Isengard_", "year": "1989", "type": "pages" },
-  { "id": "TT", "title": "_Tyalië Tyelelliéva_ (fanzine)", "year": "1994-2001", "type": "issue:pages" },
+  { "id": "TS", "title": "_Tolkien Studies_ (series)", "year": null, "type": "issue:page" },
+  { "id": "TT", "title": "_Tyalië Tyelelliéva_ (fanzine)", "year": "1994–2001", "type": "issue:pages" },
   { "id": "Tengwestie", "title": "_Tengwestië_ (online journal)", "year": null, "type": "date" },
-  { "id": "UT", "title": "_Unfinished Tales of Númenor and Middle Earth_", "year": "1980", "type": "pages" },
+  { "id": "UT", "title": "_Unfinished Tales of Númenor and Middle-earth_", "year": "1980", "type": "pages" },
   { "id": "VT", "title": "_Vinyar Tengwar_ (fanzine)", "year": null, "type": "issue:pages" },
   { "id": "WJ", "title": "_The War of the Jewels_", "year": "1994", "type": "pages" },
   { "id": "WR", "title": "_The War of the Ring_", "year": "1990", "type": "pages" },

scripts/tools/biblrefs2tei.js

@@ -0,0 +1,16 @@
+/*
+     Copyright (c) 2021 Omikhleia
+     License: MIT
+
+     TEI export of the bibliographic references
+ */
+const biblrefs = require('./biblrefs.json')
+
+biblrefs.forEach(bibl => {
+  const title = bibl.title.replace(/_([^_]+)_/g, '<hi>$1</hi>')
+  if (bibl.year) {
+    console.log(`<bibl n="${bibl.id}">${title}, ${bibl.year}.</bibl>`)
+  } else {
+    console.log(`<bibl n="${bibl.id}">${title}.</bibl>`)
+  }
+})