Merge branch 'master' of https://github.com/erc-dharma/tfb-badamicalu…

…kya-epigraphy

.github/workflows/editorial.yml

@@ -12,11 +12,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-       - uses: actions/checkout@v2
+       - uses: actions/checkout@v3
        - name: Set up JDK 1.8
-         uses: actions/setup-java@v1
+         uses: actions/setup-java@v3
          with:
-           java-version: 1.8
+           distribution: 'zulu'
+           java-version: '17'
        - name: Build with Ant
          run: ant -noinput -buildfile build.xml
 

index-mdt.html

@@ -62,7 +62,7 @@
             Conventions
           </a>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-        <a class="dropdown-item" href="editorial">Editorial Conventions</a>
+        <a class="dropdown-item" href="https://erc-dharma.github.io/editorial">Editorial Conventions</a>
         <a class="dropdown-item" href="https://erc-dharma.github.io/output/display-prosody.html">Prosodic Conventions</a>
       </div>
     </li>
@@ -71,8 +71,10 @@
             Documentation
           </a>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <a class="dropdown-item" href="https://erc-dharma.github.io/critEd_elements">Critical Editions Memo</a>
+            <a class="dropdown-item" href="https://erc-dharma.github.io/DiplEd_elements">Diplomatic Editions Memo</a>
+            <div class="dropdown-divider"></div>
             <a class="dropdown-item" href="https://erc-dharma.github.io/project-documentation/encoding-diplomatic/DHARMA%20EGD%20v1%20release.pdf">Encoding Guide for Diplomatic editions</a>
-            <a class="dropdown-item" href="critEd_elements">Critical Editions Memo</a>
             <a class="dropdown-item" href="https://erc-dharma.github.io/project-documentation/FNC/DHARMA_FNC_v01.1.pdf">File Naming Conventions</a>
             <a class="dropdown-item" href="https://erc-dharma.github.io/project-documentation/open-access/DHARMA_GuideOpenAccess_March2022.pdf">Guide Open-Access</a>
             <a class="dropdown-item" href="https://erc-dharma.github.io/project-documentation/transliteration/DHARMA%20Transliteration%20Guide%20v3%20release.pdf">Transliteration Guide</a>
@@ -97,7 +99,9 @@
             Authorities files
           </a>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-        <a class="dropdown-item" href="">Documentation for metadata and authorities - coming</a>
+            <a class="dropdown-item" href="https://opentheso.huma-num.fr/opentheso/?idt=th347">Controlled Vocabularies</a>
+            <div class="dropdown-divider"></div>
+                  <a class="dropdown-item" href="">Documentation for metadata and authorities - coming</a>
         <a class="dropdown-item" href="https://erc-dharma.github.io/mdt-authorities/output/DHARMA_places.html">Places</a>
         <a class="dropdown-item" href="https://erc-dharma.github.io/mdt-authorities/output/DHARMA_persons.html">Persons</a>
         <a class="dropdown-item" href="https://erc-dharma.github.io/mdt-authorities/output/DHARMA_monuments.html">Monuments</a>
@@ -111,6 +115,7 @@
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
             <a class="nav-link" href="https://erc-dharma.github.io/arie">ARIE</a>
             <a class="nav-link" href="https://erc-dharma.github.io/tfb-ec-epigraphy/">Epigraphia Carnatica</a>
+            <a class="nav-link" href="https://erc-dharma.github.io/output-roej/display-roej.html">Répertoire Onomastique Java</a>
             <a class="nav-link" href="https://erc-dharma.github.io/tfa-sii-epigraphy/index-sii.html">South-Indian Inscriptions</a>
           </div>
         </li>

index.html

@@ -62,7 +62,7 @@
             Conventions
           </a>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-        <a class="dropdown-item" href="editorial">Editorial Conventions</a>
+        <a class="dropdown-item" href="https://erc-dharma.github.io/editorial">Editorial Conventions</a>
         <a class="dropdown-item" href="https://erc-dharma.github.io/output/display-prosody.html">Prosodic Conventions</a>
       </div>
     </li>
@@ -71,8 +71,10 @@
             Documentation
           </a>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <a class="dropdown-item" href="https://erc-dharma.github.io/critEd_elements">Critical Editions Memo</a>
+            <a class="dropdown-item" href="https://erc-dharma.github.io/DiplEd_elements">Diplomatic Editions Memo</a>
+            <div class="dropdown-divider"></div>
             <a class="dropdown-item" href="https://erc-dharma.github.io/project-documentation/encoding-diplomatic/DHARMA%20EGD%20v1%20release.pdf">Encoding Guide for Diplomatic editions</a>
-            <a class="dropdown-item" href="critEd_elements">Critical Editions Memo</a>
             <a class="dropdown-item" href="https://erc-dharma.github.io/project-documentation/FNC/DHARMA_FNC_v01.1.pdf">File Naming Conventions</a>
             <a class="dropdown-item" href="https://erc-dharma.github.io/project-documentation/open-access/DHARMA_GuideOpenAccess_March2022.pdf">Guide Open-Access</a>
             <a class="dropdown-item" href="https://erc-dharma.github.io/project-documentation/transliteration/DHARMA%20Transliteration%20Guide%20v3%20release.pdf">Transliteration Guide</a>
@@ -97,7 +99,9 @@
             Authorities files
           </a>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-        <a class="dropdown-item" href="">Documentation for metadata and authorities - coming</a>
+            <a class="dropdown-item" href="https://opentheso.huma-num.fr/opentheso/?idt=th347">Controlled Vocabularies</a>
+            <div class="dropdown-divider"></div>
+                  <a class="dropdown-item" href="">Documentation for metadata and authorities - coming</a>
         <a class="dropdown-item" href="https://erc-dharma.github.io/mdt-authorities/output/DHARMA_places.html">Places</a>
         <a class="dropdown-item" href="https://erc-dharma.github.io/mdt-authorities/output/DHARMA_persons.html">Persons</a>
         <a class="dropdown-item" href="https://erc-dharma.github.io/mdt-authorities/output/DHARMA_monuments.html">Monuments</a>
@@ -111,6 +115,7 @@
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
             <a class="nav-link" href="https://erc-dharma.github.io/arie">ARIE</a>
             <a class="nav-link" href="https://erc-dharma.github.io/tfb-ec-epigraphy/">Epigraphia Carnatica</a>
+            <a class="nav-link" href="https://erc-dharma.github.io/output-roej/display-roej.html">Répertoire Onomastique Java</a>
             <a class="nav-link" href="https://erc-dharma.github.io/tfa-sii-epigraphy/index-sii.html">South-Indian Inscriptions</a>
           </div>
         </li>

workflow-output/editedxml/EDITED_CalE07-Lohaner-Pulakesin2.xml

@@ -267,7 +267,7 @@ to whom the greatest of feudatories bow in service,
 who has followed vows of asceticism,
 who finds satisfaction in his underlings,
 who was, it seems, reverently designed by the Creator in utter concentration <supplied reason="subaudible">on the task</supplied>,
-who utters words that are measured, beneficient, pure and true,<note>Or, assuming <foreign>amita</foreign> instead of <foreign>mita</foreign>, “words that are immeasurably beneficient, pure and true.”</note> 
+who utters words that are measured, beneficent, pure and true,<note>Or, assuming <foreign>amita</foreign> instead of <foreign>mita</foreign>, “words that are immeasurably beneficient, pure and true.”</note> 
 a foundation as it were for the proper behaviour of all beings,
 who behaves like the royal sages<note>Or, “kings and sages.” But I take <foreign>manujapati-muni</foreign> as equivalent to <foreign>rājarṣi</foreign>.</note> of the First Age,
 triumphant,