From: Phil Holmes <mail@philholmes.net>
Date: Tue, 15 Feb 2011 17:35:43 +0000 (+0000)
Subject: Update bibliography templates and titles
X-Git-Tag: release/2.13.51-1~32
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cfc6e57ef66601ecca367654f69ee8c27001c573;p=lilypond.git

Update bibliography templates and titles

Changes the bibliography titles and stops outputting the
citations themselves.
---

diff --git a/Documentation/essay/literature.itely b/Documentation/essay/literature.itely
index 2be07164f4..dcd7ac7610 100644
--- a/Documentation/essay/literature.itely
+++ b/Documentation/essay/literature.itely
@@ -84,15 +84,15 @@ practices.
 @node Long literature list
 @section Long literature list
 
-@subheading Colorado
+@subheading University of Colorado Engraving music bibliography
 
 @include colorado.itexi
 
-@subheading Computer notation
+@subheading Computer notation bibliography
 
 @include computer-notation.itexi
 
-@subheading Engraving
+@subheading Engraving bibliography
 
 @include engravingbib.itexi
 
diff --git a/Documentation/essay/texi-long.bst b/Documentation/essay/texi-long.bst
index a2406481d5..f1a0f78c2e 100644
--- a/Documentation/essay/texi-long.bst
+++ b/Documentation/essay/texi-long.bst
@@ -1,3 +1,6 @@
+% 15 Feb 2011:
+% Updates to prevent citation titles being written to the bibliography
+% and get rid of &nbsp; - the ampersand is later translated to &amp;
 % 18/aug/2010:
 %    - changed into texi-long.bst by Graham Percival for GNU LilyPond
 %    - only a minimum of changes were made; some html remains in
@@ -100,10 +103,12 @@ FUNCTION {output.check}
 
 % DFK changed to use cite$ for the label
 % DFK changed to texinfo, and use URL to make cite key a link
+% PEH changed to stop writing citation to output
 FUNCTION {output.bibitem}
 { newline$
   URL empty$
-    { "@item @code{[" cite$ * "]} " * write$ newline$
+%    { "@item @code{[" cite$ * "]} " * write$ newline$
+    { "@item " write$
     }
     { "" quote$ * cite$ * quote$ * " HREF=" * quote$ *
 	URL * quote$ * "> " * cite$ * ":</A></DT>" * write$
@@ -266,7 +271,7 @@ FUNCTION {format.names}
 		'skip$
 	      if$
 	      t "others" =
-		{ " et&nbsp;al." * }
+		{ " et al." * }
 		{ " and " * t * }
 	      if$
 	    }
@@ -354,9 +359,11 @@ FUNCTION {format.btitle}
 { title author.title.purify strong
 }
 
+%PEH changed "&nbsp;" to " " in 2nd line to avoid & being changed to &amp; later
+% looks daft but going for minimum changes
 FUNCTION {tie.or.space.connect}
 { duplicate$ text.length$ #3 <
-    { "&nbsp;" }
+    { " " }
     { " " }
   if$
   swap$ * *
@@ -544,11 +551,11 @@ FUNCTION {format.crossref.editor}
 { editor #1 "{vv~}{ll}" format.name$
   editor num.names$ duplicate$
   #2 >
-    { pop$ " et&nbsp;al." * }
+    { pop$ " et al." * }
     { #2 <
 	'skip$
 	{ editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
-	    { " et&nbsp;al." * }
+	    { " et al." * }
 	    { " and " * editor #2 "{vv~}{ll}" format.name$ * }
 	  if$
 	}
diff --git a/Documentation/web/texi-web.bst b/Documentation/web/texi-web.bst
index 32fe613e9c..290c8614e1 100644
--- a/Documentation/web/texi-web.bst
+++ b/Documentation/web/texi-web.bst
@@ -266,7 +266,7 @@ FUNCTION {format.names}
 		'skip$
 	      if$
 	      t "others" =
-		{ " et&nbsp;al." * }
+		{ " et al." * }
 		{ " and " * t * }
 	      if$
 	    }
@@ -354,9 +354,10 @@ FUNCTION {format.btitle}
 { title author.title.purify strong
 }
 
+% PEH - the 2 same lines below are because I replaced &nbsp; with a space
 FUNCTION {tie.or.space.connect}
 { duplicate$ text.length$ #3 <
-    { "&nbsp;" }
+    { " " }
     { " " }
   if$
   swap$ * *
@@ -543,11 +544,11 @@ FUNCTION {format.crossref.editor}
 { editor #1 "{vv~}{ll}" format.name$
   editor num.names$ duplicate$
   #2 >
-    { pop$ " et&nbsp;al." * }
+    { pop$ " et al." * }
     { #2 <
 	'skip$
 	{ editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
-	    { " et&nbsp;al." * }
+	    { " et al." * }
 	    { " and " * editor #2 "{vv~}{ll}" format.name$ * }
 	  if$
 	}