diff --git a/share/sgml/freebsd.dsl b/share/sgml/freebsd.dsl
index f9a1cd2929..14960e2a4e 100644
--- a/share/sgml/freebsd.dsl
+++ b/share/sgml/freebsd.dsl
@@ -1,267 +1,331 @@
-<!-- $FreeBSD: doc/share/sgml/freebsd.dsl,v 1.15 2000/07/25 10:31:35 nik Exp $ -->
+<!-- $FreeBSD: doc/share/sgml/freebsd.dsl,v 1.16 2000/07/25 18:23:45 ben Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
+<!ENTITY % output.html		"IGNORE">
+<!ENTITY % output.html.images 	"IGNORE">
+<!ENTITY % output.print 	"IGNORE">
+<!ENTITY % output.print.pdf 	"IGNORE">
 
 <![ %output.html; [
 <!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
 ]]>
 <![ %output.print; [
 <!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL>
 
 ]]>
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
       <!-- HTML only .................................................... -->
       
       <![ %output.html; [
         <!-- Configure the stylesheet using documented variables -->
 
         (define %gentext-nav-use-tables%
           ;; Use tables to build the navigation headers and footers?
           #t)
 
         (define %html-ext%
           ;; Default extension for HTML output files
           ".html")
 
         (define %shade-verbatim%
           ;; Should verbatim environments be shaded?
           #f)
 
         (define %use-id-as-filename%
           ;; Use ID attributes as name for component HTML files?
           #t)
  
         (define %root-filename%
           ;; Name for the root HTML document
           "index")
 
         (define html-manifest
           ;; Write a manifest?
           #f)
 
-        (define %callout-graphics%
-          ;; Use graphics in callouts?
-          #t)
-
-        (define %callout-graphics-ext%
-          ;; The extension to use for callout images.  This is an extension
-          ;; to the stylesheets, they do not support this functionality
-          ;; natively.
-          ".png")
-
-        (define %callout-graphics-path%
-          ;; Path to callout graphics
-          "./imagelib/callouts/")
-
-        ;; Redefine $callout-bug$ to support the %callout-graphic-ext%
-        ;; variable.
-        (define ($callout-bug$ conumber)
-	  (let ((number (if conumber (format-number conumber "1") "0")))
-	    (if conumber
-		(if %callout-graphics%
-	            (if (<= conumber %callout-graphics-number-limit%)
-		        (make empty-element gi: "IMG"
-			      attributes: (list (list "SRC"
-				                      (root-rel-path
-					               (string-append
-						        %callout-graphics-path%
-							number
-	                                                %callout-graphics-ext%)))
-		                                (list "HSPACE" "0")
-			                        (list "VSPACE" "0")
-				                (list "BORDER" "0")
-					        (list "ALT"
-						      (string-append
-	                                               "(" number ")"))))
-		        (make element gi: "B"
-			      (literal "(" (format-number conumber "1") ")")))
-	            (make element gi: "B"
-		          (literal "(" (format-number conumber "1") ")")))
-	        (make element gi: "B"
-	       (literal "(??)")))))
-
         <!-- Understand <segmentedlist> and related elements.  Simpleminded,
              and only works for the HTML output. -->
 
         (element segmentedlist
           (make element gi: "TABLE"
             (process-children)))
 
         (element seglistitem
           (make element gi: "TR"
             (process-children)))
 
         (element seg
           (make element gi: "TD"
                 attributes: '(("VALIGN" "TOP"))
             (process-children)))
 
         <!-- The next two definitions control the appearance of an
              e-mail footer at the bottom of each page. -->
 
         <!-- This is the text to display at the bottom of each page.
              Defaults to nothing.  The individual stylesheets should
              redefine this as necessary. -->
         (define ($email-footer$)
           (empty-sosofo))
 
         <!-- This code handles displaying $email-footer$ at the bottom
              of each page.
 
              If "nuchunks" is turned on then we make sure that an <hr>
              is shown first.
 
              Then create a centered paragraph ("<p>"), and reduce the font
              size ("<small>").  Then run $email-footer$, which should
              create the text and links as necessary. -->
 	(define ($html-body-end$)
           (if (equal? $email-footer$ (normalize ""))
             (empty-sosofo)
             (make sequence
               (if nochunks
                   (make empty-element gi: "hr")
                   (empty-sosofo))
                 (make element gi: "p"
                       attributes: (list (list "align" "center"))
                   (make element gi: "small"
                     ($email-footer$))))))
 
       ]]>
 
+      <!-- HTML with images  ............................................ -->
+
+      <![ %output.html.images [
+
+        (define %graphic-default-extension%
+          "png")
+
+        (define %callout-graphics%
+          ;; Use graphics in callouts?
+          #t)
+
+        (define %callout-graphics-ext%
+          ;; The extension to use for callout images.  This is an extension
+          ;; to the stylesheets, they do not support this functionality
+          ;; natively.
+          ".png")
+
+        (define %callout-graphics-path%
+          ;; Path to callout graphics
+          "./imagelib/callouts/")
+
+        ;; Redefine $callout-bug$ to support the %callout-graphic-ext%
+        ;; variable.
+        (define ($callout-bug$ conumber)
+	  (let ((number (if conumber (format-number conumber "1") "0")))
+	    (if conumber
+		(if %callout-graphics%
+	            (if (<= conumber %callout-graphics-number-limit%)
+		        (make empty-element gi: "IMG"
+			      attributes: (list (list "SRC"
+				                      (root-rel-path
+					               (string-append
+						        %callout-graphics-path%
+							number
+	                                                %callout-graphics-ext%)))
+		                                (list "HSPACE" "0")
+			                        (list "VSPACE" "0")
+				                (list "BORDER" "0")
+					        (list "ALT"
+						      (string-append
+	                                               "(" number ")"))))
+		        (make element gi: "B"
+			      (literal "(" (format-number conumber "1") ")")))
+	            (make element gi: "B"
+		          (literal "(" (format-number conumber "1") ")")))
+	        (make element gi: "B"
+	       (literal "(??)")))))
+      ]]>
+
       <!-- Print only ................................................... --> 
       <![ %output.print; [
 
+        ;; Norm's stylesheets are smart about working out what sort of
+        ;; object to display.  But this bites us.  Since we know that the
+        ;; first item is going to be displayable, always use that.
+        (define (find-displayable-object objlist notlist extlist)
+          (let loop ((nl objlist))
+            (if (node-list-empty? nl)
+              (empty-node-list)
+                (let* ((objdata  (node-list-filter-by-gi
+                                  (children (node-list-first nl))
+                                  (list (normalize "videodata")
+                                        (normalize "audiodata")
+                                        (normalize "imagedata"))))
+                       (filename (data-filename objdata))
+                       (extension (file-extension filename))
+                       (notation (attribute-string (normalize "format") objdata)))
+                  (node-list-first nl)))))
+
+        ;; When selecting a filename to use, don't append the default
+        ;; extension, instead, just use the bare filename, and let TeX
+        ;; work it out.  jadetex will use the .eps file, while pdfjadetex
+        ;; will use the .png file automatically.
+        (define (graphic-file filename)
+          (let ((ext (file-extension filename)))
+            (if (or tex-backend   ;; TeX can work this out itself
+                    (not filename)
+                    (not %graphic-default-extension%)
+                    (member ext %graphic-extensions%))
+                 filename
+                 (string-append filename "." %graphic-default-extension%))))
+
+
       ]]>
 
+      <![ %output.print.pdf [
+        (define %graphic-default-extension%
+          "png")
+      ]]>
+
+
       <!-- Both sets of stylesheets ..................................... -->
 
       (define %section-autolabel%
         #t)
 
       (define %may-format-variablelist-as-table%
         #f)
       
       (define %indent-programlisting-lines%
         "    ")
  
       (define %indent-screen-lines%
         "    ")
 
       (define (article-titlepage-recto-elements)
         (list (normalize "title")
               (normalize "subtitle")
               (normalize "corpauthor")
               (normalize "authorgroup")
               (normalize "author")
               (normalize "releaseinfo")
               (normalize "copyright")
               (normalize "pubdate")
               (normalize "revhistory")
               (normalize "legalnotice")
               (normalize "abstract")))
 
+      (define %admon-graphics%
+        ;; Use graphics in admonitions?
+        #f)
+
+      (define %admon-graphics-path%
+        ;; Path to admonition images
+        "./imagelib/admon/")
+
+      (define ($admon-graphic$ #!optional (nd (current-node)))
+        ;; Admonition graphic file
+        (string-append %admon-graphics-path% (case-fold-down (gi nd)) ".png"))
+
       <!-- Slightly deeper customisations -->
 
       <!-- I want things marked up with 'sgmltag' eg., 
 
               <para>You can use <sgmltag>para</sgmltag> to indicate
                 paragraphs.</para>
 
            to automatically have the opening and closing braces inserted,
            and it should be in a mono-spaced font. -->
 
       (element sgmltag ($mono-seq$
           (make sequence
             (literal "<")
             (process-children)
             (literal ">"))))
 
       <!-- Add double quotes around <errorname> text. -->
 
       (element errorname
         (make sequence
           <![ %output.print; [ (make entity-ref name: "ldquo") ]]>
           <![ %output.html;  [ (literal "``") ]]>
           ($mono-seq$ (process-children))
           <![ %output.print; [ (make entity-ref name: "rdquo") ]]>
           <![ %output.html;  [ (literal "''") ]]>
           ))
 
       <!-- John Fieber's 'instant' translation specification had 
            '<command>' rendered in a mono-space font, and '<application>'
            rendered in bold. 
 
            Norm's stylesheet doesn't do this (although '<command>' is 
            rendered in bold).
 
            Configure the stylesheet to behave more like John's. -->
 
       (element command ($mono-seq$))
 
       (element application ($bold-seq$))
 
       <!-- Warnings and cautions are put in boxed tables to make them stand
            out. The same effect can be better achieved using CSS or similar,
            so have them treated the same as <important>, <note>, and <tip>
       -->
       (element warning ($admonition$))
       (element (warning title) (empty-sosofo))
       (element (warning para) ($admonpara$))
       (element (warning simpara) ($admonpara$))
       (element caution ($admonition$))
       (element (caution title) (empty-sosofo))
       (element (caution para) ($admonpara$))
       (element (caution simpara) ($admonpara$))
 
       (define en-warning-label-title-sep ": ")
       (define en-caution-label-title-sep ": ")
 
       <!-- Tell the stylesheet about our local customisations -->
       
       (element hostid ($mono-seq$))
       (element username ($mono-seq$))
       (element devicename ($mono-seq$))
       (element maketarget ($mono-seq$))
       (element makevar ($mono-seq$))
 
       <!-- QAndASet ..................................................... -->
 
       <!-- Default to labelling Q/A with Q: and A: -->
 
       (define (qanda-defaultlabel)
         (normalize "qanda"))
 
       <!-- For the HTML version, display the questions in a bigger, bolder
            font. -->
 
       <![ %output.html; [
       (element question
         (let* ((chlist   (children (current-node)))
                (firstch  (node-list-first chlist))
                (restch   (node-list-rest chlist)))
                (make element gi: "DIV"
                      attributes: (list (list "CLASS" (gi)))
                      (make element gi: "P" 
                            (make element gi: "BIG"
                                  (make element gi: "A"
                                        attributes: (list
                                                    (list "NAME" (element-id)))
                                        (empty-sosofo))
                                  (make element gi: "B"
                                        (literal (question-answer-label
                                                 (current-node)) " ")
                                        (process-node-list (children firstch)))))
                     (process-node-list restch))))
       ]]>
 
+      (element docinfo (process-children))
+
+      (element (docinfo authorgroup) (process-children))
+
+      (element (docinfo date) (process-children))
     </style-specification-body>
   </style-specification>
 
   <external-specification id="docbook" document="docbook.dsl">
 </style-sheet>