gnue/common/scripts gnuedtd

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/07/15 15:27:44

Modified files:
        common/scripts : gnuedtd 

Log message:
        fixed inconsistencies in created DTDs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/scripts/gnuedtd.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/common/scripts/gnuedtd
diff -c gnue/common/scripts/gnuedtd:1.4 gnue/common/scripts/gnuedtd:1.5
*** gnue/common/scripts/gnuedtd:1.4     Sun Jun 30 20:30:50 2002
--- gnue/common/scripts/gnuedtd Mon Jul 15 15:27:44 2002
***************
*** 127,135 ****
  -->
  
  <!-- Entities for characters/symbols -->
! <!ENTITY lt "&#38;#60;">
! <!ENTITY gt "&#62;">
! <!ENTITY amp "&#38;#38;">
  
  <!-- +---------------------------------------------------+ -->
  <!-- | Datatype entities to make DTD more human readable | -->
--- 127,135 ----
  -->
  
  <!-- Entities for characters/symbols -->
! <!ENTITY % lt "&#38;#60;">
! <!ENTITY % gt "&#62;">
! <!ENTITY % amp "&#38;#38;">
  
  <!-- +---------------------------------------------------+ -->
  <!-- | Datatype entities to make DTD more human readable | -->
***************
*** 138,176 ****
  """)
      if self.typecasts.has_key (GTypecast.text):
        self.typecasts[GTypecast.text] = '%text;'
!       dest.write('<!ENTITY text "CDATA">\n\n')
  
      if self.typecasts.has_key (GTypecast.boolean):
        self.typecasts[GTypecast.boolean] = '%boolean;'
!       dest.write('<!ENTITY boolean "(%true;|%false;) #IMPLIED">\n'
!                  '<!ENTITY true "Y">\n'
!                  '<!ENTITY false "N">\n\n')
  
      if self.typecasts.has_key (GTypecast.number):
        self.typecasts[GTypecast.number] = '%number;'
!       dest.write('<!ENTITY number "NMTOKEN">\n'
                   '<!-- [-]?[0-9]+([.][0-9]+)? -->\n\n')
  
      if self.typecasts.has_key (GTypecast.whole):
        self.typecasts[GTypecast.whole] = '%whole;'
!       dest.write('<!ENTITY whole "NMTOKEN">\n'
                   '<!-- [0-9]+ -->\n\n')
  
      if self.typecasts.has_key (GTypecast.integer):
        self.typecasts[GTypecast.integer] = '%integer;'
!       dest.write('<!ENTITY integer "NMTOKEN">\n'
                   '<!-- [-]?[0-9]+ -->\n\n')
  
      if self.typecasts.has_key (GTypecast.name):
        self.typecasts[GTypecast.name] = '%name;'
!       dest.write('<!ENTITY name "NMTOKEN">\n'
                   '<!-- [A-Za-z]([A-Z][a-z][0-9][#$_-])* -->\n\n')
  
      if self.typecasts.has_key (GTypecast.names):
        self.typecasts[GTypecast.names] = '%names;'
!       dest.write('<!ENTITY names "CDATA">\n'
                   '<!-- (%name;)(,[ ]*(%name;))* -->\n\n')
!  
      dest.write('\n')
  
      self.elementStack = [['Top level element',topLevelElement]]
--- 138,176 ----
  """)
      if self.typecasts.has_key (GTypecast.text):
        self.typecasts[GTypecast.text] = '%text;'
!       dest.write('<!ENTITY % text "CDATA">\n\n')
  
      if self.typecasts.has_key (GTypecast.boolean):
        self.typecasts[GTypecast.boolean] = '%boolean;'
!       dest.write('<!ENTITY % true "Y">\n'
!                  '<!ENTITY % false "N">\n\n'
!                  '<!ENTITY % boolean "(%true;|%false;) #IMPLIED">\n')
  
      if self.typecasts.has_key (GTypecast.number):
        self.typecasts[GTypecast.number] = '%number;'
!       dest.write('<!ENTITY % number "NMTOKEN">\n'
                   '<!-- [-]?[0-9]+([.][0-9]+)? -->\n\n')
  
      if self.typecasts.has_key (GTypecast.whole):
        self.typecasts[GTypecast.whole] = '%whole;'
!       dest.write('<!ENTITY % whole "NMTOKEN">\n'
                   '<!-- [0-9]+ -->\n\n')
  
      if self.typecasts.has_key (GTypecast.integer):
        self.typecasts[GTypecast.integer] = '%integer;'
!       dest.write('<!ENTITY % integer "NMTOKEN">\n'
                   '<!-- [-]?[0-9]+ -->\n\n')
  
      if self.typecasts.has_key (GTypecast.name):
        self.typecasts[GTypecast.name] = '%name;'
!       dest.write('<!ENTITY % name "NMTOKEN">\n'
                   '<!-- [A-Za-z]([A-Z][a-z][0-9][#$_-])* -->\n\n')
  
      if self.typecasts.has_key (GTypecast.names):
        self.typecasts[GTypecast.names] = '%names;'
!       dest.write('<!ENTITY % names "CDATA">\n'
                   '<!-- (%name;)(,[ ]*(%name;))* -->\n\n')
! 
      dest.write('\n')
  
      self.elementStack = [['Top level element',topLevelElement]]
***************
*** 211,217 ****
    # If a dictionary has a key, return value 
    # associated w/that key. Otherwise return dflt.
    #
!   def default(self, dict, key, dflt): 
      if dict.has_key(key): 
        return dict[key]
      else:
--- 211,217 ----
    # If a dictionary has a key, return value 
    # associated w/that key. Otherwise return dflt.
    #
!   def default(self, dict, key, dflt):
      if dict.has_key(key): 
        return dict[key]
      else:
***************
*** 264,270 ****
          deprecated = "[%s] " % deprecated
  
        self.dest.write(self.wrap(17,
!          '<!-- DEPRECATED: Use of the <%s> element has been deprecated %s-->' 
% \
               (element, deprecated),0))
  
      if self.parentMappings.has_key(element): 
--- 264,270 ----
          deprecated = "[%s] " % deprecated
  
        self.dest.write(self.wrap(17,
!          '<!-- DEPRECATED: Use of the <%s> element has been deprecated %s 
-->' % \
               (element, deprecated),0))
  
      if self.parentMappings.has_key(element): 
***************
*** 357,363 ****
  
            self.dest.write(self.wrap(17,
              '  <!-- DEPRECATED: The "%s" attribute of "%s" '
!             'has been deprecated %s-->' % (att, element, deprecated),0))
  
  
          descr = self.default(self.xmlElements[element]['Attributes'][att],
--- 357,363 ----
  
            self.dest.write(self.wrap(17,
              '  <!-- DEPRECATED: The "%s" attribute of "%s" '
!             'has been deprecated %s -->' % (att, element, deprecated),0))
  
  
          descr = self.default(self.xmlElements[element]['Attributes'][att],