Presentation XML refactor, terms: #630

Author: opoudjis

lib/isodoc/presentation_function/terms.rb

@@ -130,9 +130,13 @@ def termsource_modification(elem)
 
     def termsource_add_modification_text(mod)
       mod or return
-      mod.text.strip.empty? or mod.previous = " — "
+      if mod.text.strip.empty?
+        mod.remove
+        return
+      end
+      mod.previous = " — "
       mod.elements.size == 1 and mod.children = to_xml(mod.elements[0].children)
-      mod.text.strip.empty? or mod.replace(semx_fmt_dup(mod))
+      mod.replace(semx_fmt_dup(mod))
     end
 
     def termsource_status(status)

spec/isodoc/terms_spec.rb

@@ -136,6 +136,14 @@
             <p id='_'>with adjustments</p>
           </modification>
         </termsource>
+        <termsource status='adapted'>
+          <origin citeas=''>
+            <termref base='IEV' target='xyz'>t1</termref>
+          </origin>
+          <modification>
+            <p id='_'/>
+          </modification>
+        </termsource>
       </term>
       <term id="paddy"><preferred><expression><name>paddy</name></expression></preferred>
       <admitted><letter-symbol><name>paddy rice</name></letter-symbol>
@@ -333,6 +341,14 @@
                          <p original-id="_">with adjustments</p>
                       </modification>
                    </termsource>
+                   <termsource status="adapted" id="_">
+                      <origin citeas="">
+                         <termref base="IEV" target="xyz">t1</termref>
+                      </origin>
+                      <modification>
+                         <p original-id="_"/>
+                      </modification>
+                   </termsource>
                    <fmt-termsource status="identical">
                       [SOURCE:
                       <semx element="termsource" source="_">
@@ -347,6 +363,13 @@
                             <termref base="IEV" target="xyz"/>
                          </origin>
                          , modified — <semx element="modification" source="_">with adjustments</semx>
+               </semx>
+               ;
+               <semx element="termsource" source="_">
+                  <origin citeas="">
+                     <termref base="IEV" target="xyz">t1</termref>
+                  </origin>
+                  , adapted
                       </semx>
                       ]
                    </fmt-termsource>
@@ -568,7 +591,7 @@
                          </ul>
                       </div>
                    </div>
-                   <p>[SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]</p>
+                   <p>[SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments; t1, adapted]</p>
                    <p class="TermNum" id="paddy">1.2.</p>
                    <p class="Terms" style="text-align:left;">
                       <b>paddy</b>
@@ -648,7 +671,7 @@
                          </ul>
                       </div>
                    </div>
-                   <p>[SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]</p>
+                   <p>[SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments; t1, adapted]</p>
                    <p class="TermNum" id="paddy">1.2.</p>
                    <p class="Terms" style="text-align:left;">
                       <b>paddy</b>