Merge pull request #618 from metanorma/feature/presxml-autonum

Caption refactor Presentation XML: https://github.com/metanorma/isodo…

Gemfile.devel

@@ -0,0 +1,2 @@
+gem "mn-requirements", git: "https://github.com/metanorma/mn-requirements", branch: "feature/presxml-autonum"
+gem "isodoc-i18n", git: "https://github.com/metanorma/isodoc-i18n", branch: "fix/markup-connectives"

lib/isodoc-yaml/i18n-ar.yaml

@@ -33,15 +33,15 @@ internal_external_terms_boilerplate: |
   لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.
 no_information_available: "[لا توجد معلومات متاحة]"
 term_defined_in: "(%)"
-binary_and: "%1 و %2"
-multiple_and: "%1, و %2"
-binary_or: "%1 او %2"
-multiple_or: "%1, او %2"
-chain_and: "%1 و %2"
-chain_or: "%1 او %2"
-chain_from: "%1 %من 2"
-chain_to: "من %1 إلى %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>ﻭ</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>ﻭ</conn> %2"
+binary_or: "%1 <conn>ﺍﻭ</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>ﺍﻭ</conn> %2"
+chain_and: "%1 <conn>ﻭ</conn> %2"
+chain_or: "%1 <conn>ﺍﻭ</conn> %2"
+chain_from: "%1 <conn>%ﻢﻧ</conn> 2"
+chain_to: "<conn>ﻢﻧ</conn> %1 <conn>ﺈﻟﻯ</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender]
 SpelloutRules:

lib/isodoc-yaml/i18n-de.yaml

@@ -35,15 +35,15 @@ internal_external_terms_boilerplate: |
           Für die Zwecke dieses Dokuments gelten die in % und im Folgenden aufgeführten Begriffe und Definitionen.
 no_information_available: "[KEINE INFORMATION VERFÜGBAR]"
 term_defined_in: "(%)"
-binary_and: "%1 und %2"
-multiple_and: "%1, und %2"
-binary_or: "%1 oder %2"
-multiple_or: "%1, oder %2"
-chain_and: "%1 und %2"
-chain_or: "%1 oder %2"
-chain_from: "%1 von %2"
-chain_to: "%1 bis %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>und</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>und</conn> %2"
+binary_or: "%1 <conn>oder</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>oder</conn> %2"
+chain_and: "%1 <conn>und</conn> %2"
+chain_or: "%1 <conn>oder</conn> %2"
+chain_from: "%1 <conn>von</conn> %2"
+chain_to: "%1 <conn>bis</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:

lib/isodoc-yaml/i18n-en.yaml

@@ -38,15 +38,15 @@ internal_external_terms_boilerplate: |
       For the purposes of this document, the terms and definitions given in % and the following apply.
 no_information_available: "[NO INFORMATION AVAILABLE]"
 term_defined_in: "(%)"
-binary_and: "%1 and %2"
-multiple_and: "%1, and %2"
-binary_or: "%1 or %2"
-multiple_or: "%1, or %2"
-chain_and: "%1 and %2"
-chain_or: "%1 or %2"
-chain_from: "%1 from %2"
-chain_to: "%1 to %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>and</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>and</conn> %2"
+binary_or: "%1 <conn>or</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>or</conn> %2"
+chain_and: "%1 <conn>and</conn> %2"
+chain_or: "%1 <conn>or</conn> %2"
+chain_from: "%1 <conn>from</conn> %2"
+chain_to: "%1 <conn>to</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal

lib/isodoc-yaml/i18n-es.yaml

@@ -37,15 +37,15 @@ internal_external_terms_boilerplate: |
           Para los propósitos de este documento, se aplican los términos y definiciones dados en % y los siguientes.
 no_information_available: "[NO HAY INFORMACIÓN DISPONIBLE]"
 term_defined_in: "(%)"
-binary_and: "%1 y %2"
-multiple_and: "%1, y %2"
-binary_or: "%1 o %2"
-multiple_or: "%1, o %2"
-chain_and: "%1 y %2"
-chain_or: "%1 o %2"
-chain_from: "%1 del %2"
-chain_to: "%1 al %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>y<//conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>y</conn> %2"
+binary_or: "%1 <conn>o</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>o</conn> %2"
+chain_and: "%1 <conn>y</conn> %2"
+chain_or: "%1 <conn>o</conn> %2"
+chain_from: "%1 <conn>del</conn> %2"
+chain_to: "%1 <conn>al</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:

lib/isodoc-yaml/i18n-fr.yaml

@@ -34,15 +34,15 @@ internal_external_terms_boilerplate: |
           Pour les besoins du présent document, les termes et définitions de % ainsi que les suivants, s’appliquent.
 no_information_available: "[PAS D’INFORMATION DISPONIBLE]"
 term_defined_in: "(%)"
-binary_and: "%1 et %2"
-multiple_and: "%1, et %2"
-binary_or: "%1 ou %2"
-multiple_or: "%1, ou %2"
-chain_and: "%1 et %2"
-chain_or: "%1 ou %2"
-chain_from: "%1 de %2"
-chain_to: "%1 à %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>et</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>et</conn> %2"
+binary_or: "%1 <conn>ou</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>ou</conn> %2"
+chain_and: "%1 <conn>et</conn> %2"
+chain_or: "%1 <conn>ou</conn> %2"
+chain_from: "%1 <conn>de</conn> %2"
+chain_to: "%1 <conn>à</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:

lib/isodoc-yaml/i18n-ja.yaml

@@ -34,16 +34,16 @@ internal_external_terms_boilerplate: |
           この規格で用いる主な用語及び定義は，次によるほか，% による。
 no_information_available: "[情報はありません]"
 term_defined_in: "(%)"
-binary_and: "%1 and %2"
-multiple_and: "%1, and %2"
-binary_or: "%1 or %2"
-multiple_or: "%1, or %2"
-chain_and: "%1 and %2"
-chain_or: "%1 or %2"
-chain_from: "%1 from %2"
-chain_to: "%1～%2"
-nested_xref: "%1の%2"
-list_nested_xref: "%1の%2"
+binary_and: "%1 <conn>及び</conn> %2"
+multiple_and: "%1<enum-comma>、</enum-comma>%2"
+binary_or: "%1 <conn>または</conn> %2"
+multiple_or: "%1<enum-comma>、</enum-comma> <conn>または</conn> %2"
+chain_and: "%1 <conn>及び</conn> %2"
+chain_or: "%1 <conn>または</conn> %2"
+chain_from: "%1 <conn>から</conn> %2"
+chain_to: "%1<conn>～</conn>%2"
+nested_xref: "%1<conn>の</conn>%2"
+list_nested_xref: "%1<conn>の</conn>%2"
 no_conflate_xref_locations: true
 ordinal_keys: []
 SpelloutRules: spellout-ordinal

lib/isodoc-yaml/i18n-ru.yaml

@@ -37,15 +37,15 @@ internal_external_terms_boilerplate: |
           Для целей этого документа применяются термины и определения, данные в % и следующие.
 no_information_available: "[ИНФОРМАЦИЯ ОТСУТСТВУЕТ]"
 term_defined_in: "(%)"
-binary_and: "%1 и %2"
-multiple_and: "%1, и %2"
-binary_or: "%1 или %2"
-multiple_or: "%1, или %2"
-chain_and: "%1 и %2"
-chain_or: "%1 или %2"
-chain_from: "%1 от %2"
-chain_to: "%1 до %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>и</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>и</conn> %2"
+binary_or: "%1 <conn>или</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>или</conn> %2"
+chain_and: "%1 <conn>и</conn> %2"
+chain_or: "%1 <conn>или</conn> %2"
+chain_from: "%1 <conn>от</conn> %2"
+chain_to: "%1 <conn>до</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number,case]
 SpelloutRules:

lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -36,15 +36,15 @@ internal_external_terms_boilerplate: |
           % 界定的以及下列术语和定义适用于本文件。
 no_information_available: "[无资料]"
 term_defined_in: "（%）"
-binary_and: "%1和%2"
-multiple_and: "%1、和%2"
-binary_or: "%1或%2"
-multiple_or: "%1、或%2"
-chain_and: "%1和%2"
-chain_or: "%1或%2"
-chain_from: "%1从%2"
-chain_to: "%1到%2"
-nested_xref: "%1, %2"
+binary_and: "%1<conn>和</conn>%2"
+multiple_and: "%1<enum-comma>、</enum-comma><conn>和</conn>%2"
+binary_or: "%1<conn>或</conn>%2"
+multiple_or: "%1<enum-comma>、</enum-comma><conn>或</conn>%2"
+chain_and: "%1<conn>和</conn>%2"
+chain_or: "%1<conn>或</conn>%2"
+chain_from: "%1<conn>从</conn>%2"
+chain_to: "%1<conn>到</conn>%2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal

lib/isodoc/function/blocks.rb

@@ -25,9 +25,9 @@ def figure_parse(node, out)
       def figure_parse1(node, out)
         out.div **figure_attrs(node) do |div|
           node.children.each do |n|
-            parse(n, div) unless n.name == "name"
+            parse(n, div) unless n.name == "fmt-name"
           end
-          figure_name_parse(node, div, node.at(ns("./name")))
+          figure_name_parse(node, div, node.at(ns("./fmt-name")))
         end
       end
 
@@ -37,9 +37,9 @@ def pseudocode_attrs(node)
 
       def pseudocode_parse(node, out)
         @in_figure = true
-        name = node.at(ns("./name"))
+        name = node.at(ns("./fmt-name"))
         out.div **pseudocode_attrs(node) do |div|
-          node.children.each { |n| parse(n, div) unless n.name == "name" }
+          node.children.each { |n| parse(n, div) unless n.name == "fmt-name" }
           sourcecode_name_parse(node, div, name)
         end
         @in_figure = false
@@ -57,7 +57,7 @@ def sourcecode_attrs(node)
       end
 
       def sourcecode_parse(node, out)
-        name = node.at(ns("./name"))
+        name = node.at(ns("./fmt-name"))
         out.p **sourcecode_attrs(node) do |div|
           sourcecode_parse1(node, div)
         end
@@ -71,7 +71,7 @@ def sourcecode_parse1(node, div)
           node.at("./ancestor::xmlns:table[@class = 'rouge-line-table']") and
           @sourcecode = "table"
         node.children.each do |n|
-          %w(name dl).include?(n.name) and next
+          %w(fmt-name dl).include?(n.name) and next
           parse(n, div)
         end
         @sourcecode = false
@@ -93,7 +93,7 @@ def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
           div.p do |_p|
             parse(node.at(ns("./stem")), div)
-            if lbl = node&.at(ns("./name"))&.text
+            if lbl = node&.at(ns("./fmt-name"))&.text
               insert_tab(div, 1)
               div << lbl
             end
@@ -109,7 +109,7 @@ def formula_parse(node, out)
         out.div **formula_attrs(node) do |div|
           formula_parse1(node, div)
           node.children.each do |n|
-            %w(stem name).include? n.name and next
+            %w(stem fmt-name).include? n.name and next
             parse(n, div)
           end
         end