remove organization/uri, conflicts with organization/{contact}/uri

relaton · Sep 10, 2024 · 2c42b17 · 2c42b17
1 parent 2e870b2
commit 2c42b17
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 15 deletions.
diff --git a/grammars/basicdoc-models b/grammars/basicdoc-models
diff --git a/grammars/biblio.rnc b/grammars/biblio.rnc
@@ -261,8 +261,6 @@ OrganizationType =
     subdivision*,
     ## Abbreviation under which the organization is known
     abbreviation?,
-    ## A URI with information about the organization
-    uri*,
     ## An identifier of the organization according to an international identifier scheme
     org-identifier*,
     ## Contact information for the organization, including address, phone number, and email

diff --git a/grammars/biblio.rng b/grammars/biblio.rng
@@ -116,7 +116,7 @@ NOTE: The number attribute can be used to represent the numeric equivalent of th
       </text>
     </element>
   </define>
-  <define name="LocalizedStringAttrs">
+  <define name="LocalizedStringAttributes">
     <a:documentation>multiple values are comma-delimited</a:documentation>
     <optional>
       <attribute name="language">
@@ -135,7 +135,7 @@ NOTE: The number attribute can be used to represent the numeric equivalent of th
     </optional>
   </define>
   <define name="LocalizedString1">
-    <ref name="LocalizedStringAttrs"/>
+    <ref name="LocalizedStringAttributes"/>
     <text/>
   </define>
   <define name="LocalizedString">
@@ -151,7 +151,7 @@ NOTE: The number attribute can be used to represent the numeric equivalent of th
     </choice>
   </define>
   <define name="LocalizedMarkedUpString1">
-    <ref name="LocalizedStringAttrs"/>
+    <ref name="LocalizedStringAttributes"/>
     <oneOrMore>
       <ref name="TextElement"/>
     </oneOrMore>
@@ -195,7 +195,7 @@ NOTE: `docbook`, `AsciiDoc`, `Metanorma` are not registered IANA Media Types</a:
     </ref>
   </define>
   <define name="LocalizedStringOrXsAny1">
-    <ref name="LocalizedStringAttrs"/>
+    <ref name="LocalizedStringAttributes"/>
     <oneOrMore>
       <choice>
         <text/>
@@ -565,7 +565,7 @@ real names (if the person is named with a pseudonym or user name); previous lega
           <a:documentation>The types of URI are open-ended, but include the IANA link relations specified in RFC 8288</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedStringAttrs"/>
+      <ref name="LocalizedStringAttributes"/>
       <data type="anyURI">
         <a:documentation>URI content</a:documentation>
       </data>
@@ -1337,7 +1337,7 @@ for which this claim of validity is made, if applicable</a:documentation>
         <a:documentation>Type of URI</a:documentation>
       </attribute>
     </optional>
-    <ref name="LocalizedStringAttrs"/>
+    <ref name="LocalizedStringAttributes"/>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -1807,7 +1807,7 @@ May be used to differentiate rendering of notes in bibliographies</a:documentati
   <define name="bibabstract">
     <a:documentation>Abstract of bibliographic item</a:documentation>
     <element name="abstract">
-      <ref name="LocalizedStringAttrs"/>
+      <ref name="LocalizedStringAttributes"/>
       <choice>
         <oneOrMore>
           <ref name="BasicBlockNoId">

diff --git a/images/RelBib_BibliographicItem.png b/images/RelBib_BibliographicItem.png
diff --git a/images/RelBib_Contributor.png b/images/RelBib_Contributor.png
diff --git a/images/RelBib_DataTypes.png b/images/RelBib_DataTypes.png
diff --git a/models/Organization.lutaml b/models/Organization.lutaml
@@ -22,11 +22,6 @@ class Organization{
       Abbreviation under which the organization is known.
     }
   }
-  +uri: TypedUri[0..*] {
-    definition {
-      A URI with information about the organization.
-    }
-  }
   +identifier: OrgIdentifier[0..*] {
     definition {
       An identifier of the organization according to an international identifier scheme.