diff --git a/README.adoc b/README.adoc index 4af8d44..e90dbe6 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.56.jar +java -Xss5m -jar target/stepmod2mn-1.57.jar ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.jar data/resource_docs/draughting_elements/resource.xml +java -Xss5m -jar target/stepmod2mn-1.57.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.56.jar [--output ] +java -Xss5m -jar target/stepmod2mn-1.57.jar [--output ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.jar data/resource_docs/draughting_elements/resource.xml --output result_dir/draughting_elements/document.adoc +java -Xss5m -jar target/stepmod2mn-1.57.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.56.jar +java -Xss5m -jar target/stepmod2mn-1.57.jar ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.jar data/ +java -Xss5m -jar target/stepmod2mn-1.57.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.56.jar [--output ] +java -Xss5m -jar target/stepmod2mn-1.57.jar [--output ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.jar data/ --output documents/ +java -Xss5m -jar target/stepmod2mn-1.57.jar data/ --output documents/ ---- @@ -80,42 +80,42 @@ java -Xss5m -jar target/stepmod2mn-1.56.jar data/ --output documents/ [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.jar [--exclude ] +java -Xss5m -jar target/stepmod2mn-1.57.jar [--exclude ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.jar data/ --exclude "machining_features 104" +java -Xss5m -jar target/stepmod2mn-1.57.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.56.jar [--include-only ] +java -Xss5m -jar target/stepmod2mn-1.57.jar [--include-only ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.jar data/ --include-only "fundamentals_of_product_description_and_support kinematics" +java -Xss5m -jar target/stepmod2mn-1.57.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.56.jar +java -Xss5m -jar target/stepmod2mn-1.57.jar ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.jar publication/part1000/CR_PMI_5/publication_index.xml +java -Xss5m -jar target/stepmod2mn-1.57.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.56.jar [--output ] +java -Xss5m -jar target/stepmod2mn-1.57.jar [--output ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.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.57.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.56.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.57.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.56.jar [--type ] +java -Xss5m -jar target/stepmod2mn-1.57.jar [--type ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.56.jar publication/part1000/CR_PMI_5/publication_index.xml --type resource_docs +java -Xss5m -jar target/stepmod2mn-1.57.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.56.jar --svg +java -jar target/stepmod2mn-1.57.jar --svg ---- e.g. [source,sh] ---- -java -jar target/stepmod2mn-1.56.jar data/resources --svg +java -jar target/stepmod2mn-1.57.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.56.jar --svg [--output ] +java -jar target/stepmod2mn-1.57.jar --svg [--output ] ---- e.g. [source,sh] ---- -java -jar target/stepmod2mn-1.56.jar data/resources --svg --output schemas/ +java -jar target/stepmod2mn-1.57.jar data/resources --svg --output schemas/ ---- === Generate SVG image for Express Imagemap XML and Image: [source,sh] ---- -java -jar stepmod2mn-1.56.jar --xml --image [--svg ] +java -jar stepmod2mn-1.57.jar --xml --image [--svg ] ---- e.g. [source,sh] ---- -java -jar stepmod2mn-1.56.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.57.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.56 +1.57 STEPmod XML to Metanorma AsciiDoc converter ---- @@ -234,8 +234,8 @@ Tag the same version in Git: [source,xml] ---- -git tag v1.56 -git push origin v1.56 +git tag v1.57 +git push origin v1.57 ---- Then the corresponding GitHub release will be automatically created at: diff --git a/pom.xml b/pom.xml index b6e7b49..1e892d8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.metanorma stepmod2mn - 1.56 + 1.57 STEPmod XML to Metanorma AsciiDoc converter jar https://www.metanorma.org diff --git a/src/main/resources/stepmod.base_xsl/common.xsl b/src/main/resources/stepmod.base_xsl/common.xsl index 0a40198..6eb98a5 100644 --- a/src/main/resources/stepmod.base_xsl/common.xsl +++ b/src/main/resources/stepmod.base_xsl/common.xsl @@ -108,6 +108,8 @@ $Id: common.xsl,v 1.209 2020/02/22 00:08:47 tom Exp $ + yes + yes @@ -1628,6 +1630,7 @@ or name()='screen' or name()='ul' or name()='example' or name()='note' or name() + @@ -1645,7 +1648,7 @@ or name()='screen' or name()='ul' or name()='example' or name()='note' or name() - + _ - + + + + @@ -4713,6 +4719,8 @@ is case sensitive.')"/> Error 1: No contact provided for project leader. + yes + yes @@ -4732,6 +4740,8 @@ is case sensitive.')"/> Error 1: No contact provided for project leader. + yes + yes @@ -4751,6 +4761,8 @@ is case sensitive.')"/> Error 1: No contact provided for project leader. + yes + yes @@ -4776,6 +4788,8 @@ is case sensitive.')"/> Error 2: No contact provided for project editor. + yes + yes @@ -4796,6 +4810,8 @@ is case sensitive.')"/> Error 2: No contact provided for project editor. + yes + yes @@ -4815,6 +4831,8 @@ is case sensitive.')"/> Error 2: No contact provided for project editor. + yes + yes @@ -4835,6 +4853,8 @@ is case sensitive.')"/> Error 1: No contact provided for developer. + yes + yes @@ -5115,7 +5135,9 @@ is case sensitive.')"/> Integrated generic resource - + + yes + yes @@ -5141,6 +5163,8 @@ is case sensitive.')"/> + yes + yes @@ -5159,9 +5183,11 @@ is case sensitive.')"/> Integrated generic resource - + + yes + yes @@ -5180,9 +5206,11 @@ is case sensitive.')"/> igr - + + yes + yes diff --git a/src/main/resources/stepmod2mn.adoc.xsl b/src/main/resources/stepmod2mn.adoc.xsl index 1c171aa..79c216e 100644 --- a/src/main/resources/stepmod2mn.adoc.xsl +++ b/src/main/resources/stepmod2mn.adoc.xsl @@ -27,26 +27,270 @@ ^ISO.*10303\-.+$ + - - - - en - de - zh - - - - - + en + de + zh + + + + + Industrial automation systems and integration + Systèmes d'automatisation industrielle et intégration + Product data representation and exchange + Représentation et échange de données de produits + + + + + + + = : : + + + + + docnumber + + + + + + + :tc-docnumber: + + + + + + + + + + + + + yes + yes + + + + + partnumber + + + + + copyright-year + + + + + language + + + + + published-date + + + + + edition + + + + + title-intro-en + + + + title-intro-fr + + + + title-main-en + + + + title-main-fr + + + + title-part-en + + + + title-part-fr + + + + + doctype + + + + + + + + + + + + + + :technical-committee-number: 184 + + :technical-committee: Industrial automation systems and integration + + :subcommittee-type: SC + + :subcommittee-number: 4 + + :subcommittee: Industrial data + + :workgroup-type: WG + + + workgroup-number + + + + :secretariat: ANSI + + + + + + + :keywords: + + + + + + Error K-1: Error in module.xml/keywords - no keywords specified. + + yes + yes + + + + :library-ics: 25.040.40 + + + + :revises: ISO - + + + + + + :supersedes: + - en - de - zh - + + 12 - - + + + + + + + + + + + + + + + + + + + + yes + yes + + + + + + Error in .xml//@wg.number.supersedes - + Error WG-16: New WG number is the same as superseded WG number. + + yes + yes + + + + + + + + + + + + + :imagesdir: + + :mn-document-class: iso + + :mn-output-extensions: xml,html,pdf,rxl + + :local-cache-only: + + :data-uri-image: + + :lutaml-express-index: schemas; ../../schemas_all.yaml; + + + + + + + + + //// + + + //// + + + + + + + + + + + + + + diff --git a/src/main/resources/stepmod2mn.module.adoc.xsl b/src/main/resources/stepmod2mn.module.adoc.xsl index d98b993..9279d91 100644 --- a/src/main/resources/stepmod2mn.module.adoc.xsl +++ b/src/main/resources/stepmod2mn.module.adoc.xsl @@ -178,203 +178,8 @@ - Industrial automation systems and integration - Systèmes d'automatisation industrielle et intégration - Product data representation and exchange - Représentation et échange de données de produits - - - - = : : - - :docnumber: - - - - - - :tc-docnumber: - - - - - - - - - - - - - - - :partnumber: - - - :copyright-year: - - - :language: - - - :publish-date: - - - :edition: - - - :title-intro-en: - - :title-intro-fr: - - :title-main-en: - - :title-main-fr: - - :title-part-en: - - :title-part-fr: - - - :doctype: - - - - - - - - - - - - - :technical-committee-number: 184 - - :technical-committee: Industrial automation systems and integration - - :subcommittee-type: SC - - :subcommittee-number: 4 - - :subcommittee: Industrial data - - :workgroup-type: WG - - :workgroup-number: - - - :secretariat: ANSI - - - - - - - :keywords: - - - - - - Error K-1: Error in module.xml/keywords - no keywords specified. - - - - - :library-ics: 25.040.40 - - - - :revises: ISO - - - - - - - :supersedes: - - - - - - - - - - - - - - - - - - - - - - - - - - Error in module.xml/module/@wg.number.supersedes - - Error WG-16: New WG number is the same as superseded WG number. - - - - - - - - - - - - - :imagesdir: - - :mn-document-class: iso - - :mn-output-extensions: xml,html,pdf,rxl - - :local-cache-only: - - :data-uri-image: - - :lutaml-express-index: schemas; ../../schemas_all.yaml; - - - - - - - - - //// - - - //// - - - + + diff --git a/src/main/resources/stepmod2mn.resource.adoc.xsl b/src/main/resources/stepmod2mn.resource.adoc.xsl index 43bb0f1..3e099d2 100644 --- a/src/main/resources/stepmod2mn.resource.adoc.xsl +++ b/src/main/resources/stepmod2mn.resource.adoc.xsl @@ -172,194 +172,8 @@ - Industrial automation systems and integration - Systèmes d'automatisation industrielle et intégration - Product data representation and exchange - Représentation et échange de données de produits - - - - = : : - - - :docnumber: - - - - - - :tc-docnumber: - - - - - - - - - - - - - - - :partnumber: - - - :copyright-year: - - - :language: - - - :publish-date: - - - :edition: - - - :title-intro-en: - - :title-intro-fr: - - :title-main-en: - - :title-main-fr: - - :title-part-en: - - :title-part-fr: - - - :doctype: - - - - - - - - - - - - - :technical-committee-number: 184 - - :technical-committee: Industrial automation systems and integration - - :subcommittee-type: SC - - :subcommittee-number: 4 - - :subcommittee: Industrial data - - :workgroup-type: WG - - :workgroup-number: - - - :secretariat: ANSI - - - - - - - :keywords: - - - - :library-ics: 25.040.40 - - - - :revises: ISO - - - - - - - :supersedes: - - - - - - - - - - - - - - - - - - - - - Error in resource.xml/resource/@wg.number.supersedes - - Error WG-16: New WG number is the same as superseded WG number. - - - - - - - - - - - - - - :imagesdir: - - :mn-document-class: iso - - :mn-output-extensions: xml,html,pdf,rxl - - :local-cache-only: - - :data-uri-image: - - :lutaml-express-index: schemas; ../../schemas_all.yaml; - - - - - - - - - //// - - - //// - - - - + +