doc: Clean up bibliography rendering for XSLT

In the DSSSL stylesheets, we had an extensive customization of the
bibliography rendering.  Since the bibliography isn't that used much, it
doesn't seem worth doing an elaborate porting of that to XSLT.  So this
just moves some things around, removes some unused things, and does some
minimal XSLT stylesheet customizations to make things look clean.

3 files changed, 71 insertions, 87 deletions

diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml
index ab5af16aee4..5462bc38e44 100644
--- a/doc/src/sgml/biblio.sgml
+++ b/doc/src/sgml/biblio.sgml
@@ -12,8 +12,7 @@
    Some white papers and technical reports from the original
    <productname>POSTGRES</productname> development team
    are available at the University of California, Berkeley, Computer Science
-   Department <ulink url="http://db.cs.berkeley.edu/papers/">
-   web site</ulink>.
+   Department <ulink url="http://db.cs.berkeley.edu/papers/">web site</ulink>.
   </para>
 
   <bibliodiv>
@@ -21,7 +20,6 @@
 
    <biblioentry id="BOWMAN01">
     <title>The Practical <acronym>SQL</acronym> Handbook</title>
-    <titleabbrev>Bowman et al, 2001</titleabbrev>
     <subtitle>Using SQL Variants</subtitle>
     <edition>Fourth Edition</edition>
     <authorgroup>
@@ -39,18 +37,14 @@
      </author>
     </authorgroup>
     <isbn>0-201-70309-2</isbn>
-    <pubdate>2001</pubdate>
     <publisher>
      <publishername>Addison-Wesley Professional</publishername>
     </publisher>
-    <copyright>
-     <year>2001</year>
-    </copyright>
+    <pubdate>2001</pubdate>
    </biblioentry>
 
    <biblioentry id="DATE97">
     <title>A Guide to the <acronym>SQL</acronym> Standard</title>
-    <titleabbrev>Date and Darwen, 1997</titleabbrev>
     <subtitle>A user's guide to the standard database language <acronym>SQL</acronym></subtitle>
     <edition>Fourth Edition</edition>
     <authorgroup>
@@ -64,19 +58,14 @@
      </author>
     </authorgroup>
     <isbn>0-201-96426-0</isbn>
-    <pubdate>1997</pubdate>
     <publisher>
      <publishername>Addison-Wesley</publishername>
     </publisher>
-    <copyright>
-     <year>1997</year>
-     <holder>Addison-Wesley Longman, Inc.</holder>
-    </copyright>
+    <pubdate>1997</pubdate>
    </biblioentry>
 
    <biblioentry id="DATE04">
     <title>An Introduction to Database Systems</title>
-    <titleabbrev>Date, 2004</titleabbrev>
     <edition>Eighth Edition</edition>
     <authorgroup>
      <author>
@@ -85,14 +74,10 @@
      </author>
     </authorgroup>
     <isbn>0-321-19784-4</isbn>
-    <pubdate>2003</pubdate>
     <publisher>
      <publishername>Addison-Wesley</publishername>
     </publisher>
-    <copyright>
-     <year>2004</year>
-     <holder>Pearson Education, Inc.</holder>
-    </copyright>
+    <pubdate>2003</pubdate>
    </biblioentry>
 
   <biblioentry id="ELMA04">
@@ -109,18 +94,14 @@
     </author>
    </authorgroup>
    <isbn>0-321-12226-7</isbn>
-   <pubdate>2003</pubdate>
    <publisher>
     <publishername>Addison-Wesley</publishername>
    </publisher>
-   <copyright>
-    <year>2004</year>
-   </copyright>
+   <pubdate>2003</pubdate>
   </biblioentry>
 
    <biblioentry id="MELT93">
     <title>Understanding the New <acronym>SQL</acronym></title>
-    <titleabbrev>Melton and Simon, 1993</titleabbrev>
     <subtitle>A complete guide</subtitle>
     <authorgroup>
      <author>
@@ -133,20 +114,15 @@
      </author>
     </authorgroup>
     <isbn>1-55860-245-3</isbn>
-    <pubdate>1993</pubdate>
     <publisher>
      <publishername>Morgan Kaufmann</publishername>
     </publisher>
-    <copyright>
-     <year>1993</year>
-     <holder>Morgan Kaufmann Publishers, Inc.</holder>
-    </copyright>
+    <pubdate>1993</pubdate>
    </biblioentry>
 
    <biblioentry id="ULL88">
     <title>Principles of Database and Knowledge</title>
     <subtitle>Base Systems</subtitle>
-    <titleabbrev>Ullman, 1988</titleabbrev>
     <authorgroup>
      <author>
       <firstname>Jeffrey D.</firstname>
@@ -167,7 +143,6 @@
 
    <biblioentry id="SIM98">
     <title>Enhancement of the ANSI SQL Implementation of PostgreSQL</title>
-    <titleabbrev>Simkovics, 1998</titleabbrev>
     <authorgroup>
      <author>
       <firstname>Stefan</firstname>
@@ -203,16 +178,15 @@ ssimkovi@ag.or.at
      </para>
     </abstract>
 
-    <pubdate>November 29, 1998</pubdate>
     <publisher>
      <publishername>Department of Information Systems, Vienna University of Technology</publishername>
      <address>Vienna, Austria</address>
     </publisher>
+    <pubdate>November 29, 1998</pubdate>
    </biblioentry>
 
    <biblioentry id="YU95">
     <title>The <productname>Postgres95</productname> User Manual</title>
-    <titleabbrev>Yu and Chen, 1995</titleabbrev>
     <authorgroup>
      <author>
       <firstname>A.</firstname>
@@ -223,24 +197,17 @@ ssimkovi@ag.or.at
       <surname>Chen</surname>
      </author>
     </authorgroup>
-    <authorgroup>
-     <collab>
-      <collabname>The POSTGRES Group</collabname>
-     </collab>
-    </authorgroup>
-
-    <pubdate>Sept. 5, 1995</pubdate>
     <publisher>
      <publishername>University  of  California</publishername>
      <address>Berkeley, California</address>
     </publisher>
+    <pubdate>Sept. 5, 1995</pubdate>
    </biblioentry>
 
   <biblioentry id="FONG">
-   <title>
-   <ulink url="http://db.cs.berkeley.edu/papers/UCB-MS-zfong.pdf">
-   The design and implementation of the <productname>POSTGRES</productname> query optimizer
-   </ulink></title>
+   <title><ulink url="http://db.cs.berkeley.edu/papers/UCB-MS-zfong.pdf">The
+   design and implementation of the <productname>POSTGRES</productname> query
+   optimizer</ulink></title>
    <author>
     <firstname>Zelaine</firstname>
     <surname>Fong</surname>
@@ -257,25 +224,23 @@ ssimkovi@ag.or.at
 
    <biblioentry id="OLSON93">
     <title>Partial indexing in POSTGRES: research project</title>
-    <titleabbrev>Olson, 1993</titleabbrev>
     <authorgroup>
      <author>
       <firstname>Nels</firstname>
       <surname>Olson</surname>
      </author>
     </authorgroup>
-    <pubdate>1993</pubdate>
     <pubsnumber>UCB Engin T7.49.1993 O676</pubsnumber>
     <publisher>
      <publishername>University  of  California</publishername>
      <address>Berkeley, California</address>
     </publisher>
+    <pubdate>1993</pubdate>
    </biblioentry>
 
    <biblioentry id="ONG90">
    <biblioset relation="article">
     <title>A Unified Framework for Version Modeling Using Production Rules in a Database System</title>
-    <titleabbrev>Ong and Goh, 1990</titleabbrev>
     <authorgroup>
      <author>
       <firstname>L.</firstname>
@@ -289,20 +254,18 @@ ssimkovi@ag.or.at
    </biblioset>
    <biblioset relation="journal">
     <title>ERL Technical Memorandum M90/33</title>
-    <pubdate>April, 1990</pubdate>
     <publisher>
      <publishername>University  of  California</publishername>
      <address>Berkeley, California</address>
     </publisher>
+    <pubdate>April, 1990</pubdate>
    </biblioset>
    </biblioentry>
 
    <biblioentry id="ROWE87">
    <biblioset relation="article">
-    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-13.pdf">
-    The <productname>POSTGRES</productname> data model
-    </ulink></title>
-    <titleabbrev>Rowe and Stonebraker, 1987</titleabbrev>
+    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-13.pdf">The <productname>POSTGRES</productname>
+    data model</ulink></title>
     <authorgroup>
      <author>
       <firstname>L.</firstname>
@@ -323,14 +286,8 @@ ssimkovi@ag.or.at
 
    <biblioentry id="SESHADRI95">
    <biblioset relation="article">
-    <title>Generalized Partial Indexes
-    <ulink url="http://citeseer.ist.psu.edu/seshadri95generalized.html">(cached version)
-<!--
-     Original URL:  http://citeseer.ist.psu.edu/seshadri95generalized.html
--->
-    </ulink>
-    </title>
-    <titleabbrev>Seshardri, 1995</titleabbrev>
+    <title><ulink url="http://citeseer.ist.psu.edu/seshadri95generalized.html">Generalized
+    Partial Indexes</ulink></title>
     <authorgroup>
      <author>
       <firstname>P.</firstname>
@@ -347,21 +304,19 @@ ssimkovi@ag.or.at
      <confdates>6-10 March 1995</confdates>
      <address>Taipeh, Taiwan</address>
     </confgroup>
-    <pubdate>1995</pubdate>
     <pubsnumber>Cat. No.95CH35724</pubsnumber>
     <publisher>
      <publishername>IEEE Computer Society Press</publishername>
      <address>Los Alamitos, California</address>
     </publisher>
+    <pubdate>1995</pubdate>
     <pagenums>420-7</pagenums>
    </biblioentry>
 
    <biblioentry id="STON86">
    <biblioset relation="article">
-    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M85-95.pdf">
-    The design of <productname>POSTGRES</productname>
-    </ulink></title>
-    <titleabbrev>Stonebraker and Rowe, 1986</titleabbrev>
+    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M85-95.pdf">The
+    design of <productname>POSTGRES</productname></ulink></title>
     <authorgroup>
      <author>
       <firstname>M.</firstname>
@@ -383,7 +338,6 @@ ssimkovi@ag.or.at
    <biblioentry id="STON87a">
    <biblioset relation="article">
     <title>The design of the <productname>POSTGRES</productname> rules system</title>
-    <titleabbrev>Stonebraker, Hanson, Hong, 1987</titleabbrev>
     <authorgroup>
      <author>
       <firstname>M.</firstname>
@@ -408,10 +362,9 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON87b">
    <biblioset relation="article">
-    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-06.pdf">
-    The design of the <productname>POSTGRES</productname> storage system
-    </ulink></title>
-    <titleabbrev>Stonebraker, 1987</titleabbrev>
+    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-06.pdf">The
+    design of the <productname>POSTGRES</productname> storage
+    system</ulink></title>
     <authorgroup>
      <author>
       <firstname>M.</firstname>
@@ -428,10 +381,9 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON89">
    <biblioset relation="article">
-    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-82.pdf">
-    A commentary on the <productname>POSTGRES</productname> rules system
-    </ulink></title>
-    <titleabbrev>Stonebraker et al, 1989</titleabbrev>
+    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-82.pdf">A
+    commentary on the <productname>POSTGRES</productname> rules
+    system</ulink></title>
     <authorgroup>
      <author>
       <firstname>M.</firstname>
@@ -455,10 +407,8 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON89b">
    <biblioset relation="article">
-    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-17.pdf">
-    The case for partial indexes
-    </ulink></title>
-    <titleabbrev>Stonebraker, M, 1989b</titleabbrev>
+    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-17.pdf">The
+    case for partial indexes</ulink></title>
     <authorgroup>
      <author>
       <firstname>M.</firstname>
@@ -468,17 +418,15 @@ ssimkovi@ag.or.at
    </biblioset>
    <biblioset relation="journal">
     <title>SIGMOD Record 18(4)</title>
-    <pagenums>4-11</pagenums>
     <date>Dec. 1989</date>
+    <pagenums>4-11</pagenums>
    </biblioset>
    </biblioentry>
 
    <biblioentry id="STON90a">
    <biblioset relation="article">
-    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-34.pdf">
-    The implementation of <productname>POSTGRES</productname>
-    </ulink></title>
-    <titleabbrev>Stonebraker, Rowe, Hirohama, 1990</titleabbrev>
+    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-34.pdf">The
+    implementation of <productname>POSTGRES</productname></ulink></title>
     <authorgroup>
      <author>
       <firstname>M.</firstname>
@@ -505,10 +453,8 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON90b">
    <biblioset relation="article">
-    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-36.pdf">
-    On Rules, Procedures, Caching and Views in Database Systems
-    </ulink></title>
-    <titleabbrev>Stonebraker et al, ACM, 1990</titleabbrev>
+    <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-36.pdf">On
+    Rules, Procedures, Caching and Views in Database Systems</ulink></title>
     <authorgroup>
      <author>
       <firstname>M.</firstname>
diff --git a/doc/src/sgml/stylesheet-fo.xsl b/doc/src/sgml/stylesheet-fo.xsl
index 434e69d8e37..69536f92cdc 100644
--- a/doc/src/sgml/stylesheet-fo.xsl
+++ b/doc/src/sgml/stylesheet-fo.xsl
@@ -24,6 +24,23 @@
   <xsl:call-template name="inline.monoseq"/>
 </xsl:template>
 
+<xsl:template match="confgroup" mode="bibliography.mode">
+  <fo:inline>
+    <xsl:apply-templates select="conftitle/text()" mode="bibliography.mode"/>
+    <xsl:text>, </xsl:text>
+    <xsl:apply-templates select="confdates/text()" mode="bibliography.mode"/>
+    <xsl:value-of select="$biblioentry.item.separator"/>
+  </fo:inline>
+</xsl:template>
+
+<xsl:template match="isbn" mode="bibliography.mode">
+  <fo:inline>
+    <xsl:text>ISBN </xsl:text>
+    <xsl:apply-templates mode="bibliography.mode"/>
+    <xsl:value-of select="$biblioentry.item.separator"/>
+  </fo:inline>
+</xsl:template>
+
 <!-- bug fix from <https://sourceforge.net/p/docbook/bugs/1360/#831b> -->
 
 <xsl:template match="varlistentry/term" mode="xref-to">
diff --git a/doc/src/sgml/stylesheet.xsl b/doc/src/sgml/stylesheet.xsl
index efcb80ffca2..e36e8cc5cc7 100644
--- a/doc/src/sgml/stylesheet.xsl
+++ b/doc/src/sgml/stylesheet.xsl
@@ -40,6 +40,27 @@
   <xsl:call-template name="inline.monoseq"/>
 </xsl:template>
 
+<xsl:template match="confgroup" mode="bibliography.mode">
+  <span>
+    <xsl:call-template name="common.html.attributes"/>
+    <xsl:call-template name="id.attribute"/>
+    <xsl:apply-templates select="conftitle/text()" mode="bibliography.mode"/>
+    <xsl:text>, </xsl:text>
+    <xsl:apply-templates select="confdates/text()" mode="bibliography.mode"/>
+    <xsl:copy-of select="$biblioentry.item.separator"/>
+  </span>
+</xsl:template>
+
+<xsl:template match="isbn" mode="bibliography.mode">
+  <span>
+    <xsl:call-template name="common.html.attributes"/>
+    <xsl:call-template name="id.attribute"/>
+    <xsl:text>ISBN </xsl:text>
+    <xsl:apply-templates mode="bibliography.mode"/>
+    <xsl:copy-of select="$biblioentry.item.separator"/>
+  </span>
+</xsl:template>
+
 
 <!-- table of contents configuration -->