Merge pull request #704 from TEIC/sydb_702_extract_schematron

Improve SQF and language handling of Schematron extraction process

Test/Makefile

@@ -571,7 +571,7 @@ test-oddity: actual css
 		else echo "==deferring: \` diff  $(AR)/test.odd.html $(ER)/test.odd.html \`"; fi
 
 	$(BINDIR)/teitoodd $(FLAGS) test.odd $(AR)/test.processedodd
-	$(SAXON) $(AR)/test.processedodd ../odds/extract-isosch.xsl > $(AR)/test.isosch
+	$(SAXON) $(AR)/test.processedodd ../odds/extract-isosch.xsl lang=en > $(AR)/test.isosch
 	perl -i -p -e 's/This file generated [0-9T:Z-]+ by .extract-isosch.xsl./DELETED TIMESTAMP/' $(AR)/test.isosch
 	if [ $(DIFFNOW) -eq 1 ]; \
 		then diff  $(AR)/test.isosch $(ER)/test.isosch; \

Test2/build_odd.xml

@@ -164,10 +164,12 @@
   <target name="extractSchematronFromOdd">
     <description>
       TARGET extractSchematronFromOdd
-      This target uses Stylesheets/odds/extract-isosch.xsl to
-      extract the Schematron embedded in an ODD file. It takes
-      a single parameter inFile, the name of the ODD file, and creates
-      a single Schematron file, outputFiles/[oddFileNameWithoutExtension]FromOdd.sch.
+      This target uses Stylesheets/odds/extract-isosch.xsl to extract
+      the Schematron embedded in an ODD file. It takes two parameters:
+      inFile, the name of the ODD file, and lang, the natural language
+      of the constraints from which to extract Schematron. It creates
+      a single Schematron file:
+      outputFiles/[oddFileNameWithoutExtension]FromOdd.sch.
     </description>
     <basename file="${inFile}" property="plainFileName" suffix=".odd"/>
     <property name="schFromOddFile" value="${outputDir}/${plainFileName}FromOdd.sch"/>
@@ -178,6 +180,7 @@
       <arg value="-o:${schFromOddFile}"/>
       <arg value="--suppressXsltNamespaceCheck:on"/>
       <arg value="-versionmsg:off"/>
+      <arg value="lang=en"/>
     </java>
 
   </target>

bin/transformtei

@@ -248,7 +248,7 @@ case $format in
           ;;
 esac
 
-echo Convert ${indir}/${infilename} to ${outdir}/${outfilename} \($from to $to\) using profile $profile $debug $fileperpage $splitLevel $viewportwidth $viewportheight 
+echo Convert ${indir}/${infilename} to ${outdir}/${outfilename} \($from to $to\) using profile $profile $debug $fileperpage $splitLevel $viewportwidth $viewportheight lang=$lang
 ant $antflag -f "$APPHOME/$format/build-$direction.xml" \
         -lib "${SAXONJAR}" $debug \
     $fileperpage $cssFile $splitLevel $viewportwidth $viewportheight $summaryDoc $mediaoverlay $nocompress \

debian-tei-xsl/debian/changelog

@@ -2,7 +2,7 @@ tei-xsl (7.58.0a) natty; urgency=low
 
   * new release from upstream
 
- -- TEI                           <[email protected]>  Tue, 29 Oct 2024 12:23:38 -0400
+ -- TEI                           <[email protected]>  Thu, 24 Oct 2024 20:09:41 -0400
 
 tei-xsl (7.57.0a) natty; urgency=low
 

schematron/build-to.xml

@@ -28,8 +28,13 @@
     <odd2odd in="${inputFile}" out="${inputFile}.processedodd"/>
     <xslt processor="trax" force="yes" style="${profiledir}/${profile}/schematron/to.xsl" in="${inputFile}.processedodd" out="${outputFile}">
       <factory name="net.sf.saxon.TransformerFactoryImpl"/>
+      <param name="lang" expression="${lang}" if="lang"/>
     </xslt>
-    <delete file="${inputFile}.processedodd"/>
+    <!-- Temporarily removed in order to make it easier to debug
+	 sydb_702_schematron_extraction branch:
+      <delete file="${inputFile}.processedodd"/>
+         Should probably be re-instated before that branch is merged
+	 into dev. -->
   </target>
 
   <target name="notodd" unless="processODD">