* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
* \author John Levon
* \author Angus Leeming
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.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 "insets/insettext.h"
+#include <boost/bind.hpp>
+#include <algorithm>
+
+using namespace lyx::support;
-#include "support/BoostFormat.h"
namespace {
<< "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);
toggleAndShow(bv, font);
}
+
void lang(BufferView * bv, string const & l)
{
- LyXFont font(LyXFont::ALL_IGNORE);
Language const * lang = languages.getLanguage(l);
if (!lang)
return;
+ LyXFont font(LyXFont::ALL_IGNORE);
font.setLanguage(lang);
toggleAndShow(bv, font);
}
bool changeDepth(BufferView * bv, LyXText * text, DEPTH_CHANGE type, bool test_only)
{
if (!bv->available() || !text)
- return false;
+ return false;
if (test_only)
return text->changeDepth(type, true);
- bv->hideCursor();
- bv->update(BufferView::SELECT);
bool const changed = text->changeDepth(type, false);
if (text->inset_owner)
- bv->updateInset((Inset *)text->inset_owner);
- bv->update(BufferView::SELECT);
+ bv->updateInset(text->inset_owner);
return changed;
}
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());
}
}
LyXText * text = bv->getLyXText();
- // FIXME: can this happen ??
- if (!text)
- return;
-
- bv->hideCursor();
- bv->update(text, BufferView::SELECT);
text->toggleFree(font, toggleall);
- bv->update(text, BufferView::SELECT);
+ bv->update();
if (font.language() != ignore_language ||
font.number() != LyXFont::IGNORE) {
LyXCursor & cursor = text->cursor;
- text->computeBidiTables(bv->buffer(), cursor.row());
+ text->computeBidiTables(text->cursor.par(), *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(cursor.par(), cursor.pos(),
false, !cursor.boundary());
}
}
+
+// deletes a selection during an insertion
+void replaceSelection(LyXText * lt)
+{
+ if (lt->selection.set()) {
+ lt->cutSelection(true, false);
+ lt->bv()->update();
+ }
+}
+
}; // namespace bv_funcs