metanorma-document 0.5.1 → 0.5.2.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82bac7c730c60f7fa121afd4d4278380019eea11c7331254453c986cc988da95
-  data.tar.gz: 889dab00a67c3d56c2ce7e284da7a7b6bca13d952efc43b405bbb553837ef87b
+  metadata.gz: c1061de30d6a7a96ae887b65148f640cc87bf1fd6f56ba02b2aba6c40c2c5dc8
+  data.tar.gz: 6453bebc29bc6d4d868893dd29b97b05fd994cf1b11e871a1a5f43548e73a40f
 SHA512:
-  metadata.gz: 5d3fee68271cacc7e090d70b07b920202bec1d50129f5365d97140c4ba66efd6225628f8fc08ae2aa8c9b4b9925eaee5ad3450a1475560f7728c54df1de284db
-  data.tar.gz: 75b2af965e8ad9d792711d5393fd0c98fdcedcf3b73bb50cf4210faeb7a2f7b901caac32cfc4822738eb6e0c51cbca7b17a43d2ef6cc635bcde2dfdfa27ad84e
+  metadata.gz: ead74957bf07e7f4eb5fd953f5d2e88df1b19e32131fd79204cbef869c9ee6dab1b7f3aadc623329e927033f713c7acad7a74d927f1c92b4e4db95f2ee387b33
+  data.tar.gz: 9ab9972291ae08de7dc279e1dcaabba877363081ba34d09a32797b500197750514f723773c849d70f54b29621b5cfd0db01d0471395acf6de982c8c9b729f3ad

data/README.adoc

@@ -354,6 +354,87 @@ metanorma-document to-mirror document.presentation.xml \
   --id-strategy positional \
   --title "My Document"
 
+== Native object-model decomposition
+
+`Metanorma::Document::NativeModels` decomposes a typed document model
+into the native object models of the Metanorma ecosystem — the owning
+gems' own classes and serializations, never re-flattened into a parallel
+schema:
+
+[source,ruby]
+require "metanorma/document"
+
+model = Metanorma::Iso::Document::Root.from_xml(xml)
+
+Metanorma::Document::NativeModels.glossarist_concepts(model)
+# => [Glossarist::Concept] — term entries as native concepts (to_json)
+
+Metanorma::Document::NativeModels.relaton_bibdata(model)
+# => Relaton::Bib::ItemData — the bibliographic record as native Relaton
+
+Metanorma::Document::NativeModels.relaton_bibliography(model)
+# => [BibliographyEntry] — every cited document as a native Relaton item
+#    plus a native Pubid::Identifier parse (what citation edges resolve to)
+
+Metanorma::Document::NativeModels.pubid_identifiers(model)
+# => [{ original:, type:, primary:, pubid: }] — native pubid parses
+
+This is a model-layer capability available to any consumer; MKO below is
+one of them.
+
+== Machine serialization (MKO)
+
+*Metanorma Knowledge Objects* (MN 116) is the machine-first output
+format: a derived bundle of typed, addressable knowledge objects
+projected from the document model — like a rendering, never a source
+format.
+
+[source,ruby]
+require "metanorma/mko"
+
+Metanorma::Mko.export(xml_or_model, to: dir, presentation_xml: nil, zip: false)
+# => <short>.mko/ bundle: manifest.json, document.json, units.jsonl,
+#    edges.jsonl, bibdata.json, bibliography.jsonl, identifiers.json,
+#    glossary.json
+
+Collections export as document families — every member document as
+its own bundle plus one small collection bundle (collection.json and
+the doc:<member> part_of doc:<family> membership edges):
+
+[source,ruby]
+Metanorma::Mko::Collection.export("collection.yml", to: dir)
+
+Figure bytes are emitted as hash-addressed, manifest-verified bundle
+assets (data URIs from the model, or `assets_from:` paths). Language
+editions align by stable anchors:
+
+[source,ruby]
+Metanorma::Mko::Alignment.export(bundle_en, bundle_fr)
+# => alignment.jsonl of variant_of unit edges
+
+The wire contract ships as generated JSON Schema (the schema classes
+are the single source of truth):
+
+[source,ruby]
+Metanorma::Mko.json_schemas # => { "unit" => …, "collection" => …, "excerpt" => … }
+
+The bundle carries: typed units (clause, term, table, figure, formula,
+note, example, sourcecode, requirement, reference) with typed payloads;
+the edge graph (part_of containment, cites from reference and term units,
+defines, class_of, and document-level relations with Relaton types
+verbatim); and the native object-model components (Relaton bibdata and
+bibliography, Glossarist concepts, pubid parses). Semantic anchors are
+preferred over GUIDs; unit ids are content-hash stable, and repeated
+exports are byte-identical.
+
+The walk dispatches on class/attribute declarations only — zero flavor
+knowledge; one format serves every flavor. `Mko.renderer_for(document)`
+follows the `Html::Generator` pattern (flavor entries may override;
+otherwise the harness exporter serves any model tree). From the CLI:
+
+[source,bash]
+metanorma compile document.adoc -x mko   # writes <short>.mko/
+
 == Documentation
 
 Detailed architecture documentation is in the `docs/` directory:

data/Rakefile

@@ -5,13 +5,9 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-# Fast gate: the full suite minus the roundtrip specs over multi-MB
-# fixtures (spec/metanorma/iso_document/roundtrip/**), which dominate
-# runtime. Those run in .github/workflows/roundtrip.yml; run the full
-# suite locally with `rake spec`.
-RSpec::Core::RakeTask.new(:spec_fast) do |t|
-  t.exclude_pattern = "spec/metanorma/iso_document/roundtrip/**"
-end
+# Fast gate: the full suite minus the multi-MB-fixture specs; the
+# per-flavor roundtrips moved to the flavor gems (Phase 5).
+RSpec::Core::RakeTask.new(:spec_fast)
 
 require "rubocop/rake_task"
 

data/data/themes/ogc.yaml

@@ -45,7 +45,12 @@ logos_light:
 
 # Section ordering
 preface_order:
+  - foreword
+  - introduction
+  - abstract
   - clause
+  - acknowledgements
+  - executivesummary
 preface_wrap: true
 toc_filter_types:
   - toc

data/lib/metanorma/basic_document/ancillary_blocks/figure_block.rb

@@ -23,7 +23,7 @@ module Metanorma
 
         # The semantic category of the figure. This is to allow different classes of figure (e.g. _Plate_,
         # _Chart_, _Diagram_) to be auto-numbered and captioned differently.
-        attribute :class, :string
+        attribute :class_attr, :string
 
         # The image file to be included in the figure as its main content.
         attribute :image, Metanorma::BasicDocument::IdElements::Image
@@ -52,7 +52,7 @@ module Metanorma
           map_attribute "unnumbered", to: :unnumbered
           map_attribute "subsequence", to: :subsequence
           map_element "name", to: :name
-          map_attribute "class", to: :class
+          map_attribute "class", to: :class_attr
           map_element "image", to: :image
           map_element "video", to: :video
           map_element "audio", to: :audio

data/lib/metanorma/basic_document/multi_paragraph/admonition_block.rb

@@ -18,7 +18,7 @@ module Metanorma
         # Subclass of admonition allowing different runs of admonitions to be labelled
         # and auto-numbered differently, even if they are of the same type.
         # Typically is a subclass of an admonition type.
-        attribute :class, :string
+        attribute :class_attr, :string
 
         # Location where the content of the admonition is accessible as an external document.
         attribute :uri, Metanorma::Document::Components::DataTypes::Uri
@@ -27,7 +27,7 @@ module Metanorma
           element "admonition"
           map_attribute "type", to: :type
           map_element "name", to: :name
-          map_attribute "class", to: :class
+          map_attribute "class", to: :class_attr
           map_element "uri", to: :uri
         end
       end

data/lib/metanorma/document/cli.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "optparse"
+require "json"
 require "fileutils"
 
 module Metanorma
@@ -24,6 +25,14 @@ module Metanorma
         keyword_init: true,
       )
 
+      ValidateOptions = Struct.new(
+        :xml_path,
+        :output,
+        :flavor,
+        :model_parse,
+        keyword_init: true,
+      )
+
       def self.run(argv)
         command = argv.shift
         case command
@@ -31,6 +40,8 @@ module Metanorma
           to_mirror(argv)
         when "to-html"
           to_html(argv)
+        when "validate"
+          validate(argv)
         when nil, "-h", "--help"
           puts usage
         else
@@ -110,6 +121,127 @@ module Metanorma
         end
       end
 
+      def self.validate(argv)
+        options = parse_validate_options(argv)
+        checks = []
+        checks << check_encoding(options)
+        checks << check_wellformed(options)
+        checks << check_document_kind(options)
+        checks << check_model_parse(options) if options.model_parse
+
+        report = {
+          "file" => options.xml_path,
+          "valid" => checks.all? { |c| c["status"] == "pass" },
+          "checks" => checks,
+        }
+        payload = JSON.pretty_generate(report)
+        if options.output
+          File.write(options.output, payload)
+        else
+          puts payload
+        end
+        report["valid"] ? 0 : 1
+      end
+
+      def self.parse_validate_options(argv)
+        opts = ValidateOptions.new(model_parse: false)
+        parser = OptionParser.new do |o|
+          o.on("--out FILE") { |v| opts.output = v }
+          o.on("--flavor NAME") { |v| opts.flavor = v }
+          o.on("--model-parse") { opts.model_parse = true }
+        end
+        parser.parse!(argv)
+        opts.xml_path = argv.shift
+        raise Error, "Usage: metanorma-document validate FILE [--out FILE] [--flavor NAME] [--model-parse]" if opts.xml_path.nil?
+
+        opts
+      end
+
+      # Byte-level UTF-8 validity, streamed in chunks: no full-document
+      # materialization for the common valid case.
+      def self.check_encoding(options)
+        result = { "check" => "encoding", "status" => "pass" }
+        base = 0
+        carry = +""
+        File.open(options.xml_path, "rb") do |f|
+          while (bytes = f.read(1 << 20))
+            chunk = carry + bytes
+            # Keep a potential partial multibyte sequence for the next
+            # round; a complete chunk must validate cleanly.
+            cut = chunk.bytesize - 3
+            cut = 0 if cut.negative?
+            rest = chunk.byteslice(0, cut)
+            rest.force_encoding("UTF-8")
+            unless rest.valid_encoding?
+              result["status"] = "fail"
+              result["error"] = "invalid UTF-8 byte sequence"
+              result["byte"] = base
+              return result
+            end
+            base += rest.bytesize
+            carry = chunk.byteslice(cut, chunk.bytesize - cut) || +""
+          end
+        end
+        carry.force_encoding("UTF-8")
+        unless carry.empty? || carry.valid_encoding?
+          result["status"] = "fail"
+          result["error"] = "invalid UTF-8 byte sequence (tail)"
+          result["byte"] = base
+          return result
+        end
+        result
+      end
+
+      # Well-formedness via the moxml/leptris parser (the fast engine;
+      # never the XSLT snapshot machinery).
+      def self.check_wellformed(options)
+        result = { "check" => "wellformed", "status" => "pass" }
+        begin
+          require "moxml"
+          doc = Moxml.new.parse(File.read(options.xml_path))
+          result["root"] = doc.root&.name
+        rescue StandardError => e
+          result["status"] = "fail"
+          result["error"] = e.message.to_s[0, 300]
+        end
+        result
+      end
+
+      # Presentation vs semantic root detection (presentation inputs
+      # are the render contract; semantic roots need the compile).
+      def self.check_document_kind(options)
+        result = { "check" => "document_kind", "status" => "pass" }
+        begin
+          require "moxml"
+          doc = Moxml.new.parse(File.read(options.xml_path))
+          root = doc.root
+          type = nil
+          root&.attributes&.each { |k, v| type = v if k == "type" }
+          result["kind"] = type || "unspecified"
+          result["root"] = root&.name
+        rescue StandardError => e
+          result["status"] = "fail"
+          result["error"] = e.message.to_s[0, 300]
+        end
+        result
+      end
+
+      # Full model parse through the flavor registry (catch-all fast
+      # path): model-level contract violations surface here.
+      def self.check_model_parse(options)
+        result = { "check" => "model_parse", "status" => "pass" }
+        begin
+          require "metanorma/html"
+          flavor = options.flavor&.to_sym
+          renderer = Metanorma::Html::StandardRenderer.new(flavor: flavor)
+          renderer.parse(File.read(options.xml_path))
+        rescue StandardError => e
+          result["status"] = "fail"
+          result["error"] = "#{e.class}: #{e.message}"[0, 300]
+        end
+        result
+      end
+
       def self.to_html(argv)
         options = parse_to_html_options(argv)
         execute_to_html(options)
@@ -159,6 +291,8 @@ module Metanorma
           Commands:
             to-mirror    Convert presentation XML to mirror JSON
             to-html      Render presentation XML to standalone HTML
+            validate     Standalone diagnostics: encoding, well-formedness,
+                         document kind, optional model parse (JSON report)
 
           Run `metanorma-document <command> --help` for command-specific options.
         USAGE

data/lib/metanorma/document/components/ancillary_blocks/figure_block.rb

@@ -81,6 +81,10 @@ module Metanorma
             map "name", to: :name
           end
 
+          attribute :fmt_figure,
+                    "Metanorma::Document::Components::AncillaryBlocks::FmtFigureElement",
+                    collection: true
+
           xml do
             element "figure"
             map_attribute "id", to: :id
@@ -105,6 +109,7 @@ module Metanorma
             map_element "key", to: :key
             map_element "fn", to: :footnotes
             map_element "note", to: :note
+            map_element "fmt-figure", to: :fmt_figure
             map_element "fmt-name", to: :fmt_name
             map_element "fmt-xref-label", to: :fmt_xref_label
           end

data/lib/metanorma/document/components/ancillary_blocks/fmt_figure_element.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Document
+    module Components
+      module AncillaryBlocks
+        # Rendered counterpart of `<figure>`: the presentation-layer
+        # figure container. The overlay allows arbitrary rendered
+        # blocks; the model carries the figure-rendering vocabulary
+        # (caption, image, notes, examples) that presentation XML
+        # emits.
+        class FmtFigureElement < Lutaml::Model::Serializable
+          include Metanorma::Document::Components::Inline::RenderedDisplay
+
+          attribute :id, :string
+          attribute :anchor, :string
+          attribute :semx_id, :string
+          attribute :name, Metanorma::Document::Components::Inline::NameWithIdElement
+          attribute :image, Metanorma::Document::Components::IdElements::Image
+          attribute :note, Metanorma::Document::Components::Blocks::NoteBlock,
+                    collection: true
+          attribute :example,
+                    Metanorma::Document::Components::AncillaryBlocks::ExampleBlock,
+                    collection: true
+          attribute :text, :string, collection: true
+          attribute :semx,
+                    Metanorma::Document::Components::Inline::SemxElement,
+                    collection: true
+
+          xml do
+            element "fmt-figure"
+            mixed_content
+            map_attribute "id", to: :id
+            map_attribute "anchor", to: :anchor
+            map_attribute "semx-id", to: :semx_id
+            map_element "name", to: :name
+            map_element "image", to: :image
+            map_element "note", to: :note
+            map_element "example", to: :example
+            map_content to: :text
+            map_element "semx", to: :semx
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/document/components/ancillary_blocks/formula_block.rb

@@ -24,6 +24,7 @@ module Metanorma
 
           attribute :anchor, :string
           attribute :semx_id, :string
+          attribute :original_id, :string
           attribute :autonum, :string
           attribute :displayorder, :integer
 
@@ -63,6 +64,7 @@ module Metanorma
             map_attribute "id", to: :id
             map_attribute "anchor", to: :anchor
             map_attribute "semx-id", to: :semx_id
+            map_attribute "original-id", to: :original_id
             map_attribute "autonum", to: :autonum
             map_attribute "displayorder", to: :displayorder
             map_element "stem", to: :stem

data/lib/metanorma/document/components/ancillary_blocks/imagemap_element.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Document
+    module Components
+      module AncillaryBlocks
+        # One hyperlinked area of an image map: a shape (rect, circle,
+        # ellipse, poly), the link it carries, and its geometry as
+        # coordinate points (plus a radius for circle areas).
+        class ImagemapAreaElement < Lutaml::Model::Serializable
+          attribute :area_type, :string
+          attribute :xref, Metanorma::Document::Components::Inline::XrefElement
+          attribute :link, Metanorma::Document::Components::Inline::LinkElement
+          attribute :eref, Metanorma::Document::Components::Inline::ErefElement
+          attribute :coords, "Metanorma::Document::Components::AncillaryBlocks::CoordsElement", collection: true
+          attribute :radius, "Metanorma::Document::Components::AncillaryBlocks::RadiusElement"
+
+          xml do
+            element "area"
+            map_attribute "type", to: :area_type
+            map_element "xref", to: :xref
+            map_element "link", to: :link
+            map_element "eref", to: :eref
+            map_element "coords", to: :coords
+            map_element "radius", to: :radius
+          end
+        end
+
+        # A coordinate point of an image map area shape.
+        class CoordsElement < Lutaml::Model::Serializable
+          attribute :x, :float
+          attribute :y, :float
+
+          xml do
+            element "coords"
+            map_attribute "x", to: :x
+            map_attribute "y", to: :y
+          end
+        end
+
+        # The centre (and optional extent) of a circle image map area.
+        class RadiusElement < Lutaml::Model::Serializable
+          attribute :x, :float
+          attribute :y, :float
+
+          xml do
+            element "radius"
+            map_attribute "x", to: :x
+            map_attribute "y", to: :y
+          end
+        end
+
+        # Wrapper around an image figure, specifying an image map:
+        # areas of the image that are hyperlinked.
+        class ImagemapElement < Lutaml::Model::Serializable
+          attribute :id, :string
+          attribute :class_attr, :string
+          attribute :figure, Metanorma::Document::Components::AncillaryBlocks::FigureBlock,
+                    collection: true
+          attribute :area, "Metanorma::Document::Components::AncillaryBlocks::ImagemapAreaElement", collection: true
+
+          xml do
+            element "imagemap"
+            map_attribute "id", to: :id
+            map_attribute "class", to: :class_attr
+            map_element "figure", to: :figure
+            map_element "area", to: :area
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/document/components/ancillary_blocks/literal_block.rb

@@ -11,6 +11,7 @@ module Metanorma
         # semantically.
         class LiteralBlock < Lutaml::Model::Serializable
           attribute :id, :string
+          attribute :anchor, :string
           attribute :alt, :string
           attribute :align, :string
           attribute :name, Metanorma::Document::Components::TextElements::TextElement,
@@ -20,6 +21,7 @@ module Metanorma
           xml do
             element "pre"
             map_attribute "id", to: :id
+            map_attribute "anchor", to: :anchor
             map_attribute "alt", to: :alt
             map_attribute "align", to: :align
             map_element "name", to: :name

data/lib/metanorma/document/components/ancillary_blocks/sourcecode_block.rb

@@ -6,6 +6,7 @@ module Metanorma
       module AncillaryBlocks
         class SourcecodeBlock < Metanorma::Document::Components::Blocks::BasicBlockNoNotes
           attribute :name, Metanorma::Document::Components::Inline::NameWithIdElement
+          attribute :fmt_name, Metanorma::Document::Components::Inline::FmtNameElement
           attribute :unnumbered, :boolean
           attribute :anchor, :string
           attribute :subsequence, :string
@@ -40,6 +41,7 @@ module Metanorma
             map_attribute "id", to: :id
             map_attribute "anchor", to: :anchor
             map_element "name", to: :name
+            map_element "fmt-name", to: :fmt_name
             map_attribute "unnumbered", to: :unnumbered
             map_attribute "subsequence", to: :subsequence
             map_attribute "filename", to: :filename

data/lib/metanorma/document/components/ancillary_blocks/svg_target_element.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Document
+    module Components
+      module AncillaryBlocks
+        # A cross-reference overwriting an SVG file's own hyperlink, so
+        # the SVG can link to anchors within the document. `href` names
+        # the link in the SVG file to overwrite.
+        class SvgTargetElement < Lutaml::Model::Serializable
+          attribute :href, :string
+          attribute :xref, Metanorma::Document::Components::Inline::XrefElement
+          attribute :link, Metanorma::Document::Components::Inline::LinkElement
+          attribute :eref, Metanorma::Document::Components::Inline::ErefElement
+
+          xml do
+            element "target"
+            map_attribute "href", to: :href
+            map_element "xref", to: :xref
+            map_element "link", to: :link
+            map_element "eref", to: :eref
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/document/components/ancillary_blocks/svgmap_element.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Document
+    module Components
+      module AncillaryBlocks
+        # Wrapper around an SVG figure, to update its hyperlinks with
+        # (potentially document-specific) links, so that the SVG can
+        # hyperlink to anchors within the document.
+        class SvgmapElement < Lutaml::Model::Serializable
+          attribute :id, :string
+          attribute :class_attr, :string
+          attribute :figure, Metanorma::Document::Components::AncillaryBlocks::FigureBlock,
+                    collection: true
+          attribute :target, "Metanorma::Document::Components::AncillaryBlocks::SvgTargetElement", collection: true
+
+          xml do
+            element "svgmap"
+            map_attribute "id", to: :id
+            map_attribute "class", to: :class_attr
+            map_element "figure", to: :figure
+            map_element "target", to: :target
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/document/components/ancillary_blocks.rb

@@ -8,6 +8,10 @@ module Metanorma
                  "#{__dir__}/ancillary_blocks/callout_annotation"
         autoload :ExampleBlock, "#{__dir__}/ancillary_blocks/example_block"
         autoload :FigureBlock, "#{__dir__}/ancillary_blocks/figure_block"
+        autoload :FmtFigureElement, "#{__dir__}/ancillary_blocks/fmt_figure_element"
+        autoload :SvgmapElement, "#{__dir__}/ancillary_blocks/svgmap_element"
+        autoload :SvgTargetElement, "#{__dir__}/ancillary_blocks/svg_target_element"
+        autoload :ImagemapElement, "#{__dir__}/ancillary_blocks/imagemap_element"
         autoload :FormulaBlock, "#{__dir__}/ancillary_blocks/formula_block"
         autoload :KeyElement, "#{__dir__}/ancillary_blocks/key_element"
         autoload :LiteralBlock, "#{__dir__}/ancillary_blocks/literal_block"

data/lib/metanorma/document/components/bib_data/bibliographic_item.rb

@@ -7,6 +7,8 @@ module Metanorma
         # Description of a bibliographic resource.
         class BibliographicItem < Lutaml::Model::Serializable
           attribute :id, :string
+          attribute :hidden, :boolean
+          attribute :suppress_identifier, :boolean
           attribute :type, Metanorma::Document::Relaton::BibItemType
           attribute :fetched, Metanorma::Document::Relaton::DateTime
           attribute :title, Metanorma::Document::Relaton::TypedTitleString,
@@ -65,6 +67,8 @@ module Metanorma
           xml do
             element "bibitem"
             map_attribute "id", to: :id
+            map_attribute "hidden", to: :hidden
+            map_attribute "suppress_identifier", to: :suppress_identifier
             map_attribute "type", to: :type_attr
             map_attribute "anchor", to: :anchor
             map_attribute "semx-id", to: :semx_id

data/lib/metanorma/document/components/blocks/fmt_provision.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Document
+    module Components
+      module Blocks
+        # Presentation-layer rendering of a requirement: the fully
+        # formatted block content emitted alongside the semantic requirement.
+        class FmtProvision < RequirementDescription
+          xml do
+            element "fmt-provision"
+            map_element "p", to: :p
+            map_element "ul", to: :ul
+            map_element "ol", to: :ol
+            map_element "sourcecode", to: :sourcecode
+            map_element "table", to: :table
+            map_element "example", to: :example
+            map_element "note", to: :note
+            map_element "figure", to: :figure
+          end
+        end
+      end
+    end
+  end
+end