From 7c13c0921df320daa9a2a46cca0c4e29afccf58c Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Thu, 4 Apr 2024 21:24:59 +0300 Subject: [PATCH 1/3] section 6 text replaced by template, #142 --- README.adoc | 56 +++++++++---------- pom.xml | 2 +- .../stepmod.base_xsl/sect_6_refdata.xsl | 10 +++- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/README.adoc b/README.adoc index 3df4bf5..4f9388d 100644 --- a/README.adoc +++ b/README.adoc @@ -17,14 +17,14 @@ You will need the `maven` build tool and `make`. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar +java -Xss5m -jar target/stepmod2mn-1.39.jar ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar data/resource_docs/draughting_elements/resource.xml +java -Xss5m -jar target/stepmod2mn-1.39.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.38.jar [--output ] +java -Xss5m -jar target/stepmod2mn-1.39.jar [--output ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar data/resource_docs/draughting_elements/resource.xml --output result_dir/draughting_elements/document.adoc +java -Xss5m -jar target/stepmod2mn-1.39.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.38.jar +java -Xss5m -jar target/stepmod2mn-1.39.jar ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar data/ +java -Xss5m -jar target/stepmod2mn-1.39.jar data/ ---- NOTE: the result AsciiDocs will be saved in the folder with the source resource.xml and module.xml files. @@ -65,14 +65,14 @@ NOTE: the result AsciiDocs will be saved in the folder with the source resource. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar [--output ] +java -Xss5m -jar target/stepmod2mn-1.39.jar [--output ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar data/ --output documents/ +java -Xss5m -jar target/stepmod2mn-1.39.jar data/ --output documents/ ---- @@ -80,42 +80,42 @@ java -Xss5m -jar target/stepmod2mn-1.38.jar data/ --output documents/ [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar [--exclude ] +java -Xss5m -jar target/stepmod2mn-1.39.jar [--exclude ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar data/ --exclude "machining_features" +java -Xss5m -jar target/stepmod2mn-1.39.jar data/ --exclude "machining_features" ---- === 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.38.jar [--include-only ] +java -Xss5m -jar target/stepmod2mn-1.39.jar [--include-only ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar data/ --include-only "fundamentals_of_product_description_and_support kinematics" +java -Xss5m -jar target/stepmod2mn-1.39.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.38.jar +java -Xss5m -jar target/stepmod2mn-1.39.jar ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar publication/part1000/CR_PMI_5/publication_index.xml +java -Xss5m -jar target/stepmod2mn-1.39.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.38.jar [--output ] +java -Xss5m -jar target/stepmod2mn-1.39.jar [--output ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.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.39.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.38.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.39.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.38.jar [--type ] +java -Xss5m -jar target/stepmod2mn-1.39.jar [--type ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.38.jar publication/part1000/CR_PMI_5/publication_index.xml --type resource_docs +java -Xss5m -jar target/stepmod2mn-1.39.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.38.jar --svg +java -jar target/stepmod2mn-1.39.jar --svg ---- e.g. [source,sh] ---- -java -jar target/stepmod2mn-1.38.jar data/resources --svg +java -jar target/stepmod2mn-1.39.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.38.jar --svg [--output ] +java -jar target/stepmod2mn-1.39.jar --svg [--output ] ---- e.g. [source,sh] ---- -java -jar target/stepmod2mn-1.38.jar data/resources --svg --output schemas/ +java -jar target/stepmod2mn-1.39.jar data/resources --svg --output schemas/ ---- === Generate SVG image for Express Imagemap XML and Image: [source,sh] ---- -java -jar stepmod2mn-1.38.jar --xml --image [--svg ] +java -jar stepmod2mn-1.39.jar --xml --image [--svg ] ---- e.g. [source,sh] ---- -java -jar stepmod2mn-1.38.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.39.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.: ---- org.metanorma stepmod2mn -1.38 +1.39 STEPmod XML to Metanorma AsciiDoc converter ---- @@ -234,8 +234,8 @@ Tag the same version in Git: [source,xml] ---- -git tag v1.38 -git push origin v1.38 +git tag v1.39 +git push origin v1.39 ---- Then the corresponding GitHub release will be automatically created at: diff --git a/pom.xml b/pom.xml index 8908fbd..f372441 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.metanorma stepmod2mn - 1.38 + 1.39 STEPmod XML to Metanorma AsciiDoc converter jar https://www.metanorma.org diff --git a/src/main/resources/stepmod.base_xsl/sect_6_refdata.xsl b/src/main/resources/stepmod.base_xsl/sect_6_refdata.xsl index a13f592..e59daa4 100644 --- a/src/main/resources/stepmod.base_xsl/sect_6_refdata.xsl +++ b/src/main/resources/stepmod.base_xsl/sect_6_refdata.xsl @@ -32,6 +32,9 @@ $Id: sect_6_refdata.xsl,v 1.1 2006/05/18 16:17:23 dmprice Exp $ + + + Implementations of this part of ISO 10303 shall make use of the capability to classify an @@ -103,7 +106,12 @@ and from the http://www.iso.org[ISO] * no other UML, EXPRESS or OWL concepts appear in these diagrams. - + + + + include::../../../templates/module_refdata.adoc[] + + From 5e18a804af262813b9028600eb8cb5b57f164cd8 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Thu, 4 Apr 2024 22:49:29 +0300 Subject: [PATCH 2/3] Annex Usage guide is mandatory, #143 --- src/main/resources/stepmod.base_xsl/module.xsl | 6 +++--- .../resources/stepmod.base_xsl/sect_g_change.xsl | 12 ++++++------ src/main/resources/stepmod2mn.module.adoc.xsl | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/module.xsl b/src/main/resources/stepmod.base_xsl/module.xsl index 7751797..5bfaa57 100644 --- a/src/main/resources/stepmod.base_xsl/module.xsl +++ b/src/main/resources/stepmod.base_xsl/module.xsl @@ -718,12 +718,12 @@ TT remove since locke is no longer available. - - + G + - - + G + - - + G + diff --git a/src/main/resources/stepmod2mn.module.adoc.xsl b/src/main/resources/stepmod2mn.module.adoc.xsl index 8b98523..3b1bac7 100644 --- a/src/main/resources/stepmod2mn.module.adoc.xsl +++ b/src/main/resources/stepmod2mn.module.adoc.xsl @@ -400,12 +400,12 @@ - + [INFO] Processing Annex F Application module implementation and usage guide ... - + From 7935c0a4069da2b66cd1d2039029265f4c4922d8 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Thu, 4 Apr 2024 23:27:41 +0300 Subject: [PATCH 3/3] wrong bibitem id fixing, #147 --- .../resources/stepmod.base_xsl/common/biblio.xsl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/resources/stepmod.base_xsl/common/biblio.xsl b/src/main/resources/stepmod.base_xsl/common/biblio.xsl index 3cc4059..4c99c29 100644 --- a/src/main/resources/stepmod.base_xsl/common/biblio.xsl +++ b/src/main/resources/stepmod.base_xsl/common/biblio.xsl @@ -78,7 +78,21 @@ - + + + + + + + + + + + + + + +