bibhtml (9sep13)

git-svn-id: svn://tug.org/texlive/trunk@31607 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 188 insertions, 83 deletions

diff --git a/Master/texmf-dist/bibtex/bst/bibhtml/abbrvhtml.bst b/Master/texmf-dist/bibtex/bst/bibhtml/abbrvhtml.bst
index 9d506770bbd..e434775bd8a 100644
--- a/Master/texmf-dist/bibtex/bst/bibhtml/abbrvhtml.bst
+++ b/Master/texmf-dist/bibtex/bst/bibhtml/abbrvhtml.bst
@@ -1,7 +1,7 @@
 %% abbrvhtml.bst
 %%
-%% Part of bibhtml, version 2.0.1, released 2009 November 2
-%% Hg node 6ca3807543d6.
+%% Part of bibhtml, version 2.0.2, released 2013 September 8
+%% Hg node 7076ce83a035.
 %% See <http://purl.org/nxg/dist/bibhtml>
 %%
 %% Copyright 1999, 2005, 2006, 2009, Norman Gray <norman@astro.gla.ac.uk>
diff --git a/Master/texmf-dist/bibtex/bst/bibhtml/alphahtml.bst b/Master/texmf-dist/bibtex/bst/bibhtml/alphahtml.bst
index a23e6113c64..dab6362bbd3 100644
--- a/Master/texmf-dist/bibtex/bst/bibhtml/alphahtml.bst
+++ b/Master/texmf-dist/bibtex/bst/bibhtml/alphahtml.bst
@@ -1,7 +1,7 @@
 %% alphahtml.bst
 %%
-%% Part of bibhtml, version 2.0.1, released 2009 November 2
-%% Hg node 6ca3807543d6.
+%% Part of bibhtml, version 2.0.2, released 2013 September 8
+%% Hg node 7076ce83a035.
 %% See <http://purl.org/nxg/dist/bibhtml>
 %%
 %% Copyright 1999, 2005, 2006, 2009, Norman Gray <norman@astro.gla.ac.uk>
diff --git a/Master/texmf-dist/bibtex/bst/bibhtml/alphahtmldate.bst b/Master/texmf-dist/bibtex/bst/bibhtml/alphahtmldate.bst
index 14f25357f9d..21597aeffb5 100644
--- a/Master/texmf-dist/bibtex/bst/bibhtml/alphahtmldate.bst
+++ b/Master/texmf-dist/bibtex/bst/bibhtml/alphahtmldate.bst
@@ -5,8 +5,8 @@
 %%
 %% alphahtml.bst
 %%
-%% Part of bibhtml, version 2.0.1, released 2009 November 2
-%% Hg node 6ca3807543d6.
+%% Part of bibhtml, version 2.0.2, released 2013 September 8
+%% Hg node 7076ce83a035.
 %% See <http://purl.org/nxg/dist/bibhtml>
 %%
 %% Copyright 1999, 2005, 2006, 2009, Norman Gray <norman@astro.gla.ac.uk>
diff --git a/Master/texmf-dist/bibtex/bst/bibhtml/alphahtmldater.bst b/Master/texmf-dist/bibtex/bst/bibhtml/alphahtmldater.bst
index 0149fe03954..75d0a9feb39 100644
--- a/Master/texmf-dist/bibtex/bst/bibhtml/alphahtmldater.bst
+++ b/Master/texmf-dist/bibtex/bst/bibhtml/alphahtmldater.bst
@@ -5,8 +5,8 @@
 %%
 %% alphahtml.bst
 %%
-%% Part of bibhtml, version 2.0.1, released 2009 November 2
-%% Hg node 6ca3807543d6.
+%% Part of bibhtml, version 2.0.2, released 2013 September 8
+%% Hg node 7076ce83a035.
 %% See <http://purl.org/nxg/dist/bibhtml>
 %%
 %% Copyright 1999, 2005, 2006, 2009, Norman Gray <norman@astro.gla.ac.uk>
diff --git a/Master/texmf-dist/bibtex/bst/bibhtml/plainhtml.bst b/Master/texmf-dist/bibtex/bst/bibhtml/plainhtml.bst
index 5e611b14119..c97d043591a 100644
--- a/Master/texmf-dist/bibtex/bst/bibhtml/plainhtml.bst
+++ b/Master/texmf-dist/bibtex/bst/bibhtml/plainhtml.bst
@@ -1,7 +1,7 @@
 %% plainhtml.bst
 %%
-%% Part of bibhtml, version 2.0.1, released 2009 November 2
-%% Hg node 6ca3807543d6.
+%% Part of bibhtml, version 2.0.2, released 2013 September 8
+%% Hg node 7076ce83a035.
 %% See <http://purl.org/nxg/dist/bibhtml>
 %%
 %% Copyright 1999, 2005, 2006, 2009, Norman Gray <norman@astro.gla.ac.uk>
diff --git a/Master/texmf-dist/bibtex/bst/bibhtml/plainhtmldate.bst b/Master/texmf-dist/bibtex/bst/bibhtml/plainhtmldate.bst
index 4d7ebd78e35..55087db870b 100644
--- a/Master/texmf-dist/bibtex/bst/bibhtml/plainhtmldate.bst
+++ b/Master/texmf-dist/bibtex/bst/bibhtml/plainhtmldate.bst
@@ -5,8 +5,8 @@
 %%
 %% plainhtml.bst
 %%
-%% Part of bibhtml, version 2.0.1, released 2009 November 2
-%% Hg node 6ca3807543d6.
+%% Part of bibhtml, version 2.0.2, released 2013 September 8
+%% Hg node 7076ce83a035.
 %% See <http://purl.org/nxg/dist/bibhtml>
 %%
 %% Copyright 1999, 2005, 2006, 2009, Norman Gray <norman@astro.gla.ac.uk>
diff --git a/Master/texmf-dist/bibtex/bst/bibhtml/plainhtmldater.bst b/Master/texmf-dist/bibtex/bst/bibhtml/plainhtmldater.bst
index 5260664575a..d3b969ac615 100644
--- a/Master/texmf-dist/bibtex/bst/bibhtml/plainhtmldater.bst
+++ b/Master/texmf-dist/bibtex/bst/bibhtml/plainhtmldater.bst
@@ -5,8 +5,8 @@
 %%
 %% plainhtml.bst
 %%
-%% Part of bibhtml, version 2.0.1, released 2009 November 2
-%% Hg node 6ca3807543d6.
+%% Part of bibhtml, version 2.0.2, released 2013 September 8
+%% Hg node 7076ce83a035.
 %% See <http://purl.org/nxg/dist/bibhtml>
 %%
 %% Copyright 1999, 2005, 2006, 2009, Norman Gray <norman@astro.gla.ac.uk>
diff --git a/Master/texmf-dist/bibtex/bst/bibhtml/unsrthtml.bst b/Master/texmf-dist/bibtex/bst/bibhtml/unsrthtml.bst
index 977e21f097b..a1c7a210a3d 100644
--- a/Master/texmf-dist/bibtex/bst/bibhtml/unsrthtml.bst
+++ b/Master/texmf-dist/bibtex/bst/bibhtml/unsrthtml.bst
@@ -1,7 +1,7 @@
 %% unsrthtml.bst
 %%
-%% Part of bibhtml, version 2.0.1, released 2009 November 2
-%% Hg node 6ca3807543d6.
+%% Part of bibhtml, version 2.0.2, released 2013 September 8
+%% Hg node 7076ce83a035.
 %% See <http://purl.org/nxg/dist/bibhtml>
 %%
 %% Copyright 1999, 2005, 2006, 2009, Norman Gray <norman@astro.gla.ac.uk>
diff --git a/Master/texmf-dist/doc/bibtex/bibhtml/README b/Master/texmf-dist/doc/bibtex/bibhtml/README
index 3462b1c0452..ff0f77f9a90 100644
--- a/Master/texmf-dist/doc/bibtex/bibhtml/README
+++ b/Master/texmf-dist/doc/bibtex/bibhtml/README
@@ -9,7 +9,10 @@ an XML/HTML workflow.
 
 The long-term URL for this package is http://purl.org/nxg/dist/bibhtml
 
-This distribution contains bibhtml version 2.0.1, released 2009 November 2.
+The code is available at <https://bitbucket.org/nxg/bibhtml>,
+where you can find an issues list.
+
+This distribution contains bibhtml version 2.0.2, released 2013 September 8.
 
 
 Norman Gray, http://nxg.me.uk
diff --git a/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml b/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml
index 250b5e5a109..7088249658b 100644
--- a/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml
+++ b/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml
@@ -32,7 +32,7 @@
 
 use strict;
 
-my $version = 'Bibhtml, version 2.0.1, Norman Gray <norman@astro.gla.ac.uk>, 2009 November 2';
+my $version = 'Bibhtml, version 2.0.2, Norman Gray <norman@astro.gla.ac.uk>, 2013 September 8';
 
 
 # configuration...
@@ -439,7 +439,7 @@ sub readconfig {
 
 sub printhelp {
     print STDOUT <<\_EOD;
-This is bibhtml version 2.0.1, 2009 November 2.
+This is bibhtml version 2.0.2, 2013 September 8.
 
 Usage:
     % bibhtml [options...] filename...
diff --git a/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml-extract-aux.xslt b/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml-extract-aux.xslt
index 2862c56dba4..f0ce737f1ec 100644
--- a/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml-extract-aux.xslt
+++ b/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml-extract-aux.xslt
@@ -2,8 +2,8 @@
 <!--
  ! bibhtml-extract-aux.xslt
  !
- ! Part of bibhtml, version 2.0.1, released 2009 November 2
- ! Hg Node 6ca3807543d6.
+ ! Part of bibhtml, version 2.0.2, released 2013 September 8
+ ! Hg Node 7076ce83a035.
  ! See <http://purl.org/nxg/dist/bibhtml>
  !
  ! This sample script processes an XML file which contains elements like
diff --git a/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml-insert-bib.xslt b/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml-insert-bib.xslt
index 57ff5600725..0fd46ff6bd1 100644
--- a/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml-insert-bib.xslt
+++ b/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml-insert-bib.xslt
@@ -2,8 +2,8 @@
 <!--
  ! bibhtml-extract-aux.xslt
  !
- ! Part of bibhtml, version 2.0.1, released 2009 November 2
- ! Hg node 6ca3807543d6.
+ ! Part of bibhtml, version 2.0.2, released 2013 September 8
+ ! Hg node 7076ce83a035.
  ! See <http://purl.org/nxg/dist/bibhtml>
  !
  ! This sample script processes an XML file which contains elements like
@@ -12,39 +12,40 @@
  ! appended, is suitable for processing with BibTeX.  Adapt or extend as
  ! appropriate.
  !-->
-<stylesheet xmlns="http://www.w3.org/1999/XSL/Transform"
+<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform"
                 version="1.0"
+                xmlns="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="h"
                 xmlns:h="http://www.w3.org/1999/xhtml">
 
-  <output method="xml"
+  <x:output method="xml"
             version="1.0"
             doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
             doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
             omit-xml-declaration="yes"/>
 
-  <param name='bibfile-name'>bibliography</param>
+  <x:param name='bibfile-name'>bibliography</x:param>
     
 
   <!-- identity transform -->
-  <template match="*">
-    <copy>
-      <copy-of select="@*"/>
-      <apply-templates/>
-    </copy>
-  </template>
+  <x:template match="*">
+    <x:copy>
+      <x:copy-of select="@*"/>
+      <x:apply-templates/>
+    </x:copy>
+  </x:template>
 
-  <template match="h:span[@class='cite']">
-    <h:a>
-      <attribute name='href'>
-        <text>#</text>
-        <copy-of select='.'/>
-      </attribute>
-      <copy-of select='.'/>
-    </h:a>
-  </template>
+  <x:template match="h:span[@class='cite']">
+    <a>
+      <x:attribute name='href'>
+        <x:text>#</x:text>
+        <x:copy-of select='.'/>
+      </x:attribute>
+      <x:apply-templates/>
+    </a>
+  </x:template>
 
-  <template match='processing-instruction("bibliography")'>
-    <copy-of select='document(concat($bibfile-name,".bbl"))'/>
-  </template>
-</stylesheet>
+  <x:template match='processing-instruction("bibliography")'>
+    <x:copy-of select='document(concat($bibfile-name,".bbl"))'/>
+  </x:template>
+</x:stylesheet>
diff --git a/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml.html b/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml.html
index d68dfd94d81..0b97184ca85 100644
--- a/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml.html
+++ b/Master/texmf-dist/doc/bibtex/bibhtml/bibhtml.html
@@ -23,7 +23,7 @@ bibliographies into an XML/HTML workflow.</p>
 <p>The long-term URL for this package is <code>http://purl.org/nxg/dist/bibhtml</code></p>
 
 <p>This documentation describes
-bibhtml version 2.0.1, released 2009 November 2.</p>
+bibhtml version 2.0.2, released 2013 September 8.</p>
 </div>
 
 <h3>Contents</h3>
@@ -50,7 +50,7 @@ bibliographies into an XML/HTML workflow.</p>
 <p>The output of these style files is usable as-is, but it benefits
 from some post-processing, to remove TeX-isms.  There’s a <em>sed</em>
 script in the distribution which does exactly that, called
-<code>detex.sed</code>.  If you want to make a version of that im some
+<code>detex.sed</code>.  If you want to make a version of that in some
 other regexp-supporting language, let me know and I can include it in
 the distribution.</p>
 
@@ -82,13 +82,13 @@ style files <a href="#bst-files">below</a>.</p>
 this <code>.aux</code> file.  This script isn’t really maintained any
 more, but it is still distributed, and documented <a href="#usage">below</a>.</p>
 
-<p><em>Bibhtml</em> works with a standard BibTeX database -- it is
+<p><em>Bibhtml</em> works with a standard BibTeX database – it is
 intended to be compatible with a database used in the standard way
 with LaTeX.  The <a href="#bst-files">BibTeX style files</a>
 distributed with this package define an additional
 <code>url</code> field: if this is present, then the generated entry
 will contain a link to this URL.  They also define an
-<code>eprint</code> field -- if you do not use the LANL preprint
+<code>eprint</code> field – if you do not use the LANL preprint
 archive, this will be of no interest to you.</p>
 
 <h2><a name="bst-files" id="bst-files">BibTeX style files</a></h2>
@@ -255,7 +255,7 @@ it.  When you run <em>bibhtml</em>, it generates an
 <code>.aux</code> file which makes BibTeX produce references for exactly those
 keys which appear in this way. </p>
 
-<h3><a name="pis" id="pis">Preparing the bibliography file -- processing
+<h3><a name="pis" id="pis">Preparing the bibliography file – processing
 instructions supported</a></h3>
 
 <p>The bibliography file is an ordinary HTML document (which may
@@ -296,7 +296,7 @@ comment <code>&lt;?bibhtml today ?&gt;</code> with today’s date.</p>
 <dl>
 <dt><code>&lt;?bibhtml start?&gt;</code> and <code>&lt;?bibhtml
 stop?&gt;</code></dt>
-<dd>Bracket the bibliography -- any text between these PIs is replaced
+<dd>Bracket the bibliography – any text between these PIs is replaced
 when <em>bibhtml</em> is next run.</dd>
 
 <dt><code>&lt;?bibhtml insert?&gt;</code></dt>
@@ -435,10 +435,10 @@ platforms.  If so, please get in touch, with suggestions. </p>
 <h2><a name="example" id="example">Example</a></h2>
 
 <p>There are multiple sources of advice for how to cite electronic
-documents.  The most formal are an ISO standard <h:a xmlns:h="http://www.w3.org/1999/xhtml" href="#url:iso690"><span class="cite">url:iso690</span></h:a>, and the American Psychological
-Association’s guidance in Sect. 6.31 of <h:a xmlns:h="http://www.w3.org/1999/xhtml" href="#apastyle"><span class="cite">apastyle</span></h:a>.  As well, there are older but still
-useful discussions in <h:a xmlns:h="http://www.w3.org/1999/xhtml" href="#walker06"><span class="cite">walker06</span></h:a> and
-<h:a xmlns:h="http://www.w3.org/1999/xhtml" href="#emory95"><span class="cite">emory95</span></h:a>.</p>
+documents.  The most formal are an ISO standard <a href="#url:iso690">url:iso690</a>, and the American Psychological
+Association’s guidance in Sect. 6.31 of <a href="#apastyle">apastyle</a>.  As well, there are older but still
+useful discussions in <a href="#walker06">walker06</a> and
+<a href="#emory95">emory95</a>.</p>
 
 <h2><a name="refs" id="refs">References</a></h2>
 
@@ -457,7 +457,8 @@ American Psychological Association.</a></dt>
 
 <dt><a name="walker06" id="walker06">[walker06]
 Janice R. Walker and Todd Taylor.</a></dt>
-<dd><a href="http://cup.columbia.edu/book/978-0-231-13210-7/the-columbia-guide-to-online-style"><em>The Columbia Guide to Online Style</em></a>.
+<dd><a href="http://cup.columbia.edu/book/978-0-231-13210-7/the-columbia-guide-to-online-style"><em>The
+  Columbia Guide to Online Style</em></a>.
 Columbia University Press, 2nd edition, 2006 [cited 9 August 2009].</dd>
 
 <dt><a name="emory95" id="emory95">[emory95]
@@ -484,8 +485,8 @@ and at
 <a href="http://purl.org/nxg/dist/bibhtml"><code>http://purl.org/nxg/dist/bibhtml</code></a>.</p>
 
 <p>Download the distribution:
-<a href="bibhtml-2.0.1.tar.gz">bibhtml-2.0.1.tar.gz</a> or
-<a href="bibhtml-2.0.1.zip">bibhtml-2.0.1.zip</a>.</p>
+<a href="bibhtml-2.0.2.tar.gz">bibhtml-2.0.2.tar.gz</a> or
+<a href="bibhtml-2.0.2.zip">bibhtml-2.0.2.zip</a>.</p>
 
 <p>Do <a href="mailto:norman@astro.gla.ac.uk">let me know</a> if
 you use this stuff.  I’d be grateful for any bug reports,
@@ -499,17 +500,21 @@ add issues to the bugparade.</p>
 
 <h3><a name="licence" id="licence">Licence</a></h3>
 
-<p>This software is copyright, 1999, 2005, 2006, 2009, Norman Gray.  It is released
-under the terms of the GNU General Public Licence.  See the copyright
-declaration at the top of file <code>bibhtml</code>, and the file
-<code>LICENCE</code> for the licence conditions.  You can find an
-online copy of the GPL at <code><a href="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</a></code>.</p>
+<p>This software is copyright, 1999, 2005, 2006, 2009, 2013 Norman Gray.
+It is released under the terms of the GNU General Public Licence.
+See the copyright declaration at the top of file <code>bibhtml</code>,
+and the file <code>LICENCE</code> for the licence conditions.
+You can find an online copy of the GPL at
+<code><a href="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</a></code>.</p>
 
-<p>If this licence is a problem for you, get in touch and we can work something out.</p>
+<p>If this licence is a problem for you,
+get in touch and we can work something out.</p>
 
 <h3><a name="changes" id="changes">Changes</a></h3>
 
 <dl>
+<dt>2.0.2, 2013 September 8</dt>
+<dd>Minor bugfixes: XSLT namespace fixes, and DOI formatting.</dd>
 
 <dt>2.0.1, 2009 November 2</dt>
 <dd>The *date.bst and *dater.bst styles now work again.</dd>
@@ -544,8 +549,8 @@ discussing how to cite online sources.</li>
 
 <dt>1.2b2, 2005 August 30</dt>
 <dd><ul>
-<li>Bugfix -- correctly escape characters in .bbl hrefs</li>
-<li>Portability fix -- use <code>/usr/bin/env perl</code> at the top of the
+<li>Bugfix – correctly escape characters in .bbl hrefs</li>
+<li>Portability fix – use <code>/usr/bin/env perl</code> at the top of the
 script, rather than <code>/usr/bin/perl</code>; this should be more
 portable.</li>
 </ul>
@@ -556,19 +561,19 @@ portable.</li>
 <li>Use processing instructions such as
 <code>&lt;?bibhtml start?&gt;</code>, rather than magic comments (the
 old behaviour is still temporarily supported).</li>
-<li>Add a new directive -- <code>&lt;?bibhtml insert?&gt;</code>
+<li>Add a new directive – <code>&lt;?bibhtml insert?&gt;</code>
 inserts the bibliography in-place.</li>
 <li>Debugging output is now written to stderr rather than stdout.</li>
 <li>Add <code>--help</code> and <code>--strip</code> options.</li>
 <li>Documentation improvements.</li>
-<li>Bugfix -- URLs are now properly escaped in the bibliography.</li>
+<li>Bugfix – URLs are now properly escaped in the bibliography.</li>
 </ul>
 </dd>
 </dl>
 
 <div class="signature">
 <a href="http://nxg.me.uk">Norman</a><br />
-2009 November 2
+2013 September 8
 </div>
 
 </body>
diff --git a/Master/texmf-dist/doc/bibtex/bibhtml/detex.sed b/Master/texmf-dist/doc/bibtex/bibhtml/detex.sed
index 795901bdf94..72395862fb5 100644
--- a/Master/texmf-dist/doc/bibtex/bibhtml/detex.sed
+++ b/Master/texmf-dist/doc/bibtex/bibhtml/detex.sed
@@ -1,6 +1,6 @@
 # Edit TeXisms in the .bbl output, to make it HTML-ready
-# From bibhtml release 2.0.1, of 2009 November 2.
-# Hg node 6ca3807543d6.
+# From bibhtml release 2.0.2, of 2013 September 8.
+# Hg node 7076ce83a035.
 # See http://purl.org/nxg/dist/bibhtml
 
 # Remove %\n line-breaks added by BibTeX
@@ -17,11 +17,11 @@ s,&,&amp;,g
 # Process DOI:{...} lines, escaping '<' characters in DOIs and rearranging into a <a> element
 # (the substitutions below probably rely on the "DOI:" being at the beginning of a line).
 # First, turn DOI:{X} into DOI:{X|X}
-/^DOI/s,DOI:{\([^}]*\)},DOI:{\1|\1},
+/^ *DOI/s,DOI:{\([^}]*\)},DOI:{\1|\1},
 # Escape the two DOIs differently...
 #    ...first do URL escaping
 #    ...then do HTML/XML escaping
-/^DOI:/{
+/^ *DOI:/{
   :bx
   s,\([^<|]*\)<\([^|]*\)|,\1%3C\2|,
   t bx
@@ -30,13 +30,15 @@ s,&,&amp;,g
   t cx
 }
 # ...and then turn the result into a <a> element
-/^DOI:{/s,DOI:{\([^|]*\)|\([^}]*\)},DOI: <a href='http://dx.doi.org/\1'><code>\2</code></a>,
+/^ *DOI:{/s,DOI:{\([^|]*\)|\([^}]*\)},doi:<a href='http://dx.doi.org/\1'><code>\2</code></a>,
 
 # Get rid of TeX braces (I hope there aren't any of these in DOIs or other URLs)
 s/[{}]//g
 
 # Replace '~' ties with spaces, as lont as they aren't URL ".../~user"
 s,\([^/]\)~,\1 ,g
+# ...and '\ ' with plain space
+s,\\ , ,g
 
 # accented characters
 s,\\'a,á,g
diff --git a/Master/texmf-dist/doc/bibtex/bibhtml/style.css b/Master/texmf-dist/doc/bibtex/bibhtml/style.css
index 0f464d2b9ed..946d11a6a55 100644
--- a/Master/texmf-dist/doc/bibtex/bibhtml/style.css
+++ b/Master/texmf-dist/doc/bibtex/bibhtml/style.css
@@ -2,18 +2,106 @@ body {
   color: #333;
   background: white;
   margin-left: +30%;
-  margin-right: +20%;
-  padding: 0.5em;               /* this will make a difference if I decide to
-     				   have the background a different colour */
+  width: 50%;            /* body is 50% of screen width */
+  padding: 0.5em;        /* this will make a difference if I decide to
+  			    have the background a different colour */
   /* I can't decide on font: Optima's always nice, but Gill looks
      agreeably intense.  Helvetica's a decent fallback. */
-  font-family: "Helvetica Neue", "Gill Sans", gill, Helvetica, sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "Gill Sans", gill, sans-serif;
   /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */
   /* font-family: "Gill Sans", gill, Helvetica, sans-serif; */
-  font-size: 11pt;
+  /* I seem to have used 11pt at some point in the past, but this
+     is far too big -- did I ever have a reason for that, or is it
+     just due to browser changes? */
+  font-size: 10pt;
   line-height: 150%;
 }
 
+/* adapt to wider screens */
+@media screen and (min-width: 700pt) {
+    body {
+        margin-left: 210pt;
+        width: 350pt;
+    }
+}
+
+/* The following appears not to work in Safari or Chrome
+   -- don't know why, yet.
+@media print {
+    @page :right {
+        size: auto;
+        body {
+            margin-top: 2cm;
+            margin-bottom: 3cm;
+            margin-left: 10%;
+            width: 60%;
+            margin-right: 30%;
+            color: #d33;
+        }
+    }
+    @page :left {
+        size: auto;
+        body {
+            margin-top: 2cm;
+            margin-bottom: 3cm;
+            margin-left: 30%;
+            width: 60%;
+            margin-right: 10%;
+            color: #33d;
+        }
+    }
+}
+*/
+
+div.topsidebar {
+    float: right;
+    width: 50%;                 /* ...of the body width (ie, 50% x 50% of screen) */
+    font-size: smaller;
+    margin-left: 1em;
+    padding-left: 1em;
+    border-left: solid thin #AAA;
+}
+
+/* On wider screens, move the sidebar out to the right hand side */
+/* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */
+@media screen and (min-width: 700pt) and (max-width: 850pt) {
+    body {
+        margin-left: 210pt;
+        width: 350pt;           /* 50% of 700pt */
+        margin-right: auto;
+    }
+    div.topsidebar {
+        position: absolute;
+        /* I feel this size should be 595pt (350 + 210 + 0.05*700),
+           but that's clearly not right -- I don't think I understand what the -5%
+           in the h1 spec below is actually 5% of! */
+        left: 570pt;
+        width: auto;
+        margin-left: 0pt;
+        padding-left: 0pt;
+        border: none;
+    }
+}
+/* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge.
+   When the screen is 850pt wide (expanding from the @media case above),
+   the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/
+@media screen and (min-width: 850pt) {
+    body {
+        margin-right: 290pt;    /* 290 = 850-(210+350) */
+        width: 350pt;
+        margin-left: auto;      /* ...takes up the slack */
+    }
+    div.topsidebar {
+        position: absolute;
+        width: 290pt;           /* same 290pt as above */
+        left: auto;
+        right: 0%;
+        padding-left: 0pt;
+        border: none;
+    }
+}
+
+
 code, pre {
   font-family: Monaco, fixed;
   font-size: 9pt;
@@ -43,7 +131,7 @@ h1 {
   margin-left: -40%;
   margin-right: -5%;
   padding: 0.5em;
-  border: solid #666;
+  border: solid thin #666;
   text-align: right;
 }
 h2 {
@@ -53,6 +141,11 @@ h2 {
   border-top: solid thin #666;
   clear: both;
 }
+
+h2.appendices {
+  margin-top: 10ex;
+  border-top: double medium #666;
+}
 h3 {
   margin-left: -30%;
   float: left;
@@ -98,8 +191,9 @@ img.smallimage {
 div.signature {
   margin-left: -40%;
   margin-right: -5%;
+  margin-top: 4ex;
   text-align: right;
-  border: solid #666;
+  border: solid thin #666;
   padding: 0.3em;
   clear: both;
 }
@@ -107,9 +201,9 @@ div.signature {
 /* ============================================================
  * Some other curiosities of my one-time formatting for web pages
  */
-pre.doc-history {
+.doc-history {
   font-size: xx-small;
-  background #eee;
+  background: #eee;
   line-height: 100%;
 }