namespace lyx {
-DocIterator::DocIterator()
- : boundary_(false), inset_(0), buffer_(0)
-{}
-
-
-// We could be able to get rid of this if only every BufferView were
-// associated to a buffer on construction.
-DocIterator::DocIterator(Buffer * buf)
- : boundary_(false), inset_(0), buffer_(buf)
-{}
-
-
-DocIterator::DocIterator(Buffer * buf, Inset * inset)
- : boundary_(false), inset_(inset), buffer_(buf)
-{}
-
-
DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0)
{
Buffer * buf = const_cast<Buffer *>(buf0);
Inset * DocIterator::nextInset() const
{
- LASSERT(!empty(), return 0);
+ LASSERT(!empty(), return nullptr);
if (pos() == lastpos())
- return 0;
+ return nullptr;
if (pos() > lastpos()) {
LYXERR0("Should not happen, but it does: pos() = "
<< pos() << ", lastpos() = " << lastpos());
- return 0;
+ return nullptr;
}
if (inMathed())
return nextAtom().nucleus();
Inset * DocIterator::prevInset() const
{
- LASSERT(!empty(), return 0);
+ LASSERT(!empty(), return nullptr);
if (pos() == 0)
- return 0;
+ return nullptr;
if (inMathed()) {
if (cell().empty())
// FIXME: this should not happen but it does.
// See bug 3189
// http://www.lyx.org/trac/ticket/3189
- return 0;
+ return nullptr;
else
return prevAtom().nucleus();
}
Inset * DocIterator::realInset() const
{
- LASSERT(inTexted(), return 0);
+ LASSERT(inTexted(), return nullptr);
// if we are in a tabular, we need the cell
if (inset().lyxCode() == TABULAR_CODE) {
InsetTabular * tabular = inset().asInsetTabular();
Text * DocIterator::text() const
{
- LASSERT(!empty(), return 0);
+ LASSERT(!empty(), return nullptr);
return top().text();
}
}
-DocIterator::idx_type DocIterator::lastidx() const
+idx_type DocIterator::lastidx() const
{
return top().lastidx();
}
}
-DocIterator::row_type DocIterator::row() const
+row_type DocIterator::row() const
{
return top().row();
}
-DocIterator::col_type DocIterator::col() const
+col_type DocIterator::col() const
{
return top().col();
}
Text * DocIterator::innerText() const
{
- LASSERT(!empty(), return 0);
+ LASSERT(!empty(), return nullptr);
return innerTextSlice().text();
}
for (int i = depth() - 1; i >= 0; --i)
if (slices_[i].inset_->lyxCode() == code)
return slices_[i].inset_;
- return 0;
+ return nullptr;
}
// not at cell/paragraph end?
if (tip.pos() != tip.lastpos()) {
// move into an inset to the right if possible
- Inset * n = 0;
+ Inset * n = nullptr;
if (inMathed())
n = (tip.cell().begin() + tip.pos())->nucleus();
else
return;
// move into an inset to the left if possible
- Inset * n = 0;
+ Inset * n = nullptr;
if (inMathed())
n = (top().cell().begin() + top().pos())->nucleus();
else
}
-#if 0
-// works, but currently not needed
+void DocIterator::backwardPosIgnoreCollapsed()
+{
+ backwardPos();
+ if (inTexted()) {
+ Inset const * ins = realInset();
+ if (ins && !ins->editable()) {
+ pop_back(); // move out of collapsed inset
+ }
+ }
+}
+
+
void DocIterator::backwardInset()
{
backwardPos();
backwardPos();
}
}
-#endif
bool DocIterator::hasPart(DocIterator const & it) const
size_t const n = slices_.size();
slices_.resize(0);
for (size_t i = 0 ; i < n; ++i) {
+ if (dit[i].empty() && pos() > 0 && prevMath().lyxCode() == MATH_SCRIPT_CODE)
+ // Workaround: With empty optional argument and a trailing script,
+ // we have empty slices in math macro args (#11676)
+ // FIXME: Find real cause!
+ continue;
LBUFERR(inset);
push_back(dit[i]);
top().inset_ = inset;
Inset * inset = inset_;
// re-add the slices one by one, and adjust the inset pointer.
for (size_t i = 0, n = sl.size(); i != n; ++i) {
- if (inset == 0) {
+ if (inset == nullptr) {
// FIXME
- LYXERR0(" Should not happen, but does e.g. after "
- "C-n C-l C-z S-C-z\n"
- << " or when a Buffer has been concurrently edited by two views"
- << '\n' << "dit: " << *this << '\n'
- << " lastpos: " << slices_[i].lastpos());
+ LYXERR0("Null inset on cursor stack.");
fixIfBroken();
break;
}
}
-void DocIterator::append(DocIterator::idx_type idx, pos_type pos)
+void DocIterator::append(idx_type idx, pos_type pos)
{
slices_.push_back(CursorSlice());
top().idx() = idx;
Encoding const * DocIterator::getEncoding() const
{
if (empty())
- return 0;
+ return nullptr;
BufferParams const & bp = buffer()->params();
if (bp.useNonTeXFonts)
return encodings.fromLyXName("utf8-plain");
+ // With platex, we don't switch encodings (not even if forced).
+ if (bp.encoding().package() == Encoding::japanese)
+ return &bp.encoding();
+
CursorSlice const & sl = innerTextSlice();
Text const & text = *sl.text();
Language const * lang =
- text.getPar(sl.pit()).getFont(bp, sl.pos(),
- text.outerFont(sl.pit())).language();
+ text.getPar(sl.pit()).getFont(bp, sl.pos(), text.outerFont(sl.pit())).language();
// If we have a custom encoding for the buffer, we don't switch
// encodings (see output_latex::switchEncoding())
- bool const customenc = bp.inputenc != "auto" && bp.inputenc != "default";
+ bool const customenc = bp.inputenc != "auto-legacy" && bp.inputenc != "auto-legacy-plain";
Encoding const * enc = customenc ? &bp.encoding() : lang->encoding();
// Some insets force specific encodings sometimes (e.g., listings in
Text const & otext = *slices_[i].text();
Language const * olang =
otext.getPar(slices_[i].pit()).getFont(bp, slices_[i].pos(),
- otext.outerFont(slices_[i].pit())).language();
+ otext.outerFont(slices_[i].pit())).language();
Encoding const * oenc = olang->encoding();
if (oenc->name() != "inherit")
return inset().forcedEncoding(enc, oenc);
Text const & otext = *slices_[i].text();
Language const * olang =
otext.getPar(slices_[i].pit()).getFont(bp, slices_[i].pos(),
- otext.outerFont(slices_[i].pit())).language();
+ otext.outerFont(slices_[i].pit())).language();
// Again, if we have a custom encoding, this is used
// instead of the language's.
- Encoding const * oenc = customenc
- ? &bp.encoding() : olang->encoding();
+ Encoding const * oenc = customenc ? &bp.encoding() : olang->encoding();
if (olang->encoding()->name() != "inherit")
return oenc;
}
data_(dit.internalData())
{
for (size_t i = 0, n = data_.size(); i != n; ++i)
- data_[i].inset_ = 0;
+ data_[i].inset_ = nullptr;
}
projects / lyx.git / blobdiff