metanorma-plugin-lutaml 0.7.57 → 0.7.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb9c176145db89f41f691658a755ce2f94cd8a1f1f302dd328deb4ec0286c5b0
-  data.tar.gz: '0309da4d8a37de8b907e77b7ab46b27f7e6d67269a1dc9ce37fb2150b9f887d6'
+  metadata.gz: d96f09e7d7f1d19bbe312762e74ee2202906df8d101844b4f886cddf13a03835
+  data.tar.gz: 3e58ee7adb78b9f8fe376c8903802e7ccba16649ad569b981b67670f2bd46c36
 SHA512:
-  metadata.gz: a4884c1d32422983d9c5ab5388c63c7a0937526a561a6b4ba5c1043f0250d389efeee2d475d750c3f1f90983caae66aa3b156beeb4551dc093ea1e63a44e95b4
-  data.tar.gz: cc10688b5530b8068fa25176e84dceb950e29a355781be749e9a6f6709b5331f64391466db046cd58013f30911ec0ac68d7cd25ee938a51e5e6c04d0b89c4ab1
+  metadata.gz: f25f543755e3a342f1cd640b2413a1bcaef5b5a9ab7706d71c4786f35814d76e0aa9c37f03b381a381420be714bf190f5fde568cb5d725f357448670a3b7b81b
+  data.tar.gz: 646d8ddf3d4e5823a9a2740a8193d2e3109273587b33ffed2e02e338182e82241fc26e7b94dcc192922830b6d1ff8f3637eaec99564c4a4d422d3762ce6cb741

data/Gemfile

@@ -37,3 +37,9 @@ gem "suma", github: "metanorma/suma", branch: "main"
 # standoc main (>= 3.5.1.pre.alpha.2) floors metanorma-document at
 # 0.5.2.pre.alpha.1 (SvgmapElement, metanorma-standoc#1303); main carries it
 gem "metanorma-document", github: "metanorma/metanorma-document", branch: "main"
+
+# svg_conform 0.2.5's rubygems object is stale on some CDN edges (the
+# re-pushed build carries a lens_core dependency that is not published);
+# 0.2.4 is the last clean release and rides moxml ~> 0.5 (= satisfied by
+# the 0.6 line). Lift when a clean 0.2.6 ships.
+gem "svg_conform", "~> 0.2.6"

data/README.adoc

@@ -39,6 +39,8 @@ link:docs/usages/lutaml-gml.adoc[Usage with LutaML GML Dictionary by lutaml_gml_
 
 link:docs/usages/json_yaml.adoc[Usage with JSON or YAML files by data2text, yaml2text or json2text]
 
+link:docs/usages/lutaml-data.adoc[Usage with LutaML data files by lutaml_data]
+
 link:docs/usages/lutaml-xsd.adoc[Usage with XML Schema files by lutaml_xsd]
 
 == Documentation

data/docs/usages/lutaml-data.adoc

@@ -0,0 +1,227 @@
+== Usage with LutaML data files by lutaml_data
+
+=== General
+
+The `lutaml_data` block command loads data that is defined with LutaML models
+and makes it available to a Liquid template in the block.
+
+The data consists of two parts:
+
+* the *data definitions*: LutaML models, always written in a `.lml` file; and
+* the *data instances*: values of those models, written in `.lml`, `.yaml`,
+  `.yml` or `.json`.
+
+=== Defining a block
+
+Data definitions and data instances in separate files:
+
+[source,asciidoc]
+------
+[lutaml_data,{definition_file},{instance_file},{context_name},options={...}]
+----
+...Liquid template...
+----
+------
+
+Data definitions and data instances in the same `.lml` file:
+
+[source,asciidoc]
+------
+[lutaml_data,{definition_file},{context_name},options={...}]
+----
+...Liquid template...
+----
+------
+
+`definition_file`:: (required) Path to the `.lml` file that holds the LutaML
+models. Relative paths are resolved from the directory of the Metanorma
+document. When this is the only file given, the same file must also contain
+the instances.
+
+`instance_file`:: (optional) Path to the file that holds the data instances,
+with extension `.lml`, `.yaml`, `.yml` or `.json`. The `.lml` instance file
+usually starts with `require "<definition_file>"`.
+
+`context_name`:: (optional) The name under which the data is exposed to the
+Liquid template. Defaults to `lutaml_data`.
+
+`options`:: (optional) Rendering options, given either as a JSON object
+(`options={"include_path":"templates"}`) or as inline `key=value` pairs
+(`include_path=templates`). The supported option is `include_path`, a
+comma-separated list of directories searched by the Liquid `include` tag.
+
+NOTE: A segment is taken as the instance file when its extension is one of
+`.lml`, `.yaml`, `.yml` or `.json`; any other segment is taken as the context
+name.
+
+=== Data in the Liquid context
+
+The data is exposed under `context_name`, then the name of the instance.
+
+* For `.lml` instances, the key is the instance name (`instance S158Checks { ... }`
+  is `S158Checks`).
+* For `.yaml` and `.json` instances, the key is the model name given by the
+  required `type` entry (`type: Widgets` is `Widgets`). A file may hold one
+  object or a list of objects.
+
+Attributes are read by name (`check.dev_id`), collections are iterated with
+`for`, and enum values expose the attributes defined in the model
+(`check.classification.description`).
+
+=== Example
+
+Data definitions, `s102_models.lml`:
+
+[source]
+----
+models IhoS102Check {
+  enum CheckClassification {
+    critical_error {
+      description "Critical Error"
+    }
+    warning {
+      description "Warning"
+    }
+  }
+
+  class ValidationChecks {
+    attribute checks {
+      type ValidationCheck
+      cardinality 0..n
+    }
+  }
+
+  class ValidationCheck {
+    attribute dev_id {
+      type String
+      cardinality 1
+    }
+
+    attribute classification {
+      type CheckClassification
+      cardinality 1
+    }
+
+    attribute check_message {
+      type String
+      cardinality 1
+    }
+  }
+}
+----
+
+Data instances, `s102_checks.lml`:
+
+[source]
+----
+// s102_checks.lml
+require "s102_models.lml"
+instance S158Checks {
+  type ValidationChecks
+
+  checks = [
+    instance IhoS102Check::ValidationCheck {
+      dev_id = "S102_Dev1001"
+      classification = CheckClassification::critical_error
+      check_message = "No feature information group"
+    },
+
+    instance IhoS102Check::ValidationCheck {
+      dev_id = "S102_Dev1002"
+      classification = CheckClassification::warning
+      check_message = "Mandatory metadata attribute missing"
+    }
+  ]
+}
+----
+
+NOTE: In `.lml` files, comments start with `//`. A `#` comment is rejected by
+the instance parser.
+
+The Metanorma document:
+
+[source,asciidoc]
+------
+[lutaml_data,s102_models.lml,s102_checks.lml,lml]
+----
+{% for check in lml.S158Checks.checks %}
+=== S-102 Validation Check `{{ check.dev_id }}`
+
+classification: {{ check.classification.description }}
+
+check message: {{ check.check_message }}
+
+{% endfor %}
+----
+------
+
+renders as:
+
+[source,asciidoc]
+----
+=== S-102 Validation Check `S102_Dev1001`
+
+classification: Critical Error
+
+check message: No feature information group
+
+=== S-102 Validation Check `S102_Dev1002`
+
+classification: Warning
+
+check message: Mandatory metadata attribute missing
+----
+
+=== Instances in YAML or JSON
+
+The same data can be given as YAML (`s102_checks.yaml`):
+
+[source,yaml]
+----
+type: ValidationChecks
+checks:
+  - dev_id: S102_Dev1001
+    check_message: No feature information group
+----
+
+NOTE: Enum-typed attributes (such as `classification` above) cannot currently
+be set from YAML or JSON instances; loading fails. Use `.lml` instances for
+data that has enum values.
+
+The key in the template is the type name:
+
+[source,asciidoc]
+------
+[lutaml_data,s102_models.lml,s102_checks.yaml,lml]
+----
+{% for check in lml.ValidationChecks.checks %}
+{{ check.dev_id }}
+{% endfor %}
+----
+------
+
+=== Instances in the definition file
+
+If the instances are in the definition file, omit the instance file:
+
+[source,asciidoc]
+------
+[lutaml_data,widgets.lml,store]
+----
+{% for widget in store.AllWidgets.widgets %}
+{{ widget.id }}: {{ widget.name }}
+{% endfor %}
+----
+------
+
+=== Options
+
+Directories for Liquid `include` can be set with `options`:
+
+[source,asciidoc]
+------
+[lutaml_data,widgets.lml,store,options={"include_path":"templates"}]
+----
+{% include 'heading' %}
+----
+------

data/harness/p41min/.gitignore

@@ -0,0 +1,10 @@
+# build outputs
+Gemfile.lock
+.bundle/
+site/
+documents/p41min/relaton/
+documents/p41min/document.*
+document.err.html
+relaton/
+schema_docs/*/doc_*.err.html
+schema_docs/*/doc_*.presentation.xml

data/harness/p41min/Gemfile

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+# Regression harness for metanorma-plugin-lutaml#329: the svgmap image
+# paths must resolve in collection builds. Pins mirror the verified
+# iso-10303 stack; the plugin rides the released line under test.
+# parsanol 1.3.120 removes the pre-1.3.113 `mode` grammar header alias,
+# which every released expressir embeds — excluded until the alias
+# returns or expressir ships `edition`-era grammars.
+gem "metanorma-cli", "1.18.0.pre.alpha.3"
+gem "stepmod-utils", "0.6.10.pre.alpha.1"
+gem "metanorma-plugin-lutaml", "~> 0.7.57"
+gem "lutaml-model", "~> 0.8.148"
+gem "relaton", "~> 3.0.1"
+gem "parsanol", "~> 1.3.115", "!= 1.3.120"
+gem "expressir", "2.4.45"

data/harness/p41min/README.md

@@ -0,0 +1,36 @@
+# p41min collection harness
+
+End-to-end regression harness for metanorma-plugin-lutaml#329: svgmap
+`image::` paths must resolve when a collection build compiles its members
+(working-directory asset resolution), not only in single-document
+compiles.
+
+## Provenance
+
+`documents/p41min` is a trimmed part-41 ISO 10303 collection; the schema
+assets under `schemas/resources/` and `plain_schemas/resources/` come
+from metanorma/iso-10303 (main at `22bf8b3729`). The `schema_docs/*/`
+HTML files are attachment stubs; the harness exercises build mechanics,
+not schema documentation content.
+
+## Usage
+
+```sh
+./run.sh
+```
+
+The script resolves its own bundle (`Gemfile`, released pins), builds
+`collection-p41min.yml` with the metanorma CLI, and fails on any
+`Image not found` / `Image specified` entry or incomplete build.
+
+## Signatures
+
+- PASS (0.7.57+): build completes; zero image errors; figures embed as
+  data URIs.
+- FAIL (0.7.55-0.7.56): parse-stage STANDOC_44 fatal
+  `Image not found: <cwd>/../../schemas/resources/action_schema/action_schemaexpg{1,2}.svg`,
+  exit 1.
+
+To test an unreleased plugin revision, temporarily point the Gemfile's
+`metanorma-plugin-lutaml` at it and remove the override before
+committing — no path gems in committed Gemfiles.

data/harness/p41min/collection-p41min.yml

@@ -0,0 +1,24 @@
+directives:
+  - documents-inline
+bibdata:
+  title:
+    - language: en
+      content: "p41min"
+  type: collection
+  docid:
+    type: iso
+    id: 10303-4100
+  edition: 1
+  copyright:
+    owner:
+      name: International Standards Organization
+      abbreviation: ISO
+    from: 2024
+manifest:
+  level: collection
+  title: ISO Collection
+  docref:
+    - level: document
+      title: Document
+      docref:
+        - fileref: documents/p41min/collection.yml

data/harness/p41min/documents/p41min/collection.yml

@@ -0,0 +1,173 @@
+directives:
+  - documents-inline
+bibdata:
+  title:
+    - language: en
+      content: "Industrial automation systems and integration -- Product data representation and exchange -- Integrated generic resource: Fundamentals of product description and support"
+    - language: fr
+      content: "Systèmes d'automatisation industrielle et intégration -- Représentation et échange de données de produits -- Ressources génériques intégrées: Principes de description et de support de produits"
+  type: collection
+  docid:
+    type: iso
+    id: 10303-41
+  edition: 8
+  copyright:
+    owner:
+      name: International Standards Organization
+      abbreviation: ISO
+    from: 2025
+manifest:
+  level: collection
+  title: ISO Collection
+  docref:
+    - level: document
+      title: Document
+      docref:
+        - fileref: document.adoc
+    - level: attachments
+      title: Attachments
+      docref:
+        - fileref: ../../plain_schemas/resources/action_schema/action_schema.exp
+          identifier: action_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/application_context_schema/application_context_schema.exp
+          identifier: application_context_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/approval_schema/approval_schema.exp
+          identifier: approval_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/basic_attribute_schema/basic_attribute_schema.exp
+          identifier: basic_attribute_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/certification_schema/certification_schema.exp
+          identifier: certification_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/contract_schema/contract_schema.exp
+          identifier: contract_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/date_time_schema/date_time_schema.exp
+          identifier: date_time_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/document_schema/document_schema.exp
+          identifier: document_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/effectivity_schema/effectivity_schema.exp
+          identifier: effectivity_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/experience_schema/experience_schema.exp
+          identifier: experience_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/external_reference_schema/external_reference_schema.exp
+          identifier: external_reference_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/group_schema/group_schema.exp
+          identifier: group_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/language_schema/language_schema.exp
+          identifier: language_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/location_schema/location_schema.exp
+          identifier: location_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/management_resources_schema/management_resources_schema.exp
+          identifier: management_resources_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/measure_schema/measure_schema.exp
+          identifier: measure_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/person_organization_schema/person_organization_schema.exp
+          identifier: person_organization_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/product_definition_schema/product_definition_schema.exp
+          identifier: product_definition_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/product_property_definition_schema/product_property_definition_schema.exp
+          identifier: product_property_definition_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/product_property_representation_schema/product_property_representation_schema.exp
+          identifier: product_property_representation_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/qualifications_schema/qualifications_schema.exp
+          identifier: qualifications_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/security_classification_schema/security_classification_schema.exp
+          identifier: security_classification_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/support_resource_schema/support_resource_schema.exp
+          identifier: support_resource_schema.exp
+          attachment: true
+        - fileref: ../../plain_schemas/resources/uuid_attribute_schema/uuid_attribute_schema.exp
+          identifier: uuid_attribute_schema.exp
+          attachment: true
+        - fileref: ../../schema_docs/action_schema/doc_action_schema.html
+          identifier: action_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/application_context_schema/doc_application_context_schema.html
+          identifier: application_context_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/approval_schema/doc_approval_schema.html
+          identifier: approval_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/basic_attribute_schema/doc_basic_attribute_schema.html
+          identifier: basic_attribute_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/certification_schema/doc_certification_schema.html
+          identifier: certification_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/contract_schema/doc_contract_schema.html
+          identifier: contract_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/date_time_schema/doc_date_time_schema.html
+          identifier: date_time_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/document_schema/doc_document_schema.html
+          identifier: document_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/effectivity_schema/doc_effectivity_schema.html
+          identifier: effectivity_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/experience_schema/doc_experience_schema.html
+          identifier: experience_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/external_reference_schema/doc_external_reference_schema.html
+          identifier: external_reference_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/group_schema/doc_group_schema.html
+          identifier: group_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/language_schema/doc_language_schema.html
+          identifier: language_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/location_schema/doc_location_schema.html
+          identifier: location_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/management_resources_schema/doc_management_resources_schema.html
+          identifier: management_resources_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/measure_schema/doc_measure_schema.html
+          identifier: measure_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/person_organization_schema/doc_person_organization_schema.html
+          identifier: person_organization_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/product_definition_schema/doc_product_definition_schema.html
+          identifier: product_definition_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/product_property_definition_schema/doc_product_property_definition_schema.html
+          identifier: product_property_definition_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/product_property_representation_schema/doc_product_property_representation_schema.html
+          identifier: product_property_representation_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/qualifications_schema/doc_qualifications_schema.html
+          identifier: qualifications_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/security_classification_schema/doc_security_classification_schema.html
+          identifier: security_classification_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/support_resource_schema/doc_support_resource_schema.html
+          identifier: support_resource_schema.html
+          attachment: true
+        - fileref: ../../schema_docs/uuid_attribute_schema/doc_uuid_attribute_schema.html
+          identifier: uuid_attribute_schema.html
+          attachment: true

data/harness/p41min/documents/p41min/document.adoc

@@ -0,0 +1,88 @@
+= Industrial automation systems and integration: Product data representation and exchange: Integrated generic resource: Fundamentals of product description and support
+:docnumber: 10303
+:tc-docnumber: ISO/TC 184/SC 4/WG 12 N11559
+:partnumber: 41
+:copyright-year: 2025
+:language: en
+:published-date: 2025
+:edition: 8
+:iso-10303-doc-version: 8
+:title-intro-en: Industrial automation systems and integration
+:title-intro-fr: Systèmes d'automatisation industrielle et intégration
+:title-main-en: Product data representation and exchange
+:title-main-fr: Représentation et échange de données de produits
+:title-part-en: Integrated generic resource: Fundamentals of product description and support
+:title-part-fr: Ressources génériques intégrées: Principes de description et de support de produits
+:doctype: international-standard
+:docstage: 60
+:docsubstage: 60
+:technical-committee-number: 184
+:technical-committee: Industrial automation systems and integration
+:subcommittee-type: SC
+:subcommittee-number: 4
+:subcommittee: Industrial data
+:workgroup-type: WG
+:workgroup-number: 12
+:secretariat: ANSI
+:keywords: STEP, ISO 10303, integrated resource, integrated generic resource, product definition, product property, measure, application context, product property representation, person, organization, experience, identification, qualifications, location and position in organization
+:library-ics: 25.040.40
+:revises: ISO 10303-41:2024
+:supersedes: ISO/TC 184/SC 4/WG 12 N10681
+:semantic-metadata-project-leader-firstname: Max
+:semantic-metadata-project-leader-lastname: Ungerer
+:semantic-metadata-project-leader-address-affiliation: PROSTEP AG
+:semantic-metadata-project-leader-address-street: Dolivostraße 11
+:semantic-metadata-project-leader-address-city: Darmstadt
+:semantic-metadata-project-leader-address-postcode: 64293
+:semantic-metadata-project-leader-address-country: Germany
+:semantic-metadata-project-leader-email: Max.Ungerer@PROSTEP.com
+:semantic-metadata-project-editor-firstname: Darla
+:semantic-metadata-project-editor-lastname: Nettles Edwards
+:semantic-metadata-project-editor-address-affiliation: Liberty Business Associates.
+:semantic-metadata-project-editor-address-street: 3509 Iron Horse Road
+:semantic-metadata-project-editor-address-city: Ladson
+:semantic-metadata-project-editor-address-state: SC
+:semantic-metadata-project-editor-address-postcode: 29456
+:semantic-metadata-project-editor-address-country: USA
+:semantic-metadata-project-editor-phone: +843-819-3263
+:semantic-metadata-project-editor-email: darla.nettles.edwards@gmail.com
+:imagesdir: images
+:mn-document-class: iso
+:mn-output-extensions: xml,html,pdf,rxl
+:local-cache-only:
+:data-uri-image:
+:lutaml-express-index: schemas; ../../schemas-srl.yml;
+
+////
+This document has been reviewed using the internal review checklist (see WG12 N11560), the project leader checklist (see WG12 N11560), and the convener checklist (see WG12 N11560), and has been determined to be ready for publication .
+
+////
+
+include::sections/00-foreword.adoc[]
+
+include::sections/00-introduction.adoc[]
+
+include::sections/01-scope.adoc[]
+
+include::sections/02-norm-refs.adoc[]
+
+include::sections/03-terms.adoc[]
+
+include::../../templates/resources/schemas.adoc[]
+
+include::../../templates/resources/resource_annex_short_names.adoc[]
+
+include::../../templates/resources/resource_annex_identifier.adoc[]
+
+include::../../templates/resources/resource_annex_listings.adoc[]
+
+include::../../templates/resources/resource_annex_diagrams.adoc[]
+
+include::sections/95-tech-discussion.adoc[]
+
+include::sections/96-examples.adoc[]
+
+include::../../templates/resources/resource_annex_change_history.adoc[]
+
+include::sections/99-bibliography.adoc[]
+

data/harness/p41min/documents/p41min/images/action_schemaexpg1.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="315" width="368" viewBox="0 0 368 315" y="0px" x="0px" id="Layer_1" version="1.1">
+			
+			
+			<image href="data:image/gif;base64,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" height="315" width="368" style="overflow:visible;">
+			</image>
+			<a href="1"><rect onmouseout="this.style.opacity=0" onmouseover="this.style.opacity=1" style="opacity: 0; fill: rgb(33, 128, 255); fill-opacity: 0.3; stroke: rgb(0, 128, 255); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" height="41" width="133" y="186" x="210"/></a><a href="2"><rect onmouseout="this.style.opacity=0" onmouseover="this.style.opacity=1" style="opacity: 0; fill: rgb(33, 128, 255); fill-opacity: 0.3; stroke: rgb(0, 128, 255); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" height="41" width="86" y="10" x="10"/></a><a href="3"><rect onmouseout="this.style.opacity=0" onmouseover="this.style.opacity=1" style="opacity: 0; fill: rgb(33, 128, 255); fill-opacity: 0.3; stroke: rgb(0, 128, 255); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" height="41" width="148" y="264" x="210"/></a>
+		</svg>