W3C home > Mailing lists > Public > public-multilingualweb-lt-commits@w3.org > April 2013

CVS WWW/International/multilingualweb/lt/drafts/its20/schemas

From: CVS User jkosek <cvsmail@w3.org>
Date: Mon, 29 Apr 2013 07:23:01 +0000
Message-Id: <E1UWiQP-0006jJ-Uu@gil.w3.org>
To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv25853/schemas

Modified Files:
	its20.rnc its20.rng 
Log Message:
Removed Ruby related markup from schema

--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc	2013/04/29 07:18:38	1.22
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc	2013/04/29 07:23:01	1.23
@@ -177,7 +177,6 @@
    | its-locNoteRule
    | its-termRule
    | its-dirRule
-   | its-rubyRule
    | its-langRule
    | its-withinTextRule
    | its-domainRule
@@ -270,7 +269,7 @@
   ## Inline element to contain ITS information
   element span { its-span.content, its-span.attributes }
   
-its-span.content = (text | its-ruby | its-span)*
+its-span.content = (text | its-span)*
 
 its-span.attributes = its-local.nons.attributes & its-foreign-attribute*
 
@@ -300,7 +299,7 @@
   ## Localization note
   element locNote { its-locNote.content, its-locNote.attributes }
 
-its-locNote.content = (text | its-ruby | its-span)*
+its-locNote.content = (text | its-span)*
 
 its-locNote.attributes = its-local.attributes
 
@@ -326,55 +325,6 @@
 its-dirRule.attributes =
   its-attribute.selector,
   its-attribute.dir.nons
-  
-its-rubyRule =
-  ## Rule about the Ruby data category
-  element rubyRule { its-rubyRule.content, its-rubyRule.attributes }
-
-its-rubyRule.content = its-rubyText?
-its-rubyRule.attributes =
-  its-attribute.selector,
-  its-attribute.rubyPointer.nons?,
-  its-attribute.rpPointer.nons?,
-  its-attribute.rtPointer.nons?
-
-its-attribute.rubyPointer.nons = attribute rubyPointer { its-relative-selector.type }
-its-attribute.rpPointer.nons = attribute rpPointer { its-relative-selector.type }
-its-attribute.rtPointer.nons = attribute rtPointer { its-relative-selector.type }
-
-its-rubyText =
-  ## Ruby text
-  element rubyText { its-rubyText.content, its-rubyText.attributes }
-  
-its-rubyText.content = text
-its-rubyText.attributes = its-local.attributes
-
-its-ruby =
-  ## Ruby markup
-  element ruby { its-ruby.content, its-ruby.attributes }
-
-# FIXME: Allow nested ruby as in HTML5
-its-ruby.content =
-  ((text | its-span)+,
-   (its-rt | (its-rp, its-rt, its-rp)))+
-its-ruby.attributes = its-local.attributes
-
-its-rt =
-  ## Ruby text
-  element rt { its-rt.content, its-rt.attributes }
-
-its-rt.content = (text | its-span)*
-its-rt.attributes = its-local.attributes
-
-its-rp =
-  ## Used in the case of simple ruby markup to specify characters 
-  ## that can denote the beginning and end of ruby text when user
-  ## agents do not have other ways to present ruby text distinctively
-  ## from the base text. Typically contains parenthesis.
-  element rp { its-rp.content, its-rp.attributes }
-
-its-rp.content = text
-its-rp.attributes = its-local.attributes
 
 its-langRule =
   ## Rule about the Language Information data category
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng	2013/04/29 07:18:38	1.19
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng	2013/04/29 07:23:01	1.20
@@ -554,7 +554,6 @@
         <ref name="its-locNoteRule"/>
         <ref name="its-termRule"/>
         <ref name="its-dirRule"/>
-        <ref name="its-rubyRule"/>
         <ref name="its-langRule"/>
         <ref name="its-withinTextRule"/>
         <ref name="its-domainRule"/>
@@ -932,7 +931,6 @@
     <zeroOrMore>
       <choice>
         <text/>
-        <ref name="its-ruby"/>
         <ref name="its-span"/>
       </choice>
     </zeroOrMore>
@@ -993,7 +991,6 @@
     <zeroOrMore>
       <choice>
         <text/>
-        <ref name="its-ruby"/>
         <ref name="its-span"/>
       </choice>
     </zeroOrMore>
@@ -1046,121 +1043,6 @@
     <ref name="its-attribute.selector"/>
     <ref name="its-attribute.dir.nons"/>
   </define>
-  <define name="its-rubyRule">
-    <element name="rubyRule">
-      <a:documentation>Rule about the Ruby data category</a:documentation>
-      <ref name="its-rubyRule.content"/>
-      <ref name="its-rubyRule.attributes"/>
-    </element>
-  </define>
-  <define name="its-rubyRule.content">
-    <optional>
-      <ref name="its-rubyText"/>
-    </optional>
-  </define>
-  <define name="its-rubyRule.attributes">
-    <ref name="its-attribute.selector"/>
-    <optional>
-      <ref name="its-attribute.rubyPointer.nons"/>
-    </optional>
-    <optional>
-      <ref name="its-attribute.rpPointer.nons"/>
-    </optional>
-    <optional>
-      <ref name="its-attribute.rtPointer.nons"/>
-    </optional>
-  </define>
-  <define name="its-attribute.rubyPointer.nons">
-    <attribute name="rubyPointer">
-      <ref name="its-relative-selector.type"/>
-    </attribute>
-  </define>
-  <define name="its-attribute.rpPointer.nons">
-    <attribute name="rpPointer">
-      <ref name="its-relative-selector.type"/>
-    </attribute>
-  </define>
-  <define name="its-attribute.rtPointer.nons">
-    <attribute name="rtPointer">
-      <ref name="its-relative-selector.type"/>
-    </attribute>
-  </define>
-  <define name="its-rubyText">
-    <element name="rubyText">
-      <a:documentation>Ruby text</a:documentation>
-      <ref name="its-rubyText.content"/>
-      <ref name="its-rubyText.attributes"/>
-    </element>
-  </define>
-  <define name="its-rubyText.content">
-    <text/>
-  </define>
-  <define name="its-rubyText.attributes">
-    <ref name="its-local.attributes"/>
-  </define>
-  <define name="its-ruby">
-    <element name="ruby">
-      <a:documentation>Ruby markup</a:documentation>
-      <ref name="its-ruby.content"/>
-      <ref name="its-ruby.attributes"/>
-    </element>
-  </define>
-  <!-- FIXME: Allow nested ruby as in HTML5 -->
-  <define name="its-ruby.content">
-    <oneOrMore>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="its-span"/>
-        </choice>
-      </oneOrMore>
-      <choice>
-        <ref name="its-rt"/>
-        <group>
-          <ref name="its-rp"/>
-          <ref name="its-rt"/>
-          <ref name="its-rp"/>
-        </group>
-      </choice>
-    </oneOrMore>
-  </define>
-  <define name="its-ruby.attributes">
-    <ref name="its-local.attributes"/>
-  </define>
-  <define name="its-rt">
-    <element name="rt">
-      <a:documentation>Ruby text</a:documentation>
-      <ref name="its-rt.content"/>
-      <ref name="its-rt.attributes"/>
-    </element>
-  </define>
-  <define name="its-rt.content">
-    <zeroOrMore>
-      <choice>
-        <text/>
-        <ref name="its-span"/>
-      </choice>
-    </zeroOrMore>
-  </define>
-  <define name="its-rt.attributes">
-    <ref name="its-local.attributes"/>
-  </define>
-  <define name="its-rp">
-    <element name="rp">
-      <a:documentation>Used in the case of simple ruby markup to specify characters 
-that can denote the beginning and end of ruby text when user
-agents do not have other ways to present ruby text distinctively
-from the base text. Typically contains parenthesis.</a:documentation>
-      <ref name="its-rp.content"/>
-      <ref name="its-rp.attributes"/>
-    </element>
-  </define>
-  <define name="its-rp.content">
-    <text/>
-  </define>
-  <define name="its-rp.attributes">
-    <ref name="its-local.attributes"/>
-  </define>
   <define name="its-langRule">
     <element name="langRule">
       <a:documentation>Rule about the Language Information data category</a:documentation>
Received on Monday, 29 April 2013 07:23:03 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 16:32:41 UTC