#include "Changes.h"
#include "Counters.h"
#include "Encoding.h"
-#include "debug.h"
-#include "gettext.h"
#include "InsetList.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "Font.h"
#include "FontList.h"
#include "LyXRC.h"
-#include "Messages.h"
#include "OutputParams.h"
#include "output_latex.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "sgml.h"
+#include "TextClass.h"
#include "TexRow.h"
#include "VSpace.h"
#include "frontends/alert.h"
-#include "frontends/FontMetrics.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetLabel.h"
-#include "insets/InsetOptArg.h"
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
+#include "support/Messages.h"
#include "support/textutils.h"
-#include "support/convert.h"
-#include "support/unicode.h"
#include <sstream>
#include <vector>
-using std::endl;
-using std::string;
-using std::ostream;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::contains;
-using support::lowercase;
-using support::prefixIs;
-using support::suffixIs;
-using support::rsplit;
-using support::uppercase;
-
namespace {
/// Inset identifier (above 0x10ffff, for ucs-4)
char_type const META_INSET = 0x200001;
Layout const & style);
/// Output consecutive unicode chars, belonging to the same script as
- /// specified by the latex macro \p ltx, to \p os starting from \p c.
+ /// specified by the latex macro \p ltx, to \p os starting from \p i.
/// \return the number of characters written.
- int writeScriptChars(odocstream & os, char_type c, docstring const & ltx,
- Change &, Encoding const &, pos_type &);
+ int writeScriptChars(odocstream & os, docstring const & ltx,
+ Change &, Encoding const &, pos_type & i);
/// This could go to ParagraphParameters if we want to.
int startTeXParParams(BufferParams const &, odocstream &, TexRow &,
bool latexSpecialPhrase(
odocstream & os,
pos_type & i,
- unsigned int & column);
+ unsigned int & column,
+ OutputParams & runparams);
///
void validate(LaTeXFeatures & features,
pos_type initial) const;
/// match a string against a particular point in the paragraph
- bool isTextAt(std::string const & str, pos_type pos) const;
+ bool isTextAt(string const & str, pos_type pos) const;
/// Which Paragraph owns us?
Paragraph * owner_;
};
-
-
-using std::endl;
-using std::upper_bound;
-using std::lower_bound;
-using std::string;
-
-
// Initialization of the counter for the paragraph id's,
unsigned int Paragraph::Private::paragraph_id = 0;
};
special_phrase const special_phrases[] = {
- { "LyX", from_ascii("\\protect\\LyX{}"), false },
- { "TeX", from_ascii("\\protect\\TeX{}"), true },
- { "LaTeX2e", from_ascii("\\protect\\LaTeXe{}"), true },
- { "LaTeX", from_ascii("\\protect\\LaTeX{}"), true },
+ { "LyX", from_ascii("\\LyX{}"), false },
+ { "TeX", from_ascii("\\TeX{}"), true },
+ { "LaTeX2e", from_ascii("\\LaTeXe{}"), true },
+ { "LaTeX", from_ascii("\\LaTeX{}"), true },
};
size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase);
}
-bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const {
+bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const
+{
// keep the logic here in sync with the logic of eraseChars()
-
- if (!trackChanges) {
+ if (!trackChanges)
return true;
- }
-
- Change change = d->changes_.lookup(size());
+ Change const change = d->changes_.lookup(size());
return change.type == Change::INSERTED && change.author == 0;
}
if (change.type != Change::DELETED) {
for (pos_type pos = 0; pos < size(); ++pos) {
- if (isInset(pos))
- getInset(pos)->setChange(change);
+ if (Inset * inset = getInset(pos))
+ inset->setChange(change);
}
}
}
void Paragraph::setChange(pos_type pos, Change const & change)
{
BOOST_ASSERT(pos >= 0 && pos <= size());
-
d->changes_.set(change, pos);
// see comment in setChange(Change const &) above
-
- if (change.type != Change::DELETED &&
- pos < size() && isInset(pos)) {
- getInset(pos)->setChange(change);
- }
+ if (change.type != Change::DELETED && pos < size())
+ if (Inset * inset = getInset(pos))
+ inset->setChange(change);
}
Change const & Paragraph::lookupChange(pos_type pos) const
{
BOOST_ASSERT(pos >= 0 && pos <= size());
-
return d->changes_.lookup(pos);
}
switch (lookupChange(pos).type) {
case Change::UNCHANGED:
// accept changes in nested inset
- if (pos < size() && isInset(pos))
- getInset(pos)->acceptChanges(bparams);
-
+ if (Inset * inset = getInset(pos))
+ inset->acceptChanges(bparams);
break;
case Change::INSERTED:
d->changes_.set(Change(Change::UNCHANGED), pos);
// also accept changes in nested inset
- if (pos < size() && isInset(pos)) {
- getInset(pos)->acceptChanges(bparams);
- }
+ if (Inset * inset = getInset(pos))
+ inset->acceptChanges(bparams);
break;
case Change::DELETED:
switch (lookupChange(pos).type) {
case Change::UNCHANGED:
// reject changes in nested inset
- if (pos < size() && isInset(pos)) {
- getInset(pos)->rejectChanges(bparams);
- }
+ if (Inset * inset = getInset(pos))
+ inset->rejectChanges(bparams);
break;
case Change::INSERTED:
// This is actually very common when parsing buffers (and
// maybe inserting ascii text)
- if (pos == text_.size()) {
+ if (pos == pos_type(text_.size())) {
// when appending characters, no need to update tables
text_.push_back(c);
return;
int Paragraph::Private::writeScriptChars(odocstream & os,
- char_type c,
docstring const & ltx,
Change & runningChange,
Encoding const & encoding,
pos_type & i)
{
- // We only arrive here when a proper language for character c has not
- // been specified (i.e., it could not be translated in the current
+ // FIXME: modifying i here is not very nice...
+
+ // We only arrive here when a proper language for character text_[i] has
+ // not been specified (i.e., it could not be translated in the current
// latex encoding) and it belongs to a known script.
- // Parameter ltx contains the latex translation of c as specified in
+ // Parameter ltx contains the latex translation of text_[i] as specified in
// the unicodesymbols file and is something like "\textXXX{<spec>}".
- // The latex macro name "textXXX" specifies the script to which c
+ // The latex macro name "textXXX" specifies the script to which text_[i]
// belongs and we use it in order to check whether characters from the
// same script immediately follow, such that we can collect them in a
// single "\textXXX" macro. So, we have to retain "\textXXX{<spec>"
if (runparams.moving_arg)
os << "\\protect ";
- os << "\\\\\n";
}
texrow.newline();
texrow.start(owner_->id(), i + 1);
bool close = false;
odocstream::pos_type const len = os.tellp();
- if ((inset->lyxCode() == GRAPHICS_CODE
- || inset->lyxCode() == MATH_CODE
- || inset->lyxCode() == HYPERLINK_CODE)
- && running_font.isRightToLeft()) {
+ if (inset->forceLTR()
+ && running_font.isRightToLeft()
+ // ERT is an exception, it should be output with no decorations at all
+ && inset->lyxCode() != ERT_CODE) {
if (running_font.language()->lang() == "farsi")
os << "\\beginL{}";
else
default:
// LyX, LaTeX etc.
- if (latexSpecialPhrase(os, i, column))
+ if (latexSpecialPhrase(os, i, column, runparams))
return;
if (c == '\0')
docstring const latex = encoding.latexChar(c);
if (Encodings::isKnownScriptChar(c, script)
&& prefixIs(latex, from_ascii("\\" + script)))
- column += writeScriptChars(os, c, latex,
+ column += writeScriptChars(os, latex,
running_change, encoding, i) - 1;
else if (latex.length() > 1 && latex[latex.length() - 1] != '}') {
// Prevent eating of a following
os.put(c);
// In T1 encoding, these characters exist
// but we should avoid ligatures
- if (i + 1 > int(text_.size()) || text_[i + 1] != c)
+ if (i + 1 >= int(text_.size()) || text_[i + 1] != c)
return true;
os << "\\,{}";
column += 3;
bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
- unsigned int & column)
+ unsigned int & column, OutputParams & runparams)
{
// FIXME: if we have "LaTeX" with a font
// change in the middle (before the 'T', then
for (size_t pnr = 0; pnr < phrases_nr; ++pnr) {
if (!isTextAt(special_phrases[pnr].phrase, i))
continue;
+ if (runparams.moving_arg)
+ os << "\\protect";
os << special_phrases[pnr].macro;
i += special_phrases[pnr].phrase.length() - 1;
column += special_phrases[pnr].macro.length() - 1;
depth_type & dth) const
{
// The beginning or end of a deeper (i.e. nested) area?
- if (dth != params().depth()) {
- if (params().depth() > dth) {
- while (params().depth() > dth) {
+ if (dth != d->params_.depth()) {
+ if (d->params_.depth() > dth) {
+ while (d->params_.depth() > dth) {
os << "\n\\begin_deeper";
++dth;
}
} else {
- while (params().depth() < dth) {
+ while (d->params_.depth() < dth) {
os << "\n\\end_deeper";
--dth;
}
}
// First write the layout
- os << "\n\\begin_layout " << to_utf8(layout()->name()) << '\n';
+ os << "\n\\begin_layout " << to_utf8(d->layout_->name()) << '\n';
- params().write(os);
+ d->params_.write(os);
Font font1(inherit_font, bparams.language);
char_type const c = d->text_[i];
switch (c) {
case META_INSET:
- {
- Inset const * inset = getInset(i);
- if (inset)
+ if (Inset const * inset = getInset(i)) {
if (inset->directWrite()) {
// international char, let it write
// code directly so it's shorter in
os << "\n\\end_inset\n\n";
column = 0;
}
- }
- break;
+ }
+ break;
case '\\':
os << "\n\\backslash\n";
column = 0;
}
// this check is to amend a bug. LyX sometimes
// inserts '\0' this could cause problems.
- if (c != '\0') {
- std::vector<char> tmp = ucs4_to_utf8(c);
- tmp.push_back('\0');
- os << &tmp[0];
- } else
+ if (c != '\0')
+ os << to_utf8(docstring(1, c));
+ else
lyxerr << "ERROR (Paragraph::writeFile):"
" NULL char in structure." << endl;
++column;
void Paragraph::validate(LaTeXFeatures & features) const
{
- d->validate(features, *layout());
+ d->validate(features, *d->layout_);
}
void Paragraph::appendString(docstring const & s, Font const & font,
Change const & change)
{
- size_t end = s.size();
+ pos_type end = s.size();
size_t oldsize = d->text_.size();
size_t newsize = oldsize + end;
size_t capacity = d->text_.capacity();
if (newsize >= capacity)
- d->text_.reserve(std::max(capacity + 100, newsize));
+ d->text_.reserve(max(capacity + 100, newsize));
// when appending characters, no need to update tables
d->text_.append(s);
// track change
d->changes_.insert(change, i);
}
- d->fontlist_.setRange(oldsize, newsize, font);
+ d->fontlist_.set(oldsize, font);
+ d->fontlist_.set(newsize - 1, font);
}
void Paragraph::resetFonts(Font const & font)
{
- d->fontlist_.setRange(0, d->text_.size(), font);
+ d->fontlist_.clear();
+ d->fontlist_.set(0, font);
+ d->fontlist_.set(d->text_.size() - 1, font);
}
// Gets uninstantiated font setting at position.
for (; cit != end; ++cit) {
if (cit->pos() >= pos) {
if (pos >= beginOfBody())
- return FontSpan(std::max(start, beginOfBody()),
+ return FontSpan(max(start, beginOfBody()),
cit->pos());
else
return FontSpan(start,
- std::min(beginOfBody() - 1,
+ min(beginOfBody() - 1,
cit->pos()));
}
start = cit->pos() + 1;
Font const Paragraph::getLabelFont
(BufferParams const & bparams, Font const & outerfont) const
{
- Font tmpfont = layout()->labelfont;
- tmpfont.setLanguage(getParLanguage(bparams));
- tmpfont.fontInfo().realize(outerfont.fontInfo());
- tmpfont.fontInfo().realize(bparams.getFont().fontInfo());
- return tmpfont;
+ FontInfo tmpfont = d->layout_->labelfont;
+ tmpfont.realize(outerfont.fontInfo());
+ tmpfont.realize(bparams.getFont().fontInfo());
+ return Font(tmpfont, getParLanguage(bparams));
}
Font const Paragraph::getLayoutFont
(BufferParams const & bparams, Font const & outerfont) const
{
- FontInfo tmpfont = layout()->font;
+ FontInfo tmpfont = d->layout_->font;
tmpfont.realize(outerfont.fontInfo());
tmpfont.realize(bparams.getFont().fontInfo());
return Font(tmpfont, getParLanguage(bparams));
void Paragraph::makeSameLayout(Paragraph const & par)
{
- layout(par.layout());
- // move to pimpl?
- d->params_ = par.params();
+ d->layout_ = par.d->layout_;
+ d->params_ = par.d->params_;
}
bool Paragraph::hasSameLayout(Paragraph const & par) const
{
- return par.layout() == layout() && d->params_.sameLayout(par.params());
+ return par.d->layout_ == d->layout_ && d->params_.sameLayout(par.d->params_);
}
depth_type Paragraph::getDepth() const
{
- return params().depth();
+ return d->params_.depth();
}
depth_type Paragraph::getMaxDepthAfter() const
{
- if (layout()->isEnvironment())
- return params().depth() + 1;
+ if (d->layout_->isEnvironment())
+ return d->params_.depth() + 1;
else
- return params().depth();
+ return d->params_.depth();
}
char Paragraph::getAlign() const
{
- if (params().align() == LYX_ALIGN_LAYOUT)
- return layout()->align;
+ if (d->params_.align() == LYX_ALIGN_LAYOUT)
+ return d->layout_->align;
else
- return params().align();
+ return d->params_.align();
}
-docstring const & Paragraph::getLabelstring() const
+docstring const & Paragraph::labelString() const
{
- return params().labelString();
+ return d->params_.labelString();
}
// the next two functions are for the manual labels
docstring const Paragraph::getLabelWidthString() const
{
- if (layout()->margintype == MARGIN_MANUAL)
- return params().labelWidthString();
+ if (d->layout_->margintype == MARGIN_MANUAL)
+ return d->params_.labelWidthString();
else
return _("Senseless with this layout!");
}
void Paragraph::setLabelWidthString(docstring const & s)
{
- params().labelWidthString(s);
+ d->params_.labelWidthString(s);
}
docstring const Paragraph::translateIfPossible(docstring const & s,
BufferParams const & bparams) const
{
- if (!support::isAscii(s) || s.empty()) {
+ if (!isAscii(s) || s.empty()) {
// This must be a user defined layout. We cannot translate
// this, since gettext accepts only ascii keys.
return s;
TextClass const & tclass = bparams.getTextClass();
docstring fmt;
- if (process_appendix && params().appendix())
+ if (process_appendix && d->params_.appendix())
fmt = translateIfPossible(layout->labelstring_appendix(),
bparams);
else
void Paragraph::applyLayout(LayoutPtr const & new_layout)
{
- layout(new_layout);
- LyXAlignment const oldAlign = params().align();
+ d->layout_ = new_layout;
+ LyXAlignment const oldAlign = d->params_.align();
- if (!(oldAlign & layout()->alignpossible)) {
+ if (!(oldAlign & d->layout_->alignpossible)) {
frontend::Alert::warning(_("Alignment not permitted"),
_("The new layout does not permit the alignment previously used.\nSetting to default."));
- params().align(LYX_ALIGN_LAYOUT);
+ d->params_.align(LYX_ALIGN_LAYOUT);
}
}
void Paragraph::setBeginOfBody()
{
- if (layout()->labeltype != LABEL_MANUAL) {
+ if (d->layout_->labeltype != LABEL_MANUAL) {
d->begin_of_body_ = 0;
return;
}
}
-bool Paragraph::forceDefaultParagraphs() const
+bool Paragraph::forceEmptyLayout() const
+{
+ return inInset() && inInset()->forceEmptyLayout();
+}
+
+
+bool Paragraph::allowParagraphCustomization() const
{
- return inInset() && inInset()->forceDefaultParagraphs(0);
+ return inInset() && inInset()->allowParagraphCustomization(0);
+}
+
+
+bool Paragraph::useEmptyLayout() const
+{
+ return inInset() && inInset()->useEmptyLayout();
}
odocstream & os, TexRow & texrow,
OutputParams const & runparams) const
{
- LYXERR(Debug::LATEX) << "SimpleTeXOnePar... " << this << endl;
+ LYXERR(Debug::LATEX, "SimpleTeXOnePar... " << this);
bool return_value = false;
// any special options in the paragraph and also we don't allow
// any environment other than the default layout of the text class
// to be valid!
- bool asdefault = forceDefaultParagraphs();
+ bool asdefault = forceEmptyLayout();
if (asdefault) {
style = bparams.getTextClass().defaultLayout();
} else {
- style = layout();
+ style = d->layout_;
}
// Current base font for all inherited font changes, without any
open_font = false;
}
+ // close babel's font environment before opening CJK.
+ if (!running_font.language()->babel().empty() &&
+ font.language()->encoding()->package() == Encoding::CJK) {
+ string end_tag = subst(lyxrc.language_command_end,
+ "$$lang",
+ running_font.language()->babel());
+ os << from_ascii(end_tag);
+ column += end_tag.length();
+ }
+
// Switch file encoding if necessary (and allowed)
if (!runparams.verbatim &&
- runparams.encoding->package() == Encoding::inputenc &&
- font.language()->encoding()->package() == Encoding::inputenc) {
- std::pair<bool, int> const enc_switch = switchEncoding(os, bparams,
- runparams.moving_arg, *(runparams.encoding),
- *(font.language()->encoding()));
+ runparams.encoding->package() == Encoding::none &&
+ font.language()->encoding()->package() == Encoding::none) {
+ pair<bool, int> const enc_switch = switchEncoding(os, bparams,
+ runparams, *(font.language()->encoding()));
if (enc_switch.first) {
column += enc_switch.second;
runparams.encoding = font.language()->encoding();
texrow, rp, running_font,
basefont, outerfont, open_font,
runningChange, *style, i, column);
- else
- d->latexSpecialChar(os, rp, running_font, runningChange,
- *style, i, column);
+ else {
+ try {
+ d->latexSpecialChar(os, rp, running_font, runningChange,
+ *style, i, column);
+ } catch (EncodingException & e) {
+ if (runparams.dryrun) {
+ os << "<" << _("LyX Warning: ")
+ << _("uncodable character") << " '";
+ os.put(c);
+ os << "'>";
+ } else {
+ // add location information and throw again.
+ e.par_id = id();
+ e.pos = i;
+ throw(e);
+ }
+ }
+ }
// Set the encoding to that returned from simpleTeXSpecialChars (see
// comment for encoding member in OutputParams.h)
runparams.moving_arg);
}
- LYXERR(Debug::LATEX) << "SimpleTeXOnePar...done " << this << endl;
+ LYXERR(Debug::LATEX, "SimpleTeXOnePar...done " << this);
return return_value;
}
bool Paragraph::emptyTag() const
{
for (pos_type i = 0; i < size(); ++i) {
- if (isInset(i)) {
- Inset const * inset = getInset(i);
+ if (Inset const * inset = getInset(i)) {
InsetCode lyx_code = inset->lyxCode();
if (lyx_code != TOC_CODE &&
lyx_code != INCLUDE_CODE &&
string Paragraph::getID(Buffer const & buf, OutputParams const & runparams) const
{
for (pos_type i = 0; i < size(); ++i) {
- if (isInset(i)) {
- Inset const * inset = getInset(i);
+ if (Inset const * inset = getInset(i)) {
InsetCode lyx_code = inset->lyxCode();
if (lyx_code == LABEL_CODE) {
InsetLabel const * const il = static_cast<InsetLabel const *>(inset);
return "id='" + to_utf8(sgml::cleanID(buf, runparams, id)) + "'";
}
}
-
}
return string();
}
{
pos_type i;
for (i = 0; i < size(); ++i) {
- if (isInset(i)) {
- Inset const * inset = getInset(i);
+ if (Inset const * inset = getInset(i)) {
inset->docbook(buf, os, runparams);
} else {
char_type c = d->text_[i];
{
bool emph_flag = false;
- LayoutPtr const & style = layout();
- Font font_old =
+ LayoutPtr const & style = d->layout_;
+ FontInfo font_old =
style->labeltype == LABEL_MANUAL ? style->labelfont : style->font;
if (style->pass_thru && !d->onlyText(buf, outerfont, initial))
Font font = getFont(buf.params(), i, outerfont);
// handle <emphasis> tag
- if (font_old.fontInfo().emph() != font.fontInfo().emph()) {
+ if (font_old.emph() != font.fontInfo().emph()) {
if (font.fontInfo().emph() == FONT_ON) {
os << "<emphasis>";
emph_flag = true;
}
}
- if (isInset(i)) {
- Inset const * inset = getInset(i);
+ if (Inset const * inset = getInset(i)) {
inset->docbook(buf, os, runparams);
} else {
char_type c = d->text_[i];
else
os << sgml::escapeChar(c);
}
- font_old = font;
+ font_old = font.fontInfo();
}
if (emph_flag) {
bool Paragraph::isHfill(pos_type pos) const
{
- return isInset(pos)
- && getInset(pos)->lyxCode() == HFILL_CODE;
+ Inset const * inset = getInset(pos);
+ return inset && inset->lyxCode() == HFILL_CODE;
}
bool Paragraph::isNewline(pos_type pos) const
{
- return isInset(pos)
- && getInset(pos)->lyxCode() == NEWLINE_CODE;
+ Inset const * inset = getInset(pos);
+ return inset && inset->lyxCode() == NEWLINE_CODE;
}
bool Paragraph::isLineSeparator(pos_type pos) const
{
char_type const c = d->text_[pos];
- return isLineSeparatorChar(c)
- || (c == META_INSET && getInset(pos) &&
- getInset(pos)->isLineSeparator());
+ if (isLineSeparatorChar(c))
+ return true;
+ Inset const * inset = getInset(pos);
+ return inset && inset->isLineSeparator();
}
/// Used by the spellchecker
bool Paragraph::isLetter(pos_type pos) const
{
- if (isInset(pos))
- return getInset(pos)->isLetter();
- else {
- char_type const c = d->text_[pos];
- return isLetterChar(c) || isDigit(c);
- }
+ if (Inset const * inset = getInset(pos))
+ return inset->isLetter();
+ char_type const c = d->text_[pos];
+ return isLetterChar(c) || isDigit(c);
}
odocstringstream os;
- if (beg == 0 && label && !params().labelString().empty())
- os << params().labelString() << ' ';
+ if (beg == 0 && label && !d->params_.labelString().empty())
+ os << d->params_.labelString() << ' ';
for (pos_type i = beg; i < end; ++i) {
char_type const c = d->text_[i];
}
-void Paragraph::layout(LayoutPtr const & new_layout)
+void Paragraph::setLayout(LayoutPtr const & layout)
{
- d->layout_ = new_layout;
+ d->layout_ = layout;
+}
+
+
+void Paragraph::setEmptyOrDefaultLayout(TextClass const & tclass)
+{
+ if (useEmptyLayout())
+ setLayout(tclass.emptyLayout());
+ else
+ setLayout(tclass.defaultLayout());
}
InsetCode Paragraph::ownerCode() const
{
- return d->inset_owner_ ?
- d->inset_owner_->lyxCode() : NO_CODE;
+ return d->inset_owner_ ? d->inset_owner_->lyxCode() : NO_CODE;
}
bool Paragraph::isFreeSpacing() const
{
- if (layout()->free_spacing)
+ if (d->layout_->free_spacing)
return true;
return d->inset_owner_ && d->inset_owner_->isFreeSpacing();
}
bool Paragraph::allowEmpty() const
{
- if (layout()->keepempty)
+ if (d->layout_->keepempty)
return true;
return d->inset_owner_ && d->inset_owner_->allowEmpty();
}
//up this bibitem issue for 1.6. See also bug 2743.
// Add bibitem insets if necessary
- if (layout()->labeltype != LABEL_BIBLIO)
+ if (d->layout_->labeltype != LABEL_BIBLIO)
return 0;
bool hasbibitem = !d->insetlist_.empty()
Inset * Paragraph::getInset(pos_type pos)
{
- return d->insetlist_.get(pos);
+ return (pos < pos_type(d->text_.size()) && d->text_[pos] == META_INSET)
+ ? d->insetlist_.get(pos) : 0;
}
Inset const * Paragraph::getInset(pos_type pos) const
{
- return d->insetlist_.get(pos);
+ return (pos < pos_type(d->text_.size()) && d->text_[pos] == META_INSET)
+ ? d->insetlist_.get(pos) : 0;
}
void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
- pos_type right, TextCase action)
+ pos_type & right, TextCase action)
{
// process sequences of modified characters; in change
// tracking mode, this approach results in much better
projects / lyx.git / blobdiff