isodoc 3.1.6 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9537662f7ab02f4c50797c307b3f0ed4ae1f1d1627b70e3bd61f58bdfc9d30c
-  data.tar.gz: a9582a5ba998a8807e6da33a908be1523a362d8be41dd4964efea3263d07a7cf
+  metadata.gz: aad761a973bdff1849d666ab902b4964b557b26fb145deffb180aa665f411d11
+  data.tar.gz: 1f0ede0902421b11b89e8caf6034e17e13dc5b8639c0bfaa435ad3cb1f609f06
 SHA512:
-  metadata.gz: cea0eec386e6300c4b993d54b81f634625973a92363effaba6ca5ebcc62bf9f9bb847a714264b4909bd001020ea0ed47bf5503f494860b6af9b9ec83482ea9ab
-  data.tar.gz: 61678783412c3bc1fd6525dd656750f152eb18868cb4beabbf24ad963a63176b86fe90889844e6b3527cbc47637d49c51e03982991911f222acf8505277484b8
+  metadata.gz: e86d05bd30c8c3f4ff3299c82af79bbde4bdf4018aab90c635808fd66c88ee04d20384c87d42b292a888acf72114ff66ba250af69628e83f58378f4b48daf12e
+  data.tar.gz: fa112ae3e51c7b2045f93e387f60541c94a7771eb38a74b1d311102ba376e84aa1e7fc3ed0dc12599b8ffd4b6270677c4b85502398effbab970f7efd6103fe1e

data/lib/isodoc/css_border_parser.rb

@@ -0,0 +1,229 @@
+# frozen_string_literal: true
+
+require_relative "css_border_parser_vars"
+
+module IsoDoc
+  # CssBorderParser provides functionality to parse CSS border shorthand
+  # properties # and break them down into atomic CSS attributes.
+  class CssBorderParser
+    # BorderParser class handles the parsing of CSS border properties
+    class BorderParser
+      def initialize; end # No initialization needed
+
+      # Parse CSS and extract border properties
+      #
+      # @param css_string [String] CSS content to parse
+      # @return [Hash] Parsed border properties organized by selector
+      def parse(css_string)
+        results = {}
+        rule_sets = extract_rule_sets(css_string)
+        rule_sets.each do |selector, declarations|
+          results[selector] = {}
+          process_border_properties(declarations, results[selector])
+          store_non_border_properties(declarations, results[selector])
+        end
+
+        results
+      end
+
+      # Parse a CSS declaration string
+      #
+      # @param css_declaration [String] CSS declaration string
+      # (can contain multiple declarations)
+      # @return [Hash] Parsed border properties
+      def parse_declaration(css_declaration)
+        result = {}
+        declarations = css_declaration.split(";").each_with_object({}) do |d, m|
+          d = d.strip
+          d.empty? and next
+          property, value = d.split(":", 2).map(&:strip)
+          m[property] = value
+        end
+        process_border_properties(declarations, result)
+        store_non_border_properties(declarations, result)
+        result
+      end
+
+      # Generate a CSS string from parsed properties
+      #
+      # @param parsed_properties [Hash] Parsed CSS properties
+      # @param format [Symbol] Output format (:inline, :rule_set)
+      # @param selector [String] CSS selector (only used with :rule_set format)
+      # @return [String] CSS string representation
+      def to_css_string(parsed_properties, format: :inline, selector: nil)
+        css_parts = []
+        parsed_properties.each do |property_group, components|
+          property_group == "other_properties" and next
+          if property_group == "border"
+            components.each do |property_type, value|
+              css_parts << "border-#{property_type}: #{value};"
+            end
+          elsif property_group.start_with?("border-")
+            # direction-specific border properties
+            direction = property_group.sub("border-", "")
+            components.each do |property_type, value|
+              css_parts << "border-#{direction}-#{property_type}: #{value};"
+            end
+          end
+        end
+        # non-border properties
+        parsed_properties["other_properties"]&.each do |property, value|
+          css_parts << "#{property}: #{value};"
+        end
+        format_properties(format, css_parts, selector)
+      end
+
+      private
+
+      def format_properties(format, css_parts, selector)
+        case format
+        when :inline
+          css_parts.join(" ")
+        when :rule_set
+          selector = selector || "selector"
+          "#{selector} {\n  #{css_parts.join("\n  ")}\n}"
+        else
+          css_parts.join(" ")
+        end
+      end
+
+      # Extract rule sets from CSS string
+      def extract_rule_sets(css_string)
+        rule_sets = {}
+        css_string = css_string.gsub(/\/\*.*?\*\//m, "") # Remove comments
+        css_string.scan(/([^{]+)\{([^}]+)\}/m) do |selector, declarations|
+          selector = selector.strip
+          declarations_hash = {} # Extract declarations
+          declarations.scan(/([^:;]+):([^;]+);?/) do |property, value|
+            declarations_hash[property.strip] = value.strip
+          end
+          rule_sets[selector] = declarations_hash
+        end
+        rule_sets
+      end
+
+      # Process border properties from declarations
+      def process_border_properties(declarations, result_hash)
+        # Process general border property
+        process_border_property(declarations, result_hash, "border")
+        # Process direction-specific border properties
+        ["top", "right", "bottom", "left"].each do |direction|
+          process_border_property(declarations, result_hash,
+                                  "border-#{direction}")
+        end
+        # Process individual property groups
+        process_individual_properties(declarations, result_hash)
+      end
+
+      # Store non-border properties
+      def store_non_border_properties(declarations, result_hash)
+        # Initialize other_properties hash if it doesn't exist
+        result_hash["other_properties"] ||= {}
+
+        # Identify and store non-border properties
+        declarations.each do |property, value|
+          # Skip border-related properties
+          next if property == "border"
+          next if property.start_with?("border-")
+
+          # Store non-border property
+          result_hash["other_properties"][property] = value
+        end
+      end
+
+      # Process a specific border property
+      def process_border_property(declarations, result_hash, prefix)
+        # Check if the property exists
+        if declarations.key?(prefix)
+          # Parse the border shorthand value
+          components = parse_border_value(declarations[prefix])
+          result_hash[prefix] = components
+        end
+      end
+
+      # Parse border shorthand value into components
+      def parse_border_value(value)
+        components = {
+          "width" => DEFAULT_VALUES["width"],
+          "style" => DEFAULT_VALUES["style"],
+          "color" => DEFAULT_VALUES["color"],
+        }
+        value.split(/\s+/).each do |part|
+          if width?(part) then components["width"] = part
+          elsif style?(part) then components["style"] = part
+          elsif color?(part)
+            components["color"] = convert_color_to_rgb(part)
+          end
+        end
+        components
+      end
+
+      # Convert a color name to its RGB hex value
+      def convert_color_to_rgb(color)
+        color_lower = color.downcase
+        # Return the hex value if the color is a named color
+        COLOR_MAP.key?(color_lower) and return COLOR_MAP[color_lower]
+        # Return the original value if it's not a named color
+        # or is already in a valid color format
+        color
+      end
+
+      # Process individual property groups
+      def process_individual_properties(declarations, result)
+        # Check for individual property groups
+        individual_props = {}
+        ["width", "style", "color"].each do |type|
+          name = "border-#{type}"
+          declarations.key?(name) or next
+          # If we don't have a border property yet, create it
+          result["border"] ||= {}
+          result["border"][type] = if type == "color"
+                                     convert_color_to_rgb(declarations[name])
+                                   else
+                                     declarations[name]
+                                   end
+          individual_props[type] = true
+        end
+        process_individual_properties_cleanup(individual_props, declarations,
+                                              result)
+      end
+
+      # If we're only dealing with individual properties (not a shorthand),
+      # only include the properties that were explicitly specified
+      def process_individual_properties_cleanup(props, declarations, result)
+        if props.size.positive? && !declarations.key?("border")
+          # Remove default values for properties that weren't specified
+          ["width", "style", "color"].each do |type|
+            props[type] or result["border"].delete(type)
+          end
+        end
+      end
+
+      # Check if a value is a border width
+      def width?(value)
+        return true if BORDER_WIDTHS.include?(value)
+        return true if /^(\d+(\.\d+)?)(px|em|rem|%|pt|pc|in|cm|mm|ex|ch|vw|vh|vmin|vmax)$/.match?(value)
+        return true if /^\d+$/.match?(value)
+
+        false
+      end
+
+      # Check if a value is a border style
+      def style?(value)
+        BORDER_STYLES.include?(value)
+      end
+
+      # Check if a value is a color
+      def color?(value)
+        return true if COLOR_KEYWORDS.include?(value.downcase)
+        return true if /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/.match?(value)
+        return true if /^rgb\(\s*\d+\s*,\s*\d+\s*,\s*\d+\s*\)$/.match?(value)
+        return true if /^rgba\(\s*\d+\s*,\s*\d+\s*,\s*\d+\s*,\s*[\d.]+\s*\)$/.match?(value)
+        return true if /^hsl\(\s*\d+\s*,\s*[\d.]+%\s*,\s*[\d.]+%\s*\)$/.match?(value)
+        return true if /^hsla\(\s*\d+\s*,\s*[\d.]+%\s*,\s*[\d.]+%\s*,\s*[\d.]+\s*\)$/.match?(value)
+
+        false
+      end
+    end
+  end
+end

data/lib/isodoc/css_border_parser_vars.rb

@@ -0,0 +1,211 @@
+# frozen_string_literal: true
+
+module IsoDoc
+  class CssBorderParser
+    class BorderParser
+      # Default values according to CSS specifications
+      DEFAULT_VALUES = {
+        "width" => "medium",
+        "style" => "none",
+        "color" => "currentColor",
+      }.freeze
+
+      # CSS border width values
+      BORDER_WIDTHS = ["thin", "medium", "thick"].freeze
+
+      # CSS border style values
+      BORDER_STYLES = [
+        "none", "hidden", "dotted", "dashed", "solid", "double",
+        "groove", "ridge", "inset", "outset"
+      ].freeze
+
+      # CSS color keywords
+      COLOR_KEYWORDS = [
+        "black", "silver", "gray", "white", "maroon", "red", "purple",
+        "fuchsia", "green", "lime", "olive", "yellow", "navy", "blue",
+        "teal", "aqua", "orange", "aliceblue", "antiquewhite", "aquamarine",
+        "azure", "beige", "bisque", "blanchedalmond", "blueviolet", "brown",
+        "burlywood", "cadetblue", "chartreuse", "chocolate", "coral",
+        "cornflowerblue", "cornsilk", "crimson", "cyan", "darkblue",
+        "darkcyan", "darkgoldenrod", "darkgray", "darkgreen", "darkgrey",
+        "darkkhaki", "darkmagenta", "darkolivegreen", "darkorange",
+        "darkorchid", "darkred", "darksalmon", "darkseagreen", "darkslateblue",
+        "darkslategray", "darkslategrey", "darkturquoise", "darkviolet",
+        "deeppink", "deepskyblue", "dimgray", "dimgrey", "dodgerblue",
+        "firebrick", "floralwhite", "forestgreen", "gainsboro", "ghostwhite",
+        "gold", "goldenrod", "greenyellow", "grey", "honeydew", "hotpink",
+        "indianred", "indigo", "ivory", "khaki", "lavender", "lavenderblush",
+        "lawngreen", "lemonchiffon", "lightblue", "lightcoral", "lightcyan",
+        "lightgoldenrodyellow", "lightgray", "lightgreen", "lightgrey",
+        "lightpink", "lightsalmon", "lightseagreen", "lightskyblue",
+        "lightslategray", "lightslategrey", "lightsteelblue", "lightyellow",
+        "limegreen", "linen", "magenta", "mediumaquamarine", "mediumblue",
+        "mediumorchid", "mediumpurple", "mediumseagreen", "mediumslateblue",
+        "mediumspringgreen", "mediumturquoise", "mediumvioletred",
+        "midnightblue", "mintcream", "mistyrose", "moccasin", "navajowhite",
+        "oldlace", "olivedrab", "orangered", "orchid", "palegoldenrod",
+        "palegreen", "paleturquoise", "palevioletred", "papayawhip",
+        "peachpuff", "peru", "pink", "plum", "powderblue", "rosybrown",
+        "royalblue", "saddlebrown", "salmon", "sandybrown", "seagreen",
+        "seashell", "sienna", "skyblue", "slateblue", "slategray",
+        "slategrey", "snow", "springgreen", "steelblue", "tan", "thistle",
+        "tomato", "turquoise", "violet", "wheat", "whitesmoke",
+        "yellowgreen", "transparent", "currentColor"
+      ].freeze
+
+      # Mapping of CSS color names to RGB hex values
+      COLOR_MAP = {
+        "black" => "#000000",
+        "silver" => "#C0C0C0",
+        "gray" => "#808080",
+        "white" => "#FFFFFF",
+        "maroon" => "#800000",
+        "red" => "#FF0000",
+        "purple" => "#800080",
+        "fuchsia" => "#FF00FF",
+        "green" => "#008000",
+        "lime" => "#00FF00",
+        "olive" => "#808000",
+        "yellow" => "#FFFF00",
+        "navy" => "#000080",
+        "blue" => "#0000FF",
+        "teal" => "#008080",
+        "aqua" => "#00FFFF",
+        "orange" => "#FFA500",
+        "aliceblue" => "#F0F8FF",
+        "antiquewhite" => "#FAEBD7",
+        "aquamarine" => "#7FFFD4",
+        "azure" => "#F0FFFF",
+        "beige" => "#F5F5DC",
+        "bisque" => "#FFE4C4",
+        "blanchedalmond" => "#FFEBCD",
+        "blueviolet" => "#8A2BE2",
+        "brown" => "#A52A2A",
+        "burlywood" => "#DEB887",
+        "cadetblue" => "#5F9EA0",
+        "chartreuse" => "#7FFF00",
+        "chocolate" => "#D2691E",
+        "coral" => "#FF7F50",
+        "cornflowerblue" => "#6495ED",
+        "cornsilk" => "#FFF8DC",
+        "crimson" => "#DC143C",
+        "cyan" => "#00FFFF",
+        "darkblue" => "#00008B",
+        "darkcyan" => "#008B8B",
+        "darkgoldenrod" => "#B8860B",
+        "darkgray" => "#A9A9A9",
+        "darkgreen" => "#006400",
+        "darkgrey" => "#A9A9A9",
+        "darkkhaki" => "#BDB76B",
+        "darkmagenta" => "#8B008B",
+        "darkolivegreen" => "#556B2F",
+        "darkorange" => "#FF8C00",
+        "darkorchid" => "#9932CC",
+        "darkred" => "#8B0000",
+        "darksalmon" => "#E9967A",
+        "darkseagreen" => "#8FBC8F",
+        "darkslateblue" => "#483D8B",
+        "darkslategray" => "#2F4F4F",
+        "darkslategrey" => "#2F4F4F",
+        "darkturquoise" => "#00CED1",
+        "darkviolet" => "#9400D3",
+        "deeppink" => "#FF1493",
+        "deepskyblue" => "#00BFFF",
+        "dimgray" => "#696969",
+        "dimgrey" => "#696969",
+        "dodgerblue" => "#1E90FF",
+        "firebrick" => "#B22222",
+        "floralwhite" => "#FFFAF0",
+        "forestgreen" => "#228B22",
+        "gainsboro" => "#DCDCDC",
+        "ghostwhite" => "#F8F8FF",
+        "gold" => "#FFD700",
+        "goldenrod" => "#DAA520",
+        "greenyellow" => "#ADFF2F",
+        "grey" => "#808080",
+        "honeydew" => "#F0FFF0",
+        "hotpink" => "#FF69B4",
+        "indianred" => "#CD5C5C",
+        "indigo" => "#4B0082",
+        "ivory" => "#FFFFF0",
+        "khaki" => "#F0E68C",
+        "lavender" => "#E6E6FA",
+        "lavenderblush" => "#FFF0F5",
+        "lawngreen" => "#7CFC00",
+        "lemonchiffon" => "#FFFACD",
+        "lightblue" => "#ADD8E6",
+        "lightcoral" => "#F08080",
+        "lightcyan" => "#E0FFFF",
+        "lightgoldenrodyellow" => "#FAFAD2",
+        "lightgray" => "#D3D3D3",
+        "lightgreen" => "#90EE90",
+        "lightgrey" => "#D3D3D3",
+        "lightpink" => "#FFB6C1",
+        "lightsalmon" => "#FFA07A",
+        "lightseagreen" => "#20B2AA",
+        "lightskyblue" => "#87CEFA",
+        "lightslategray" => "#778899",
+        "lightslategrey" => "#778899",
+        "lightsteelblue" => "#B0C4DE",
+        "lightyellow" => "#FFFFE0",
+        "limegreen" => "#32CD32",
+        "linen" => "#FAF0E6",
+        "magenta" => "#FF00FF",
+        "mediumaquamarine" => "#66CDAA",
+        "mediumblue" => "#0000CD",
+        "mediumorchid" => "#BA55D3",
+        "mediumpurple" => "#9370DB",
+        "mediumseagreen" => "#3CB371",
+        "mediumslateblue" => "#7B68EE",
+        "mediumspringgreen" => "#00FA9A",
+        "mediumturquoise" => "#48D1CC",
+        "mediumvioletred" => "#C71585",
+        "midnightblue" => "#191970",
+        "mintcream" => "#F5FFFA",
+        "mistyrose" => "#FFE4E1",
+        "moccasin" => "#FFE4B5",
+        "navajowhite" => "#FFDEAD",
+        "oldlace" => "#FDF5E6",
+        "olivedrab" => "#6B8E23",
+        "orangered" => "#FF4500",
+        "orchid" => "#DA70D6",
+        "palegoldenrod" => "#EEE8AA",
+        "palegreen" => "#98FB98",
+        "paleturquoise" => "#AFEEEE",
+        "palevioletred" => "#DB7093",
+        "papayawhip" => "#FFEFD5",
+        "peachpuff" => "#FFDAB9",
+        "peru" => "#CD853F",
+        "pink" => "#FFC0CB",
+        "plum" => "#DDA0DD",
+        "powderblue" => "#B0E0E6",
+        "rosybrown" => "#BC8F8F",
+        "royalblue" => "#4169E1",
+        "saddlebrown" => "#8B4513",
+        "salmon" => "#FA8072",
+        "sandybrown" => "#F4A460",
+        "seagreen" => "#2E8B57",
+        "seashell" => "#FFF5EE",
+        "sienna" => "#A0522D",
+        "skyblue" => "#87CEEB",
+        "slateblue" => "#6A5ACD",
+        "slategray" => "#708090",
+        "slategrey" => "#708090",
+        "snow" => "#FFFAFA",
+        "springgreen" => "#00FF7F",
+        "steelblue" => "#4682B4",
+        "tan" => "#D2B48C",
+        "thistle" => "#D8BFD8",
+        "tomato" => "#FF6347",
+        "turquoise" => "#40E0D0",
+        "violet" => "#EE82EE",
+        "wheat" => "#F5DEB3",
+        "whitesmoke" => "#F5F5F5",
+        "yellowgreen" => "#9ACD32",
+        # Special values that should not be converted
+        "transparent" => "transparent",
+        "currentColor" => "currentColor",
+      }.freeze
+    end
+  end
+end

data/lib/isodoc/function/blocks.rb

@@ -157,7 +157,7 @@ module IsoDoc
 
       def passthrough_parse(node, out)
         node["formats"] &&
-          !(node["formats"].split(" ").include? @format.to_s) and return
+          !(node["formats"].split.include? @format.to_s) and return
         out.passthrough node.text
       end
 

data/lib/isodoc/function/blocks_example_note.rb

@@ -78,7 +78,6 @@ module IsoDoc
           name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
           end
-          #insert_tab(p, 1) # TODO to Presentation XML
           children_parse(para, p)
         end
         para.xpath("./following-sibling::*").each { |n| parse(n, div) }
@@ -90,7 +89,6 @@ module IsoDoc
             p.span class: "note_label" do |s|
               name.remove.children.each { |n| parse(n, s) }
             end
-            #insert_tab(p, 1) # TODO to Presentation XML
           end
         children_parse(node, div)
       end

data/lib/isodoc/function/footnotes.rb

@@ -3,7 +3,7 @@ module IsoDoc
     module Footnotes
       def make_table_footnote_link(out, fnid, node)
         attrs = { href: "##{fnid}", class: "TableFootnoteRef" }
-        sup = node.at(ns("./sup")) and sup.replace(sup.children)
+        sup = node.at(ns(".//sup")) and sup.replace(sup.children)
         out.a **attrs do |a|
           children_parse(node, a)
         end
@@ -30,10 +30,11 @@ module IsoDoc
       end
 
       def update_table_fn_body_ref(fnote, table, reference)
-        fnbody = table.at(ns(".//fmt-fn-body[@id = '#{fnote['target']}']")) or return
+        fnbody = table.at(ns(".//fmt-fn-body[@id = '#{fnote['target']}']")) or
+          return
         fnbody["reference"] = reference
         fnbody["is_table"] = true
-        sup = fnbody.at(ns(".//fmt-fn-label/sup")) and sup.replace(sup.children)
+        sup = fnbody.at(ns(".//fmt-fn-label//sup")) and sup.replace(sup.children)
         fnbody.xpath(ns(".//fmt-fn-label")).each do |s|
           s["class"] = "TableFootnoteRef"
           s.name = "span"

data/lib/isodoc/function/inline.rb

@@ -220,6 +220,7 @@ module IsoDoc
       def amend_parse(node, out); end
       def semx_sourcecode_parse(node, out); end
       def review_note_parse(node, out); end
+      def semx_source_parse(node, out); end
 
       def fmt_name_parse(node, out)
         children_parse(node, out)

data/lib/isodoc/function/lists.rb

@@ -34,21 +34,6 @@ module IsoDoc
         OL_STYLE[type.to_sym]
       end
 
-      # We don't really want users to specify type of ordered list;
-      # we will use a fixed hierarchy as practiced by ISO (though not
-      # fully spelled out): a) 1) i) A) I)
-      # Fallback, this is now being done in Presentation XML
-      # KILL
-      def ol_depthx(node)
-        depth = node.ancestors("ul, ol").size + 1
-        type = :alphabet
-        type = :arabic if [2, 7].include? depth
-        type = :roman if [3, 8].include? depth
-        type = :alphabet_upper if [4, 9].include? depth
-        type = :roman_upper if [5, 10].include? depth
-        ol_style(type)
-      end
-
       def ol_attrs(node)
         { # type: node["type"] ? ol_style(node["type"].to_sym) : ol_depth(node),
           type: ol_style(node["type"]&.to_sym),

data/lib/isodoc/function/section.rb

@@ -41,6 +41,10 @@ module IsoDoc
         end
       end
 
+      def appendix_parse(isoxml, out)
+        clause_parse(isoxml, out)
+      end
+
       def indexsect(node, out)
         clause_parse(node, out)
       end
@@ -173,9 +177,9 @@ module IsoDoc
         end
       end
 
-      def is_clause?(name)
+      def clause?(name)
         %w(clause references definitions terms foreword introduction abstract
-           acknowledgements indexsect).include? name
+           executivesummary acknowledgements indexsect).include? name
       end
 
       def single_term_clause?(elem)

data/lib/isodoc/function/section_titles.rb

@@ -19,7 +19,7 @@ module IsoDoc
       end
 
       def sections_names
-        %w[clause annex terms references definitions
+        %w[clause annex terms references definitions executivesummary
            acknowledgements introduction abstract foreword appendix]
       end
 
@@ -53,7 +53,7 @@ module IsoDoc
 
       def clause_title_depth(node, title)
         depth = title["depth"] if title && title["depth"]
-        depth = node.ancestors(sections_names.join(", ")).size + 1 unless depth
+        depth ||= node.ancestors(sections_names.join(", ")).size + 1
         depth
       end
 

data/lib/isodoc/function/table.rb

@@ -84,7 +84,7 @@ module IsoDoc
 
       def table_parse_tail(node, out)
         (dl = node.at(ns("./dl"))) && parse(dl, out)
-        node.xpath(ns("./source")).each { |n| parse(n, out) }
+        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
         node.xpath(ns("./note")).each { |n| parse(n, out) }
         node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))
           .each { |n| parse(n, out) }

data/lib/isodoc/function/terms.rb

@@ -26,7 +26,7 @@ module IsoDoc
       def semx_admitted_term_parse(node, out); end
 
       def admitted_term_parse(node, out)
-                node.children.each do |c|
+        node.children.each do |c|
           if c.name == "p"
             out.p class: "AltTerms", style: "text-align:left;" do |p|
               c.children.each { |c1| parse(c1, p) }

data/lib/isodoc/function/to_word_html.rb

@@ -74,6 +74,7 @@ module IsoDoc
         when "executivesummary" then executivesummary e, out
         when "acknowledgements" then acknowledgements e, out
         when "annex" then annex e, out
+        when "appendix" then appendix e, out
         when "definitions" then symbols_abbrevs e, out
         when "indexsect" then indexsect e, out
         when "references"
@@ -136,6 +137,7 @@ module IsoDoc
           when "fmt-stem" then stem_parse(node, out)
           when "stem" then semx_stem_parse(node, out)
           when "clause" then clause_parse(node, out)
+          when "appendix" then appendix_parse(node, out)
           when "xref" then semx_xref_parse(node, out)
           when "fmt-xref" then xref_parse(node, out)
           when "eref" then semx_eref_parse(node, out)
@@ -151,7 +153,8 @@ module IsoDoc
           when "fn" then footnote_parse(node, out)
           when "p" then para_parse(node, out)
           when "quote" then quote_parse(node, out)
-          when "source" then source_parse(node, out)
+          when "source" then semx_source_parse(node, out)
+          when "fmt-source" then source_parse(node, out)
           when "tr" then tr_parse(node, out)
           when "note" then note_parse(node, out)
           when "review" then review_note_parse(node, out)

data/lib/isodoc/function/utils.rb

@@ -76,26 +76,17 @@ module IsoDoc
           .sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, ""))
       end
 
-      CLAUSE_ANCESTOR =
-        ".//ancestor::*[local-name() = 'annex' or " \
-        "local-name() = 'definitions' or " \
-        "local-name() = 'acknowledgements' or local-name() = 'term' or " \
-        "local-name() = 'appendix' or local-name() = 'foreword' or " \
-        "local-name() = 'introduction' or local-name() = 'terms' or " \
-        "local-name() = 'clause' or local-name() = 'references']/@id".freeze
+      CLAUSE_ANCESTOR = <<~XPATH.strip.freeze
+        .//ancestor::*[local-name() = 'annex' or local-name() = 'definitions' or local-name() = 'executivesummary' or local-name() = 'acknowledgements' or local-name() = 'term' or local-name() = 'appendix' or local-name() = 'foreword' or local-name() = 'introduction' or local-name() = 'terms' or local-name() = 'clause' or local-name() = 'references']/@id
+      XPATH
 
       def get_clause_id(node)
         node.xpath(CLAUSE_ANCESTOR)&.last&.text || nil
       end
 
-      NOTE_CONTAINER_ANCESTOR =
-        ".//ancestor::*[local-name() = 'annex' or " \
-        "local-name() = 'foreword' or local-name() = 'appendix' or " \
-        "local-name() = 'introduction' or local-name() = 'terms' or " \
-        "local-name() = 'acknowledgements' or local-name() = 'term' or " \
-        "local-name() = 'clause' or local-name() = 'references' or " \
-        "local-name() = 'figure' or local-name() = 'formula' or " \
-        "local-name() = 'table' or local-name() = 'example']/@id".freeze
+      NOTE_CONTAINER_ANCESTOR = <<~XPATH.strip.freeze
+        .//ancestor::*[local-name() = 'annex' or local-name() = 'foreword' or local-name() = 'appendix' or local-name() = 'introduction' or local-name() = 'terms' or local-name() = 'acknowledgements' or local-name() = 'executivesummary' or local-name() = 'term' or local-name() = 'clause' or local-name() = 'references' or local-name() = 'figure' or local-name() = 'formula' or local-name() = 'table' or local-name() = 'example']/@id
+      XPATH
 
       # no recursion on references
       def get_note_container_id(node, type)