Merge pull request #210 from eeditiones/feature/annotations-v2

Enhanced annotation editor
eeditiones · Jan 17, 2024 · 80f4083 · 80f4083
2 parents a8d974e + c2ac007
commit 80f4083
Show file tree

Hide file tree

Showing 60 changed files with 6,056 additions and 746 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -9,7 +9,7 @@
         }
     },
     "runArgs": ["--name=TEIPublisherDev"],
-    "forwardPorts": [ 8080, 8001 ],
+    "forwardPorts": [ 8080, 8001, 8443 ],
     "customizations": {
         "vscode": {
             "extensions": [ "exist-db.existdb-vscode", "42crunch.vscode-openapi", "redhat.vscode-xml" ]

diff --git a/.existdb.json b/.existdb.json
@@ -1,7 +1,7 @@
 {
     "servers": {
         "localhost": {
-            "server": "http://localhost:8080/exist",
+            "server": "http://127.0.0.1:8080/exist",
             "user": "admin",
             "password": "",
             "root": "/db/apps/tei-publisher"
@@ -21,4 +21,4 @@
             "webtest/**"
         ]
     }
-}
+}
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ FROM openjdk:8-jdk-slim as builder
 USER root
 
 ENV NODE_MAJOR 20
-ENV ANT_VERSION 1.10.13
+ENV ANT_VERSION 1.10.14
 ENV ANT_HOME /etc/ant-${ANT_VERSION}
 
 WORKDIR /tmp
@@ -21,7 +21,7 @@ RUN mkdir -p /etc/apt/keyrings && \
     apt-get update && \
     apt-get install nodejs -y
 
-RUN curl -L -o apache-ant-${ANT_VERSION}-bin.tar.gz http://www.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz \
+RUN curl -L -o apache-ant-${ANT_VERSION}-bin.tar.gz https://downloads.apache.org/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz \
     && mkdir ant-${ANT_VERSION} \
     && tar -zxvf apache-ant-${ANT_VERSION}-bin.tar.gz \
     && mv apache-ant-${ANT_VERSION} ${ANT_HOME} \

diff --git a/build.xml b/build.xml
@@ -11,6 +11,7 @@
     <property name="git.repo.path" value="${basedir}/.git" />
     <available file="${git.repo.path}" type="dir" property="git.present" />
     <property name="scripts.dir" value="${basedir}/node_modules/@teipublisher/pb-components/dist" />
+    <property name="fore.dir" value="${basedir}/node_modules/@jinntec/fore/dist"/>
 
     <condition property="git.commit" value="${git.commit}" else="">
         <isset property="git.commit" />
@@ -83,9 +84,22 @@
                 <include name="*.js" />
                 <include name="*.map" />
             </fileset>
+            <fileset dir="${fore.dir}">
+                <include name="*.js" />
+                <include name="*.map" />
+            </fileset>
+        </copy>
+        <copy todir="${app.build.dir}/resources/scripts/fore">
+            <fileset dir="${fore.dir}">
+                <include name="*.js" />
+                <include name="*.map" />
+            </fileset>
         </copy>
         <copy todir="${app.build.dir}/resources/css">
             <fileset dir="${basedir}/node_modules/@teipublisher/pb-components/css" />
+            <fileset dir="${basedir}/node_modules/@jinntec/fore/resources">
+                <include name="*.css"/>
+            </fileset>
         </copy>
 
         <copy todir="${app.build.dir}/resources/lib">

diff --git a/data/annotate/leibnuetz.xml b/data/annotate/leibnuetz.xml
@@ -0,0 +1,65 @@
+<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
+	schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<TEI xmlns="http://www.tei-c.org/ns/1.0">
+    <teiHeader>
+        <fileDesc>
+            <titleStmt>
+                <title>Friedrich Leibnütz (Wikipedia sample)</title>
+            </titleStmt>
+            <publicationStmt>
+                <p>Publication Information</p>
+            </publicationStmt>
+            <sourceDesc>
+                <p>Information about the source</p>
+            </sourceDesc>
+        </fileDesc>
+        <profileDesc>
+            <langUsage>
+                <language ident="de"/>
+            </langUsage>
+        </profileDesc>
+    </teiHeader>
+    <text>
+        <body>
+            <div>
+                <head>Friedrich Leibnütz</head>
+                <p>Friedrich wurde als Sohn des Stadt- und Bergschreibers in Altenberg Ambrosius
+                    Leibnütz (* 14. April 1569 in Berggießhübel; † 28. Mai 1617 in Altenberg) und
+                    dessen am 23. August 1596 in Königstein geheirateten Frau Anna Deuerlin († 14.
+                    April 1617 in Altenberg) geboren. Sein Großvater Christoph Leibnütz (* 10.
+                    September 1537 in Rochlitz; † 28. Mai 1587 in Pirna) hatte als Land- und
+                    Erbrichter unter Johann Wilhelm von Sachsen-Weimar gedient, wurde 1576 vom
+                    Kurfürst August von Sachsen als Schösser in Pirna eingesetzt und hatte am 27.
+                    Januar 1578 in Dresden seine Frau Barbara von Kahlenburg (* 11. Dezember 1539 in
+                    Kalundborg; † 11. Juli 1577 in Pirna) geheiratet, die aus einem adligen
+                    Geschlecht in Jütland stammte.</p>
+
+                <!-- Some places intentionally marked wrong for testing -->
+                <p>Nach anfänglichem Schulbesuch frequentierte Friedrich ab 1612 die kurfürstlich
+                    sächsische Landesschule St. Afra in Meißen. Nach sechs Jahren zog er nach <placeName
+                        ref="geo-2887933">Leipzig</placeName>, wo er sich zunächst als
+                    Hauslehrer der Kinder des Oberhofgerichtsnotars Stephan Hoffmann seinen
+                    Unterhalt verdiente. Am 21. Oktober 1618 begann er an der Universität <placeName>Leipzig</placeName> ein Studium der philosophischen
+                    und juristischen Wissenschaften. Hier wurde der damalige Professor der Ethik und
+                    Notar der Universität Leipzig Johann Müller (* in Frohburg; † 1628 in <placeName
+                        ref="geo-2879139">Leipzig</placeName>) sein führender Lehrer. Am 6. März
+                    1619 erwarb er sich das Baccalaureat und wurde am 30. Januar 1622 Magister der
+                    Philosophie. Zuvor wurde er am 19. März 1621 als Adjunkt an die philosophische
+                    Fakultät angestellt, am 20. Oktober 1624 wurde er Notar der Universität <orgName
+                        ref="gnd-2024343-1">Leipzig</orgName> und am 26. November 1628 Professor
+                    für <term>Moralphilosophie</term>.</p>
+
+                <p>Am 9. November 1634 wurde er Kollegial am großen Fürstenkollegium und am 19.
+                    November 1635 Assessor der philosophischen Fakultät. In den Jahren 1639, 1641,
+                    1645 und 1649 führte er das Dekanat der philosophischen Fakultät, war Prokanzler
+                    der Alma Mater und wurde 1640 ordentlicher Professor für praktische Philosophie.
+                    Letztere Aufgabe versah er bis zu seinem Lebensende. Sein Leichnam wurde am 8.
+                    September 1652 in der Leipziger Paulinerkirche beigesetzt. Von seinen
+                    literarischen Arbeiten ist nicht viel überliefert. Er wird sich auch mehr im
+                    praktischen Bereich der Ausbildung in den philosophischen Wissenschaften bewegt
+                    haben.</p>
+            </div>
+
+        </body>
+    </text>
+</TEI>
diff --git a/data/doc/documentation.xml b/data/doc/documentation.xml
@@ -6933,7 +6933,7 @@ import module namespace docbook-nav="http://www.tei-c.org/tei-simple/navigation/
           change the location by modifying the variable
             <varname>$anno:local-authority-file</varname> in the annotation configuration,
             <filename>modules/annotation-config.xqm</filename>. You can also change the function
-            <function>anno:insert-point</function> to configure where exactly the local entity
+            <function>rapi:insert-point</function> to configure where exactly the local entity
           definitions will be stored.</para>
         <para>Currently, it is not possible to use the Reconciliation connector described above in
           the context of the Custom connector. This will be added in a future release.</para>

diff --git a/data/registers/keywords.xml b/data/registers/keywords.xml
@@ -0,0 +1,25 @@
+<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
+	schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<TEI xmlns="http://www.tei-c.org/ns/1.0" xml:id="pb-keywords">
+   <teiHeader>
+      <fileDesc>
+         <titleStmt>
+            <title>Local Authority File: Person register</title>
+         </titleStmt>
+         <publicationStmt>
+            <p>Publication Information</p>
+         </publicationStmt>
+         <sourceDesc>
+            <p>Information about the source</p>
+         </sourceDesc>
+      </fileDesc>
+      <encodingDesc>
+         <classDecl>
+            <taxonomy/>
+         </classDecl>
+      </encodingDesc>
+   </teiHeader>
+   <text>
+    <body><p/></body>
+   </text>
+</TEI>
diff --git a/data/registers/organizations.xml b/data/registers/organizations.xml
@@ -0,0 +1,26 @@
+<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
+	schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<tei:TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xml:id="pb-organizations">
+   <teiHeader>
+      <fileDesc>
+         <titleStmt>
+            <title>Local Authority File: Person register</title>
+         </titleStmt>
+         <publicationStmt>
+            <p>Publication Information</p>
+         </publicationStmt>
+         <sourceDesc>
+            <p>Information about the source</p>
+         </sourceDesc>
+      </fileDesc>
+      <encodingDesc>
+         <classDecl>
+            <taxonomy></taxonomy>
+         </classDecl>
+      </encodingDesc>
+   </teiHeader>
+   <standOff>
+      <listOrg>
+      </listOrg>
+   </standOff>
+</tei:TEI>
diff --git a/data/registers/persons.xml b/data/registers/persons.xml
@@ -0,0 +1,39 @@
+<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
+	schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<tei:TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xml:id="pb-persons">
+   <teiHeader>
+      <fileDesc>
+         <titleStmt>
+            <title>Local Authority File: Person register</title>
+         </titleStmt>
+         <publicationStmt>
+            <p>Publication Information</p>
+         </publicationStmt>
+         <sourceDesc>
+            <p>Information about the source</p>
+         </sourceDesc>
+      </fileDesc>
+      <encodingDesc>
+         <classDecl>
+            <taxonomy></taxonomy>
+         </classDecl>
+      </encodingDesc>
+   </teiHeader>
+   <standOff>
+      <listPerson>
+         <!-- 
+         -->
+         <person xml:id="gnd-139890289">
+            <persName type="main">Lucia Graves</persName>
+            <persName type="sort">Graves, Lucia</persName>
+
+            <birth>
+               <date notBefore="1943-06-21" notAfter="1943-06-21">21 July 1943</date>
+               <placeName ref="https://www.geonames.org/2651292">Devon, England</placeName>
+            </birth>
+
+            <note type="bio">Robert Graves' first daughter by Beryl</note>
+         </person>
+      </listPerson>
+   </standOff>
+</tei:TEI>
diff --git a/data/register.xml → data/registers/places.xml b/data/register.xml → data/registers/places.xml
@@ -1,10 +1,10 @@
 <?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
 	schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<tei:TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0">
+<tei:TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xml:id="pb-places">
    <teiHeader>
       <fileDesc>
          <titleStmt>
-            <title>Local Authority File</title>
+            <title>Local Authority File: Place register</title>
          </titleStmt>
          <publicationStmt>
             <p>Publication Information</p>
@@ -20,17 +20,22 @@
       </encodingDesc>
    </teiHeader>
    <standOff>
-      <listPerson>
-         <person xml:id="gnd-139890289">
-            <persName type="full">Lucia Graves</persName>
-            <note>Robert Graves' first daughter by Beryl</note>
-        </person>
-      </listPerson>
-      <listOrg/>
       <listPlace>
+         <!-- 
+         -->
+         <place xml:id="geo-2512989">
+            <placeName type="main">Palma</placeName>
+            <location>
+               <geo>39.56939 2.65024</geo>
+            </location>
+            <country>Spain</country>
+            <region>Balearic Islands</region>
+            <note>Palma, unofficially known as Palma de Mallorca, is the capital and largest city of the autonomous community of the Balearic Islands in Spain. It is situated on the south coast of Mallorca on the Bay of Palma.</note>
+            <ptr type="geonames" target="https://www.geonames.org/2512989"/>
+         </place>
          <place xml:id="custom-Deia">
-            <placeName type="full">Deya</placeName>
-            <placeName>Deià</placeName>
+            <placeName type="main">Deya</placeName>
+            <placeName type="variant">Deià</placeName>
             <location>
                <geo>39.7484 2.64918</geo>
             </location>
@@ -45,20 +50,10 @@
                olive groves on steep cliffs overlooking the Mediterranean, served as a draw for German, English, and American expatriates after the First
                World War.</note>
          </place>
-         <place xml:id="geo-2512989">
-            <placeName type="full">Palma</placeName>
-            <location>
-               <geo>39.56939 2.65024</geo>
-            </location>
-            <country>Spain</country>
-            <region>Balearic Islands</region>
-            <note>Palma, unofficially known as Palma de Mallorca, is the capital and largest city of the autonomous community of the Balearic Islands in Spain. It is situated on the south coast of Mallorca on the Bay of Palma.</note>
-            <ptr type="geonames" target="https://www.geonames.org/2512989"/>
-         </place>
          <place xml:id="geo-6946437">
-            <placeName type="full">Basilika San Francisco</placeName>
-            <placeName>Convento de San Francisco</placeName>
-            <placeName>Sant Francesc de Palma</placeName>
+            <placeName type="main">Basilika San Francisco</placeName>
+            <placeName type="variant">Convento de San Francisco</placeName>
+            <placeName type="variant">Sant Francesc de Palma</placeName>
             <location>
                 <geo>39.5689 2.65306</geo>
             </location>

diff --git a/data/registers/templates/organization-default.xml b/data/registers/templates/organization-default.xml
@@ -0,0 +1,7 @@
+<orgList xmlns="http://www.tei-c.org/ns/1.0" xml:id="organization-default">
+    <org xml:id="">
+        <orgName type="main"></orgName>
+        <orgName type="sort"></orgName>
+        <note></note>
+    </org>
+</orgList>
diff --git a/data/registers/templates/organization-template.xml b/data/registers/templates/organization-template.xml
@@ -0,0 +1,5 @@
+<orgList xmlns="http://www.tei-c.org/ns/1.0" xml:id="organization-template">
+    <org xml:id="">
+        <orgName type="variant"></orgName>
+    </org>
+</orgList>
diff --git a/data/registers/templates/person-default.xml b/data/registers/templates/person-default.xml
@@ -0,0 +1,16 @@
+<listPerson xmlns="http://www.tei-c.org/ns/1.0" xml:id="person-default">
+    <person xml:id="person-NEW">
+        <persName type="main"></persName>
+        <persName type="sort"/>
+        <gender value="U"/>
+        <birth>
+           <date when=""/>
+           <placeName ref=""/>
+        </birth>
+        <death>
+           <date when=""/>
+           <placeName ref=""/>
+        </death>
+        <note type="bio"/>
+     </person>
+</listPerson>
diff --git a/data/registers/templates/person-template.xml b/data/registers/templates/person-template.xml
@@ -0,0 +1,9 @@
+<listPerson xmlns="http://www.tei-c.org/ns/1.0" xml:id="person-template">
+   <person>
+      <!-- repeatable for all name variants of a person -->
+      <persName type="variant"></persName>
+
+      <!-- repeatable for all professions or roles of a person -->
+      <occupation/>
+   </person>
+</listPerson>
diff --git a/data/registers/templates/place-default.xml b/data/registers/templates/place-default.xml
@@ -0,0 +1,12 @@
+<listPlace xmlns="http://www.tei-c.org/ns/1.0" xml:id="place-default">
+    <place xml:id="place-NEW" type="PPL">
+        <placeName type="main"></placeName>
+        <placeName type="sort"/>
+        <country/>
+        <region/>
+        <location>
+            <geo></geo>
+        </location>
+        <note></note>
+     </place>
+</listPlace>
diff --git a/data/registers/templates/place-template.xml b/data/registers/templates/place-template.xml
@@ -0,0 +1,6 @@
+<listPlace xmlns="http://www.tei-c.org/ns/1.0" xml:id="place-template">
+   <place>
+      <!-- repeatable for all name variants of a person -->
+      <placeName type="variant"></placeName>  
+   </place>
+</listPlace>