#include "frontends/LyXView.h"
#include "frontends/Alert.h"
+#include "mathed/math_cursor.h"
-#include "support/lstrings.h"
+#include "support/tostr.h"
#include "Lsstream.h"
#include "insets/updatableinset.h"
-#include "BoostFormat.h"
+using namespace lyx::support;
+
namespace {
+
LyXFont freefont(LyXFont::ALL_IGNORE);
bool toggleall(false);
+
}
+namespace bv_funcs {
// Set data using font and toggle
// If successful, returns true
<< "color " << font.color() << '\n'
<< "language " << lang << '\n'
<< "toggleall " << tostr(toggle);
- data = os.str();
+ data = STRCONV(os.str());
return true;
}
// If successful, returns true
bool string2font(string const & data, LyXFont & font, bool & toggle)
{
- istringstream is(data);
+ istringstream is(STRCONV(data));
LyXLex lex(0,0);
lex.setStream(is);
- int Int = 0;
- bool Bool = false;
- string String;
-
int nset = 0;
while (lex.isOK()) {
- lex.next();
- string const token = lex.getString();
-
- if (token == "family" ||
- token == "series" ||
- token == "shape" ||
- token == "size" ||
- token == "emph" ||
- token == "underbar" ||
- token == "noun" ||
- token == "number" ||
- token == "color") {
- lex.next();
- Int = lex.getInteger();
- } else if (token == "language") {
- lex.next();
- String = lex.getString();
- } else if (token == "toggleall") {
- lex.next();
- Bool = lex.getBool();
- } else {
- // Unrecognised token
- break;
- }
+ string token;
+ if (lex.next())
+ token = lex.getString();
- if (!lex.isOK())
+ if (token.empty() || !lex.next())
break;
- ++nset;
if (token == "family") {
- font.setFamily(static_cast<LyXFont::FONT_FAMILY>(Int));
-
+ int const next = lex.getInteger();
+ font.setFamily(LyXFont::FONT_FAMILY(next));
+
} else if (token == "series") {
- font.setSeries(static_cast<LyXFont::FONT_SERIES>(Int));
+ int const next = lex.getInteger();
+ font.setSeries(LyXFont::FONT_SERIES(next));
} else if (token == "shape") {
- font.setShape(static_cast<LyXFont::FONT_SHAPE>(Int));
+ int const next = lex.getInteger();
+ font.setShape(LyXFont::FONT_SHAPE(next));
} else if (token == "size") {
- font.setSize(static_cast<LyXFont::FONT_SIZE>(Int));
-
- } else if (token == "emph") {
- font.setEmph(static_cast<LyXFont::FONT_MISC_STATE>(Int));
+ int const next = lex.getInteger();
+ font.setSize(LyXFont::FONT_SIZE(next));
- } else if (token == "underbar") {
- font.setUnderbar(static_cast<LyXFont::FONT_MISC_STATE>(Int));
+ } else if (token == "emph" || token == "underbar" ||
+ token == "noun" || token == "number") {
- } else if (token == "noun") {
- font.setNoun(static_cast<LyXFont::FONT_MISC_STATE>(Int));
+ int const next = lex.getInteger();
+ LyXFont::FONT_MISC_STATE const misc =
+ LyXFont::FONT_MISC_STATE(next);
- } else if (token == "number") {
- font.setNumber(static_cast<LyXFont::FONT_MISC_STATE>(Int));
+ if (token == "emph")
+ font.setEmph(misc);
+ else if (token == "underbar")
+ font.setUnderbar(misc);
+ else if (token == "noun")
+ font.setNoun(misc);
+ else if (token == "number")
+ font.setNumber(misc);
} else if (token == "color") {
- font.setColor(static_cast<LColor::color>(Int));
+ int const next = lex.getInteger();
+ font.setColor(LColor::color(next));
} else if (token == "language") {
- if (String == "ignore")
+ string const next = lex.getString();
+ if (next == "ignore")
font.setLanguage(ignore_language);
else
- font.setLanguage(languages.getLanguage(String));
+ font.setLanguage(languages.getLanguage(next));
} else if (token == "toggleall") {
- toggle = Bool;
+ toggle = lex.getBool();
+
+ } else {
+ // Unrecognised token
+ break;
}
+
+ ++nset;
}
return (nset > 0);
}
{
toggleAndShow(bv, freefont, toggleall);
bv->owner()->view_state_changed();
- bv->buffer()->markDirty();
bv->owner()->message(_("Character set"));
}
{
LyXFont font(LyXFont::ALL_IGNORE);
Language const * lang = languages.getLanguage(l);
- if (lang) {
- font.setLanguage(lang);
- toggleAndShow(bv, font);
- } else
- Alert::alert(_("Error! unknown language"),l);
+ if (!lang)
+ return;
+
+ font.setLanguage(lang);
+ toggleAndShow(bv, font);
}
-// Change environment depth.
-// if decInc >= 0, increment depth
-// if decInc < 0, decrement depth
-void changeDepth(BufferView * bv, LyXText * text, int decInc)
+bool changeDepth(BufferView * bv, LyXText * text, DEPTH_CHANGE type, bool test_only)
{
if (!bv->available() || !text)
- return;
-
- bv->hideCursor();
- bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
- if (decInc >= 0)
- text->incDepth(bv);
- else
- text->decDepth(bv);
+ return false;
+
+ if (test_only)
+ return text->changeDepth(type, true);
+
+ bv->update(BufferView::SELECT);
+ bool const changed = text->changeDepth(type, false);
if (text->inset_owner)
- bv->updateInset((Inset *)text->inset_owner, true);
- bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ bv->updateInset((Inset *)text->inset_owner);
+ bv->update(BufferView::SELECT);
+ return changed;
}
if (!bv->available())
return string();
+ if (mathcursor)
+ return mathcursor->info();
+
ostringstream state;
LyXText * text = bv->getLyXText();
buffer->params.getLyXTextClass().defaultfont();
font.reduce(defaultfont);
-#if USE_BOOST_FORMAT
- state << boost::format(_("Font: %1$s")) % font.stateText(&buffer->params);
-#else
- state << _("Font: ") << font.stateText(&buffer->params);
-#endif
+ // avoid _(...) re-entrance problem
+ string const s = font.stateText(&buffer->params);
+ state << bformat(_("Font: %1$s"), s);
+
+ // state << bformat(_("Font: %1$s"), font.stateText(&buffer->params));
// The paragraph depth
int depth = text->getDepth();
- if (depth > 0) {
-#if USE_BOOST_FORMAT
- state << boost::format(_(", Depth: %1$d")) % depth;
-#else
- state << _(", Depth: ") << depth;
-#endif
- }
-
+ if (depth > 0)
+ state << bformat(_(", Depth: %1$s"), tostr(depth));
// The paragraph spacing, but only if different from
// buffer spacing.
}
#ifdef DEVEL_VERSION
state << _(", Paragraph: ") << text->cursor.par()->id();
+ state << " Inset: " <<
+ (text->cursor.par()->inInset() ? text->cursor.par()->inInset()->id() : -1);
#endif
return STRCONV(state.str());
}
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);
+ bv->update(text, BufferView::SELECT);
+ text->toggleFree(font, toggleall);
+ bv->update(text, BufferView::SELECT);
if (font.language() != ignore_language ||
font.number() != LyXFont::IGNORE) {
LyXCursor & cursor = text->cursor;
- text->computeBidiTables(bv->buffer(), cursor.row());
+ text->computeBidiTables(bv->buffer(), text->cursorRow());
if (cursor.boundary() !=
- text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(),
+ text->isBoundary(bv->buffer(), *cursor.par(), cursor.pos(),
text->real_current_font))
- text->setCursor(bv, cursor.par(), cursor.pos(),
+ text->setCursor(cursor.par(), cursor.pos(),
false, !cursor.boundary());
}
}
+
+}; // namespace bv_funcs
projects / lyx.git / blobdiff