metanorma-jis 0.0.2 → 0.0.3

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -4,6 +4,94 @@ require "isodoc"
 module IsoDoc
   module JIS
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+      def inline(docxml)
+        super
+        strong(docxml)
+      end
+
+      JPAN = "\\p{Hiragana}\\p{Katakana}\\p{Han}".freeze
+      JPAN_BOLD = "<span style='font-family:\"MS Gothic\"'>".freeze
+
+      def strong(docxml)
+        docxml.xpath(ns("//strong")).each do |x|
+          (x.children.size == 1 && x.children.first.text?) or next # too hard
+          x.replace(strong1(x.text))
+        end
+      end
+
+      def strong1(text)
+        jpan = /^[#{JPAN}]/o.match?(text[0])
+        ret = jpan ? JPAN_BOLD : "<strong>"
+        text.split("").each do |n|
+          new = /^[#{JPAN}]/o.match?(n)
+          jpan && !new and ret += "</span><strong>"
+          !jpan && new and ret += "</strong>#{JPAN_BOLD}"
+          ret += n
+          jpan = new
+        end
+        ret += /[#{JPAN}]/o.match?(text[-1]) ? "</span>" : "</strong>"
+        ret
+      end
+
+      def block(docxml)
+        super
+        dl docxml
+      end
+
+      def dl(docxml)
+        docxml.xpath(ns("//table//dl | //figure//dl")).each do |l|
+          l.at(ns("./dl")) || l.at("./ancestor::xmlns:dl") and next
+          dl_to_para(l)
+        end
+      end
+
+      def dt_dd?(node)
+        %w{dt dd}.include? node.name
+      end
+
+      def dl_to_para(node)
+        ret = ""
+        e = node.at(ns("./name")) and
+          ret += "<p class='ListTitle' id='#{dlist['id']}'>" \
+                 "#{e.children.to_xml}</p>"
+        node.elements.select { |n| dt_dd?(n) }.each_slice(2) do |dt, dd|
+          term = dt.children.to_xml.gsub(%r{</?p( [^>]*)>}, "")
+          defn = dd.children.to_xml.gsub(%r{</?p( [^>]*)>}, "")
+          ret += "<p id='#{dt['id']}'>#{term}: " \
+                 "<bookmark id='#{dd['id']}'/>#{defn}</p>"
+        end
+        node.elements.each do |x|
+          %w(dt dd name).include?(x.name) and next
+          ret += x.to_xml
+        end
+        node.replace(ret.gsub(/ id=''/, ""))
+      end
+
+      def table1(node)
+        super
+        cols = 0
+        node.at(ns(".//tr")).xpath(ns("./td | ./th")).each do |x|
+          cols += x["colspan"]&.to_i || 1
+        end
+        name = node.at(ns("./name"))
+        h = node.at(ns("./thead")) || name.after("<thead> </thead>").next
+        unit_note = node.at(ns(".//note[@type = 'units']"))&.remove
+        unit_note and h.children.first.previous = full_row(cols, unit_row.to_xml)
+        name and h.children.first.previous =
+          full_row(cols, "<p class='TableTitle' style='text-align:center;'>#{name.remove.children.to_xml}</p>")
+      end
+
+      def full_row(cols, elem)
+        "<tr><td border='0' colspan='#{cols}'>#{elem}</td></tr>"
+      end
+
+      def annex1(elem)
+      lbl = @xrefs.anchor(elem["id"], :label)
+      if t = elem.at(ns("./title"))
+        t.children = "<strong>#{to_xml(t.children)}</strong>"
+      end
+      prefix_name(elem, "<br/>", lbl, "title")
+    end
 
       include Init
     end

data/lib/isodoc/jis/word_cleanup.rb

@@ -0,0 +1,143 @@
+require_relative "../../html2doc/lists"
+
+module IsoDoc
+  module JIS
+    class WordConvert < IsoDoc::Iso::WordConvert
+      def postprocess(result, filename, dir)
+        filename = filename.sub(/\.doc$/, "")
+        header = generate_header(filename, dir)
+        result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
+        toWord(result, filename, dir, header)
+        @files_to_delete.each { |f| FileUtils.rm_f f }
+      end
+
+      def word_cleanup(docxml)
+        word_note_cleanup(docxml)
+        boldface(docxml)
+        super
+        move_to_inner_cover(docxml)
+      end
+
+      def move_to_inner_cover(docxml)
+        source = docxml.at("//div[@type = 'inner-cover-note']")
+        dest = docxml.at("//div[@id = 'boilerplate-inner-cover-note']")
+        source && dest and dest.replace(source)
+        source = docxml.at("//div[@type = 'contributors']")
+        dest = docxml.at("//div[@id = 'boilerplate-contributors']")
+        source && dest and dest.replace(source)
+        docxml
+      end
+
+      def word_intro(docxml, level)
+        intro = insert_toc(File.read(@wordintropage, encoding: "UTF-8"),
+                           docxml, level)
+        intro = populate_template(intro, :word)
+        introxml = to_word_xhtml_fragment(intro)
+        docxml.at('//div[@class="WordSection2"]') << introxml
+          .to_xml(encoding: "US-ASCII")
+      end
+
+      def word_note_cleanup(docxml)
+        docxml.xpath("//p[@class = 'Note']").each do |p|
+          p.xpath("//following-sibling::p").each do |p2|
+            p2["class"] == "Note" and
+              p2["class"] = "NoteCont"
+          end
+        end
+      end
+
+      def boldface(docxml)
+        docxml.xpath("//b").each do |b|
+          b.name = "span"
+          b["class"] = "Strong"
+        end
+      end
+
+      def toWord(result, filename, dir, header)
+        result = word_split(word_cleanup(to_xhtml(result)))
+        @wordstylesheet = wordstylesheet_update
+        result.each do |k, v|
+          to_word1(v, "#{filename}#{k}", dir, header)
+        end
+        header&.unlink
+        @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
+      end
+
+      def to_word1(result, filename, dir, header)
+        result or return
+        result = from_xhtml(result).gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
+        ::Html2Doc::JIS.new(
+          filename: filename, imagedir: @localdir,
+          stylesheet: @wordstylesheet&.path,
+          header_file: header&.path, dir: dir,
+          asciimathdelims: [@openmathdelim, @closemathdelim],
+          liststyles: { ul: @ulstyle, ol: @olstyle }
+        ).process(result)
+      end
+
+      def word_split(xml)
+        b = xml.dup
+        { _cover: cover_split(xml), "": main_split(b) }
+      end
+
+      def cover_split(xml)
+        xml.at("//body").elements.each do |e|
+          e.name == "div" && e["class"] == "WordSection1" and next
+          e.remove
+        end
+        xml
+      end
+
+      def main_split(xml)
+        c = xml.at("//div[@class = 'WordSection1']")
+        c.next_element&.remove
+        c.remove
+        c = xml.at("//div[@class = 'WordSection2']")
+        c.elements.first.at("./br") and c.elements.first.remove
+        xml
+      end
+
+      STYLESMAP = {}.freeze
+
+      def style_cleanup(docxml)
+        new_styles(docxml)
+        index_cleanup(docxml)
+      end
+
+      def new_styles(docxml)
+        super
+        biblio_paras(docxml)
+        heading_to_para(docxml)
+      end
+
+      def biblio_paras(docxml)
+        docxml.xpath("//div[@class = 'normref_div']//" \
+                     "p[not(@class) or @class = 'MsoNormal']").each do |p|
+          p["class"] = "NormRefText"
+        end
+      end
+
+      def heading_to_para(docxml)
+        docxml.xpath("//h1[@class = 'ForewordTitle']").each do |p|
+          p.name = "p"
+          p.xpath("../div/p[not(@class) or @class = 'MsoNormal']").each do |n|
+            n["class"] = "ForewordText"
+          end
+        end
+        docxml.xpath("//h1[@class = 'IntroTitle'] | //h1[@class = 'Annex'] | " \
+                     "//h2[@class = 'Terms'] | " \
+                     "//h3[@class = 'Terms'] | //h4[@class = 'Terms'] | " \
+                     "//h5[@class = 'Terms'] | //h6[@class = 'Terms']").each do |p|
+          p.name = "p"
+        end
+      end
+
+      def word_annex_cleanup1(docxml, lvl)
+        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = ".h#{lvl}Annex"
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/jis/word_convert.rb

@@ -1,7 +1,7 @@
-require_relative "../../html2doc/lists"
 require_relative "base_convert"
 require "isodoc"
 require_relative "init"
+require_relative "word_cleanup"
 
 module IsoDoc
   module JIS
@@ -14,6 +14,11 @@ module IsoDoc
 
       def init_dis(opt); end
 
+      def clause_attrs(node)
+        # capture the type of clause
+        { id: node["id"], type: node["type"] }
+      end
+
       def convert(input_filename, file = nil, debug = false,
                 output_filename = nil)
         file = File.read(input_filename, encoding: "utf-8") if file.nil?
@@ -56,85 +61,10 @@ module IsoDoc
           olstyle: "l8" }
       end
 
-      def postprocess(result, filename, dir)
-        filename = filename.sub(/\.doc$/, "")
-        header = generate_header(filename, dir)
-        result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
-        toWord(result, filename, dir, header)
-        @files_to_delete.each { |f| FileUtils.rm_f f }
-      end
-
-      def word_cleanup(docxml)
-        word_note_cleanup(docxml)
-        boldface(docxml)
-        super
-      end
-
-      def word_note_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Note']").each do |p|
-          p.xpath("//following-sibling::p").each do |p2|
-            p2["class"] == "Note" and
-              p2["class"] = "NoteCont"
-          end
-        end
-      end
-
-      def boldface(docxml)
-        docxml.xpath("//h1 | h2 | h3 | h4 | h5 | h6").each do |h|
-          h.children = "<b>#{to_xml(h.children)}</b>"
-        end
-        docxml.xpath("//b").each do |b|
-          b.name = "span"
-          b["class"] = "Strong"
-        end
-      end
-
-      def toWord(result, filename, dir, header)
-        result = word_split(word_cleanup(to_xhtml(result)))
-        @wordstylesheet = wordstylesheet_update
-        result.each do |k, v|
-          to_word1(v, "#{filename}#{k}", dir, header)
-        end
-        header&.unlink
-        @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
-      end
-
-      def to_word1(result, filename, dir, header)
-        result or return
-        result = from_xhtml(result).gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
-        ::Html2Doc::JIS.new(
-          filename: filename, imagedir: @localdir,
-          stylesheet: @wordstylesheet&.path,
-          header_file: header&.path, dir: dir,
-          asciimathdelims: [@openmathdelim, @closemathdelim],
-          liststyles: { ul: @ulstyle, ol: @olstyle }
-        ).process(result)
-      end
-
-      def word_split(xml)
-        b = xml.dup
-        { _cover: cover_split(xml), "": main_split(b) }
-      end
-
-      def cover_split(xml)
-        xml.at("//body").elements.each do |e|
-          e.name == "div" && e["class"] == "WordSection1" and next
-          e.remove
-        end
-        xml
-      end
-
-      def main_split(xml)
-        c = xml.at("//div[@class = 'WordSection1']")
-        c.next_element&.remove
-        c.remove
-        xml
-      end
-
       def norm_ref(isoxml, out, num)
         (f = isoxml.at(ns(norm_ref_xpath)) and f["hidden"] != "true") or
           return num
-        out.div class: "normref" do |div|
+        out.div class: "normref_div" do |div|
           num += 1
           clause_name(f, f.at(ns("./title")), div, nil)
           if f.name == "clause"
@@ -167,26 +97,228 @@ module IsoDoc
         end
       end
 
-      def new_styles(docxml)
-        super
-        biblio_paras(docxml)
-        heading_to_para(docxml)
+      def preface(isoxml, out)
+        isoxml.xpath(ns("//preface/clause | //preface/references | " \
+                        "//preface/definitions | //preface/terms")).each do |f|
+          out.div **attr_code(class: "Section3", id: f["id"],
+                              type: f["type"]) do |div|
+            clause_name(f, f&.at(ns("./title")), div, { class: "IntroTitle" })
+            f.elements.each do |e|
+              parse(e, div) unless e.name == "title"
+            end
+          end
+        end
+      end
+
+      def introduction(isoxml, out)
+        f = isoxml.at(ns("//introduction")) || return
+        out.div class: "Section3", id: f["id"] do |div|
+          clause_name(f, f.at(ns("./title")), div, { class: "IntroTitle" })
+          f.elements.each do |e|
+            parse(e, div) unless e.name == "title"
+          end
+        end
+      end
+
+      def make_body2(body, docxml)
+        body.div class: "WordSection2" do |div2|
+          boilerplate docxml, div2
+          preface_block docxml, div2
+          abstract docxml, div2
+          foreword docxml, div2
+          preface docxml, div2
+          acknowledgements docxml, div2
+          div2.p { |p| p << "&#xa0;" } # placeholder
+        end
+        section_break(body)
+      end
+
+      def middle(isoxml, out)
+        middle_title(isoxml, out)
+        middle_admonitions(isoxml, out)
+        introduction isoxml, out
+        scope isoxml, out, 0
+        norm_ref isoxml, out, 0
+        terms_defs isoxml, out, 0
+        symbols_abbrevs isoxml, out, 0
+        clause isoxml, out
+        annex isoxml, out
+        bibliography isoxml, out
+        # colophon isoxml, out
+      end
+
+      def figure_attrs(node)
+        attr_code(id: node["id"], class: "MsoTableGrid",
+                  style: "border-collapse:collapse;" \
+                         "border:none;mso-padding-alt: " \
+                         "0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
+                         "mso-border-insidev:none;#{keep_style(node)}",
+                  border: 0, cellspacing: 0, cellpadding: 0)
+      end
+
+      def figure_components(node)
+        { units: node.at(ns("./note[@type = 'units']/p")),
+          notes_etc: figure_notes_examples_paras(node
+          .xpath(ns("./note[not(@type = 'units')] | ./example | ./p"))),
+          name: node.at(ns("./name")),
+          key: node.at(ns("./dl")),
+          img: node.at(ns("./image")),
+          aside: node.at(ns("./aside")),
+          subfigs: node.xpath(ns("./figure")).map { |n| figure_components(n) } }
+      end
+
+      def figure_notes_examples_paras(xpath)
+        xpath.empty? and return nil
+        curr = ""
+        xpath.each_with_object([]) do |e, m|
+          e.name == curr or m << []
+          curr = e.name
+          m[-1] << e
+        end
+      end
+
+      def figure_parse1(node, out)
+        c = figure_components(node)
+        out.table **figure_attrs(node) do |div|
+          %i(units img subfigs key notes_etc aside name).each do |key|
+            case key
+            when :subfigs
+              c[key].each do |n|
+                n[:subname] = n[:name]
+                figure_row(node, div, n, :img)
+                figure_row(node, div, n, :subname)
+              end
+            when :notes_etc
+              c[key].each do |n|
+                figure_row(node, div, n, :notes_etc)
+              end
+            else figure_row(node, div, c, key)
+            end
+          end
+        end
+      end
+
+      def figure_name_parse(_node, div, name)
+        name.nil? and return
+        div.p class: "Tabletitle", style: "text-align:center;" do |p|
+          name.children.each { |n| parse(n, p) }
+        end
+      end
+
+      def figure_row(node, table, hash, key)
+        key != :notes_etc && (
+        hash[key].nil? || (hash[key].is_a?(Array) && hash[key].empty?)) and
+          return
+        table.tr do |r|
+          r.td valign: "top", style: "padding:0cm 5.4pt 0cm 5.4pt" do |d|
+            figure_row1(node, d, hash, key)
+          end
+        end
+      end
+
+      def fig_para(klass, row, nodes)
+        row.td valign: "top", style: "padding:0cm 5.4pt 0cm 5.4pt" do |d|
+          d.p class: klass do |p|
+            nodes.each { |n| parse(n, p) }
+          end
+        end
+      end
+
+      def figure_row1(node, cell, hash, key)
+        case key
+        when :units
+          cell.p class: "UnitStatement" do |p|
+            hash[key].children.each { |n| parse(n, p) }
+          end
+        when :key
+          figure_key(cell)
+          parse(hash[key], cell)
+        when :notes_etc, :aside
+          hash.each { |n| parse(n, cell) }
+        when :name then figure_name_parse(node, cell, hash[key])
+        when :img
+          cell.p class: "Figure" do |p|
+            parse(hash[key], p)
+          end
+        when :subname
+          cell.p class: "SubfigureCaption" do |p|
+            hash[key].children.each { |n| parse(n, p) }
+          end
+        end
       end
 
-      def biblio_paras(docxml)
-        docxml.xpath("//div[@class = 'normref']//" \
-                     "p[not(@class) or @class = 'MsoNormal']").each do |p|
-          p["class"] = "NormRefText"
+      def footnote_parse(node, out)
+        return table_footnote_parse(node, out) if @in_table || @in_figure # &&
+
+        # !node.ancestors.map(&:name).include?("name")
+
+        fn = node["reference"] || UUIDTools::UUID.random_create.to_s
+        return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)
+
+        @fn_bookmarks[fn] = bookmarkid
+        out.span style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}" do |s|
+          s.a class: "FootnoteRef", "epub:type": "footnote",
+              href: "#ftn#{fn}" do |a|
+            a.sup { |sup| sup << fn }
+          end
         end
+        @in_footnote = true
+        @footnotes << make_generic_footnote_text(node, fn)
+        @in_footnote = false
+        @seen_footnote << fn
       end
 
-      def heading_to_para(docxml)
-        docxml.xpath("//h1[@class = 'ForewordTitle']").each do |p|
-          p.name = "p"
-          p.xpath("../div/p[not(@class) or @class = 'MsoNormal']").each do |n|
-            n["class"] = "ForewordText"
+      def make_table_footnote_target(out, fnid, fnref)
+        attrs = { id: fnid, class: "TableFootnoteRef" }
+        out.span do |s|
+          s << @i18n.table_footnote
+          out.span **attrs do |a|
+            a << "#{fnref})"
           end
+          insert_tab(s, 1)
+        end
+      end
+
+      def table_title_parse(node, out); end
+
+      def table_attrs(node)
+        { id: node["id"], title: node["alt"],
+          summary: node["summary"], width: node["width"],
+          class: (node.text.length > 4000 ? "MsoTableGridBig" : "MsoTableGrid"),
+          style: "border-collapse:collapse;" \
+                 "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
+                 "border:none;mso-padding-alt: " \
+                 "0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
+                 "mso-border-insidev:none;#{keep_style(node)}",
+          border: 0, cellspacing: 0, cellpadding: 0 }
+      end
+
+      def make_tr_attr_style(cell, row, rowmax, totalrows, opt)
+        top = row.zero? ? "#{SW1} 1.5pt;" : "none;"
+        bottom = "#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;"
+        ret = <<~STYLE.gsub(/\n/, "")
+          border-top:#{top}mso-border-top-alt:#{top}
+          border-left:#{bottom}mso-border-top-alt:#{bottom}
+          border-right:#{bottom}mso-border-top-alt:#{bottom}
+          border-bottom:#{bottom}mso-border-bottom-alt:#{bottom}
+        STYLE
+        opt[:bordered] or ret = ""
+        pb = keep_rows_together(cell, rowmax, totalrows, opt) ? "avoid" : "auto"
+        "#{ret}page-break-after:#{pb};"
+      end
+
+      def new_fullcolspan_row(table, tfoot)
+        # how many columns in the table?
+        cols = 0
+        table.at(".//tr").xpath("./td | ./th").each do |td|
+          cols += (td["colspan"] ? td["colspan"].to_i : 1)
         end
+        style = "border-top:0pt;mso-border-top-alt:0pt;" \
+                "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;" \
+                "border-left:#{SW1} 1.5pt;mso-border-left-alt:#{SW1} 1.5pt;" \
+                "border-right:#{SW1} 1.5pt;mso-border-right-alt:#{SW1} 1.5pt;"
+        tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
+        tfoot.xpath(".//td").last
       end
 
       include BaseConvert

data/lib/isodoc/jis/xref.rb

@@ -1,6 +1,13 @@
 module IsoDoc
   module JIS
     class Xref < IsoDoc::Iso::Xref
+      def annex_name_lbl(clause, num)
+        obl = l10n("(#{@labels['inform_annex']})")
+        clause["obligation"] == "normative" and
+          obl = l10n("(#{@labels['norm_annex']})")
+        title = Common::case_with_markup(@labels["annex"], "capital", @script)
+        l10n("#{title} #{num}<br/>#{obl}")
+      end
     end
   end
 end

data/lib/metanorma/jis/cleanup.rb

@@ -0,0 +1,42 @@
+module Metanorma
+  module JIS
+    class Converter < ISO::Converter
+      def norm_ref_preface(ref)
+        if ref.at("./note[@type = 'boilerplate']")
+          unwrap_boilerplate_clauses(ref, ".")
+        else
+          pref = if ref_empty?(ref) then @i18n.norm_empty_pref
+                 else @i18n.get[ref_dated(ref)]
+                 end
+          ref.at("./title").next = "<p>#{pref}</p>"
+        end
+      end
+
+      def ref_empty?(ref)
+        ref.xpath(".//bibitem").empty?
+      end
+
+      def ref_dated(ref)
+        refs = ref.xpath("./bibitem").each_with_object({}) do |e, m|
+          if e.at("./date") then m[:dated] = true
+          else m[:undated] = true
+          end
+        end
+        refs[:dated] && refs[:undated] and return "norm_with_refs_pref"
+        refs[:dated] and return "norm_with_refs_pref_all_dated"
+        "norm_with_refs_pref_none_dated"
+      end
+
+      def table_footnote_renumber(xmldoc)
+        xmldoc.xpath("//table | //figure").each do |t|
+          seen = {}
+          i = 0
+          #t.xpath(".//fn[not(ancestor::name)]").each do |fn|
+          t.xpath(".//fn").each do |fn|
+            i, seen = table_footnote_renumber1(fn, i, seen)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/jis/converter.rb

@@ -1,6 +1,8 @@
 require "asciidoctor"
 require "metanorma-iso"
 require_relative "./front"
+require_relative "./validate"
+require_relative "./cleanup"
 
 module Metanorma
   module JIS
@@ -16,6 +18,13 @@ module Metanorma
         super
       end
 
+      def doctype(node)
+        ret = node.attr("doctype")&.gsub(/\s+/, "-")&.downcase ||
+          "japanese-industrial-standard"
+        ret = "japanese-industrial-standard" if ret == "article"
+        ret
+      end
+
       def boilerplate_file(_x_orig)
         File.join(@libdir, "jis_intro_jp.xml")
       end
@@ -39,8 +48,6 @@ module Metanorma
       def pdf_converter(node)
         return if node.attr("no-pdf")
 
-        return
-
         if node.nil?
           IsoDoc::JIS::PdfConvert.new({})
         else
@@ -55,19 +62,6 @@ module Metanorma
           IsoDoc::JIS::PresentationXMLConvert.new(doc_extract_attributes(node))
         end
       end
-
-      def script_validate(xmldoc)
-        script = xmldoc&.at("//bibdata/script")&.text
-        %w(Jpan Latn).include?(script) or
-          @log.add("Document Attributes", nil,
-                   "#{script} is not a recognised script")
-      end
-
-      def validate(doc)
-        content_validate(doc)
-        schema_validate(formattedstr_strip(doc.dup),
-                        File.join(File.dirname(__FILE__), "jis.rng"))
-      end
     end
   end
 end