From 4e4ebe5d4d675348bbd7f75b9ca6424b6727a253 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Thu, 9 Aug 2001 15:08:06 +0000
Subject: [PATCH] Fixes to References dialog (read-only status) and to Bibtex
 bibliography output.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2463 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/controllers/ChangeLog |  8 ++++++++
 src/frontends/controllers/GUI.h     |  6 +++---
 src/frontends/controllers/biblio.C  | 10 ++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 16722b66f5..09a94ae0b0 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-09  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* GUI.h: Button controller for Reference dialog changed to
+	NoRepeatedApplyReadOnlyPolicy.
+
+	* biblio.C (getInfo): output volume and number info. Move year to end
+	of string.
+
 2001-08-09  Allan Rae  <rae@lyx.org>
 
 	* Makefile.am (SUBDIRS, dist-hook): remove bogus entries. 
diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h
index 2a6e509c5c..c46bec4842 100644
--- a/src/frontends/controllers/GUI.h
+++ b/src/frontends/controllers/GUI.h
@@ -285,11 +285,11 @@ class ControlRef;
 
 template <class GUIview, class GUIbc>
 class GUIRef :
-	public GUI<ControlRef, GUIview, NoRepeatedApplyPolicy, GUIbc> {
+	public GUI<ControlRef, GUIview, NoRepeatedApplyReadOnlyPolicy, GUIbc> {
 public:
 	///
 	GUIRef(LyXView & lv, Dialogs & d)
-		: GUI<ControlRef, GUIview, NoRepeatedApplyPolicy, GUIbc>(lv, d) {}
+		: GUI<ControlRef, GUIview, NoRepeatedApplyReadOnlyPolicy, GUIbc>(lv, d) {}
 };
 
 
@@ -349,7 +349,7 @@ public:
 };
 
 
-/** Specialization for TabularCreate dialog
+/** Specialization for Thesaurus dialog
  */
 class ControlThesaurus;
 
diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index 9b2096e0c9..9a6a8fabb4 100644
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -253,6 +253,8 @@ string const getInfo(InfoMap const & map, string const & key)
 	string title      = parseBibTeX(it->second, "title");
 	string booktitle  = parseBibTeX(it->second, "booktitle");
 	string chapter    = parseBibTeX(it->second, "chapter");
+	string number     = parseBibTeX(it->second, "number");
+	string volume     = parseBibTeX(it->second, "volume");
 	string pages      = parseBibTeX(it->second, "pages");
 
 	string media      = parseBibTeX(it->second, "journal");
@@ -265,8 +267,6 @@ string const getInfo(InfoMap const & map, string const & key)
 
 	ostringstream result;
 	result << author;
-	if (!year.empty())
-		result << ", " << year;
 	if (!title.empty())
 		result << ", " << title;
 	if (!booktitle.empty())
@@ -275,8 +275,14 @@ string const getInfo(InfoMap const & map, string const & key)
 		result << ", Ch. " << chapter;
 	if (!media.empty())
 		result << ", " << media;
+	if (!volume.empty())
+		result << ", vol. " << volume;
+	if (!number.empty())
+		result << ", no. " << number;
 	if (!pages.empty())
 		result << ", pp. " << pages;
+	if (!year.empty())
+		result << ", " << year;
 
 	if (result.str().empty()) // not a BibTeX record
 		result << it->second;