Main  History  Search  Repository tree

[BACK] Return to gheta_promo_01_la_1603.xml CVS log [TXT][DIR] Up to [CVSROOT] / texts / archimedes / xml

Colored diff for /texts/archimedes/xml/Attic/gheta_promo_01_la_1603.xml between version 1.3 and 1.4

version 1.3, 2002/06/24 18:03:53 version 1.4, 2002/06/27 17:24:38
Line 1 
Line 1 
  <?xml version="1.0"?>
 <!DOCTYPE archimedes [ <!DOCTYPE archimedes [
  
 <!-- footnotes and margnotes get yanked out of their <p>s, repl. by <arrow>, --> <!-- footnotes and margnotes get yanked out of their <p>s, repl. by <arrow>, -->
Line 19 
Line 20 
         id ID #REQUIRED         id ID #REQUIRED
         n CDATA #IMPLIED >         n CDATA #IMPLIED >
  
  <!ELEMENT table.target
          (#PCDATA)  >
  
  <!ATTLIST table.target
          id ID #REQUIRED
          n CDATA #IMPLIED >
  
 <!ELEMENT arrow.to.target  <!ELEMENT arrow.to.target
         (#PCDATA)*  >         (#PCDATA)*  >
  
 <!ATTLIST arrow.to.target <!ATTLIST arrow.to.target
         symbol CDATA #IMPLIED         symbol CDATA #IMPLIED
         id ID #IMPLIED         id ID #IMPLIED
         n CDATA #IMPLIED >         n                 CDATA #IMPLIED
          xlink:type      (simple)        #FIXED "simple"
          xlink:href      CDATA           #IMPLIED>
  
 <!-- reference to removed figure/note. contains mark in text. --> <!-- reference to removed figure/note. contains mark in text. -->
 <!-- n attribute contains id of referent target --> <!-- n attribute contains id of referent target -->
 <!-- Can marginalia ever have referring marks in text? --> <!-- Can marginalia ever have referring marks in text? -->
Line 37 
Line 48 
  
 <!ATTLIST archimedes  <!ATTLIST archimedes
         id ID #IMPLIED         id ID #IMPLIED
          xmlns:xlink     CDATA           #FIXED "http://www.w3.org/1999/xlink"
         n CDATA #IMPLIED >         n CDATA #IMPLIED >
  
  
 <!ELEMENT author  <!ELEMENT author
         (#PCDATA) >         (#PCDATA) >
  
Line 66 
Line 79 
  
  
 <!ELEMENT chap  <!ELEMENT chap
         (  p | pb | figure)+ >         (  p | pb | figure | table)+ >
  
  
 <!ATTLIST chap <!ATTLIST chap
Line 119 
Line 132 
         n CDATA #IMPLIED>         n CDATA #IMPLIED>
  
  
  
 <!ELEMENT expan  <!ELEMENT expan
         (#PCDATA | foot.target|margin.target|arrow.to.target|pb|lb|emph|emph.end|gap)* >         (#PCDATA | foot.target|margin.target|arrow.to.target|pb|lb|emph|emph.end|gap)* >
  
Line 136 
Line 148 
  
 <!ATTLIST figure  <!ATTLIST figure
         id ID #IMPLIED         id ID #IMPLIED
         place (margin|text) "text" >         place (margin|text) "text"
          xlink:type      (simple)        #FIXED "simple"
          xlink:href      CDATA           #IMPLIED>
  
  
 <!ELEMENT foreign <!ELEMENT foreign
Line 171 
Line 185 
  
  
 <!ELEMENT info  <!ELEMENT info
         (author, title, date, place, editor, publisher, translator, lang, chunk) >         (author, title, date, place, editor, publisher, translator, lang, chunk,locator) >
 <!-- how many of these should be required? --> <!-- how many of these should be required? -->
 <!-- what about bringing in line with dublin core? --> <!-- what about bringing in line with dublin core? -->
  
Line 196 
Line 210 
           id                 ID                  #IMPLIED           id                 ID                  #IMPLIED
            n                  CDATA               #IMPLIED>            n                  CDATA               #IMPLIED>
                      
 <!-- <lb> occurs at  <!-- <lb> occurs at <s> level and at <p> level  -->
 <s> level and at <p> level  --> <!-- <lb> at end of <s> must be placed after </s> -->
 <!-- <lb> at end of  
 <s> must be placed after </s> 
  --> 
  
 <!-- unrecognized symbols will appear inline acc. to special conventions.  --> <!-- unrecognized symbols will appear inline acc. to special conventions.  -->
 <!--   (as in DE specs) --> <!--   (as in DE specs) -->
  
 <!-- emph and and emph.end are elements that are quer to the xml structure --> <!-- emph and and emph.end are elements that are quer to the xml structure -->
  
  <!ELEMENT locator       (#PCDATA)   >
  
  <!ATTLIST locator
          id ID #IMPLIED
          n CDATA #IMPLIED >
  
 <!ELEMENT p <!ELEMENT p
  
Line 216 
Line 232 
 <!ATTLIST p  <!ATTLIST p
         id ID #IMPLIED         id ID #IMPLIED
         n CDATA #IMPLIED          n CDATA #IMPLIED
         type (main|marked|foot|margin|table|list|head|caption) "main" >         type (main|marked|foot|margin|list|head|caption) "main" >
 <!-- captions go in paragr's immediately after figure, with arrow.to.target --> <!-- captions go in paragr's immediately after figure, with arrow.to.target -->
  
 <!-- pb can occur within p but NOT at the start or end --> <!-- pb can occur within p but NOT at the start or end -->
Line 230 
Line 246 
         ed CDATA #IMPLIED         ed CDATA #IMPLIED
         id ID #IMPLIED         id ID #IMPLIED
         n CDATA #IMPLIED          n CDATA #IMPLIED
          xlink:type      (simple)        #FIXED "simple"
          xlink:href      CDATA           #IMPLIED
         pagenum CDATA #IMPLIED>         pagenum CDATA #IMPLIED>
  
 <!-- the "ed"  attribute gives the edition in which the page break occurs. If no --> <!-- the "ed"  attribute gives the edition in which the page break occurs. If no -->
 <!-- edition is given, it is assumed to be that given in info --> <!-- edition is given, it is assumed to be that given in info -->
 <!-- pagenum gives the page number actually printed on the page.  --> <!-- pagenum gives the page number actually printed on the page.  -->
 <!-- n gives the page number numbered consecutively from page 1 of text. --> <!-- n gives the page number numbered consecutively from page 1 of text. -->
 <!-- pb can occur inside  <!-- pb can occur inside <s> etc. and inside <p> and inside <chap> -->
 <s> etc. and inside <p> and inside <chap> --> 
 <!-- <pb> at end of <p> must be placed after </p> --> <!-- <pb> at end of <p> must be placed after </p> -->
  
  
Line 262 
Line 279 
  
 <!ELEMENT s  <!ELEMENT s
  
 (#PCDATA| foreign | figure | expan | foot.target|margin.target|arrow.to.target|pb|lb|emph|emph.end|gap)* > (#PCDATA| figure |foreign | expan | foot.target|margin.target|arrow.to.target|pb|lb|emph|emph.end|gap)* >
  
  
 <!ATTLIST s <!ATTLIST s
Line 278 
Line 295 
         n CDATA #IMPLIED         n CDATA #IMPLIED
         type CDATA #IMPLIED>         type CDATA #IMPLIED>
  
  <!ELEMENT table
          ( table.target?,  (row, pb?)+ ) >
  
  <!-- order is now:
  <table><table.target/><row>...</row><pb>
  i.e. <table> is equiv. to <p type=margin>
   -->
  <!ATTLIST table
          id ID #IMPLIED
          n CDATA #IMPLIED >
  
  <!ELEMENT row
          ( cell+ ) >
  
  <!ATTLIST row
          id ID #IMPLIED
          n CDATA #IMPLIED >
  
  <!ELEMENT cell
          (#PCDATA| foreign | expan | foot.target|margin.target|arrow.to.target|pb|lb|emph|emph.end|gap)* >
  
  <!ATTLIST cell
          id ID #IMPLIED
          n CDATA #IMPLIED >
  
 <!ELEMENT text <!ELEMENT text
         (pb?, front, pb?, body, pb?, back) >         (pb?, front, pb?, body, pb?, back) >
Line 311 
Line 352 
  
  
  
  
  
  
 <!ENTITY AElig "[AElig]"> <!ENTITY AElig "[AElig]">
 <!ENTITY aelig "[aelig]"> <!ENTITY aelig "[aelig]">
 <!ENTITY agrave "[agrave]"> <!ENTITY agrave "[agrave]">

Legend:
Removed from v.1.3 
changed lines
 Added in v.1.4