Use <mediaobject> instead of <graphic> for forward compatibility. Be more

flexible about the extension of the graphic files, allow for other formats
in print output.  (Generating these formats is not implemented yet.)

diff --git a/doc/src/sgml/arch-pg.sgml b/doc/src/sgml/arch-pg.sgml
index b2f2b962db74973723d88a8f4fe6fbc69801be2e..3c5e44098be81f69c13fb5cb0a37f4932f092cd4 100644 (file)
--- a/doc/src/sgml/arch-pg.sgml
+++ b/doc/src/sgml/arch-pg.sgml
@@ -43,10 +43,15 @@
 which in turn  starts  a  new backend  server  process 
 (<XRef LinkEnd="PGARCH-CONNECTIONS">(b)) 
      
-<Figure Id="PGARCH-CONNECTIONS">
-<Title>How a connection is established</Title>
-<Graphic Align="center" FileRef="connections.gif" Format="GIF"></Graphic>
-</Figure>
+<figure id="PGARCH-CONNECTIONS">
+ <title>How a connection is established</title>
+
+ <mediaobject>
+  <imageobject>
+   <imagedata align="center" fileref="connections">
+  </imageobject>
+ </mediaobject>
+</figure>
 
      and connects the frontend process to the new server 
 (<XRef LinkEnd="PGARCH-CONNECTIONS">(c)).

diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index d448237962ab8f340957af4ec84f25ecff4ccfcb..58453bc5ec94cecdbfc3032b6a61b4a444ad5102 100644 (file)
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.12 2001/09/13 15:55:22 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.13 2001/09/30 16:05:54 petere Exp $
 -->
 
  <chapter id="extend">
@@ -191,7 +191,11 @@ $Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.12 2001/09/13 15:55:22 pete
    <para>
     <figure float="1" id="EXTEND-CATALOGS">
      <title>The major <productname>Postgres</productname> system catalogs</title>
-     <graphic fileref="catalogs.gif" format="GIF" align="center"></graphic>
+     <mediaobject>
+      <imageobject>
+       <imagedata fileref="catalogs" align="center">
+      </imageobject>
+     </mediaobject>
     </figure>
 
     The Reference Manual gives a more detailed  explanation

diff --git a/doc/src/sgml/stylesheet.dsl b/doc/src/sgml/stylesheet.dsl
index d3fa0ba20dbcb35804b5d16122bd16a79043c83b..db655f47dfb879c2b1b05af2811d83d519db773b 100644 (file)
--- a/doc/src/sgml/stylesheet.dsl
+++ b/doc/src/sgml/stylesheet.dsl
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/stylesheet.dsl,v 1.11 2001/09/18 12:08:27 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/stylesheet.dsl,v 1.12 2001/09/30 16:05:54 petere Exp $ -->
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 
 <!-- must turn on one of these with -i on the jade command line -->
@@ -48,6 +48,7 @@
 (define %link-mailto-url%       (string-append "mailto:" pgsql-docs-list))
 (define %use-id-as-filename%    #t)
 (define %stylesheet%            "stylesheet.css")
+(define %graphic-default-extension% "gif")
 
 ;; Returns the depth of auto TOC that should be made at the nd-level
 (define (toc-depth nd)
@@ -116,6 +117,10 @@
 (define %hyphenation%
   (if tex-backend #t #f))
 
+(define %graphic-default-extension%
+  (cond (tex-backend "eps")
+        (rtf-backend "ai"))) ;; ApplixWare?
+
 ]]> <!-- %output-print -->
 
 <![ %output-text; [