* src/LaTeXFeatures.cpp:

- handle case where natbib is loaded internally by a class, but still plain cite commands
	  have to be output (bug 5182)
* lib/revtex4.layout:
	- this is such a case.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@26299 a592a061-630c-0410-9148-cb99ea01b6c8

lib/layouts/revtex4.layout

@@ -11,11 +11,11 @@
 
 
 Format 4
-Columns                 1
-Sides                   1
-PageStyle               Headers
-Provides natbib		1
-Provides url		1
+Columns				1
+Sides				1
+PageStyle               	Headers
+Provides natbib-internal	1
+Provides url			1
 
 # Default textclass options. The user may need to modify this.
 ClassOptions

src/LaTeXFeatures.cpp

@@ -587,7 +587,11 @@ string const LaTeXFeatures::getPackages() const
 		packages << "\\usepackage{esint}\n";
 
 	// natbib.sty
-	if (mustProvide("natbib")) {
+	// Some classes load natbib themselves, but still allow (or even require)
+	// plain numeric citations (ReVTeX is such a case, see bug 5182).
+	// This special case is indicated by the "natbib-internal" key.
+	if (mustProvide("natbib")
+	    && !params_.getTextClass().provides("natbib-internal")) {
 		packages << "\\usepackage[";
 		if (params_.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL) {
 			packages << "numbers";

status.15x

@@ -80,6 +80,8 @@ What's new
 
 - Fix importing of LaTeX files that don't use the package inputenc (bug 5181).
 
+- Fix output of citation commands in the ReVTeX4 class (bug 5182).
+
 
 * USER INTERFACE