gnue/reports doc/report-notes.txt src/base/GRPa...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/05/13 23:42:01

Modified files:
        reports/doc    : report-notes.txt 
        reports/src/base: GRParser.py 
Added files:
        reports/samples/foobulations: docbook.grd 

Log message:
        more work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/doc/report-notes.txt.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/samples/foobulations/docbook.grd?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/GRParser.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: gnue/reports/doc/report-notes.txt
diff -c gnue/reports/doc/report-notes.txt:1.18 
gnue/reports/doc/report-notes.txt:1.19
*** gnue/reports/doc/report-notes.txt:1.18      Tue May 13 14:58:25 2003
--- gnue/reports/doc/report-notes.txt   Tue May 13 23:42:01 2003
***************
*** 26,36 ****
    <trailerpage> ??
       ... ?
  
!   <!-- Predefine any commonly used images, so their encoding doesn't
!        have to appear everytime the image is used.
  
         Reference using <image name="xxxx">    -->
    <imageref name="xxxx" inline="Y|N" source="url://..."><binary/></imageref>
  
    <reportheader>
      <cell style="+left">
--- 26,44 ----
    <trailerpage> ??
       ... ?
  
!   <!-- Predefine any commonly used images, so their binary
!        data doesn't have to appear everytime the image is used.
  
         Reference using <image name="xxxx">    -->
+ <<<<<<< report-notes.txt
+       <imageref name="..."  size="100%|x%;y%|x;y"
+                 color="grayscale|<forecolor>;<backcolor>|auto"
+                 format="auto|png|eps|tiff|..."> src="inline|<name>|<url>">
+         <binary>(base64-encoded image)</binary>
+       </imageref>
+ =======
    <imageref name="xxxx" inline="Y|N" source="url://..."><binary/></imageref>
+ >>>>>>> 1.17
  
    <reportheader>
      <cell style="+left">
***************
*** 85,92 ****
--- 93,105 ----
            Text
            <image color="grayscale|<forecolor>;<backcolor>|auto"
                   size="100%|x%;y%|x;y"
+ <<<<<<< report-notes.txt
+                  format="auto|png|eps|tiff|..."> src="inline|<name>|<url>">
+                      <binary>(encoded image)</binary>
+ =======
                   format="auto|png|eps|tiff|svg|..."> 
src="inline|<name>|<url>">
                       <binary>(encoded image)</binary>
+ >>>>>>> 1.17
            </image>
            <barcode format="EAN13" captioned="Y|N">1234323422346</barcode>
  
Index: gnue/reports/src/base/GRParser.py
diff -c gnue/reports/src/base/GRParser.py:1.34 
gnue/reports/src/base/GRParser.py:1.35
*** gnue/reports/src/base/GRParser.py:1.34      Mon Feb 17 02:32:54 2003
--- gnue/reports/src/base/GRParser.py   Tue May 13 23:42:01 2003
***************
*** 157,162 ****
--- 157,163 ----
           'Required': 1,
           'SingleInstance': 1,
           'MixedContent': 1,
+          'KeepWhitespace': 1,
           'Attributes': {
              'format':      {
                 'Typecast': GTypecast.text },