#include <config.h>
-#include "buffer.h"
#include "bufferview_funcs.h"
+
+#include "author.h"
+#include "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
-#include "language.h"
#include "gettext.h"
+#include "language.h"
+#include "LColor.h"
#include "lyxlex.h"
#include "lyxrow.h"
#include "paragraph.h"
#include "ParagraphParameters.h"
-#include "frontends/LyXView.h"
#include "frontends/Alert.h"
+#include "frontends/LyXView.h"
+
+#include "insets/insettext.h"
+
#include "mathed/math_cursor.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
-#include "insets/insettext.h"
+#include "support/std_sstream.h"
-using namespace lyx::support;
+using lyx::support::bformat;
using std::istringstream;
using std::ostringstream;
+using std::string;
namespace {
<< "color " << font.color() << '\n'
<< "language " << lang << '\n'
<< "toggleall " << tostr(toggle);
- data = STRCONV(os.str());
+ data = os.str();
return true;
}
// If successful, returns true
bool string2font(string const & data, LyXFont & font, bool & toggle)
{
- istringstream is(STRCONV(data));
+ istringstream is(data);
LyXLex lex(0,0);
lex.setStream(is);
LyXText * text = bv->getLyXText();
Buffer * buffer = bv->buffer();
- LyXCursor const & c(text->cursor);
+ LyXCursor const & c = text->cursor;
- bool const show_change = buffer->params.tracking_changes
- && c.pos() != c.par()->size()
- && c.par()->lookupChange(c.pos()) != Change::UNCHANGED;
+ bool const show_change = buffer->params().tracking_changes
+ && text->cursor.pos() != text->cursorPar()->size()
+ && text->cursorPar()->lookupChange(c.pos()) != Change::UNCHANGED;
if (show_change) {
- Change change(c.par()->lookupChangeFull(c.pos()));
- Author const & a(bv->buffer()->authors().get(change.author));
+ Change change = text->cursorPar()->lookupChangeFull(c.pos());
+ Author const & a = bv->buffer()->params().authors().get(change.author);
state << _("Change: ") << a.name();
- if (!a.email().empty()) {
+ if (!a.email().empty())
state << " (" << a.email() << ")";
- }
if (change.changetime)
state << _(" at ") << ctime(&change.changetime);
state << " : ";
// I think we should only show changes from the default
// font. (Asger)
LyXFont font = text->real_current_font;
- LyXFont const & defaultfont =
- buffer->params.getLyXTextClass().defaultfont();
- font.reduce(defaultfont);
+ font.reduce(buffer->params().getLyXTextClass().defaultfont());
// avoid _(...) re-entrance problem
- string const s = font.stateText(&buffer->params);
+ string const s = font.stateText(&buffer->params());
state << bformat(_("Font: %1$s"), s);
// state << bformat(_("Font: %1$s"), font.stateText(&buffer->params));
// The paragraph spacing, but only if different from
// buffer spacing.
- if (!text->cursor.par()->params().spacing().isDefault()) {
+ if (!text->cursorPar()->params().spacing().isDefault()) {
Spacing::Space cur_space =
- text->cursor.par()->params().spacing().getSpace();
+ text->cursorPar()->params().spacing().getSpace();
state << _(", Spacing: ");
switch (cur_space) {
break;
case Spacing::Other:
state << _("Other (")
- << text->cursor.par()->params().spacing().getValue()
+ << text->cursorPar()->params().spacing().getValue()
<< ')';
break;
case Spacing::Default:
}
}
#ifdef DEVEL_VERSION
- state << _(", Paragraph: ") << text->cursor.par()->id();
+ state << _(", Paragraph: ") << text->cursorPar()->id();
state << _(", Position: ") << text->cursor.pos();
RowList::iterator rit = text->cursorRow();
state << bformat(_(", Row b:%1$d e:%2$d"), rit->pos(), rit->end());
- state << _(", Inset: ") <<
- (text->cursor.par()->inInset() ? text->cursor.par()->inInset()->id() : -1);
+ state << _(", Inset: ");
+ InsetOld * inset = text->cursorPar()->inInset();
+ if (inset)
+ state << inset << " id: " << inset->id()
+ << " text: " << inset->getLyXText(bv, true)
+ << " owner: " << inset->owner();
+ else
+ state << -1;
#endif
- return STRCONV(state.str());
+ return state.str();
}
if (font.language() != ignore_language ||
font.number() != LyXFont::IGNORE) {
LyXCursor & cursor = text->cursor;
- text->computeBidiTables(text->cursor.par(), *bv->buffer(),
+ text->computeBidiTables(text->cursorPar(), *bv->buffer(),
text->cursorRow());
if (cursor.boundary() !=
- text->isBoundary(*bv->buffer(), *cursor.par(), cursor.pos(),
+ text->isBoundary(*bv->buffer(), *text->cursorPar(), cursor.pos(),
text->real_current_font))
text->setCursor(cursor.par(), cursor.pos(),
false, !cursor.boundary());