Changeset f59c2ec


Ignore:
Timestamp:
Apr 23, 2011, 9:27:41 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
babec4b
Parents:
a2b92f3
git-author:
Joe Ciccone <jciccone@…> (04/23/11 21:27:08)
git-committer:
Joe Ciccone <jciccone@…> (04/23/11 21:27:41)
Message:

Expand the filtering ability of the schema to match the stylesheet.

Location:
BOOK/schema/clfs/0.1/rng
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • BOOK/schema/clfs/0.1/rng/clfs.rnc

    ra2b92f3 rf59c2ec  
    7878# Block Elements
    7979
    80 clfs.block.para =
     80clfs.package.para =
    8181  element c:para {
     82    clfs.attrib.arch,
     83    clfs.attrib.bits,
     84    clfs.attrib.multilib,
    8285    clfs.inline
    8386  }
    8487 
    85 clfs.block.note =
     88clfs.package.note =
    8689  element c:note {
    87     clfs.block.para*
     90    clfs.attrib.arch,
     91    clfs.attrib.bits,
     92    clfs.attrib.multilib,
     93    clfs.package.para*
    8894  }
    8995
    90 clfs.block.command =
     96clfs.package.command =
    9197  element c:command {
    9298    clfs.attrib.arch,
    … …  
    115121   
    116122    element c:install {
    117       (clfs.block.para |
    118        clfs.block.command |
    119        clfs.block.note)+
     123      (clfs.package.para |
     124       clfs.package.command |
     125       clfs.package.note)+
    120126    }+,
    121127   

  • BOOK/schema/clfs/0.1/rng/clfs.rng

    ra2b92f3 rf59c2ec  
    132132  </define>
    133133  <!-- Block Elements -->
    134   <define name="clfs.block.para">
     134  <define name="clfs.package.para">
    135135    <element name="c:para">
    136       <ref name="clfs.inline"/>
    137     </element>
    138   </define>
    139   <define name="clfs.block.note">
     136      <ref name="clfs.attrib.arch"/>
     137      <ref name="clfs.attrib.bits"/>
     138      <ref name="clfs.attrib.multilib"/>
     139      <ref name="clfs.inline"/>
     140    </element>
     141  </define>
     142  <define name="clfs.package.note">
    140143    <element name="c:note">
     144      <ref name="clfs.attrib.arch"/>
     145      <ref name="clfs.attrib.bits"/>
     146      <ref name="clfs.attrib.multilib"/>
    141147      <zeroOrMore>
    142         <ref name="clfs.block.para"/>
     148        <ref name="clfs.package.para"/>
    143149      </zeroOrMore>
    144150    </element>
    145151  </define>
    146   <define name="clfs.block.command">
     152  <define name="clfs.package.command">
    147153    <element name="c:command">
    148154      <ref name="clfs.attrib.arch"/>
    … …  
    193199          <oneOrMore>
    194200            <choice>
    195               <ref name="clfs.block.para"/>
    196               <ref name="clfs.block.command"/>
    197               <ref name="clfs.block.note"/>
     201              <ref name="clfs.package.para"/>
     202              <ref name="clfs.package.command"/>
     203              <ref name="clfs.package.note"/>
    198204            </choice>
    199205          </oneOrMore>
Note: See TracChangeset for help on using the changeset viewer.