#include "BufferList.h"
#include "BufferParams.h"
#include "BufferView.h"
-#include "Bullet.h"
#include "Changes.h"
#include "Cursor.h"
#include "CutAndPaste.h"
}
-FontInfo Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const
+FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const
{
- LayoutPtr const & layout = pars_[pit].layout();
+ Layout const & layout = pars_[pit].layout();
if (!pars_[pit].getDepth()) {
- FontInfo lf = layout->resfont;
+ FontInfo lf = layout.resfont;
// In case the default family has been customized
- if (layout->font.family() == INHERIT_FAMILY)
+ if (layout.font.family() == INHERIT_FAMILY)
lf.setFamily(buffer.params().getFont().fontInfo().family());
return lf;
}
- FontInfo font = layout->font;
+ FontInfo font = layout.font;
// Realize with the fonts of lesser depth.
//font.realize(outerFont(pit, paragraphs()));
font.realize(buffer.params().getFont().fontInfo());
}
-FontInfo Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const
+FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const
{
- LayoutPtr const & layout = par.layout();
+ Layout const & layout = par.layout();
if (!par.getDepth()) {
- FontInfo lf = layout->reslabelfont;
+ FontInfo lf = layout.reslabelfont;
// In case the default family has been customized
- if (layout->labelfont.family() == INHERIT_FAMILY)
+ if (layout.labelfont.family() == INHERIT_FAMILY)
lf.setFamily(buffer.params().getFont().fontInfo().family());
return lf;
}
- FontInfo font = layout->labelfont;
+ FontInfo font = layout.labelfont;
// Realize with the fonts of lesser depth.
font.realize(buffer.params().getFont().fontInfo());
pos_type pos, Font const & fnt, Font const & display_font)
{
Font font = fnt;
- LayoutPtr const & layout = pars_[pit].layout();
+ Layout const & layout = pars_[pit].layout();
// Get concrete layout font to reduce against
FontInfo layoutfont;
if (pos < pars_[pit].beginOfBody())
- layoutfont = layout->labelfont;
+ layoutfont = layout.labelfont;
else
- layoutfont = layout->font;
+ layoutfont = layout.font;
// Realize against environment font information
if (pars_[pit].getDepth()) {
pars_[tp].getDepth()) {
tp = outerHook(tp, paragraphs());
if (tp != pit_type(paragraphs().size()))
- layoutfont.realize(pars_[tp].layout()->font);
+ layoutfont.realize(pars_[tp].layout().font);
}
}
BOOST_ASSERT(start != end);
BufferParams const & bufparams = buffer.params();
- LayoutPtr const & lyxlayout = bufparams.getTextClass()[layout];
+ Layout const & lyxlayout = bufparams.documentClass()[layout];
for (pit_type pit = start; pit != end; ++pit) {
Paragraph & par = pars_[pit];
par.applyLayout(lyxlayout);
- if (lyxlayout->margintype == MARGIN_MANUAL)
+ if (lyxlayout.margintype == MARGIN_MANUAL)
par.setLabelWidthString(par.translateIfPossible(
- lyxlayout->labelstring(), buffer.params()));
+ lyxlayout.labelstring(), buffer.params()));
}
}
// special handling of new environment insets
BufferView & bv = cur.bv();
BufferParams const & params = bv.buffer().params();
- LayoutPtr const & lyxlayout = params.getTextClass()[layout];
- if (lyxlayout->is_environment) {
+ Layout const & lyxlayout = params.documentClass()[layout];
+ if (lyxlayout.is_environment) {
// move everything in a new environment inset
LYXERR(Debug::DEBUG, "setting layout " << to_utf8(layout));
lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN));
lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT));
lyx::dispatch(FuncRequest(LFUN_CUT));
- Inset * inset = new InsetEnvironment(params, layout);
+ Inset * inset = new InsetEnvironment(bv.buffer(), layout);
insertInset(cur, inset);
//inset->edit(cur, true);
//lyx::dispatch(FuncRequest(LFUN_PASTE));
static bool changeDepthAllowed(Text::DEPTH_CHANGE type,
Paragraph const & par, int max_depth)
{
- if (par.layout()->labeltype == LABEL_BIBLIO)
+ if (par.layout().labeltype == LABEL_BIBLIO)
return false;
int const depth = par.params().depth();
if (type == Text::INC_DEPTH && depth < max_depth)
FontInfo layoutfont;
pit_type pit = cur.pit();
if (cur.pos() < pars_[pit].beginOfBody())
- layoutfont = getLabelFont(cur.buffer(), pars_[pit]);
+ layoutfont = labelFont(cur.buffer(), pars_[pit]);
else
- layoutfont = getLayoutFont(cur.buffer(), pit);
+ layoutfont = layoutFont(cur.buffer(), pit);
// Update current font
cur.real_current_font.update(font,
// nested insets.
Language const * language = buffer.params().language;
for (CursorSlice dit = begin; dit != end; dit.forwardPos()) {
- if (dit.pos() != dit.lastpos()) {
- pit_type const pit = dit.pit();
- pos_type const pos = dit.pos();
- Inset * inset = pars_[pit].getInset(pos);
- if (inset && inset->noFontChange()) {
- // We need to propagate the font change to all
- // text cells of the inset (bug 1973).
- // FIXME: This should change, see documentation
- // of noFontChange in Inset.h
- setInsetFont(bv, pit, pos, font, toggleall);
- }
- TextMetrics const & tm = bv.textMetrics(this);
- Font f = tm.getDisplayFont(pit, pos);
- f.update(font, language, toggleall);
- setCharFont(buffer, pit, pos, f, tm.font_);
+ if (dit.pos() == dit.lastpos())
+ continue;
+ pit_type const pit = dit.pit();
+ pos_type const pos = dit.pos();
+ Inset * inset = pars_[pit].getInset(pos);
+ if (inset && inset->noFontChange()) {
+ // We need to propagate the font change to all
+ // text cells of the inset (bug 1973).
+ // FIXME: This should change, see documentation
+ // of noFontChange in Inset.h
+ setInsetFont(bv, pit, pos, font, toggleall);
}
+ TextMetrics const & tm = bv.textMetrics(this);
+ Font f = tm.displayFont(pit, pos);
+ f.update(font, language, toggleall);
+ setCharFont(buffer, pit, pos, f, tm.font_);
}
}
{
BOOST_ASSERT(this == cur.text());
- docstring idxstring;
if (cur.selection())
- idxstring = cur.selectionAsString(false);
- else {
- // Try implicit word selection. If there is a change
- // in the language the implicit word selection is
- // disabled.
- Cursor tmpcur = cur;
- selectWord(tmpcur, PREVIOUS_WORD);
-
- if (!tmpcur.selection())
- cur.message(_("Nothing to index!"));
- else if (tmpcur.selBegin().pit() != tmpcur.selEnd().pit())
- cur.message(_("Cannot index more than one paragraph!"));
- else
- idxstring = tmpcur.selectionAsString(false);
- }
-
- return idxstring;
+ return cur.selectionAsString(false);
+
+ // Try implicit word selection. If there is a change
+ // in the language the implicit word selection is
+ // disabled.
+ Cursor tmpcur = cur;
+ selectWord(tmpcur, PREVIOUS_WORD);
+
+ if (!tmpcur.selection())
+ cur.message(_("Nothing to index!"));
+ else if (tmpcur.selBegin().pit() != tmpcur.selEnd().pit())
+ cur.message(_("Cannot index more than one paragraph!"));
+ else
+ return tmpcur.selectionAsString(false);
+
+ return docstring();
}
pit_type undopit = undoSpan(cur.selEnd().pit());
recUndo(cur, cur.selBegin().pit(), undopit - 1);
+ //FIXME UNICODE
+ string const argument = to_utf8(arg);
for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit();
pit <= end; ++pit) {
Paragraph & par = pars_[pit];
ParagraphParameters params = par.params();
- params.read(to_utf8(arg), merge);
- Layout const & layout = *(par.layout());
- par.params().apply(params, layout);
+ params.read(argument, merge);
+ par.params().apply(params, par.layout());
}
}
for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit();
pit <= end; ++pit) {
Paragraph & par = pars_[pit];
- Layout const & layout = *(par.layout());
- par.params().apply(p, layout);
+ par.params().apply(p, par.layout());
}
}
BOOST_ASSERT(this == cur.text());
BOOST_ASSERT(inset);
cur.paragraph().insertInset(cur.pos(), inset, cur.current_font,
- Change(cur.buffer().params().trackChanges ?
- Change::INSERTED : Change::UNCHANGED));
+ Change(cur.buffer().params().trackChanges
+ ? Change::INSERTED : Change::UNCHANGED));
}
void Text::insertStringAsLines(Cursor & cur, docstring const & str)
{
cur.buffer().insertStringAsLines(pars_, cur.pit(), cur.pos(),
- cur.current_font, str, autoBreakRows_);
+ cur.current_font, str, autoBreakRows_);
}
bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos,
bool setfont, bool boundary)
{
+ TextMetrics const & tm = cur.bv().textMetrics(this);
+ bool const update_needed = !tm.contains(par);
Cursor old = cur;
setCursorIntern(cur, par, pos, setfont, boundary);
- return cur.bv().checkDepm(cur, old);
+ return cur.bv().checkDepm(cur, old) || update_needed;
}
// position 'left_pos' + 1.
if (new_pos_is_RTL) {
new_pos = left_pos + 1;
- // if the position *after* left_pos is not RTL, set boundary to
- // true (we want to be *after* left_pos, not before left_pos + 1!)
- new_boundary = !cur.paragraph().getFontSettings(
- cur.bv().buffer().params(), new_pos).isVisibleRightToLeft();
+ // set the boundary to true in two situations:
+ if (
+ // 1. if new_pos is now lastpos (which means that we're moving left
+ // to the end of an RTL chunk which is at the end of an LTR
+ // paragraph);
+ new_pos == cur.lastpos()
+ // 2. if the position *after* left_pos is not RTL (we want to be
+ // *after* left_pos, not before left_pos + 1!)
+ || !cur.paragraph().getFontSettings(cur.bv().buffer().params(),
+ new_pos).isVisibleRightToLeft()
+ )
+ new_boundary = true;
+ else // set the boundary to false
+ new_boundary = false;
}
// Otherwise (if the character at position 'left_pos' is LTR), then
// moving to the left of it is as easy as setting the new position
// position 'right_pos' + 1.
if (!new_pos_is_RTL) {
new_pos = right_pos + 1;
- // if the position *after* right_pos is RTL, set boundary to
- // true (we want to be *after* right_pos, not before right_pos + 1!)
- new_boundary = cur.paragraph().getFontSettings(
- cur.bv().buffer().params(), new_pos).isVisibleRightToLeft();
+ // set the boundary to true in two situations:
+ if (
+ // 1. if new_pos is now lastpos (which means that we're moving
+ // right to the end of an LTR chunk which is at the end of an
+ // RTL paragraph);
+ new_pos == cur.lastpos()
+ // 2. if the position *after* right_pos is RTL (we want to be
+ // *after* right_pos, not before right_pos + 1!)
+ || cur.paragraph().getFontSettings(cur.bv().buffer().params(),
+ new_pos).isVisibleRightToLeft()
+ )
+ new_boundary = true;
+ else // set the boundary to false
+ new_boundary = false;
}
// Otherwise (if the character at position 'right_pos' is RTL), then
// moving to the right of it is as easy as setting the new position
projects / lyx.git / blobdiff