Skip to content

Commit d637624

Browse files
peterepetere
committed
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.
1 parent 244dd95 commit d637624

File tree

3 files changed

+71
-87
lines changed

3 files changed

+71
-87
lines changed

‎doc/src/sgml/biblio.sgml

+33-87
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@
1212
Some white papers and technical reports from the original
1313
<productname>POSTGRES</productname> development team
1414
are available at the University of California, Berkeley, Computer Science
15-
Department <ulink url="http://db.cs.berkeley.edu/papers/">
16-
web site</ulink>.
15+
Department <ulink url="http://db.cs.berkeley.edu/papers/">web site</ulink>.
1716
</para>
1817

1918
<bibliodiv>
2019
<title><acronym>SQL</acronym> Reference Books</title>
2120

2221
<biblioentry id="BOWMAN01">
2322
<title>The Practical <acronym>SQL</acronym> Handbook</title>
24-
<titleabbrev>Bowman et al, 2001</titleabbrev>
2523
<subtitle>Using SQL Variants</subtitle>
2624
<edition>Fourth Edition</edition>
2725
<authorgroup>
@@ -39,18 +37,14 @@
3937
</author>
4038
</authorgroup>
4139
<isbn>0-201-70309-2</isbn>
42-
<pubdate>2001</pubdate>
4340
<publisher>
4441
<publishername>Addison-Wesley Professional</publishername>
4542
</publisher>
46-
<copyright>
47-
<year>2001</year>
48-
</copyright>
43+
<pubdate>2001</pubdate>
4944
</biblioentry>
5045

5146
<biblioentry id="DATE97">
5247
<title>A Guide to the <acronym>SQL</acronym> Standard</title>
53-
<titleabbrev>Date and Darwen, 1997</titleabbrev>
5448
<subtitle>A user's guide to the standard database language <acronym>SQL</acronym></subtitle>
5549
<edition>Fourth Edition</edition>
5650
<authorgroup>
@@ -64,19 +58,14 @@
6458
</author>
6559
</authorgroup>
6660
<isbn>0-201-96426-0</isbn>
67-
<pubdate>1997</pubdate>
6861
<publisher>
6962
<publishername>Addison-Wesley</publishername>
7063
</publisher>
71-
<copyright>
72-
<year>1997</year>
73-
<holder>Addison-Wesley Longman, Inc.</holder>
74-
</copyright>
64+
<pubdate>1997</pubdate>
7565
</biblioentry>
7666

7767
<biblioentry id="DATE04">
7868
<title>An Introduction to Database Systems</title>
79-
<titleabbrev>Date, 2004</titleabbrev>
8069
<edition>Eighth Edition</edition>
8170
<authorgroup>
8271
<author>
@@ -85,14 +74,10 @@
8574
</author>
8675
</authorgroup>
8776
<isbn>0-321-19784-4</isbn>
88-
<pubdate>2003</pubdate>
8977
<publisher>
9078
<publishername>Addison-Wesley</publishername>
9179
</publisher>
92-
<copyright>
93-
<year>2004</year>
94-
<holder>Pearson Education, Inc.</holder>
95-
</copyright>
80+
<pubdate>2003</pubdate>
9681
</biblioentry>
9782

9883
<biblioentry id="ELMA04">
@@ -109,18 +94,14 @@
10994
</author>
11095
</authorgroup>
11196
<isbn>0-321-12226-7</isbn>
112-
<pubdate>2003</pubdate>
11397
<publisher>
11498
<publishername>Addison-Wesley</publishername>
11599
</publisher>
116-
<copyright>
117-
<year>2004</year>
118-
</copyright>
100+
<pubdate>2003</pubdate>
119101
</biblioentry>
120102

121103
<biblioentry id="MELT93">
122104
<title>Understanding the New <acronym>SQL</acronym></title>
123-
<titleabbrev>Melton and Simon, 1993</titleabbrev>
124105
<subtitle>A complete guide</subtitle>
125106
<authorgroup>
126107
<author>
@@ -133,20 +114,15 @@
133114
</author>
134115
</authorgroup>
135116
<isbn>1-55860-245-3</isbn>
136-
<pubdate>1993</pubdate>
137117
<publisher>
138118
<publishername>Morgan Kaufmann</publishername>
139119
</publisher>
140-
<copyright>
141-
<year>1993</year>
142-
<holder>Morgan Kaufmann Publishers, Inc.</holder>
143-
</copyright>
120+
<pubdate>1993</pubdate>
144121
</biblioentry>
145122

146123
<biblioentry id="ULL88">
147124
<title>Principles of Database and Knowledge</title>
148125
<subtitle>Base Systems</subtitle>
149-
<titleabbrev>Ullman, 1988</titleabbrev>
150126
<authorgroup>
151127
<author>
152128
<firstname>Jeffrey D.</firstname>
@@ -167,7 +143,6 @@
167143

168144
<biblioentry id="SIM98">
169145
<title>Enhancement of the ANSI SQL Implementation of PostgreSQL</title>
170-
<titleabbrev>Simkovics, 1998</titleabbrev>
171146
<authorgroup>
172147
<author>
173148
<firstname>Stefan</firstname>
@@ -203,16 +178,15 @@ ssimkovi@ag.or.at
203178
</para>
204179
</abstract>
205180

206-
<pubdate>November 29, 1998</pubdate>
207181
<publisher>
208182
<publishername>Department of Information Systems, Vienna University of Technology</publishername>
209183
<address>Vienna, Austria</address>
210184
</publisher>
185+
<pubdate>November 29, 1998</pubdate>
211186
</biblioentry>
212187

213188
<biblioentry id="YU95">
214189
<title>The <productname>Postgres95</productname> User Manual</title>
215-
<titleabbrev>Yu and Chen, 1995</titleabbrev>
216190
<authorgroup>
217191
<author>
218192
<firstname>A.</firstname>
@@ -223,24 +197,17 @@ ssimkovi@ag.or.at
223197
<surname>Chen</surname>
224198
</author>
225199
</authorgroup>
226-
<authorgroup>
227-
<collab>
228-
<collabname>The POSTGRES Group</collabname>
229-
</collab>
230-
</authorgroup>
231-
232-
<pubdate>Sept. 5, 1995</pubdate>
233200
<publisher>
234201
<publishername>University of California</publishername>
235202
<address>Berkeley, California</address>
236203
</publisher>
204+
<pubdate>Sept. 5, 1995</pubdate>
237205
</biblioentry>
238206

239207
<biblioentry id="FONG">
240-
<title>
241-
<ulink url="http://db.cs.berkeley.edu/papers/UCB-MS-zfong.pdf">
242-
The design and implementation of the <productname>POSTGRES</productname> query optimizer
243-
</ulink></title>
208+
<title><ulink url="http://db.cs.berkeley.edu/papers/UCB-MS-zfong.pdf">The
209+
design and implementation of the <productname>POSTGRES</productname> query
210+
optimizer</ulink></title>
244211
<author>
245212
<firstname>Zelaine</firstname>
246213
<surname>Fong</surname>
@@ -257,25 +224,23 @@ ssimkovi@ag.or.at
257224

258225
<biblioentry id="OLSON93">
259226
<title>Partial indexing in POSTGRES: research project</title>
260-
<titleabbrev>Olson, 1993</titleabbrev>
261227
<authorgroup>
262228
<author>
263229
<firstname>Nels</firstname>
264230
<surname>Olson</surname>
265231
</author>
266232
</authorgroup>
267-
<pubdate>1993</pubdate>
268233
<pubsnumber>UCB Engin T7.49.1993 O676</pubsnumber>
269234
<publisher>
270235
<publishername>University of California</publishername>
271236
<address>Berkeley, California</address>
272237
</publisher>
238+
<pubdate>1993</pubdate>
273239
</biblioentry>
274240

275241
<biblioentry id="ONG90">
276242
<biblioset relation="article">
277243
<title>A Unified Framework for Version Modeling Using Production Rules in a Database System</title>
278-
<titleabbrev>Ong and Goh, 1990</titleabbrev>
279244
<authorgroup>
280245
<author>
281246
<firstname>L.</firstname>
@@ -289,20 +254,18 @@ ssimkovi@ag.or.at
289254
</biblioset>
290255
<biblioset relation="journal">
291256
<title>ERL Technical Memorandum M90/33</title>
292-
<pubdate>April, 1990</pubdate>
293257
<publisher>
294258
<publishername>University of California</publishername>
295259
<address>Berkeley, California</address>
296260
</publisher>
261+
<pubdate>April, 1990</pubdate>
297262
</biblioset>
298263
</biblioentry>
299264

300265
<biblioentry id="ROWE87">
301266
<biblioset relation="article">
302-
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-13.pdf">
303-
The <productname>POSTGRES</productname> data model
304-
</ulink></title>
305-
<titleabbrev>Rowe and Stonebraker, 1987</titleabbrev>
267+
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-13.pdf">The <productname>POSTGRES</productname>
268+
data model</ulink></title>
306269
<authorgroup>
307270
<author>
308271
<firstname>L.</firstname>
@@ -323,14 +286,8 @@ ssimkovi@ag.or.at
323286

324287
<biblioentry id="SESHADRI95">
325288
<biblioset relation="article">
326-
<title>Generalized Partial Indexes
327-
<ulink url="http://citeseer.ist.psu.edu/seshadri95generalized.html">(cached version)
328-
<!--
329-
Original URL: http://citeseer.ist.psu.edu/seshadri95generalized.html
330-
-->
331-
</ulink>
332-
</title>
333-
<titleabbrev>Seshardri, 1995</titleabbrev>
289+
<title><ulink url="http://citeseer.ist.psu.edu/seshadri95generalized.html">Generalized
290+
Partial Indexes</ulink></title>
334291
<authorgroup>
335292
<author>
336293
<firstname>P.</firstname>
@@ -347,21 +304,19 @@ ssimkovi@ag.or.at
347304
<confdates>6-10 March 1995</confdates>
348305
<address>Taipeh, Taiwan</address>
349306
</confgroup>
350-
<pubdate>1995</pubdate>
351307
<pubsnumber>Cat. No.95CH35724</pubsnumber>
352308
<publisher>
353309
<publishername>IEEE Computer Society Press</publishername>
354310
<address>Los Alamitos, California</address>
355311
</publisher>
312+
<pubdate>1995</pubdate>
356313
<pagenums>420-7</pagenums>
357314
</biblioentry>
358315

359316
<biblioentry id="STON86">
360317
<biblioset relation="article">
361-
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M85-95.pdf">
362-
The design of <productname>POSTGRES</productname>
363-
</ulink></title>
364-
<titleabbrev>Stonebraker and Rowe, 1986</titleabbrev>
318+
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M85-95.pdf">The
319+
design of <productname>POSTGRES</productname></ulink></title>
365320
<authorgroup>
366321
<author>
367322
<firstname>M.</firstname>
@@ -383,7 +338,6 @@ ssimkovi@ag.or.at
383338
<biblioentry id="STON87a">
384339
<biblioset relation="article">
385340
<title>The design of the <productname>POSTGRES</productname> rules system</title>
386-
<titleabbrev>Stonebraker, Hanson, Hong, 1987</titleabbrev>
387341
<authorgroup>
388342
<author>
389343
<firstname>M.</firstname>
@@ -408,10 +362,9 @@ ssimkovi@ag.or.at
408362

409363
<biblioentry id="STON87b">
410364
<biblioset relation="article">
411-
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-06.pdf">
412-
The design of the <productname>POSTGRES</productname> storage system
413-
</ulink></title>
414-
<titleabbrev>Stonebraker, 1987</titleabbrev>
365+
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-06.pdf">The
366+
design of the <productname>POSTGRES</productname> storage
367+
system</ulink></title>
415368
<authorgroup>
416369
<author>
417370
<firstname>M.</firstname>
@@ -428,10 +381,9 @@ ssimkovi@ag.or.at
428381

429382
<biblioentry id="STON89">
430383
<biblioset relation="article">
431-
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-82.pdf">
432-
A commentary on the <productname>POSTGRES</productname> rules system
433-
</ulink></title>
434-
<titleabbrev>Stonebraker et al, 1989</titleabbrev>
384+
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-82.pdf">A
385+
commentary on the <productname>POSTGRES</productname> rules
386+
system</ulink></title>
435387
<authorgroup>
436388
<author>
437389
<firstname>M.</firstname>
@@ -455,10 +407,8 @@ ssimkovi@ag.or.at
455407

456408
<biblioentry id="STON89b">
457409
<biblioset relation="article">
458-
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-17.pdf">
459-
The case for partial indexes
460-
</ulink></title>
461-
<titleabbrev>Stonebraker, M, 1989b</titleabbrev>
410+
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-17.pdf">The
411+
case for partial indexes</ulink></title>
462412
<authorgroup>
463413
<author>
464414
<firstname>M.</firstname>
@@ -468,17 +418,15 @@ ssimkovi@ag.or.at
468418
</biblioset>
469419
<biblioset relation="journal">
470420
<title>SIGMOD Record 18(4)</title>
471-
<pagenums>4-11</pagenums>
472421
<date>Dec. 1989</date>
422+
<pagenums>4-11</pagenums>
473423
</biblioset>
474424
</biblioentry>
475425

476426
<biblioentry id="STON90a">
477427
<biblioset relation="article">
478-
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-34.pdf">
479-
The implementation of <productname>POSTGRES</productname>
480-
</ulink></title>
481-
<titleabbrev>Stonebraker, Rowe, Hirohama, 1990</titleabbrev>
428+
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-34.pdf">The
429+
implementation of <productname>POSTGRES</productname></ulink></title>
482430
<authorgroup>
483431
<author>
484432
<firstname>M.</firstname>
@@ -505,10 +453,8 @@ ssimkovi@ag.or.at
505453

506454
<biblioentry id="STON90b">
507455
<biblioset relation="article">
508-
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-36.pdf">
509-
On Rules, Procedures, Caching and Views in Database Systems
510-
</ulink></title>
511-
<titleabbrev>Stonebraker et al, ACM, 1990</titleabbrev>
456+
<title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-36.pdf">On
457+
Rules, Procedures, Caching and Views in Database Systems</ulink></title>
512458
<authorgroup>
513459
<author>
514460
<firstname>M.</firstname>

‎doc/src/sgml/stylesheet-fo.xsl

+17
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,23 @@
2424
<xsl:call-template name="inline.monoseq"/>
2525
</xsl:template>
2626

27+
<xsl:template match="confgroup" mode="bibliography.mode">
28+
<fo:inline>
29+
<xsl:apply-templates select="conftitle/text()" mode="bibliography.mode"/>
30+
<xsl:text>, </xsl:text>
31+
<xsl:apply-templates select="confdates/text()" mode="bibliography.mode"/>
32+
<xsl:value-of select="$biblioentry.item.separator"/>
33+
</fo:inline>
34+
</xsl:template>
35+
36+
<xsl:template match="isbn" mode="bibliography.mode">
37+
<fo:inline>
38+
<xsl:text>ISBN </xsl:text>
39+
<xsl:apply-templates mode="bibliography.mode"/>
40+
<xsl:value-of select="$biblioentry.item.separator"/>
41+
</fo:inline>
42+
</xsl:template>
43+
2744
<!-- bug fix from <https://sourceforge.net/p/docbook/bugs/1360/#831b> -->
2845

2946
<xsl:template match="varlistentry/term" mode="xref-to">

‎doc/src/sgml/stylesheet.xsl

+21
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,27 @@
4040
<xsl:call-template name="inline.monoseq"/>
4141
</xsl:template>
4242

43+
<xsl:template match="confgroup" mode="bibliography.mode">
44+
<span>
45+
<xsl:call-template name="common.html.attributes"/>
46+
<xsl:call-template name="id.attribute"/>
47+
<xsl:apply-templates select="conftitle/text()" mode="bibliography.mode"/>
48+
<xsl:text>, </xsl:text>
49+
<xsl:apply-templates select="confdates/text()" mode="bibliography.mode"/>
50+
<xsl:copy-of select="$biblioentry.item.separator"/>
51+
</span>
52+
</xsl:template>
53+
54+
<xsl:template match="isbn" mode="bibliography.mode">
55+
<span>
56+
<xsl:call-template name="common.html.attributes"/>
57+
<xsl:call-template name="id.attribute"/>
58+
<xsl:text>ISBN </xsl:text>
59+
<xsl:apply-templates mode="bibliography.mode"/>
60+
<xsl:copy-of select="$biblioentry.item.separator"/>
61+
</span>
62+
</xsl:template>
63+
4364

4465
<!-- table of contents configuration -->
4566

0 commit comments

Comments
 (0)