fix math fonts with LyX/Mac

[lyx.git] / src / frontends / LyXView.C

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index 4b00b244fe97370c77a7659088b86a12f712abe4..a8d33b65f7b7804647e8b217842f49ad0ffda909 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -6,31 +6,34 @@
  * \author Lars Gullik Bjønnes
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "LyXView.h"
+#include "Dialogs.h"
+#include "Timeout.h"
+#include "Toolbars.h"
+#include "Menubar.h"
+
+#include "buffer.h"
+#include "bufferparams.h"
+#include "BufferView.h"
+#include "bufferview_funcs.h"
+#include "cursor.h"
 #include "debug.h"
+#include "funcrequest.h"
+#include "gettext.h"
 #include "intl.h"
+#include "lyx_cb.h"
+#include "lyxfunc.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
-#include "buffer.h"
 #include "MenuBackend.h"
-#include "gettext.h"
-#include "lyxfunc.h"
-#include "funcrequest.h"
-#include "lyx_cb.h"
-#include "BufferView.h"
-#include "bufferview_funcs.h"
+#include "paragraph.h"
 
-#include "Dialogs.h"
-#include "Toolbar.h"
-#include "Timeout.h"
-#include "Menubar.h"
 #include "controllers/ControlCommandBuffer.h"
-#include "mathed/math_cursor.h"
 
 #include "support/filetools.h" // OnlyFilename()
 
@@ -39,14 +42,20 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-using namespace lyx::support;
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
+
 using std::endl;
+using std::string;
+
+using lyx::frontend::ControlCommandBuffer;
 
 string current_layout;
 
 
 LyXView::LyXView()
-       : intl_(new Intl),
+       : toolbars_(new Toolbars(*this)),
+         intl_(new Intl),
          autosave_timeout_(new Timeout(5000)),
          lyxfunc_(new LyXFunc(this)),
          dialogs_(new Dialogs(*this)),
@@ -91,16 +100,16 @@ boost::shared_ptr<BufferView> const & LyXView::view() const
 
 void LyXView::setLayout(string const & layout)
 {
-       toolbar_->setLayout(layout);
+       toolbars_->setLayout(layout);
 }
 
 
-void LyXView::updateToolbar()
+void LyXView::updateToolbars()
 {
-       bool const math = mathcursor;
+       bool const math = bufferview_->cursor().inMathed();
        bool const table =
-               !getLyXFunc().getStatus(LFUN_LAYOUT_TABULAR).disabled();
-       toolbar_->update(math, table);
+               getLyXFunc().getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
+       toolbars_->update(math, table);
 }
 
 
@@ -131,20 +140,23 @@ void LyXView::updateLayoutChoice()
 {
        // don't show any layouts without a buffer
        if (!view()->buffer()) {
-               toolbar_->clearLayoutList();
+               toolbars_->clearLayoutList();
                return;
        }
 
        // update the layout display
-       if (toolbar_->updateLayoutList(buffer()->params.textclass)) {
-               current_layout = buffer()->params.getLyXTextClass().defaultLayoutName();
+       if (toolbars_->updateLayoutList(buffer()->params().textclass)) {
+               current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
        }
 
+       if (bufferview_->cursor().inMathed())
+               return;
+
        string const & layout =
-               bufferview_->getLyXText()->cursor.par()->layout()->name();
+               bufferview_->cursor().paragraph().layout()->name();
 
        if (layout != current_layout) {
-               toolbar_->setLayout(layout);
+               toolbars_->setLayout(layout);
                current_layout = layout;
        }
 }
@@ -177,10 +189,18 @@ void LyXView::updateWindowTitle()
 }
 
 
-void LyXView::dispatch(FuncRequest const & req)
+void LyXView::dispatch(FuncRequest const & cmd)
 {
-       // substitute the correct BufferView here
-       FuncRequest r = req;
-       r.setView(view().get());
-       getLyXFunc().dispatch(r);
+       getLyXFunc().dispatch(cmd);
+}
+
+
+Buffer const * const LyXView::updateInset(InsetBase const * inset) const
+{
+       Buffer const * buffer_ptr = 0;
+       if (inset) {
+               buffer_ptr = bufferview_->buffer();
+               bufferview_->update();
+       }
+       return buffer_ptr;
 }