version bump

metanorma · Apr 20, 2019 · 926708d · 926708d
1 parent be72c18
commit 926708d
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 34 deletions.
diff --git a/lib/asciidoctor/csand/biblio.rng b/lib/asciidoctor/csand/biblio.rng
@@ -636,22 +636,27 @@
       <ref name="ISO8601Date"/>
     </optional>
   </define>
+  <define name="BibliographicDateType">
+    <choice>
+      <value>published</value>
+      <value>accessed</value>
+      <value>created</value>
+      <value>implemented</value>
+      <value>obsoleted</value>
+      <value>confirmed</value>
+      <value>updated</value>
+      <value>issued</value>
+      <value>transmitted</value>
+      <value>copied</value>
+      <value>unchanged</value>
+      <value>circulated</value>
+    </choice>
+  </define>
   <define name="bdate">
     <element name="date">
       <attribute name="type">
         <choice>
-          <value>published</value>
-          <value>accessed</value>
-          <value>created</value>
-          <value>implemented</value>
-          <value>obsoleted</value>
-          <value>confirmed</value>
-          <value>updated</value>
-          <value>issued</value>
-          <value>transmitted</value>
-          <value>copied</value>
-          <value>unchanged</value>
-          <value>circulated</value>
+          <ref name="BibliographicDateType"/>
           <text/>
         </choice>
       </attribute>

diff --git a/lib/asciidoctor/csand/csand.rng b/lib/asciidoctor/csand/csand.rng
@@ -9,11 +9,6 @@
     <start>
       <ref name="csand-standard"/>
     </start>
-    <define name="language">
-      <element name="language">
-        <value>en</value>
-      </element>
-    </define>
     <define name="docidentifier">
       <element name="docidentifier">
         <optional>

diff --git a/lib/asciidoctor/csand/isodoc.rng b/lib/asciidoctor/csand/isodoc.rng
@@ -735,49 +735,79 @@
       <ref name="bookmark"/>
     </choice>
   </define>
+  <define name="PureTextElement">
+    <choice>
+      <text/>
+      <ref name="em"/>
+      <ref name="strong"/>
+      <ref name="sub"/>
+      <ref name="sup"/>
+      <ref name="tt"/>
+      <ref name="keyword"/>
+      <ref name="strike"/>
+      <ref name="smallcap"/>
+      <ref name="br"/>
+    </choice>
+  </define>
   <define name="source">
     <element name="source">
       <ref name="TypedUri"/>
     </element>
   </define>
   <define name="em">
     <element name="em">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="strong">
     <element name="strong">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="tt">
     <element name="tt">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="keyword">
     <element name="keyword">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="sub">
     <element name="sub">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="sup">
     <element name="sup">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="strike">
     <element name="strike">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="smallcap">
     <element name="smallcap">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="br">

diff --git a/lib/asciidoctor/csand/isostandard.rng b/lib/asciidoctor/csand/isostandard.rng
@@ -4,14 +4,6 @@
     <start>
       <ref name="iso-standard"/>
     </start>
-    <define name="language">
-      <element name="language">
-        <choice>
-          <value>en</value>
-          <value>fr</value>
-        </choice>
-      </element>
-    </define>
     <define name="script">
       <element name="script">
         <value>Latn</value>

diff --git a/lib/metanorma/csand/version.rb b/lib/metanorma/csand/version.rb
@@ -1,5 +1,5 @@
 module Metanorma
   module Csand
-    VERSION = "1.1.4"
+    VERSION = "1.1.5"
   end
 end