HTML output for InsetMathCancel.

[lyx.git] / src / frontends / qt4 / GuiCitation.cpp

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 16f8da48d2b1be2c4d4864447ac3048e5eb58453..6cd534bf91ca223b9e06d49a554164f47e4605ca 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -116,9 +116,6 @@ GuiCitation::GuiCitation(GuiView & lv)
                this, SLOT(on_okPB_clicked()));
 
        setFocusProxy(availableLV);
-
-       // FIXME: the sizeHint() for this is _way_ too high
-       infoML->setFixedHeight(60);
 }
 
 
@@ -214,9 +211,7 @@ void GuiCitation::updateControls(BiblioInfo const & bi)
 void GuiCitation::updateFormatting(CiteStyle currentStyle)
 {
        CiteEngine const engine = citeEngine();
-       bool const natbib_engine =
-               engine == ENGINE_NATBIB_AUTHORYEAR ||
-               engine == ENGINE_NATBIB_NUMERICAL;
+       bool const natbib_engine = engine == ENGINE_NATBIB;
        bool const basic_engine = engine == ENGINE_BASIC;
 
        bool const haveSelection = 
@@ -627,7 +622,8 @@ bool GuiCitation::initialiseParams(string const & data)
 {
        InsetCommand::string2params(data, params_);
        CiteEngine const engine = citeEngine();
-       citeStyles_ = citeStyles(engine);
+       CiteEngineType const engine_type = citeEngineType();
+       citeStyles_ = citeStyles(engine, engine_type);
        init();
        return true;
 }
@@ -667,6 +663,12 @@ CiteEngine GuiCitation::citeEngine() const
 }
 
 
+CiteEngineType GuiCitation::citeEngineType() const
+{
+       return documentBuffer().params().citeEngineType();
+}
+
+
 // Escape special chars.
 // All characters are literals except: '.|*?+(){}[]^$\'
 // These characters are literals when preceded by a "\", which is done here