* 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 "bufferview_funcs.h"
-#include "BufferView.h"
-#include "paragraph.h"
-#include "lyxfont.h"
-#include "lyxlex.h"
-#include "lyxtext.h"
+
+#include "author.h"
#include "buffer.h"
-#include "lyx_cb.h"
-#include "language.h"
+#include "bufferparams.h"
+#include "BufferView.h"
#include "gettext.h"
+#include "language.h"
+#include "LColor.h"
+#include "lyxlex.h"
+#include "lyxrow.h"
+#include "paragraph.h"
#include "ParagraphParameters.h"
-#include "author.h"
-#include "changes.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/lstrings.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
-#include "insets/updatableinset.h"
+using lyx::support::bformat;
+
+using std::istringstream;
+using std::ostringstream;
+using std::string;
-#include "support/BoostFormat.h"
namespace {
+
LyXFont freefont(LyXFont::ALL_IGNORE);
bool toggleall(false);
+
}
+namespace bv_funcs {
// Set data using font and toggle
// If successful, returns true
if (token == "family") {
int const next = lex.getInteger();
- LyXFont::FONT_FAMILY const family =
- static_cast<LyXFont::FONT_FAMILY>(next);
- font.setFamily(family);
+ font.setFamily(LyXFont::FONT_FAMILY(next));
} else if (token == "series") {
int const next = lex.getInteger();
- LyXFont::FONT_SERIES const series =
- static_cast<LyXFont::FONT_SERIES>(next);
- font.setSeries(series);
+ font.setSeries(LyXFont::FONT_SERIES(next));
} else if (token == "shape") {
int const next = lex.getInteger();
- LyXFont::FONT_SHAPE const shape =
- static_cast<LyXFont::FONT_SHAPE>(next);
- font.setShape(shape);
+ font.setShape(LyXFont::FONT_SHAPE(next));
} else if (token == "size") {
int const next = lex.getInteger();
- LyXFont::FONT_SIZE const size =
- static_cast<LyXFont::FONT_SIZE>(next);
- font.setSize(size);
+ font.setSize(LyXFont::FONT_SIZE(next));
} else if (token == "emph" || token == "underbar" ||
token == "noun" || token == "number") {
int const next = lex.getInteger();
LyXFont::FONT_MISC_STATE const misc =
- static_cast<LyXFont::FONT_MISC_STATE>(next);
+ LyXFont::FONT_MISC_STATE(next);
if (token == "emph")
font.setEmph(misc);
} else if (token == "color") {
int const next = lex.getInteger();
- LColor::color const color =
- static_cast<LColor::color>(next);
- font.setColor(color);
+ font.setColor(LColor::color(next));
} else if (token == "language") {
string const next = lex.getString();
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);
}
-// 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;
+ return false;
- bv->hideCursor();
- bv->update(BufferView::SELECT);
- if (decInc >= 0)
- text->incDepth();
- else
- text->decDepth();
+ if (test_only)
+ return text->changeDepth(type, true);
+
+ 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;
}
if (!bv->available())
return string();
+ if (mathcursor)
+ return mathcursor->info();
+
ostringstream state;
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);
-
-#if USE_BOOST_FORMAT
- state << boost::format(_("Font: %1$s")) % font.stateText(&buffer->params);
-#else
- state << _("Font: ") << font.stateText(&buffer->params);
-#endif
+ font.reduce(buffer->params().getLyXTextClass().defaultfont());
+
+ // 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.
- 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: ");
+ 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();
}
}
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->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());
}
}
+
+
+// deletes a selection during an insertion
+void replaceSelection(LyXText * lt)
+{
+ if (lt->selection.set()) {
+ lt->cutSelection(true, false);
+ lt->bv()->update();
+ }
+}
+
+}; // namespace bv_funcs
projects / lyx.git / blobdiff