update w2tei fork

.gitignore

@@ -1,8 +1,15 @@
 /.project
 /*.docx
 /test/*.docx
-add/wtotei-intro-result.html
+add/*-report.html
+*-report.html
 *.zip
 /fertig/
 /test/
-/result/
+result/
+xspec/
+wt0.xml
+wt1.xml
+wt2.xml
+ECMA-376, Fifth Edition, Part 1 - Fundamentals And Markup Language Reference/
+build/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "2tei-post"]
+	path = 2tei-post
+	url = ../2tei-post/

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Dario Kampkaspar
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,5 +1,31 @@
 # Word to TEI conversion - w2tei
 
-A (currently) very basic web service to convert Word to TEI.
-Some helper functions are included to make working with Word's XML less tiresome.
-Also, some example transformations are available
+A web service and collection of basic scripts to convert Word (XML or DOCX) to TEI.
+
+**Incompatible change: As of 2020-11-23, paragraph style names (`w:pStyle/@w:val`) are recorded in `tei:p/@rendition`,
+the definitions in `w:rPr` are kept in `tei:p/@style`.** 
+
+**Incompatible change: As of 2021-09-06, heading levels and div structure are evaluated based upon the values given by
+w:outlineLvl in a paragraph preset or paragraph style; empty lines or a style called “Heading \d” will not suffice.
+Paragraphs not having a defined outline level are not recognized as headings.**
+
+## How to use (docx to Flat XML)
+
+### Oxygen
+1. Import the scenarios into “transformation scenarios“
+1. applying “DOCX → Flat OPC” to a **docx** file will create a (very basic) flat XML file
+
+### web service
+Build the package using `ant` on `build.xml`. You can upload docx files via a web form or by POSTing them to cnvert2.xql
+
+### CLI
+! The older `zip:xml-entry` function is available in Saxon ⩽ 9.5.1.1 while `file:read-binary` and `archive:extract-text`
+require Saxon *PE or EE* ⩾ 9.6. If you do not have Saxon PE or EE, you currently have to use a different XSLT processor,
+use oXygen (as it includes a recent version ofSaxon PE and EE), or use the web service implementation from within
+eXist-DB or baseX as these implement the ExPath modules independently.
+
+To convert a docx, apply `docx.xsl` to `word-empty.xml` (or any XML file) and pass the parameter `filename` with a path
+to the docx to be converted.
+
+## How to use (XML to TEI)
+apply basic transformation scenario to docx or apply wt0.xsl and wt1.xsl to any flat Word XML

add/bibl.xsl

@@ -1,19 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:math="http://www.w3.org/2005/xpath-functions/math"
+  xmlns:map="http://www.w3.org/2005/xpath-functions/map"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
   xmlns="http://www.tei-c.org/ns/1.0"
   exclude-result-prefixes="#all"
   version="3.0">
+
+  <xsl:variable name="bibliography" select="doc('http://dev2.hab.de/edoc/data/ed000216/register/kgk_bibliography.xml')" />
+  <xsl:variable name="personenregister" select="doc('http://dev2.hab.de/edoc/data/ed000216/register/kgk_personenregister.xml')" />
+  <xsl:variable name="ortsregister" select="doc('http://dev2.hab.de/edoc/data/ed000216/register/kgk_ortsregister.xml')" />
+
   <xsl:template match="tei:bibl">
-    <bibl>
-      <xsl:variable name="bibliography" select="doc('http://dev2.hab.de/edoc/ed000240/register/bibliography.xml')" />
+    <rs type="bibl">
       <xsl:variable name="self" select="normalize-space()" />
-      <xsl:variable name="entry" select="$bibliography//tei:bibl[starts-with($self, normalize-space(tei:abbr))]"/>
-      <xsl:attribute name="ref">
-        <xsl:value-of select="'#'||$entry[1]/@xml:id"/>
-      </xsl:attribute>
+      <xsl:variable name="entry" select="$bibliography//tei:bibl[tei:abbr
+        and starts-with($self, normalize-space(tei:abbr))]"/>
+      <xsl:choose>
+        <xsl:when test="count($entry) > 0">
+          <xsl:attribute name="ref">
+            <xsl:value-of select="'#'||$entry[1]/@xml:id"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:comment>TODO ref eintragen!</xsl:comment>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:variable name="start">
         <xsl:value-of select="substring-after(text()[1], normalize-space($entry[1]/tei:abbr))"/>
       </xsl:variable>
@@ -25,7 +37,14 @@
           <xsl:value-of select="normalize-space($start)"/>
         </xsl:otherwise>
       </xsl:choose>
-      <xsl:sequence select="node()[not(position() = 1 or position()=last())]" />
+      <xsl:choose>
+        <xsl:when test="string-length($start) = 0">
+          <xsl:sequence select="node()[not(position() = 1 or position()=last() or self::tei:hi[@rend = 'super'])]" />
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:sequence select="node()[not(position() = 1 or position()=last())]" />
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:choose>
         <xsl:when test="count(node()) = 1" />
         <xsl:when test="node()[last()][self::text()]">
@@ -43,6 +62,45 @@
           <xsl:sequence select="node()[last()]" />
         </xsl:otherwise>
       </xsl:choose>
-    </bibl>
+    </rs>
+    <xsl:if test="matches(., '\s$') and not(ancestor::tei:listBibl)">
+      <xsl:text> </xsl:text>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="tei:rs[@type = 'person']">
+    <rs type="person">
+      <xsl:variable name="self" select="string-join(analyze-string(normalize-space(), '''')//*:non-match, '')" />
+      <xsl:variable name="entry" select="$personenregister//tei:person[tei:persName[normalize-space() = $self]]"/>
+      <xsl:choose>
+        <xsl:when test="count($entry) > 0">
+          <xsl:attribute name="ref">
+            <xsl:value-of select="'#'||$entry[1]/@xml:id"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:comment>TODO ref eintragen!</xsl:comment>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:sequence select="node()[not(self::comment())]" />
+    </rs>
+  </xsl:template>
+
+  <xsl:template match="tei:rs[@type = 'place']">
+    <rs type="place">
+      <xsl:variable name="self" select="string-join(analyze-string(normalize-space(), '''')//*:non-match, '')" />
+      <xsl:variable name="entry" select="$ortsregister//tei:place[descendant::tei:settlement[normalize-space() = $self]]"/>
+      <xsl:choose>
+        <xsl:when test="count($entry) > 0">
+          <xsl:attribute name="ref">
+            <xsl:value-of select="'#'||$entry[1]/@xml:id"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:comment>TODO ref eintragen!</xsl:comment>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:sequence select="node()[not(self::comment())]" />
+    </rs>
   </xsl:template>
 </xsl:stylesheet>