isodoc 2.11.4 → 2.12.1

data/lib/isodoc/metadata.rb

@@ -15,7 +15,7 @@ module IsoDoc
 
     def initialize(lang, script, locale, i18n, fonts_options = {})
       @metadata = { lang:, script: }
-      DATETYPES.each { |w| @metadata["#{w.gsub('-', '_')}date".to_sym] = "XXX" }
+      DATETYPES.each { |w| @metadata["#{w.tr('-', '_')}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
       @locale = locale

data/lib/isodoc/presentation_function/block.rb

@@ -16,8 +16,6 @@ module IsoDoc
     def prefix_name(node, delim, number, elem)
       number.nil? || number.empty? and return
       unless name = node.at(ns("./#{elem}"))
-        #(node.children.empty? and node.add_child("<#{elem}></#{elem}>")) or
-        #  node.children.first.previous = "<#{elem}></#{elem}>"
         node.add_first_child "<#{elem}></#{elem}>"
         name = node.children.first
       end
@@ -33,7 +31,7 @@ module IsoDoc
     def formula1(elem)
       formula_where(elem.at(ns("./dl")))
       lbl = @xrefs.anchor(elem["id"], :label, false)
-      prefix_name(elem, "", lbl, "name")
+      lbl.nil? || lbl.empty? or prefix_name(elem, "", "(#{lbl})", "name")
     end
 
     def formula_where(dlist)
@@ -60,14 +58,23 @@ module IsoDoc
       docxml.xpath(ns("//note")).each { |f| note1(f) }
     end
 
+    def note_delim(_elem)
+      ""
+    end
+
     def note1(elem)
       %w(bibdata bibitem).include?(elem.parent.name) ||
         elem["notag"] == "true" and return
+      lbl = note_label(elem)
+      prefix_name(elem, "", lbl, "name")
+    end
+
+    def note_label(elem)
       n = @xrefs.get[elem["id"]]
       lbl = @i18n.note
       (n.nil? || n[:label].nil? || n[:label].empty?) or
         lbl = l10n("#{lbl} #{n[:label]}")
-      prefix_name(elem, "", lbl, "name")
+      "#{lbl}#{note_delim(elem)}"
     end
 
     def admonition(docxml)
@@ -77,16 +84,29 @@ module IsoDoc
     def admonition1(elem)
       if elem["type"] == "box"
         admonition_numbered1(elem)
+      elsif elem["notag"] == "true" || elem.at(ns("./name"))
       else
-        elem["notag"] == "true" || elem.at(ns("./name")) and return
-        prefix_name(elem, "", @i18n.admonition[elem["type"]]&.upcase, "name")
+        label = admonition_label(elem, nil)
+        prefix_name(elem, "", label, "name")
       end
+      n = elem.at(ns("./name")) and n << admonition_delim(elem)
     end
 
     def admonition_numbered1(elem)
       elem["unnumbered"] && !elem.at(ns("./name")) and return
-      n = @xrefs.anchor(elem["id"], :label, false)
-      prefix_name(elem, block_delim, l10n("#{@i18n.box} #{n}"), "name")
+      label = admonition_label(elem, @xrefs.anchor(elem["id"], :label, false))
+      prefix_name(elem, block_delim, label, "name")
+    end
+
+    def admonition_label(elem, num)
+      lbl = if elem["type"] == "box" then @i18n.box
+            else @i18n.admonition[elem["type"]]&.upcase end
+      num and lbl = l10n("#{lbl} #{num}")
+      lbl
+    end
+
+    def admonition_delim(_elem)
+      ""
     end
 
     def table(docxml)
@@ -95,6 +115,7 @@ module IsoDoc
     end
 
     def table1(elem)
+      table_fn(elem)
       labelled_ancestor(elem) and return
       elem["unnumbered"] && !elem.at(ns("./name")) and return
       n = @xrefs.anchor(elem["id"], :label, false)
@@ -113,6 +134,15 @@ module IsoDoc
       end
     end
 
+    def table_fn(elem)
+      (elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn")))
+        .each_with_index do |f, i|
+          table_fn1(elem, f, i)
+        end
+    end
+
+    def table_fn1(table, fnote, idx); end
+
     # we use this to eliminate the semantic amend blocks from rendering
     def amend(docxml)
       docxml.xpath(ns("//amend")).each { |f| amend1(f) }
@@ -126,6 +156,8 @@ module IsoDoc
       elem.replace(elem.children)
     end
 
+    def dl(docxml); end
+
     def ol(docxml)
       docxml.xpath(ns("//ol")).each { |f| ol1(f) }
       @xrefs.list_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
@@ -182,5 +214,23 @@ module IsoDoc
     def source_modification(mod)
       termsource_modification(mod.parent)
     end
+
+    def quote(docxml)
+      docxml.xpath(ns("//quote")).each { |f| quote1(f) }
+    end
+
+    def quote1(elem)
+      author = elem.at(ns("./author"))
+      source = elem.at(ns("./source"))
+      author.nil? && source.nil? and return
+      p = "&#x2014; "
+      p += author.remove.to_xml if author
+      p += ", " if author && source
+      if source
+        source.name = "eref"
+        p += source.remove.to_xml
+      end
+      elem << "<attribution><p>#{l10n p}</p></attribution>"
+    end
   end
 end

data/lib/isodoc/presentation_function/docid.rb

@@ -0,0 +1,101 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def docid_prefixes(docxml)
+      docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
+        i.children = docid_prefix(i["type"], to_xml(i.children))
+      end
+    end
+
+=begin
+    # This is highly specific to ISO, but it's not a bad precedent for
+    # references anyway; keeping here instead of in IsoDoc::Iso for now
+    def docid_l10n(text)
+      text.nil? and return text
+      @i18n.all_parts and text.gsub!(/All Parts/i, @i18n.all_parts.downcase)
+      text.size < 20 and text.gsub!(/ /, "&#xa0;")
+      text
+    end
+
+    def docid_prefix(prefix, docid)
+      docid = "#{prefix} #{docid}" if prefix && !omit_docid_prefix(prefix) &&
+        !/^#{prefix}\b/.match(docid)
+      docid_l10n(docid)
+    end
+
+    def omit_docid_prefix(prefix)
+      prefix.nil? || prefix.empty? and return true
+      %w(ISO IEC IEV ITU W3C BIPM csd metanorma repository metanorma-ordinal)
+        .include? prefix
+    end
+=end
+
+    def pref_ref_code(bib)
+      bib["suppress_identifier"] == "true" and return nil
+      ret = bib.xpath(ns("./docidentifier[@scope = 'biblio-tag']"))
+      ret.empty? or return ret.map(&:text)
+      ret = pref_ref_code_parse(bib) or return nil
+      ins = bib.at(ns("./docidentifier[last()]"))
+      ret.reverse_each do |r|
+        ins.next = "<docidentifier scope='biblio-tag'>#{docid_l10n(r)}</docidentifier>"
+      end
+      ret
+    end
+
+    def pref_ref_code_parse(bib)
+      data, = @bibrender.parse(bib)
+      ret = data[:authoritative_identifier] or return nil
+      ret.empty? and return nil
+      ret
+    end
+
+    # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
+    def bibitem_ref_code(bib)
+      id, id1, id2, id3 = bibitem_ref_code_prep(bib)
+      id || id1 || id2 || id3 and return [id, id1, id2, id3]
+      bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil]
+      [nil, no_identifier(bib), nil, nil]
+    end
+
+    def bibitem_ref_code_prep(bib)
+      id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
+      id1 = pref_ref_code(bib)
+      id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
+      id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
+      [id, id1, id2, id3]
+    end
+
+    def no_identifier(bib)
+      @i18n.no_identifier or return nil
+      id = Nokogiri::XML::Node.new("docidentifier", bib.document)
+      id << @i18n.no_identifier
+      id
+    end
+
+    def bracket_if_num(num)
+      num.nil? and return nil
+      num = num.text.sub(/^\[/, "").sub(/\]$/, "")
+      /^\d+$/.match?(num) and return "[#{num}]"
+      num
+    end
+
+    def unbracket1(ident)
+      ident.nil? and return nil
+      ident.is_a?(String) or ident = ident.text
+      ident.sub(/^\[/, "").sub(/\]$/, "")
+    end
+
+    def unbracket(ident)
+      if ident.respond_to?(:size)
+        ident.map { |x| unbracket1(x) }.join("&#xA0;/ ")
+      else unbracket1(ident)
+      end
+    end
+
+    def render_identifier(ident)
+      { metanorma: bracket_if_num(ident[0]),
+        sdo: unbracket(ident[1]),
+        doi: unbracket(ident[2]),
+        ordinal: bracket_if_num(ident[3]) }
+    end
+  end
+end

data/lib/isodoc/presentation_function/erefs.rb

@@ -3,7 +3,7 @@ require "metanorma-utils"
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def citeas(xmldoc)
-      xmldoc.xpath(ns("//eref | //origin | //quote/source")).each do |e|
+      xmldoc.xpath(ns("//eref | //origin | //quote//source")).each do |e|
         e["bibitemid"] && e["citeas"] or next
         a = @xrefs.anchor(e["bibitemid"], :xref, false) and e["citeas"] = a
       end
@@ -178,7 +178,7 @@ module IsoDoc
     end
 
     def eref2link(docxml)
-      docxml.xpath(ns("//eref | //origin[not(termref)] | //quote/source"))
+      docxml.xpath(ns("//eref | //origin[not(termref)] | //quote//source"))
         .each do |e|
         href = eref_target(e) or next
         e.xpath(ns("./locality | ./localityStack")).each(&:remove)

data/lib/isodoc/presentation_function/image.rb

@@ -46,6 +46,8 @@ module IsoDoc
     def figure1(elem)
       elem["class"] == "pseudocode" || elem["type"] == "pseudocode" and
         return sourcecode1(elem)
+      figure_fn(elem)
+      figure_key(elem.at(ns("./dl")))
       figure_label?(elem) or return nil
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
       # no xref, no label: this can be set in xref
@@ -53,6 +55,24 @@ module IsoDoc
                   l10n("#{figure_label(elem)} #{lbl}"), "name")
     end
 
+    # move footnotes into key, and get rid of footnote reference
+    # since it is in diagram
+    def figure_fn(elem)
+      fn = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn"))
+      fn.empty? and return
+      dl = figure_key_insert_pt(elem)
+      fn.each do |f|
+        dl.previous = "<dt><p><sup>#{f['reference']}</sup></p></dt>" \
+          "<dd>#{f.remove.children.to_xml}</dd>"
+      end
+    end
+
+    def figure_key_insert_pt(elem)
+      elem.at(ns("//dl/name"))&.next ||
+        elem.at(ns("//dl"))&.children&.first ||
+        elem.add_child("<dl> </dl>").first.children.first
+    end
+
     def figure_label?(elem)
       elem.at(ns("./figure")) && !elem.at(ns("./name")) and return false
       true
@@ -64,6 +84,14 @@ module IsoDoc
       lower2cap klasslbl
     end
 
+    def figure_key(dlist)
+      dlist or return
+      dlist["class"] = "formula_dl"
+      dlist.at(ns("./name")) and return
+      dlist.previous =
+        "<p keep-with-next='true'><strong>#{@i18n.key}</strong></p>"
+    end
+
     def eps2svg(img)
       return unless eps?(img["mimetype"])
 
@@ -77,7 +105,7 @@ module IsoDoc
     def svg_emf_double(img)
       if emf?(img["mimetype"])
         img = emf_encode(img)
-        #img.children.first.previous = emf_to_svg(img)
+        # img.children.first.previous = emf_to_svg(img)
         img.add_first_child emf_to_svg(img)
       elsif img["mimetype"] == "image/svg+xml"
         src = svg_to_emf(img) or return
@@ -127,16 +155,11 @@ module IsoDoc
 
     def svg_to_emf(node)
       @output_formats[:doc] or return
-
       svg_impose_height_attr(node)
-
-      if node.elements&.first&.name == "svg" || %r{^data:}.match?(node["src"])
+      node.elements&.first&.name == "svg" || %r{^data:}.match?(node["src"]) and
         return svg_to_emf_from_node(node)
-      end
-
       target_path = imgfile_suffix(node["src"], "emf")
-      return target_path if File.exist?(target_path)
-
+      File.exist?(target_path) and return target_path
       svg_to_emf_from_node(node, target_path)
     end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -54,8 +54,8 @@ module IsoDoc
     end
 
     def quotesource(docxml)
-      docxml.xpath(ns("//quote/source")).each { |f| xref1(f) }
-      docxml.xpath(ns("//quote/source//xref")).each do |f|
+      docxml.xpath(ns("//quote//source")).each { |f| xref1(f) }
+      docxml.xpath(ns("//quote//source//xref")).each do |f|
         f.replace(f.children)
       end
     end
@@ -164,9 +164,9 @@ module IsoDoc
     def passthrough1(elem, formats)
       (elem["formats"] && !elem["formats"].empty?) or elem["formats"] = "all"
       f = elem["formats"].split(",")
-      (f - formats).size == f.size or elem["formats"] = "all"
-      elem["formats"] == "all" and elem["formats"] = formats.join(",")
-      elem["formats"] = ",#{elem['formats']},"
+      (f - formats).size == f.size or f = "all"
+      f == ["all"] and f = formats.dup
+      elem["formats"] = " #{f.join(' ')} "
     end
 
     def extract_custom_charsets(docxml)

data/lib/isodoc/presentation_function/math.rb

@@ -7,7 +7,6 @@ module IsoDoc
     MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
 
     def mathml(docxml)
-      docxml.xpath("//m:math", MATHML).each { |f| mathml_linebreak(f) }
       locale = @lang.to_sym
       @numfmt = Plurimath::NumberFormatter
         .new(locale, localize_number: @localizenumber,
@@ -160,19 +159,6 @@ module IsoDoc
       mathml_number(node, locale)
     end
 
-    def mathml_linebreak(node)
-      node.at(".//*/@linebreak") or return
-      m = Plurimath::Math.parse(node.to_xml, :mathml)
-        .to_mathml(split_on_linebreak: true)
-      ret = Nokogiri::XML("<m>#{m}</m>").root
-      ret.elements.each_with_index do |e, i|
-        i.zero? or e.previous = "<br/>"
-      end
-      node.replace(<<~OUTPUT)
-        <math-with-linebreak>#{ret.children}</math-with-linebreak><math-no-linebreak>#{node.to_xml}</math-no-linebreak>
-      OUTPUT
-    end
-
     # convert any Ascii superscripts to correct(ish) MathML
     # Not bothering to match times, base of 1.0 x 10^-20, just ^-20
     def mn_to_msup(node)

data/lib/isodoc/presentation_function/metadata.rb

@@ -4,7 +4,6 @@ module IsoDoc
       toc_metadata(docxml)
       fonts_metadata(docxml)
       attachments_extract(docxml)
-      preprocess_xslt_insert(docxml)
       localized_strings(docxml)
       a = docxml.at(ns("//metanorma-extension")) or return
       a.elements.empty? and a.remove
@@ -83,67 +82,6 @@ module IsoDoc
         "</presentation-metadata>"
     end
 
-    def preprocess_xslt_insert(docxml)
-      content = ""
-      p = passthrough_xslt and content += p
-      p = preprocess_xslt_read and content += File.read(p)
-      content.empty? and return
-      ins = extension_insert(docxml, %w(render))
-      ins << content
-    end
-
-    COPY_XSLT =
-      '<xsl:copy><xsl:apply-templates select="@* | node()"/></xsl:copy>'.freeze
-    COPY_CHILDREN_XSLT =
-      '<xsl:apply-templates select="node()"/>'.freeze
-
-    def xslt_template(content)
-      <<~XSLT
-        <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-          <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
-          <xsl:template match="@* | node()">#{COPY_XSLT}</xsl:template>
-        #{content}
-        </xsl:stylesheet>
-      XSLT
-    end
-
-    def passthrough_xslt
-      @output_formats.nil? and return nil
-      @output_formats.empty? and return nil
-      @output_formats.each_key.with_object([]) do |k, m|
-        m << <<~XSLT
-          <preprocess-xslt format="#{k}">
-            #{xslt_template(<<~XSLT1)
-              <xsl:template match="*[local-name() = 'passthrough']">
-                <xsl:if test="contains(@formats,',#{k},')"> <!-- delimited -->
-                #{COPY_XSLT}
-                </xsl:if>
-              </xsl:template>
-            XSLT1
-            }
-          </preprocess-xslt>
-        XSLT
-        m << <<~XSLT
-          <preprocess-xslt format="#{k}">
-            #{xslt_template(<<~XSLT1)
-              <xsl:template match="*[local-name() = 'math-with-linebreak']">
-              #{k == 'pdf' ? COPY_CHILDREN_XSLT : ''}
-              </xsl:template>
-              <xsl:template match="*[local-name() = 'math-no-linebreak']">
-              #{k == 'pdf' ? '' : COPY_CHILDREN_XSLT}
-              </xsl:template>
-            XSLT1
-            }
-          </preprocess-xslt>
-        XSLT
-      end.join("\n")
-    end
-
-    # read in from file, but with `<preprocess-xslt @format="">` wrapper
-    def preprocess_xslt_read
-      html_doc_path("preprocess.xslt")
-    end
-
     def i18n_tag(key, value)
       "<localized-string key='#{key}' language='#{@lang}'>#{value}" \
         "</localized-string>"

data/lib/isodoc/presentation_function/refs.rb

@@ -1,3 +1,5 @@
+require_relative "docid"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def references(docxml)
@@ -5,10 +7,24 @@ module IsoDoc
       renderings = references_render(docxml)
       docxml.xpath(ns("//references/bibitem")).each do |x|
         bibitem(x, renderings)
+        reference_name(x)
       end
       hidden_items(docxml)
       move_norm_ref_to_sections(docxml)
-      @xrefs.parse_inclusions(refs: true).parse(docxml)
+    end
+
+    def reference_names(docxml)
+      docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
+        reference_name(ref)
+      end
+    end
+
+    def reference_name(ref)
+      ids = bibitem_ref_code(ref)
+      identifiers = render_identifier(ids)
+      reference = docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
+                    identifiers[:ordinal] || identifiers[:doi])
+      @xrefs.get[ref["id"]] = { xref: reference }
     end
 
     def move_norm_ref_to_sections(docxml)
@@ -56,7 +72,7 @@ module IsoDoc
     end
 
     def bibitem(xml, renderings)
-      @xrefs.klass.implicit_reference(xml) and xml["hidden"] = "true"
+      implicit_reference(xml) and xml["hidden"] = "true"
       bibrender_item(xml, renderings)
     end
 
@@ -81,7 +97,7 @@ module IsoDoc
     end
 
     def bibliography_bibitem_number_skip(bibitem)
-      @xrefs.klass.implicit_reference(bibitem) ||
+      implicit_reference(bibitem) ||
         bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) ||
         bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']")) ||
         bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
@@ -92,7 +108,7 @@ module IsoDoc
       docxml.xpath(ns("//references[@normative = 'false']/bibitem")).each do |b|
         i = bibliography_bibitem_number1(b, i)
       end
-      @xrefs.references docxml
+      reference_names docxml
       bibliography_bibitem_tag(docxml)
     end
 
@@ -122,12 +138,6 @@ module IsoDoc
       ins
     end
 
-    def docid_prefixes(docxml)
-      docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
-        i.children = @xrefs.klass.docid_prefix(i["type"], to_xml(i.children))
-      end
-    end
-
     def bibliography_bibitem_tag(docxml)
       [true, false].each do |norm|
         i = 0
@@ -139,17 +149,17 @@ module IsoDoc
 
     def bibliography_bibitem_tag1(ref, idx, norm)
       ref.xpath(ns("./bibitem")).each do |b|
-        @xrefs.klass.implicit_reference(b) and next
+        implicit_reference(b) and next
         idx += 1 unless b["hidden"]
-        insert_biblio_tag(b, idx, !norm, @xrefs.klass.standard?(b))
+        insert_biblio_tag(b, idx, !norm, standard?(b))
       end
       idx
     end
 
     def insert_biblio_tag(bib, ordinal, biblio, standard)
       datefn = date_note_process(bib)
-      ids = @xrefs.klass.bibitem_ref_code(bib)
-      idents = @xrefs.klass.render_identifier(ids)
+      ids = bibitem_ref_code(bib)
+      idents = render_identifier(ids)
       ret = if biblio then biblio_ref_entry_code(ordinal, idents, ids,
                                                  standard, datefn, bib)
             else norm_ref_entry_code(ordinal, idents, ids, standard, datefn,
@@ -199,5 +209,25 @@ module IsoDoc
       ret = bib.at(ns("./docidentifier//fn")) or return ""
       to_xml(ret.remove)
     end
+
+    # reference not to be rendered because it is deemed implicit
+    # in the standards environment
+    def implicit_reference(bib)
+      bib["hidden"] == "true"
+    end
+
+    SKIP_DOCID = <<~XPATH.strip.freeze
+      @type = 'DOI' or @type = 'doi' or @type = 'ISSN' or @type = 'issn' or @type = 'ISBN' or @type = 'isbn' or starts-with(@type, 'ISSN.') or starts-with(@type, 'ISBN.') or starts-with(@type, 'issn.') or starts-with(@type, 'isbn.')
+    XPATH
+
+    def standard?(bib)
+      ret = false
+      bib.xpath(ns("./docidentifier")).each do |id|
+        id["type"].nil? ||
+          id.at(".//self::*[#{SKIP_DOCID} or @type = 'metanorma']") and next
+        ret = true
+      end
+      ret
+    end
   end
 end

data/lib/isodoc/presentation_function/section.rb

@@ -9,9 +9,18 @@ module IsoDoc
       s.add_first_child "<p class='zzSTDTitle1'>#{t}</p>"
     end
 
+    def missing_title(docxml)
+      docxml.xpath(ns("//definitions[not(./title)]")).each do |d|
+        # should only be happening for subclauses
+        d.add_first_child "<title>#{@i18n.symbols}</title>"
+      end
+      docxml.xpath(ns("//foreword[not(./title)]")).each do |d|
+        d.add_first_child "<title>#{@i18n.foreword}</title>"
+      end
+    end
+
     def clause(docxml)
-      docxml.xpath(ns("//clause | " \
-                      "//terms | //definitions | //references"))
+      docxml.xpath(ns("//clause | //terms | //definitions | //references"))
         .each do |f|
         f.parent.name == "annex" &&
           @xrefs.klass.single_term_clause?(f.parent) and next
@@ -87,17 +96,6 @@ module IsoDoc
         end
     end
 
-    def term(docxml)
-      docxml.xpath(ns("//term")).each do |f|
-        term1(f)
-      end
-    end
-
-    def term1(elem)
-      lbl = @xrefs.anchor(elem["id"], :label) or return
-      prefix_name(elem, "", "#{lbl}#{clausedelim}", "name")
-    end
-
     def index(docxml)
       docxml.xpath(ns("//index | //index-xref | //indexsect")).each(&:remove)
     end
@@ -207,8 +205,7 @@ module IsoDoc
         if prev.name == "floating-title"
           ret << prev
           p = prev
-        else break
-        end
+        else break end
       end
       ret
     end