Revert "Add tei2xelatex code"

This reverts commit b3bff8a.

xxe/eoa/eoa.incl

@@ -15,14 +15,13 @@
         <!-- <command name="confirm" parameter="Create EOATeX files, run xelatex and biber and open PDF?"/> -->
         <command name="XXE.save" parameter="[ifNeeded]"/>
         <command name="selectConvertedFile" parameter="[Create EOATeX files] [processCommand=exporteoatex] saveDirectoryURL" />
-        <!-- <command name="exporteoatex"/> -->
-        <command name="exportxelatex"/>
+        <command name="exporteoatex"/>
         <command name="updatefiles"/>
         <command name="getbibcopybib"/>
         <command name="runxelatexonce"/>
         <command name="runbiber"/>
         <command name="runxelatextwice"/>
-        <command name="start" parameter="helper(defaultViewer) '%P%Soutput%Slatex%Smain.pdf'" />
+        <command name="start" parameter="helper(defaultViewer) '%P%Soutput%Slatex%S%R.pdf'" />
       </sequence>
     </macro>
   </command>
@@ -38,15 +37,15 @@
   <command name="openpdf">
     <macro>
       <sequence>
-        <command name="start" parameter="helper(defaultViewer) '%P%Soutput%Slatex%Smain.pdf'" />
+        <command name="start" parameter="helper(defaultViewer) '%P%Soutput%Slatex%S%R.pdf'" />
       </sequence>
     </macro>
   </command>
 
   <command name="opentex">
     <macro>
       <sequence>
-        <command name="start" parameter="helper(defaultViewer) '%P%Soutput%Slatex%Smain.tex'" />
+        <command name="start" parameter="helper(defaultViewer) '%P%Soutput%Slatex%S%R.tex'" />
       </sequence>
     </macro>
   </command>
@@ -64,19 +63,6 @@
     </macro>
   </command>
 
-  <command name="xelatex">
-    <macro>
-      <sequence>
-        <command name="XXE.save" parameter="[ifNeeded]"/>
-        <!-- exportxelatex is defined below -->
-        <command name="selectConvertedFile" parameter="[Create XeLaTeX files] [processCommand=exportxelatex] saveDirectoryURL" />
-        <command name="exportxelatex"/>
-        <command name="updatefiles"/>
-        <!-- <command name="getbibcopybib"/> -->
-      </sequence>
-    </macro>
-  </command>
-
   <command name="eoatex2html">
     <macro>
       <sequence>
@@ -159,54 +145,6 @@
     </process>
   </command>
 
-
-  <parameterGroup name="exportxelatex.transformParameters" >
-    <parameter name="directory">%p</parameter>
-    <parameter name="frontmatter">true</parameter>
-    <parameter name="frontmattermanual">false</parameter>
-    <parameter name="contributors">false</parameter>
-    <parameter name="contributorsmanual">false</parameter>
-    <parameter name="manualpreambel">true</parameter>
-    <parameter name="indentafterfloats">false</parameter>
-    <parameter name="extranewpage">false</parameter>
-    <parameter name="strictfloats">true</parameter>
-    <parameter name="hyphenation">false</parameter>
-    <parameter name="verbosity">0</parameter>
-    <parameter name="documentclass">eoa</parameter>
-    <parameter name="biblatexstyle">eoa-authoryear</parameter>
-    <parameter name="include">true</parameter>
-  </parameterGroup>
-
-  <command name="exportxelatex">
-    <!--
-        transforms the file opened in xmlmind with the parameters : directory, frontmatter, contributors, strictfigures, verbosity, parts, manualpreambel.
-        The directory parameter could help for the result-document XSL function as XMLMind requires the full path to write an output document (eg. <xsl:result-document href=“{concat($directory, ’EOA%Stexfiles/chapter’, format-number(position(), '00'), '.tex')}” …… >. + %S is used as folder separator for both Mac and Windows).
-    -->
-    <process>
-      <info>
-        <usage>
-          Convert TEI document to XeLaTeX.
-        </usage>
-      </info>
-      <mkdir dir="%P%Soutput%S" quiet="true"/>
-      <mkdir dir="%P%Soutput%Slatex%S" quiet="true"/>
-      <!--stylesheet="xsl%Stei2xelatex.xsl"-->
-
-      <transform file="%D" label="exportxelatex"
-                 stylesheet="xsl%Stei2xelatex.xsl"
-                 to="%P%Soutput%Slatex%Smain.tex" version="2.0">
-        <info>
-          <label>Convert to XeLaTeX</label>
-          <documentation>http://wiki.edition-open-access.de</documentation>
-        </info>
-        <parameterGroup name="exportxelatex.transformParameters" />
-      </transform>
-      <!-- <delete files="%P%SEOA%Stemp%S" quiet="true" recurse="true"/> -->
-    </process>
-  </command>
-
-
-
   <command name="runxelatexonce">
     <!-- run xelatex once -->
     <macro>
@@ -229,15 +167,15 @@
   <command name="xelatexcmd">
     <macro>
       <sequence>
-        <command name="run" parameter="[Mac] '/bin/bash' '%C%Ssh%Srunxelatex.sh' '--output-dir' '%P%Soutput%Slatex%S' '--latex-file' '%P%Soutput%Slatex%Smain.tex'"/>
+        <command name="run" parameter="[Mac] '/bin/bash' '%C%Ssh%Srunxelatex.sh' '--output-dir' '%P%Soutput%Slatex%S' '--latex-file' '%P%Soutput%Slatex%S%R.tex'"/>
       </sequence>
     </macro>
   </command>
 
   <command name="runbiber">
     <macro>
       <sequence>
-        <command name="run" parameter="[Mac] '/bin/bash' '%C%Ssh%Srunbiber.sh' '--output-dir' '%P%Soutput%Slatex%S'  '--latex-file' '%P%Soutput%Slatex%Smain.tex'"/>
+        <command name="run" parameter="[Mac] '/bin/bash' '%C%Ssh%Srunbiber.sh' '--output-dir' '%P%Soutput%Slatex%S'  '--latex-file' '%P%Soutput%Slatex%S%R.tex'"/>
       </sequence>
     </macro>
   </command>
@@ -255,17 +193,13 @@
       <mkdir dir="%P%Soutput%Slatex%Sinline%S" quiet="true"/>
       <mkdir dir="%P%Soutput%Slatex%Sfacsim%S" quiet="true"/>
       <mkdir dir="%P%Soutput%Slatex%Stexfiles%S" quiet="true"/>
-      <!--
-           <mkdir dir="%P%Soutput%Slatex%Spreambel%S" quiet="true"/>
-           <delete files="%P%Spreambel%Sauto%S*.el" quiet="true"/>
-           <rmdir dir="%P%Spreambel%Sauto" quiet="true"/>
-      -->
+      <mkdir dir="%P%Soutput%Slatex%Spreambel%S" quiet="true"/>
+      <delete files="%P%Spreambel%Sauto%S*.el" quiet="true"/>
+      <rmdir dir="%P%Spreambel%Sauto" quiet="true"/>
       <copy files="%P%Simages%S*" to="%P%Soutput%Slatex%Simages%S" recurse="true" quiet="true"/>
       <copy files="%P%Sinline%S*" to="%P%Soutput%Slatex%Sinline%S" recurse="true" quiet="true"/>
       <copy files="%P%Sfacsim%S*" to="%P%Soutput%Slatex%Sfacsim%S" recurse="true" quiet="true"/>
-      <!--
-          <copy files="%P%Spreambel%S*" to="%P%Soutput%Slatex%Spreambel%S" recurse="true" quiet="true"/>
-      -->
+      <copy files="%P%Spreambel%S*" to="%P%Soutput%Slatex%Spreambel%S" recurse="true" quiet="true"/>
       <copy files="%P%Stexfiles%S*" to="%P%Soutput%Slatex%Stexfiles%S" quiet="true"/>
     </process>
   </command>

xxe/eoa/rnc/eoa-tei-strict.rnc

@@ -241,7 +241,7 @@ backmatter =
       # attribute n { "nonumber" }?,
       # attribute xml:id { xsd:NCName },
       head
-   }?
+   }+
 
 p_as_pointer =
    element p {
@@ -456,7 +456,7 @@ p =
        | foreign
        | ref
        | bibref
-       | footnote)+
+       | footnote)*
    }
 
 figure =
@@ -552,8 +552,9 @@ bibref =
    element bibl {
       element ref {
          attribute type { "year" | "authoryear"},
-         attribute target { xsd:string {pattern = "#[A-Za-z0-9\-_:\./]+" }},
-         text?
+         attribute target { xsd:string {pattern = "#[A-Za-z0-9\-_:\./]+" }}
+         # attribute target { xsd:anyURI }
+         # text
       },
       element citedRange {
          (
@@ -631,9 +632,9 @@ ref =
             text)+
          )
        |
-         attribute type { "number" | "page" | "text" }
+         attribute type { "number" | "page" }
       ),
-      spanmarkup?
+      text
    }
 
 index =