Main  History  Search  Repository tree

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

Colored diff for /texts/archimedes/xml/Attic/manuz_eleme_01_it_1557.xml between version 1.2 and 1.3

version 1.2, 2002/06/24 18:03:53 version 1.3, 2002/06/27 17:24:39
Line 1 
Line 1 
  <?xml version="1.0"?>
 <!DOCTYPE archimedes [ <!DOCTYPE archimedes [
  
 <!-- footnotes and margnotes get yanked out of their  <!-- footnotes and margnotes get yanked out of their <p>s, repl. by <arrow>, -->
 <p>s, repl. by  
 <arrow>, --> 
 <!-- and moved to own p.  --> <!-- and moved to own p.  -->
  
 <!ELEMENT foot.target  <!ELEMENT foot.target
Line 34 
Line 33 
 <!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 -->
Line 47 
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 129 
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 147 
Line 149 
 <!ATTLIST figure  <!ATTLIST figure
         id ID #IMPLIED         id ID #IMPLIED
         place (margin|text) "text"         place (margin|text) "text"
         xmlns:xlink     CDATA           #FIXED "http://www.w3.org/1999/xlink" 
         xlink:type      (simple)        #FIXED "simple"         xlink:type      (simple)        #FIXED "simple"
         xlink:href      CDATA           #IMPLIED>         xlink:href      CDATA           #IMPLIED>
   
  
  
  
 <!ELEMENT foreign <!ELEMENT foreign
        (#PCDATA | expan | foot.target|margin.target|arrow.to.target|pb|lb|emph|emph.end|gap)* >         (#PCDATA | expan | foot.target|margin.target|arrow.to.target|pb|lb|emph|emph.end|gap)* >
  
Line 211 
Line 210 
           id                 ID                  #IMPLIED           id                 ID                  #IMPLIED
            n                  CDATA               #IMPLIED>            n                  CDATA               #IMPLIED>
                      
 <!-- <lb> <!-- <lb> occurs at <s> level and at <p> level  -->
  occurs at  <!-- <lb> at end of <s> must be placed after </s> -->
  
 <s> level and at  
 <p> level  --> 
 <!-- <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) -->
Line 255 
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> -->
  <!-- <pb> at end of <p> must be placed after </p> -->
 <s> etc. and inside  
 <p> and inside <chap> --> 
 <!--  
  
  
 <pb> at end of  
 <p> must be placed after </p> --> 
  
  
 <!ELEMENT place <!ELEMENT place
Line 293 
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 313 
Line 299 
         ( table.target?,  (row, pb?)+ ) >         ( table.target?,  (row, pb?)+ ) >
  
 <!-- order is now: <!-- order is now:
  <table><table.target/><row>...</row><pb>
  i.e. <table> is equiv. to <p type=margin>
 <table> 
  
 <table.target/> 
 <row>...</row> 
  
  
 <pb> 
 i.e.  
  
 <table> is equiv. to  
 <p type=margin> 
  -->  -->
 <!ATTLIST table <!ATTLIST table
         id ID #IMPLIED          id ID #IMPLIED
Line 376 
Line 351 
 <!ENTITY shy "[-]"> <!ENTITY shy "[-]">
  
  
  
  
  
 <!ENTITY aelig "[aelig]"> <!ENTITY aelig "[aelig]">
 <!ENTITY agrave "[agrave]"> <!ENTITY agrave "[agrave]">
 <!ENTITY amp "[amp]"> <!ENTITY amp "[amp]">

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