Presentation XML refactor, terms: termsource modification: #630

metanorma · Jan 8, 2025 · 036bc30 · 036bc30
1 parent 2d9646e
commit 036bc30
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/lib/isodoc/presentation_function/terms.rb b/lib/isodoc/presentation_function/terms.rb
@@ -132,7 +132,7 @@ def termsource_add_modification_text(mod)
       mod or return
       mod.text.strip.empty? or mod.previous = " &#x2014; "
       mod.elements.size == 1 and mod.children = to_xml(mod.elements[0].children)
-      mod.replace(to_xml(mod.children))
+      mod.replace(semx_fmt_dup(mod))
     end
 
     def termsource_status(status)

diff --git a/spec/isodoc/figures_spec.rb b/spec/isodoc/figures_spec.rb
@@ -150,7 +150,7 @@
                    <source status="generalisation">
                       [SOURCE:
                       <xref type="inline" target="ISO712">ISO 712, Section 1</xref>
-                      — with adjustments;
+                      — <semx element="modification" source="_">with adjustments</semx>;
                       <xref type="inline" target="ISO712">ISO 712, Section 2</xref>
                       ]
                    </source>

diff --git a/spec/isodoc/table_spec.rb b/spec/isodoc/table_spec.rb
@@ -228,7 +228,7 @@
                     <source status="generalisation">
                        [SOURCE:
                        <xref type="inline" target="ISO712">ISO 712, Section 1</xref>
-                       — with adjustments;
+                       — <semx element="modification" source="_">with adjustments</semx>;
                        <xref type="inline" target="ISO712">ISO 712, Section 2</xref>
                        ]
                     </source>

diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb
@@ -244,7 +244,7 @@
                                </locality>
                                ISO 7301:2011, Clause 3.1
                             </origin>
-                            , modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
+                            , modified — <semx element="modification" source="_">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</semx>
                          </semx>
                          ]
                       </fmt-termsource>
@@ -339,14 +339,14 @@
                          <origin citeas="">
                             <termref base="IEV" target="xyz">t1</termref>
                          </origin>
-                         — comment
+                         — <semx element="modification" source="_">comment</semx>
                       </semx>
                       ;
                       <semx element="termsource" source="_">
                          <origin citeas="">
                             <termref base="IEV" target="xyz"/>
                          </origin>
-                         , modified — with adjustments
+                         , modified — <semx element="modification" source="_">with adjustments</semx>
                       </semx>
                       ]
                    </fmt-termsource>
@@ -833,7 +833,7 @@
                                </locality>
                                ISO 7301:2011, Clause 3.1
                             </origin>
-                            , modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
+                            , modified — <semx element="modification" source="_">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</semx>
                          </semx>
                          ]
                       </semx>
@@ -918,7 +918,7 @@
                    <origin citeas="">
                       <termref base="IEV" target="xyz"/>
                    </origin>
-                   , modified — with adjustments
+                   , modified — <semx element="modification" source="_">with adjustments</semx>
                 </semx>
                 ]
              </fmt-termsource>
@@ -2160,21 +2160,21 @@
                    <origin citeas="">
                       <termref base="IEV" target="xyz">t1</termref>
                    </origin>
-                   — with adjustments
+                   — <semx element="modification" source="_">with adjustments</semx>
                 </semx>
                 ;
                 <semx element="termsource" source="_">
                    <origin citeas="">
                       <termref base="IEV" target="xyz"/>
                    </origin>
-                   , adapted — with adjustments
+                   , adapted — <semx element="modification" source="_">with adjustments</semx>
                 </semx>
                 ;
                 <semx element="termsource" source="_">
                    <origin citeas="">
                       <termref base="IEV" target="xyz"/>
                    </origin>
-                   , modified — with adjustments
+                   , modified — <semx element="modification" source="_">with adjustments</semx>
                 </semx>
                 ;
                 <semx element="termsource" source="_">
@@ -2306,21 +2306,21 @@
                    <origin citeas="">
                       <termref base="IEV" target="xyz">t1</termref>
                    </origin>
-                   — with adjustments
+                   — <semx element="modification" source="_">with adjustments</semx>
                 </semx>
                 ;
                 <semx element="termsource" source="_">
                    <origin citeas="">
                       <termref base="IEV" target="xyz"/>
                    </origin>
-                   , angepasst — with adjustments
+                   , angepasst — <semx element="modification" source="_">with adjustments</semx>
                 </semx>
                 ;
                 <semx element="termsource" source="_">
                    <origin citeas="">
                       <termref base="IEV" target="xyz"/>
                    </origin>
-                   , geändert — with adjustments
+                   , geändert — <semx element="modification" source="_">with adjustments</semx>
                 </semx>
                 ;
                 <semx element="termsource" source="_">