Re: [patch 1.4] small correction to the natbib fix

[Abdelrazak Younes]

Jürgen Spitzmüller wrote:
Abdelrazak Younes wrote:
I think Martin's backport was not at fault here. Trunk is correct
because I extended Martin's cite_engine patch. Look at rev 17537 below. 

Then trunk was buggy as well before that commit.

Maybe you should backport the rest of it?

Don't know. The one bug I was aware of is fixed now, and the fix looks very 
clear to me. I'm not sure we need the rest of you changes for branch.

Hum... not all of it but maybe those three changes might be useful:


Modified: lyx-devel/trunk/src/frontends/controllers/ControlBibtex.C
URL: 
http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/controllers/ControlBibtex.C?rev=17537
==============================================================================
--- lyx-devel/trunk/src/frontends/controllers/ControlBibtex.C (original)
+++ lyx-devel/trunk/src/frontends/controllers/ControlBibtex.C Sun Mar 25 
03:12:38 2007
@@ -133,7 +133,7 @@
 {
     // the different bibtex packages have (and need) their
     // own "plain" stylefiles
-    biblio::CiteEngine_enum const & engine =
+    biblio::CiteEngine const engine =
         kernel().buffer().params().getEngine();
     docstring defaultstyle;
     switch (engine) {



Modified: lyx-devel/trunk/src/insets/insetcite.C
URL: 
http://www.lyx.org/trac/file/lyx-devel/trunk/src/insets/insetcite.C?rev=17537
==============================================================================
--- lyx-devel/trunk/src/insets/insetcite.C (original)
+++ lyx-devel/trunk/src/insets/insetcite.C Sun Mar 25 03:12:38 2007
@@ -446,7 +446,7 @@

 void InsetCitation::validate(LaTeXFeatures & features) const
 {
-    switch (features.bufferParams().cite_engine) {
+    switch (features.bufferParams().getEngine()) {
     case biblio::ENGINE_BASIC:
         break;
     case biblio::ENGINE_NATBIB_AUTHORYEAR:



Modified: lyx-devel/trunk/src/lyxfunc.C
URL: http://www.lyx.org/trac/file/lyx-devel/trunk/src/lyxfunc.C?rev=17537
==============================================================================
--- lyx-devel/trunk/src/lyxfunc.C (original)
+++ lyx-devel/trunk/src/lyxfunc.C Sun Mar 25 03:12:38 2007
@@ -1623,7 +1623,7 @@
         case LFUN_BUFFER_PARAMS_APPLY: {
             BOOST_ASSERT(lyx_view_);
             biblio::CiteEngine const engine =
-                lyx_view_->buffer()->params().cite_engine;
+                lyx_view_->buffer()->params().getEngine();

             istringstream ss(argument);
             LyXLex lex(0,0);
@@ -1637,7 +1637,7 @@
                        << (unknown_tokens == 1 ? "" : "s")
                        << endl;
             }
-            if (engine == lyx_view_->buffer()->params().cite_engine)
+            if (engine == lyx_view_->buffer()->params().getEngine())
                 break;

             LCursor & cur = view()->cursor();