From bda35db4d75907319d6663cdd9512267afdafc17 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Tue, 23 Apr 2024 16:29:22 +0300 Subject: [PATCH 01/26] sect_add_scope.xsl minor updates, #145 --- README.adoc | 56 +++++++++---------- pom.xml | 2 +- .../res_doc/sect_add_scope.xsl | 3 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/README.adoc b/README.adoc index 44c6328..a59c4db 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.46.jar +java -Xss5m -jar target/stepmod2mn-1.47.jar ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.jar data/resource_docs/draughting_elements/resource.xml +java -Xss5m -jar target/stepmod2mn-1.47.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.46.jar [--output ] +java -Xss5m -jar target/stepmod2mn-1.47.jar [--output ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.jar data/resource_docs/draughting_elements/resource.xml --output result_dir/draughting_elements/document.adoc +java -Xss5m -jar target/stepmod2mn-1.47.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.46.jar +java -Xss5m -jar target/stepmod2mn-1.47.jar ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.jar data/ +java -Xss5m -jar target/stepmod2mn-1.47.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.46.jar [--output ] +java -Xss5m -jar target/stepmod2mn-1.47.jar [--output ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.jar data/ --output documents/ +java -Xss5m -jar target/stepmod2mn-1.47.jar data/ --output documents/ ---- @@ -80,42 +80,42 @@ java -Xss5m -jar target/stepmod2mn-1.46.jar data/ --output documents/ [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.jar [--exclude ] +java -Xss5m -jar target/stepmod2mn-1.47.jar [--exclude ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.jar data/ --exclude "machining_features 104" +java -Xss5m -jar target/stepmod2mn-1.47.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.46.jar [--include-only ] +java -Xss5m -jar target/stepmod2mn-1.47.jar [--include-only ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.jar data/ --include-only "fundamentals_of_product_description_and_support kinematics" +java -Xss5m -jar target/stepmod2mn-1.47.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.46.jar +java -Xss5m -jar target/stepmod2mn-1.47.jar ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.jar publication/part1000/CR_PMI_5/publication_index.xml +java -Xss5m -jar target/stepmod2mn-1.47.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.46.jar [--output ] +java -Xss5m -jar target/stepmod2mn-1.47.jar [--output ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.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.47.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.46.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.47.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.46.jar [--type ] +java -Xss5m -jar target/stepmod2mn-1.47.jar [--type ] ---- e.g. [source,sh] ---- -java -Xss5m -jar target/stepmod2mn-1.46.jar publication/part1000/CR_PMI_5/publication_index.xml --type resource_docs +java -Xss5m -jar target/stepmod2mn-1.47.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.46.jar --svg +java -jar target/stepmod2mn-1.47.jar --svg ---- e.g. [source,sh] ---- -java -jar target/stepmod2mn-1.46.jar data/resources --svg +java -jar target/stepmod2mn-1.47.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.46.jar --svg [--output ] +java -jar target/stepmod2mn-1.47.jar --svg [--output ] ---- e.g. [source,sh] ---- -java -jar target/stepmod2mn-1.46.jar data/resources --svg --output schemas/ +java -jar target/stepmod2mn-1.47.jar data/resources --svg --output schemas/ ---- === Generate SVG image for Express Imagemap XML and Image: [source,sh] ---- -java -jar stepmod2mn-1.46.jar --xml --image [--svg ] +java -jar stepmod2mn-1.47.jar --xml --image [--svg ] ---- e.g. [source,sh] ---- -java -jar stepmod2mn-1.46.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.47.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.46 +1.47 STEPmod XML to Metanorma AsciiDoc converter ---- @@ -234,8 +234,8 @@ Tag the same version in Git: [source,xml] ---- -git tag v1.46 -git push origin v1.46 +git tag v1.47 +git push origin v1.47 ---- Then the corresponding GitHub release will be automatically created at: diff --git a/pom.xml b/pom.xml index 80ab34f..091898f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.metanorma stepmod2mn - 1.46 + 1.47 STEPmod XML to Metanorma AsciiDoc converter jar https://www.metanorma.org diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_add_scope.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_add_scope.xsl index 89cc524..3562bbc 100644 --- a/src/main/resources/stepmod.base_xsl/res_doc/sect_add_scope.xsl +++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_add_scope.xsl @@ -1,7 +1,8 @@ + - is assigned to this part of ISO 10303. The meaning of this value is defined + is assigned to this document. The meaning of this value is defined in ISO/IEC 8824-1, and is described in ISO 10303-1. From d459be58a96fed10759fa1e65d2a5122262368bd Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Tue, 23 Apr 2024 16:57:06 +0300 Subject: [PATCH 03/26] sect_biblio.xsl minor updates, #145 --- .../resources/stepmod.base_xsl/res_doc/sect_add_scope.xsl | 2 +- .../resources/stepmod.base_xsl/res_doc/sect_b_obj_reg.xsl | 2 +- src/main/resources/stepmod.base_xsl/res_doc/sect_biblio.xsl | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_add_scope.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_add_scope.xsl index 3562bbc..3c29e07 100644 --- a/src/main/resources/stepmod.base_xsl/res_doc/sect_add_scope.xsl +++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_add_scope.xsl @@ -23,7 +23,7 @@ $Id: sect_add_scope.xsl,v 1.1 2003/01/15 23:44:35 thendrix Exp $ --> - + - + diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_biblio.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_biblio.xsl index 5712b5f..1535b3f 100644 --- a/src/main/resources/stepmod.base_xsl/res_doc/sect_biblio.xsl +++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_biblio.xsl @@ -1,7 +1,7 @@ - + - + + - - |=== diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_c_exp_schema.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_c_exp_schema.xsl index 1ea535c..dca6017 100644 --- a/src/main/resources/stepmod.base_xsl/res_doc/sect_c_exp_schema.xsl +++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_c_exp_schema.xsl @@ -1,7 +1,8 @@ + @@ -98,8 +98,8 @@ This file is a copy of the file data/xsl/sect_g_changes.xsl for application modu instances encoded according to ISO 10303-21, and that conform to an ISO 10303 application - protocol based on the previous edition of this part of ISO 10303, also conform to a revision of that - application protocol based on this edition of this part of ISO 10303; + protocol based on the previous edition of this document, also conform to a revision of that + application protocol based on this edition of this document; [INFO] Processing Annex F Application module implementation and usage guide ... - - + + + + + + + + + + + + From a75f574458695cb1d3afc3da12dffc4212b2e08e Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 18:15:42 +0300 Subject: [PATCH 08/26] Error c3 fixing, #169 --- .../resources/stepmod.base_xsl/common.xsl | 64 +++++++++++++++---- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/common.xsl b/src/main/resources/stepmod.base_xsl/common.xsl index 0cde466..82552e0 100644 --- a/src/main/resources/stepmod.base_xsl/common.xsl +++ b/src/main/resources/stepmod.base_xsl/common.xsl @@ -2471,7 +2471,15 @@ width="20" height="20"/> --> - + + + + + + + + + @@ -2931,6 +2939,19 @@ width="20" height="20"/> --> [construct:] [id:] --> + + + + + + + + + + + + + @@ -2940,6 +2961,20 @@ width="20" height="20"/> --> $nlinkend, '# is incorrectly specified.')"/> + @@ -2960,20 +2995,11 @@ width="20" height="20"/> --> - - - - - - - - - - - + + @@ -2997,8 +3023,20 @@ width="20" height="20"/> --> - + + + + + + + + + + + + + true From b5f18050d54925640a3d0dd5b3d020c38de1bf69 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 18:16:14 +0300 Subject: [PATCH 09/26] missing p and wrong italic fixing, #169 --- src/main/resources/linearize.xsl | 2 +- src/main/resources/stepmod2mn.adoc.xsl | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/resources/linearize.xsl b/src/main/resources/linearize.xsl index 2b2ead7..5c4df35 100644 --- a/src/main/resources/linearize.xsl +++ b/src/main/resources/linearize.xsl @@ -30,7 +30,7 @@ - + diff --git a/src/main/resources/stepmod2mn.adoc.xsl b/src/main/resources/stepmod2mn.adoc.xsl index f482ecb..44d73fc 100644 --- a/src/main/resources/stepmod2mn.adoc.xsl +++ b/src/main/resources/stepmod2mn.adoc.xsl @@ -754,7 +754,18 @@ - + + + + + + + + + + + + From 1bdd0a964a133f4b194cb165e8ed975ada9326eb Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 19:13:50 +0300 Subject: [PATCH 10/26] module.xsl updated for #169 and #144 --- src/main/resources/stepmod.base_xsl/module.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/module.xsl b/src/main/resources/stepmod.base_xsl/module.xsl index 769b060..ba37278 100644 --- a/src/main/resources/stepmod.base_xsl/module.xsl +++ b/src/main/resources/stepmod.base_xsl/module.xsl @@ -980,11 +980,11 @@ TT remove since locke is no longer available. - + - + From 82a4ad71c8736f2a9298ff09008ea3368798df8d Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 19:33:04 +0300 Subject: [PATCH 11/26] sect_introduction updated, #145 --- .../res_doc/sect_introduction.xsl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_introduction.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_introduction.xsl index b0a04bb..0077ec1 100644 --- a/src/main/resources/stepmod.base_xsl/res_doc/sect_introduction.xsl +++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_introduction.xsl @@ -1,7 +1,8 @@ + - + @@ -69,7 +70,7 @@ $Id: sect_introduction.xsl,v 1.13 2010/10/20 07:44:26 robbod Exp $ - - Major subdivisions of this part of ISO 10303 are: + Major subdivisions of this document are: @@ -127,7 +128,7 @@ $Id: sect_introduction.xsl,v 1.13 2010/10/20 07:44:26 robbod Exp $ - This part of ISO 10303 specifies the + This document specifies the . @@ -146,7 +147,7 @@ $Id: sect_introduction.xsl,v 1.13 2010/10/20 07:44:26 robbod Exp $ - The relationships of the schemas in this part of ISO 10303 to other schemas + The relationships of the schemas in this document to other schemas that define the integrated resources of ISO 10303 are illustrated in Figure 1 using the EXPRESS-G notation. EXPRESS-G is defined in ISO 10303-11. @@ -242,7 +243,7 @@ $Id: sect_introduction.xsl,v 1.13 2010/10/20 07:44:26 robbod Exp $ - The following schemas shown in Figure 1 are not found in this part of ISO 10303, but are found as specified: + The following schemas shown in Figure 1 are not found in this document, but are found as specified: - + From 816cadc84639a1cc256b478e462c10ed5fd69e45 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 21:19:21 +0300 Subject: [PATCH 13/26] stepmod2mn.resource.adoc.xsl updated for processing schemas images, #145 --- src/main/resources/stepmod2mn.resource.adoc.xsl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/resources/stepmod2mn.resource.adoc.xsl b/src/main/resources/stepmod2mn.resource.adoc.xsl index 8c8cec1..f34eaae 100644 --- a/src/main/resources/stepmod2mn.resource.adoc.xsl +++ b/src/main/resources/stepmod2mn.resource.adoc.xsl @@ -353,20 +353,23 @@ - + + + - - + - --> + - + From 444fb124ac554c7fb1a240bffdd5fcc5980ef175 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 21:23:22 +0300 Subject: [PATCH 14/26] sect_tech_discussion.xsl minor updates, #145 --- .../stepmod.base_xsl/res_doc/sect_tech_discussion.xsl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_tech_discussion.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_tech_discussion.xsl index 75da48b..93855e5 100644 --- a/src/main/resources/stepmod.base_xsl/res_doc/sect_tech_discussion.xsl +++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_tech_discussion.xsl @@ -1,7 +1,8 @@ + - + :imagesdir: From 4b2a92f223e1c1ffdd2529e82fcfee7384697652 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 22:17:14 +0300 Subject: [PATCH 16/26] tc-docnumber document attribute updated, #145 --- src/main/resources/stepmod2mn.resource.adoc.xsl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/stepmod2mn.resource.adoc.xsl b/src/main/resources/stepmod2mn.resource.adoc.xsl index 5c38f40..0fd5d90 100644 --- a/src/main/resources/stepmod2mn.resource.adoc.xsl +++ b/src/main/resources/stepmod2mn.resource.adoc.xsl @@ -172,7 +172,11 @@ :docnumber: 10303 - :tc-docnumber: + + + + :tc-docnumber: + :partnumber: From 9d399aee7ab8b1ed4b3fa0d83414f48b522aa19f Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 22:29:08 +0300 Subject: [PATCH 17/26] supersedes document attribute and tests updated, #145 --- .../resources/stepmod2mn.resource.adoc.xsl | 49 ++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/src/main/resources/stepmod2mn.resource.adoc.xsl b/src/main/resources/stepmod2mn.resource.adoc.xsl index 0fd5d90..f00c636 100644 --- a/src/main/resources/stepmod2mn.resource.adoc.xsl +++ b/src/main/resources/stepmod2mn.resource.adoc.xsl @@ -176,8 +176,21 @@ :tc-docnumber: - + + + + + + + + + + + + :partnumber: @@ -254,6 +267,40 @@ + + + :supersedes: + + + + + + + + + + + + + + + + + + + + + Error in resource.xml/resource/@wg.number.supersedes - + Error WG-16: New WG number is the same as superseded WG number. + + + + + + :imagesdir: From 2bbd5c594f9580a1831b5b1a2546cb2af757ceb7 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 23:03:39 +0300 Subject: [PATCH 18/26] resource.xsl updated for texts, #145 --- .../stepmod.base_xsl/res_doc/resource.xsl | 357 +++--------------- 1 file changed, 50 insertions(+), 307 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl b/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl index 3fdfddd..a9c20ed 100644 --- a/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl +++ b/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl @@ -1,6 +1,7 @@ + @@ -373,7 +375,6 @@ Purpose: CP 401 · Ch. de Blandonnet 8
CH-1214 Vernier, Geneva
Phone: + 41 22 749 01 11
- Fax: + 41 22 734 10 79
Email: copyright@iso.ch
Website: https://www.iso.org[www.iso.org] @@ -401,7 +402,6 @@ Purpose: CP 401 · Ch. de Blandonnet 8
CH-1214 Vernier, Geneva
Phone: + 41 22 749 01 11
- Fax: + 41 22 734 10 79
Email: copyright@iso.ch
Website: https://www.iso.org[www.iso.org] @@ -473,7 +473,6 @@ Purpose: CP 401 · Ch. de Blandonnet 8
CH-1214 Vernier, Geneva
Phone: + 41 22 749 01 11
- Fax: + 41 22 734 10 79
Email: copyright@iso.ch
Website: https://www.iso.org[www.iso.org] @@ -809,10 +808,26 @@ Purpose: - Attention is drawn to the possibility that some of the elements of this document may be the subject of + ). + on the ISO list of patent declarations received (see http://www.iso.org/patents[www.iso.org/patents] -->). + ISO draws attention to the possibility that the implementation of this document may involve the use of (a) patent(s). + ISO takes no position concerning the evidence, validity or applicability of any claimed patent rights in respect thereof. + As of the date of publication of this document, ISO + + + + + + + + + received notice of (a) patent(s) which may be required to + implement this document. + However, implementers are cautioned that this may not represent the latest information, which may be obtained from the patent database available at http://www.iso.org/patents[www.iso.org/patents]. + ISO shall not be held responsible for identifying any or all such patent rights. + @@ -1018,287 +1033,6 @@ Purpose: - @@ -1312,7 +1046,7 @@ Purpose: - The following are within the scope of this part of ISO 10303: + The following are within the scope of this document: @@ -1336,7 +1070,7 @@ Purpose: - The following are outside the scope of this part of ISO 10303: + The following are outside the scope of this document: @@ -1374,9 +1108,8 @@ Purpose: This annex references a listing of the EXPRESS entity names and - corresponding short names as specified or referenced in this part of ISO - 10303. It also provides a listing of each EXPRESS schema specified in this - part of ISO 10303 without comments or other explanatory text. These + corresponding short names as specified or referenced in this document. It also provides a listing of each EXPRESS schema specified in this + document without comments or other explanatory text. These listings are available in computer-interpretable form in <<tablec1>> and can be found at the following URLs: @@ -1585,7 +1318,7 @@ Purpose: NOTE  The information provided in computer-interpretable form at the above URLs is informative. The information that is contained in the - body of this part of ISO 10303 is normative. + body of this document is normative.

--> @@ -1594,7 +1327,7 @@ Purpose: The information provided in computer-interpretable form at the above URLs is informative. The information that is contained in the - body of this part of ISO 10303 is normative. + body of this document is normative. @@ -1651,7 +1384,7 @@ Purpose: - The diagrams in this annex correspond to the EXPRESS schemas specified in this part of ISO 10303. + The diagrams in this annex correspond to the EXPRESS schemas specified in this document. The diagrams use the EXPRESS-G graphical notation for the EXPRESS language. EXPRESS-G is defined in ISO 10303-11. @@ -2023,7 +1756,7 @@ Purpose: schema that uses elements from the integrated resources and contains -the types, entity specializations, and functions that are specific to this part of ISO 10303. +the types, entity specializations, and functions that are specific to this document. and identifies the necessary external references. @@ -2049,7 +1782,17 @@ the types, entity specializations, and functions that are specific to this part - Short names of entities defined in this schema are described in <<short_entity_names>>. Unambiguous identification of this schema is defined in <<info_object_reg>>. + + + Each implementation of an AP that uses this schema and that encodes entity names shall use the encoding specified in <<short_entity_names>>. + Each reference to this schema in an open system shall use the identifier encoding specified in <<info_object_reg>>. + This schema is illustrated in <<expg>> using the EXPRESS-G notation. + Publicly available computer interpretable listings that are associated with this document + are identified in <<AnnexC>>. @@ -3082,7 +2825,7 @@ the types, entity specializations, and functions that are specific to this part @@ -3388,7 +3131,7 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre footnote:[Reference applicable during ballot or review period.] - footnote:[To be published.] + footnote:[] , - footnote:[To be published.] + footnote:[] , @@ -3499,7 +3242,7 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre + For the purposes of this document, --> For the purposes of this document, @@ -3659,7 +3402,7 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre + For the purposes of this document, --> @@ -3744,7 +3487,7 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre + For the purposes of this document, --> For the purposes of this document, @@ -3843,7 +3586,7 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre + For the purposes of document,--> For the purposes of this document, @@ -4523,7 +4266,7 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre - .The schemas of this part of ISO 10303 + .The schemas of this document @@ -4872,7 +4615,7 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre From a71050d7abd8b4faf6b1cfa976ad790851adc4c7 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Wed, 24 Apr 2024 23:08:53 +0300 Subject: [PATCH 19/26] sect_g_change.xsl updated for texts, #145 --- src/main/resources/stepmod.base_xsl/res_doc/sect_g_change.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_g_change.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_g_change.xsl index 4df71e5..fb785bf 100644 --- a/src/main/resources/stepmod.base_xsl/res_doc/sect_g_change.xsl +++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_g_change.xsl @@ -25,7 +25,7 @@ This file is a copy of the file data/xsl/sect_g_changes.xsl for application modu --> - + - Attention is drawn to the possibility that some of the elements of this document may be the subject of + + on the ISO list of patent declarations received (see http://www.iso.org/patents[www.iso.org/patents]). --> + ISO draws attention to the possibility that the implementation of this document may involve the use of (a) patent(s). + ISO takes no position concerning the evidence, validity or applicability of any claimed patent rights in respect thereof. + As of the date of publication of this document, ISO + + + + + + + + + received notice of (a) patent(s) which may be required to + implement this document. + However, implementers are cautioned that this may not represent the latest information, which may be obtained from the patent database available at http://www.iso.org/patents[www.iso.org/patents]. + ISO shall not be held responsible for identifying any or all such patent rights. @@ -832,131 +867,23 @@ TT remove since locke is no longer available. - - - + + + + + + C + B + + + + + E + C + + + <<defns>> lists the words defined in - this part of ISO 10303 and gives pointers to words defined elsewhere. + this document and gives pointers to words defined elsewhere. The information requirements of the application are specified in Clause @@ -1077,13 +1004,19 @@ TT remove since locke is no longer available. This interpretation, given in <<mapping>>, shows the correspondence between the information requirements and the - MIM. The short listing of the MIM specifies the interface to the + MIM. + The short listing of the MIM specifies the interface to the resources and is given in <<mim_express>>. A graphical representation of the short listing of the MIM is given - in <<AnnexD>>. + in <<AnnexD>>. + Publicly available computer interpretable listings that are associated with this document + + are identified in <<annex_listings>>. + @@ -1144,10 +1077,10 @@ TT remove since locke is no longer available. - This part of ISO 10303 specifies the application module + This document specifies the application module . - The following are within the scope of this part of ISO 10303: + The following are within the scope of this document: @@ -1168,7 +1101,7 @@ TT remove since locke is no longer available. - The following are outside the scope of this part of ISO 10303: + The following are outside the scope of this document: @@ -1195,7 +1128,12 @@ TT remove since locke is no longer available. - + + + E + C + + This annex references a listing of the EXPRESS entity names and - corresponding short names as specified or referenced in this part of ISO - 10303. It also provides a listing of each EXPRESS schema specified in this - part of ISO 10303 without comments nor other explanatory text. These + corresponding short names as specified or referenced in document. + It also provides a listing of each EXPRESS schema specified in this + document without comments nor other explanatory text. These listings are available in computer-interpretable form in <<table_e1>> and can be found at the following URLs: @@ -1295,11 +1233,11 @@ provided that links throught SC4ONLINE to a new repository --> +this document, may be provided to support implementations. If the information is provided it can be found at the following URL:

--> Additional information, such as computer-interpretable rules derived from normative text or mappings in - this part of ISO 10303, may be provided to support implementations. If the information is provided it can be found at the following URL: + this document, may be provided to support implementations. If the information is provided it can be found at the following URL: + + + + |=== @@ -1499,7 +1447,7 @@ this part of ISO 10303, may be provided to support implementations. If the inf NOTE  The information provided in computer-interpretable form at the above URLs is informative. The information that is contained in the - body of this part of ISO 10303 is normative. + body of this document is normative.

--> @@ -1507,7 +1455,7 @@ this part of ISO 10303, may be provided to support implementations. If the inf The information provided in computer-interpretable form at the above URLs is informative. The information that is contained in the - body of this part of ISO 10303 is normative. + body of this document is normative. @@ -1680,6 +1628,21 @@ this part of ISO 10303, may be provided to support implementations. If the inf + + + + C + B + + + + + + E + C + + + @@ -1718,7 +1681,8 @@ this part of ISO 10303, may be provided to support implementations. If the inf NOTE 1  A graphical representation of the information requirements is given in - Annex C. + Annex + .

--> @@ -1863,15 +1827,15 @@ this part of ISO 10303, may be provided to support implementations. If the inf This subclause specifies the units of functionality (UoF) for this - part of ISO 10303 as well as any support elements needed for the + document as well as any support elements needed for the application module definition. - This part of ISO 10303 specifies the following units of + This document specifies the following units of functionality and application objects: - This part of ISO 10303 specifies the following units of + This document specifies the following units of functionality: @@ -1888,7 +1852,7 @@ this part of ISO 10303, may be provided to support implementations. If the inf - This part of ISO 10303 also includes the following units of + This document also includes the following units of functionality: @@ -1906,7 +1870,7 @@ this part of ISO 10303, may be provided to support implementations. If the inf --> - This part of ISO 10303 also includes the units of functionality + This document also includes the units of functionality defined in the application modules that are imported with the USE FROM statements specified in Clause 4.2 @@ -2250,7 +2214,7 @@ this part of ISO 10303, may be provided to support implementations. If the inf table. It uses elements from the common resources or from other application modules and defines the EXPRESS constructs that are specific to this - part of ISO 10303. + document. @@ -4225,6 +4189,18 @@ $module_ok,' Check the normatives references')"/> + + + C + B + + + + + E + C + + From 717613482ecb08890cd6970aa7d4f3f826ae1969 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Thu, 25 Apr 2024 00:16:02 +0300 Subject: [PATCH 21/26] sect_4_express.xsl updated, #144 --- .../stepmod.base_xsl/sect_4_express.xsl | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/sect_4_express.xsl b/src/main/resources/stepmod.base_xsl/sect_4_express.xsl index b331a8f..ca3a6fc 100644 --- a/src/main/resources/stepmod.base_xsl/sect_4_express.xsl +++ b/src/main/resources/stepmod.base_xsl/sect_4_express.xsl @@ -1,5 +1,5 @@ - + - - + - - The list of entity data types may be + The list of entity data types can be extended in application modules that use the constructs of this module. - - The list of entity data types may be + The list of entity data types can be extended in application modules that use the constructs of this module. - - The list of entity data types may be + The list of entity data types can be extended in application modules that use the constructs of this module. - - + - + From a1d74bda495b72ca27ce10f233bba75c075b23eb Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Thu, 25 Apr 2024 00:18:58 +0300 Subject: [PATCH 22/26] sect_5_mapping.xsl updated, #144 --- .../stepmod.base_xsl/sect_5_mapping.xsl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/sect_5_mapping.xsl b/src/main/resources/stepmod.base_xsl/sect_5_mapping.xsl index 5e0ee4d..c6756b0 100644 --- a/src/main/resources/stepmod.base_xsl/sect_5_mapping.xsl +++ b/src/main/resources/stepmod.base_xsl/sect_5_mapping.xsl @@ -1,8 +1,8 @@ - + - The mapping specification for this part of ISO 10303 is defined in + The mapping specification for this document is defined in @@ -178,7 +178,7 @@ $Id: sect_5_mapping.xsl,v 1.89 2019/03/28 19:39:31 mike Exp $ - The mapping specification for this part of ISO 10303 is defined in: + The mapping specification for this document is defined in: @@ -192,7 +192,7 @@ $Id: sect_5_mapping.xsl,v 1.89 2019/03/28 19:39:31 mike Exp $ - There is no mapping specification for this part of ISO 10303. + There is no mapping specification for this document. @@ -278,7 +278,7 @@ $Id: sect_5_mapping.xsl,v 1.89 2019/03/28 19:39:31 mike Exp $ This clause contains the mapping specification that defines how each - application element of this part of ISO 10303 (see <<>>) maps to one + application element of this document (see <<>>) maps to one or more MIM elements (see <<>>). @@ -353,7 +353,7 @@ When the mapping of an application element involves more than one MIM element, e MIM element is defined, for those MIM elements that are defined in a common resource document; * the ISO standard number and - part number of this part of ISO 10303, for those MIM elements that are defined in the MIM schema of this part. + part number of this document, for those MIM elements that are defined in the MIM schema of this part. @@ -417,7 +417,7 @@ When the mapping of an application element involves more than one MIM element, e * the reference path to its supertypes in the common resources, -for each MIM element created within this part of ISO 10303; +for each MIM element created within this document; * the specification of the relationships between MIM elements, when the mapping of an application element requires to relate instances of several MIM entity data types. In such a case, each line in the reference path From 23aee287bdc821e37f3c70956dd5f8c9ccd5aef5 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Thu, 25 Apr 2024 00:20:27 +0300 Subject: [PATCH 23/26] sect_6_refdata.xsl updated, #144 --- src/main/resources/stepmod.base_xsl/sect_6_refdata.xsl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 e59daa4..e398329 100644 --- a/src/main/resources/stepmod.base_xsl/sect_6_refdata.xsl +++ b/src/main/resources/stepmod.base_xsl/sect_6_refdata.xsl @@ -1,8 +1,8 @@ - + - Implementations of this part of ISO 10303 shall make use of the capability to classify an + Implementations of this document shall make use of the capability to classify an entity type using Classification_assignment (see ISO 10303-1114), Class (see ISO 10303-1070) and External_class (see ISO 10303-1275). - This annex contains a subclause for each entity type defined in or used by this part of ISO 10303 for which that capability + This annex contains a subclause for each entity type defined in or used by this document for which that capability shall be applied. The specified Uniform Resource Identifier (URI) is used to identify each class. From 62310ff6477cacedf8b0c20b7277685a590c1ab1 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Thu, 25 Apr 2024 00:29:22 +0300 Subject: [PATCH 24/26] sect_b_obj_reg.xsl updated, #144 --- .../stepmod.base_xsl/sect_b_obj_reg.xsl | 126 ++++++++++-------- 1 file changed, 71 insertions(+), 55 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/sect_b_obj_reg.xsl b/src/main/resources/stepmod.base_xsl/sect_b_obj_reg.xsl index 6f17350..28d95e7 100644 --- a/src/main/resources/stepmod.base_xsl/sect_b_obj_reg.xsl +++ b/src/main/resources/stepmod.base_xsl/sect_b_obj_reg.xsl @@ -1,8 +1,8 @@ - + @@ -90,7 +105,7 @@ $Id: sect_b_obj_reg.xsl,v 1.12 2004/11/02 11:26:59 robbod Exp $ - is assigned to this part of ISO 10303. The meaning of this value is defined + is assigned to this document. The meaning of this value is defined in ISO/IEC 8824-1, and is described in ISO 10303-1. @@ -98,7 +113,7 @@ $Id: sect_b_obj_reg.xsl,v 1.12 2004/11/02 11:26:59 robbod Exp $ @@ -116,7 +131,7 @@ $Id: sect_b_obj_reg.xsl,v 1.12 2004/11/02 11:26:59 robbod Exp $ @@ -156,54 +171,55 @@ $Id: sect_b_obj_reg.xsl,v 1.12 2004/11/02 11:26:59 robbod Exp $ - - - - - - - - - schema identification - + + + + - - - - To provide for unambiguous identification of the schema specifications - given in this application module in an open information system, the object - identifiers are assigned as follows: - - - - - - [align=center] - - - - - - - - - - - - is assigned to the schema. - The meaning of this value is defined in ISO/IEC 8824-1, and is described in - ISO 10303-1. - - - + + + + + schema identification + + + + + To provide for unambiguous identification of the schema specifications + given in this application module in an open information system, the object + identifiers are assigned as follows: + + + + + + [align=center] + + + + + + + + + + + + is assigned to the schema. + The meaning of this value is defined in ISO/IEC 8824-1, and is described in + ISO 10303-1. + + + + @@ -219,7 +235,7 @@ $Id: sect_b_obj_reg.xsl,v 1.12 2004/11/02 11:26:59 robbod Exp $ @@ -244,7 +260,7 @@ $Id: sect_b_obj_reg.xsl,v 1.12 2004/11/02 11:26:59 robbod Exp $ + select="concat($object_reg,' schema(1) ', $arm_schema_lf_reg,'(',$inf_obj_arm_lf_number,') }' )"/> @@ -271,7 +287,7 @@ $Id: sect_b_obj_reg.xsl,v 1.12 2004/11/02 11:26:59 robbod Exp $ From d18a82e1226f143bbe4e7e9dcdfe017ae21adc09 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Thu, 25 Apr 2024 00:32:38 +0300 Subject: [PATCH 25/26] sect_g_change.xsl updated, #144 --- .../stepmod.base_xsl/sect_g_change.xsl | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/resources/stepmod.base_xsl/sect_g_change.xsl b/src/main/resources/stepmod.base_xsl/sect_g_change.xsl index 91bd63b..68d144f 100644 --- a/src/main/resources/stepmod.base_xsl/sect_g_change.xsl +++ b/src/main/resources/stepmod.base_xsl/sect_g_change.xsl @@ -1,8 +1,8 @@ - + @@ -115,13 +115,21 @@ $Id: sect_g_change.xsl,v 1.17 2017/09/29 06:01:47 mikeward Exp $ - + + + + + +