updated for metanorma/iso-10303#229

README.adoc

@@ -17,14 +17,14 @@ You will need the `maven` build tool and `make`.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar <XML-FileName>
+java -Xss5m -jar target/stepmod2mn-1.60.jar <XML-FileName>
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar data/resource_docs/draughting_elements/resource.xml 
+java -Xss5m -jar target/stepmod2mn-1.60.jar data/resource_docs/draughting_elements/resource.xml 
 ----
 
 NOTE: resulted AsciiDoc found in data/resource_docs/draughting_elements/document.adoc
@@ -34,28 +34,28 @@ NOTE: resulted AsciiDoc found in data/resource_docs/draughting_elements/document
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar <XML-FileName> [--output <AsciiDoc-FileName>]
+java -Xss5m -jar target/stepmod2mn-1.60.jar <XML-FileName> [--output <AsciiDoc-FileName>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar data/resource_docs/draughting_elements/resource.xml --output result_dir/draughting_elements/document.adoc
+java -Xss5m -jar target/stepmod2mn-1.60.jar data/resource_docs/draughting_elements/resource.xml --output result_dir/draughting_elements/document.adoc
 ----
 
 === Convert all resource.xml and module.xml in the specified folder and sub-folders into the Metanorma AsciiDoc format:
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar <Input-folder>
+java -Xss5m -jar target/stepmod2mn-1.60.jar <Input-folder>
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar data/
+java -Xss5m -jar target/stepmod2mn-1.60.jar data/
 ----
 
 NOTE: the result AsciiDocs will be saved in the folder with the source resource.xml and module.xml files.
@@ -65,57 +65,57 @@ NOTE: the result AsciiDocs will be saved in the folder with the source resource.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar <Input-folder> [--output <Output-folder>]
+java -Xss5m -jar target/stepmod2mn-1.60.jar <Input-folder> [--output <Output-folder>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar data/ --output documents/
+java -Xss5m -jar target/stepmod2mn-1.60.jar data/ --output documents/
 ----
 
 
 === Convert all resource.xml and module.xml in the specified folder and sub-folders into the Metanorma AsciiDoc format, except specified documents:
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar <Input-folder> [--exclude <documents or part numbers list>]
+java -Xss5m -jar target/stepmod2mn-1.60.jar <Input-folder> [--exclude <documents or part numbers list>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar data/ --exclude "machining_features 104"
+java -Xss5m -jar target/stepmod2mn-1.60.jar data/ --exclude "machining_features 104"
 ----
 
 === Convert only specified documents resource.xml and module.xml in the specified folder and sub-folders into the Metanorma AsciiDoc format:
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar <Input-folder> [--include-only <documents list>]
+java -Xss5m -jar target/stepmod2mn-1.60.jar <Input-folder> [--include-only <documents list>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar data/ --include-only "fundamentals_of_product_description_and_support kinematics"
+java -Xss5m -jar target/stepmod2mn-1.60.jar data/ --include-only "fundamentals_of_product_description_and_support kinematics"
 ----
 
 === Generate Metanorma collection files (metanorma.yml and collection.yml) for the documents specified in the publication index xml file in the tags 'resource_docs' and 'modules':
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar <Publication-Index-XML-FileName>
+java -Xss5m -jar target/stepmod2mn-1.60.jar <Publication-Index-XML-FileName>
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar publication/part1000/CR_PMI_5/publication_index.xml
+java -Xss5m -jar target/stepmod2mn-1.60.jar publication/part1000/CR_PMI_5/publication_index.xml
 ----
 
 NOTE: the Metanorma collection files .yml will be saved in the 3 level up folder (usually, source repository's root folder).
@@ -125,14 +125,14 @@ and save them into the output folder:
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar <Publication-Index-XML-FileName> [--output <Output-folder>]
+java -Xss5m -jar target/stepmod2mn-1.60.jar <Publication-Index-XML-FileName> [--output <Output-folder>]
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar iso-10303-srl/iso-10303-stepmod-wg12/publication/part1000/CR_PMI_5/publication_index.xml --output iso-10303-srl/
+java -Xss5m -jar target/stepmod2mn-1.60.jar iso-10303-srl/iso-10303-stepmod-wg12/publication/part1000/CR_PMI_5/publication_index.xml --output iso-10303-srl/
 ----
 
 NOTE: the output folder should contains the folder with the generated .adoc (usually, 'documents'). You can specify this folder obviously by the parameter '--input-documents':
@@ -141,7 +141,7 @@ e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar iso-10303-srl/iso-10303-stepmod-wg12/publication/part1000/CR_PMI_5/publication_index.xml --output iso-10303-srl/CR_PMI_5 --input-documents iso-10303-srl/documents
+java -Xss5m -jar target/stepmod2mn-1.60.jar iso-10303-srl/iso-10303-stepmod-wg12/publication/part1000/CR_PMI_5/publication_index.xml --output iso-10303-srl/CR_PMI_5 --input-documents iso-10303-srl/documents
 ----
 
 NOTE: the Metanorma collection files (.yml) will be saved in the folder 'iso-10303-srl/CR_PMI_5' and the references point to the documents in the folder iso-10303-srl/documents.
@@ -151,14 +151,14 @@ NOTE: the Metanorma collection files (.yml) will be saved in the folder 'iso-103
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar <Publication-Index-XML-FileName> [--type <resource_docs or modules>]
+java -Xss5m -jar target/stepmod2mn-1.60.jar <Publication-Index-XML-FileName> [--type <resource_docs or modules>]
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.59.jar publication/part1000/CR_PMI_5/publication_index.xml --type resource_docs
+java -Xss5m -jar target/stepmod2mn-1.60.jar publication/part1000/CR_PMI_5/publication_index.xml --type resource_docs
 ----
 
 NOTE: the Metanorma collection file 'metanorma.yml' will be saved in the 3 level up folder (usually, source repository's root folder).
@@ -168,42 +168,42 @@ NOTE: the Metanorma collection file 'metanorma.yml' will be saved in the 3 level
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.59.jar <start folder to process xml maps files> --svg
+java -jar target/stepmod2mn-1.60.jar <start folder to process xml maps files> --svg
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.59.jar data/resources --svg
+java -jar target/stepmod2mn-1.60.jar data/resources --svg
 ----
 
 === Generate SVG images for the XML in the specified folder and sub-folders, and save them in the output folder:
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.59.jar <start folder to process xml maps files> --svg [--output <Output-folder>]
+java -jar target/stepmod2mn-1.60.jar <start folder to process xml maps files> --svg [--output <Output-folder>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.59.jar data/resources --svg --output schemas/
+java -jar target/stepmod2mn-1.60.jar data/resources --svg --output schemas/
 ----
 
 === Generate SVG image for Express Imagemap XML and Image:
 
 [source,sh]
 ----
-java -jar stepmod2mn-1.59.jar --xml <Express Imagemap XML file path> --image <Image file name> [--svg <resulted SVG map file or folder>]
+java -jar stepmod2mn-1.60.jar --xml <Express Imagemap XML file path> --image <Image file name> [--svg <resulted SVG map file or folder>]
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -jar stepmod2mn-1.59.jar --xml data\resource_docs\fundamentals_of_product_description_and_support\schema_diagexpg1.xml --image schema_diagexpg1.gif --svg schema_diagexpg1.svg
+java -jar stepmod2mn-1.60.jar --xml data\resource_docs\fundamentals_of_product_description_and_support\schema_diagexpg1.xml --image schema_diagexpg1.gif --svg schema_diagexpg1.svg
 ----
 
 
@@ -223,7 +223,7 @@ Update version in `pom.xml`, e.g.:
 ----
 <groupId>org.metanorma</groupId>
 <artifactId>stepmod2mn</artifactId>
-<version>1.59</version>
+<version>1.60</version>
 <name>STEPmod XML to Metanorma AsciiDoc converter</name>
 ----
 
@@ -234,8 +234,8 @@ Tag the same version in Git:
 
 [source,xml]
 ----
-git tag v1.59
-git push origin v1.59
+git tag v1.60
+git push origin v1.60
 ----
 
 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>stepmod2mn</artifactId>
-	<version>1.59</version>
+	<version>1.60</version>
 	<name>STEPmod XML to Metanorma AsciiDoc converter</name>
 	<packaging>jar</packaging>
 	<url>https://www.metanorma.org</url>

src/main/java/org/metanorma/MetanormaCollectionManifest.java

@@ -88,7 +88,7 @@ private void update_docref(Map<String, Object> yamlDocumentObj, int num, String
                                 ((ArrayList<Object>)
                                         ((LinkedHashMap <String, Object>)
                                                 yamlDocumentObj.get("manifest"))
-                                                .get("manifest"))
+                                                .get("docref"))
                                         .get(num))
                                 .get("docref"));
         for (int i = 0; i < docref.size(); i++) {
@@ -112,7 +112,7 @@ private void update_docref(Map<String, Object> yamlDocumentObj, int num, String
                                     ((ArrayList<Object>)
                                             ((LinkedHashMap <String, Object>)
                                                     yamlObj.get("manifest"))
-                                                    .get("manifest"))
+                                                    .get("docref"))
                                             .get(num))
                                     .get("docref"));
             if (template_docref == null) {
@@ -123,7 +123,7 @@ private void update_docref(Map<String, Object> yamlDocumentObj, int num, String
                     ((ArrayList<Object>)
                             ((LinkedHashMap <String, Object>)
                                     yamlObj.get("manifest"))
-                                    .get("manifest"))
+                                    .get("docref"))
                             .get(num))
                     .put("docref",template_docref);
         }

src/main/java/org/metanorma/stepmod2mn.java

@@ -396,7 +396,7 @@ private static void runoptions(String[] args) throws ParseException {
             argOutputPath = fXMLout.getAbsoluteFile().toString();
             //new File(fXMLout.getParent()).mkdirs();
 
-            Path schemasPath = Paths.get(new File(argOutputPath).getParent(), "schemas");
+            Path schemasPath = Paths.get(new File(argOutputPath).getParent(), "plain_schemas"); // default schemas path, was "schemas" (see https://github.com/metanorma/iso-10303-srl/issues/229)
             // create 'schemas' folder at the same level as output folder (for instance 'documents')
             outputPathSchemas = schemasPath.toString();
         }

src/main/resources/collection_template.yml

@@ -18,7 +18,7 @@ bibdata:
 manifest:
   level: collection
   title: ISO collection
-  manifest:
+  docref:
   - level: document
     title: Document
     docref:

src/main/resources/stepmod2mn.adoc.xsl

@@ -264,7 +264,7 @@
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>:data-uri-image:</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
-		<xsl:text>:lutaml-express-index: schemas; ../../schemas_all.yaml;</xsl:text>
+		<xsl:text>:lutaml-express-index: schemas; ../../schemas-srl.yml;</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 
@@ -1407,7 +1407,7 @@
 		manifest:
 			level: collection
 			title: ISO Collection
-			manifest:
+			docref:
 				- level: document
 					title: Document
 					sectionsplit: true
@@ -1465,7 +1465,7 @@
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>  title: ISO Collection</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
-		<xsl:text>  manifest:</xsl:text>
+		<xsl:text>  docref:</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>    - level: document</xsl:text>
 		<xsl:text>&#xa;</xsl:text>

src/main/resources/stepmod2mn.module.adoc.xsl

@@ -613,7 +613,9 @@
             <xsl:text>&#xa;</xsl:text>
             <xsl:text>          attachment: true</xsl:text>
             <xsl:text>&#xa;</xsl:text>
-            <xsl:text>        - fileref: </xsl:text><xsl:value-of select="concat('sections/schemadocs/',@name,'.html')"/>
+            <!-- <xsl:text>        - fileref: </xsl:text><xsl:value-of select="concat('sections/schemadocs/',@name,'.html')"/> -->
+            <!-- https://github.com/metanorma/iso-10303-srl/issues/229 -->
+            <xsl:text>        - fileref: </xsl:text><xsl:value-of select="concat('../../schema_docs/',@name,'/doc_',@name,'.html')"/>
             <xsl:text>&#xa;</xsl:text>
             <xsl:text>          identifier: </xsl:text><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
             <xsl:text>&#xa;</xsl:text>

src/main/resources/stepmod2mn.resource.adoc.xsl

@@ -545,7 +545,9 @@
 				<xsl:text>&#xa;</xsl:text>
 			</xsl:for-each>
 			<xsl:for-each select="resource/schema">
-				<xsl:text>        - fileref: </xsl:text><xsl:value-of select="concat('sections/schemadocs/',@name,'.html')"/>
+				<!-- <xsl:text>        - fileref: </xsl:text><xsl:value-of select="concat('sections/schemadocs/',@name,'.html')"/> -->
+				<!-- https://github.com/metanorma/iso-10303-srl/issues/229 -->
+				<xsl:text>        - fileref: </xsl:text><xsl:value-of select="concat('../../schema_docs/',@name,'/doc_',@name,'.html')"/>
 				<xsl:text>&#xa;</xsl:text>
 				<xsl:text>          identifier: </xsl:text><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
 				<xsl:text>&#xa;</xsl:text>