Merge pull request #411 from metanorma/issue/410

fixing issue #410

.github/workflows/release.yml

@@ -41,6 +41,10 @@ jobs:
 
       - run: sudo gem install metanorma-cli
 
+      - run: mkdir ~/bundle_tmp
+
+      - run: bundle config path ~/bundle_tmp
+
       - run: bundle update
 
       - run: make testMN2STS

.github/workflows/test.yml

@@ -37,9 +37,9 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.1
           rubygems: latest
-          bundler: 2.3.22
+#          bundler: 2.5.10
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
@@ -73,6 +73,11 @@ jobs:
       - if: matrix.os != 'ubuntu-latest'
         run: gem install metanorma-cli
 
+      - if: matrix.os == 'ubuntu-latest'
+        run: |
+         mkdir ~/bundle_tmp
+         bundle config path ~/bundle_tmp
+
       - run: bundle update
 
       - run: make testMN2STS

README.adoc

@@ -7,7 +7,7 @@
 
 [source,sh]
 ----
-java -jar mnconvert-1.60.0.jar xml_file --check-type xsd-niso
+java -jar mnconvert-1.61.0.jar xml_file --check-type xsd-niso
 ----
 
 - `--check-type`, `-ct` - Check against XSD NISO (value xsd-niso), DTD ISO (dtd-iso), DTD NISO (dtd-niso)
@@ -19,7 +19,7 @@ or check any XML against XSD, DTD.
 
 [source,sh]
 ----
-java -jar mnconvert-1.60.0.jar xml_file --validation-against <path DTD or XSD>
+java -jar mnconvert-1.61.0.jar xml_file --validation-against <path DTD or XSD>
 ----
 
 - `--validation-against`, `-va` - Check against specified DTD ot XSD
@@ -30,7 +30,7 @@ java -jar mnconvert-1.60.0.jar xml_file --validation-against <path DTD or XSD>
 
 [source,sh]
 ----
-java -jar mnconvert-1.60.0.jar xml_file [options]
+java -jar mnconvert-1.61.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -45,7 +45,7 @@ java -jar mnconvert-1.60.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.60.0.jar xml_file [options]
+java -jar mnconvert-1.61.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -60,7 +60,7 @@ java -jar mnconvert-1.60.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.60.0.jar xml_file [options]
+java -jar mnconvert-1.61.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -71,7 +71,7 @@ java -jar mnconvert-1.60.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.60.0.jar docx_file [options]
+java -jar mnconvert-1.61.0.jar docx_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -81,7 +81,7 @@ java -jar mnconvert-1.60.0.jar docx_file [options]
 === 6. Convert from IEEE STL XML to Metanorma AsciiDoc.
 
 ----
-java -jar mnconvert-1.60.0.jar xml_file [options]
+java -jar mnconvert-1.61.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -93,7 +93,7 @@ java -jar mnconvert-1.60.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.60.0.jar xml_file --output-format ieee --validation-against <path to IEEE DTD>
+java -jar mnconvert-1.61.0.jar xml_file --output-format ieee --validation-against <path to IEEE DTD>
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -111,7 +111,7 @@ e.g.
 
 [source,sh]
 ----
-java -jar target/mnconvert-1.60.0.jar tests/iso-tc154-8601-1-en.xml --output tests/iso-tc154-8601-1-en.out.xml
+java -jar target/mnconvert-1.61.0.jar tests/iso-tc154-8601-1-en.xml --output tests/iso-tc154-8601-1-en.out.xml
 ----
 
 NOTE: Input XML format (Metanorma, STS ISO/NISO, IEEE or XML2RFC) determines programmatically by root element of input file: +
@@ -150,7 +150,7 @@ Update version in `pom.xml`, e.g.:
 ----
 <groupId>org.metanorma</groupId>
 <artifactId>mnconvert</artifactId>
-<version>1.60.0</version>
+<version>1.61.0</version>
 <name>Metanorma XML to NISO STS XML two-directional converter</name>
 ----
 
@@ -161,8 +161,8 @@ Tag the same version in Git:
 
 [source,xml]
 ----
-git tag v1.60.0
-git push origin v1.60.0
+git tag v1.61.0
+git push origin v1.61.0
 ----
 
 Then the corresponding GitHub release will be automatically created at:

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.metanorma</groupId>
 	<artifactId>mnconvert</artifactId>
-	<version>1.60.0</version>
+	<version>1.61.0</version>
 	<name>Metanorma XML to NISO STS XML two-directional, IEEE to Metanorma ADOC, Metanorma XML to IEEE XML, and XML2RFC to Metanorma Asciidoc IETF converter</name>
 	<packaging>jar</packaging>
 	<url>https://www.metanorma.org</url>

src/main/resources/mn2xml.xsl

@@ -5285,7 +5285,18 @@
 
 		<xsl:if test="starts-with(@id, concat($first_table_id, '_'))">
 			<table>
-				<xsl:copy-of select="@*[not(local-name() = 'id' or local-name() = 'unnumbered' or local-name() = 'section' or local-name() = 'section_prefix' or local-name() = 'width')]"/>
+				<xsl:copy-of select="@*[not(local-name() = 'id' or local-name() = 'unnumbered' or local-name() = 'section' or local-name() = 'section_prefix' or local-name() = 'width' or local-name() = 'class' or local-name() = 'type' or local-name() = 'presentation')]"/>
+				<!-- for requirements -->
+				<xsl:if test="@type or @class">
+					<xsl:copy-of select="@id"/>
+				</xsl:if>
+				<xsl:if test="@type">
+					<xsl:attribute name="content-type"><xsl:value-of select="@type"/></xsl:attribute>
+				</xsl:if>
+				<xsl:if test="@class">
+					<xsl:attribute name="specific-use"><xsl:value-of select="@class"/></xsl:attribute>
+				</xsl:if><!-- END: for requirements -->
+
 				<xsl:apply-templates select="@width"/>
 
 				<xsl:apply-templates select="colgroup" mode="table"/>