/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
#endif
#include "bufferview_funcs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "BufferView.h"
#include "paragraph.h"
#include "lyxfont.h"
#include "language.h"
#include "gettext.h"
#include "ParagraphParameters.h"
-#include "lyxtextclasslist.h"
#include "frontends/Alert.h"
{
if (!bv->available() || !text)
return;
-
+
bv->hideCursor();
bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
if (decInc >= 0)
{
#ifndef INHERIT_LANG
LyXFont font(LyXFont::ALL_INHERIT, ignore_language);
-#else
+#else
LyXFont font(LyXFont::ALL_INHERIT);
#endif
toggleAndShow(bv, font);
}
-// Returns the current font and depth as a message.
+// Returns the current font and depth as a message.
string const currentState(BufferView * bv)
{
ostringstream state;
- if (bv->available()) {
+ if (bv->available()) {
// I think we should only show changes from the default
// font. (Asger)
LyXText * text = bv->getLyXText();
Buffer * buffer = bv->buffer();
LyXFont font = text->real_current_font;
LyXFont const & defaultfont =
- textclasslist[buffer->params.textclass].defaultfont();
+ buffer->params.getLyXTextClass().defaultfont();
font.reduce(defaultfont);
state << _("Font:") << ' '
<< font.stateText(&buffer->params);
-
+
// The paragraph depth
int depth = text->getDepth();
if (depth > 0)
state << _(", Depth: ") << depth;
-
+
// The paragraph spacing, but only if different from
// buffer spacing.
if (!text->cursor.par()->params().spacing().isDefault()) {
switch (cur_space) {
case Spacing::Single:
state << _("Single");
-
+
break;
case Spacing::Onehalf:
state << _("Onehalf");
break;
}
}
-#if 1
+#ifdef DEVEL_VERSION
state << _(", Paragraph: ") << text->cursor.par()->id();
#endif
}
}
-/* -------> Does the actual toggle job of the XxxCB() calls above.
+/* Does the actual toggle job of the calls above.
* Also shows the current font state.
*/
void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
{
- if (bv->available()) {
- if (bv->theLockingInset()) {
- bv->theLockingInset()->setFont(bv, font, toggleall);
- return;
- }
- LyXText * text = bv->getLyXText();
- if (!text)
- return;
-
- bv->hideCursor();
- bv->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->toggleFree(bv, font, toggleall);
- bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
- if (font.language() != ignore_language ||
- font.number() != LyXFont::IGNORE) {
- LyXCursor & cursor = text->cursor;
- text->computeBidiTables(bv->buffer(), cursor.row());
- if (cursor.boundary() !=
- text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(),
- text->real_current_font))
- text->setCursor(bv, cursor.par(), cursor.pos(),
- false, !cursor.boundary());
- }
+ if (!bv->available())
+ return;
+
+ if (bv->theLockingInset()) {
+ bv->theLockingInset()->setFont(bv, font, toggleall);
+ return;
+ }
+
+ LyXText * text = bv->getLyXText();
+ // FIXME: can this happen ??
+ if (!text)
+ return;
+
+ bv->hideCursor();
+ bv->update(text, BufferView::SELECT | BufferView::FITCUR);
+ text->toggleFree(bv, font, toggleall);
+ bv->update(text, BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+
+ if (font.language() != ignore_language ||
+ font.number() != LyXFont::IGNORE) {
+ LyXCursor & cursor = text->cursor;
+ text->computeBidiTables(bv->buffer(), cursor.row());
+ if (cursor.boundary() !=
+ text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(),
+ text->real_current_font))
+ text->setCursor(bv, cursor.par(), cursor.pos(),
+ false, !cursor.boundary());
}
}