Pass the encoding to the japanese pLaTeX processor (#4697).

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 464152c4b2fe85f5b2c92c645fe340a0207de149..310b85131ba8e1e3fe16eeaf69e58713d62cfc47 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -72,10 +72,30 @@ DocIterator doc_iterator_end(const Buffer * buf0, const Inset * inset0)
 }
 
 
+DocIterator DocIterator::clone(Buffer * buffer) const
+{
+       LASSERT(buffer->isClone(), return DocIterator());
+       Inset * inset = &buffer->inset();
+       DocIterator dit(buffer);
+       size_t const n = slices_.size();
+       for (size_t i = 0 ; i != n; ++i) {
+               LASSERT(inset, /**/);
+               dit.push_back(slices_[i]);
+               dit.top().inset_ = inset;
+               if (i + 1 != n)
+                       inset = dit.nextInset();
+       }
+       return dit;
+}
+
+
 bool DocIterator::inRegexped() const
 {
-       InsetMathHull * i = dynamic_cast<InsetMathHull *>(inset().asInsetMath());
-       return i && i->getType() == hullRegexp;
+       InsetMath * im = inset().asInsetMath();
+       if (!im) 
+               return false;
+       InsetMathHull * hull = im->asHullInset();
+       return hull && hull->getType() == hullRegexp;
 }
 
 
@@ -92,7 +112,8 @@ Inset * DocIterator::nextInset() const
        if (pos() == lastpos())
                return 0;
        if (pos() > lastpos()) {
-               LYXERR0("Should not happen, but it does. ");
+               LYXERR0("Should not happen, but it does: pos() = "
+                       << pos() << ", lastpos() = " << lastpos());
                return 0;
        }
        if (inMathed())
@@ -110,7 +131,7 @@ Inset * DocIterator::prevInset() const
                if (cell().empty())
                        // FIXME: this should not happen but it does.
                        // See bug 3189
-                       // http://bugzilla.lyx.org/show_bug.cgi?id=3189
+                       // http://www.lyx.org/trac/ticket/3189
                        return 0;
                else
                        return prevAtom().nucleus();
@@ -124,8 +145,8 @@ Inset * DocIterator::realInset() const
        LASSERT(inTexted(), /**/);
        // if we are in a tabular, we need the cell
        if (inset().lyxCode() == TABULAR_CODE) {
-               InsetTabular & tabular = static_cast<InsetTabular&>(inset());
-               return tabular.cell(idx()).get();
+               InsetTabular * tabular = inset().asInsetTabular();
+               return tabular->cell(idx()).get();
        }
        return &inset();
 }
@@ -171,6 +192,18 @@ Paragraph & DocIterator::innerParagraph() const
 }
 
 
+FontSpan DocIterator::locateWord(word_location const loc) const
+{
+       FontSpan f = FontSpan();
+
+       if (!top().text()->empty()) {
+               f.first = pos();
+               top().paragraph().locateWord(f.first, f.last, loc);
+       }
+       return f;
+}
+
+       
 CursorSlice const & DocIterator::innerTextSlice() const
 {
        LASSERT(!empty(), /**/);
@@ -249,12 +282,7 @@ MathData & DocIterator::cell() const
 Text * DocIterator::innerText() const
 {
        LASSERT(!empty(), /**/);
-       // go up until first non-0 text is hit
-       // (innermost text is 0 in mathed)
-       for (int i = depth() - 1; i >= 0; --i)
-               if (slices_[i].text())
-                       return slices_[i].text();
-       return 0;
+       return innerTextSlice().text();
 }
 
 
@@ -610,9 +638,4 @@ bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2)
 }
 
 
-bool isLetter(DocIterator const & dit)
-{
-       return dit.inTexted() && !dit.paragraph().isWordSeparator(dit.pos());
-}
-
 } // namespace lyx