]> git.lyx.org Git - lyx.git/blobdiff - src/Paragraph.cpp
No space after inline math for text export (#9282)
[lyx.git] / src / Paragraph.cpp
index 535506f9d4eba45de05e4e88da09dfed999e283e..103428a2d5dbdc006684cc4ca7dd76098dbb11ee 100644 (file)
@@ -25,7 +25,7 @@
 #include "BufferParams.h"
 #include "Changes.h"
 #include "Counters.h"
-#include "Encoding.h"
+#include "BufferEncodings.h"
 #include "InsetList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -96,7 +96,7 @@ public:
        ///
        void result(SpellChecker::Result r) { result_ = r; }
        ///
-       bool inside(pos_type pos) const { return range_.inside(pos); }
+       bool contains(pos_type pos) const { return range_.contains(pos); }
        ///
        bool covered(FontSpan const & r) const
        {
@@ -104,8 +104,9 @@ public:
                // 2. last of new range inside current range or
                // 3. first of current range inside new range or
                // 4. last of current range inside new range
-               return range_.inside(r.first) || range_.inside(r.last) ||
-                       r.inside(range_.first) || r.inside(range_.last);
+               //FIXME: is this the same as !range_.intersect(r).empty() ?
+               return range_.contains(r.first) || range_.contains(r.last) ||
+                       r.contains(range_.first) || r.contains(range_.last);
        }
        ///
        void shift(pos_type pos, int offset)
@@ -191,7 +192,7 @@ public:
                RangesIterator et = ranges_.end();
                RangesIterator it = ranges_.begin();
                for (; it != et; ++it) {
-                       if(it->inside(pos)) {
+                       if(it->contains(pos)) {
                                return it->result();
                        }
                }
@@ -205,7 +206,7 @@ public:
                RangesIterator et = ranges_.end();
                RangesIterator it = ranges_.begin();
                for (; it != et; ++it) {
-                       if(it->inside(pos)) {
+                       if(it->contains(pos)) {
                                return it->range();
                        }
                }
@@ -499,7 +500,7 @@ public:
        TextContainer text_;
 
        typedef set<docstring> Words;
-       typedef map<Language, Words> LangWordsMap;
+       typedef map<string, Words> LangWordsMap;
        ///
        LangWordsMap words_;
        ///
@@ -767,7 +768,7 @@ void Paragraph::Private::insertChar(pos_type pos, char_type c,
 
 
 bool Paragraph::insertInset(pos_type pos, Inset * inset,
-                           Font const & font, Change const & change)
+                                  Font const & font, Change const & change)
 {
        LASSERT(inset, return false);
        LASSERT(pos >= 0 && pos <= size(), return false);
@@ -785,7 +786,6 @@ bool Paragraph::insertInset(pos_type pos, Inset * inset,
 
        // Some insets require run of spell checker
        requestSpellCheck(pos);
-
        setFont(pos, font);
        return true;
 }
@@ -1055,7 +1055,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
        }
 
        // FIXME: move this to InsetNewline::latex
-       if (inset->lyxCode() == NEWLINE_CODE) {
+       if (inset->lyxCode() == NEWLINE_CODE || inset->lyxCode() == SEPARATOR_CODE) {
                // newlines are handled differently here than
                // the default in simpleTeXSpecialChars().
                if (!style.newline_allowed) {
@@ -1303,7 +1303,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
                docstring nextlatex;
                bool nexttipas = false;
                string nexttipashortcut;
-               if (next != '\0' && next != META_INSET) {
+               if (next != '\0' && next != META_INSET && encoding.encodable(next)) {
                        nextlatex = encoding.latexChar(next).first;
                        if (runparams.inIPA) {
                                nexttipashortcut = Encodings::TIPAShortcut(next);
@@ -1451,7 +1451,8 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const
        if (layout_->inpreamble && inset_owner_) {
                bool const is_command = layout_->latextype == LATEX_COMMAND;
                Buffer const & buf = inset_owner_->buffer();
-               BufferParams const & bp = buf.params();
+               BufferParams const & bp = features.runparams().is_child
+                       ? buf.masterParams() : buf.params();
                Font f;
                TexRow texrow;
                // Using a string stream here circumvents the encoding
@@ -1529,7 +1530,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const
                                break;
                        }
                }
-               Encodings::validate(text_[i], features);
+               BufferEncodings::validate(text_[i], features);
        }
 }
 
@@ -1671,6 +1672,9 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
                                        os << "\n\\end_inset\n\n";
                                        column = 0;
                                }
+                               // FIXME This can be removed again once the mystery
+                               // crash has been resolved.
+                               os << flush;
                        }
                        break;
                case '\\':
@@ -1706,6 +1710,9 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
 
        flushString(os, write_buffer);
        os << "\n\\end_layout\n";
+       // FIXME This can be removed again once the mystery
+       // crash has been resolved.
+       os << flush;
 }
 
 
@@ -1784,14 +1791,6 @@ void Paragraph::insertChar(pos_type pos, char_type c,
 }
 
 
-bool Paragraph::insertInset(pos_type pos, Inset * inset,
-                           Change const & change)
-{
-       Font no_font;
-       return insertInset(pos, inset, no_font, change);
-}
-
-
 void Paragraph::resetFonts(Font const & font)
 {
        d->fontlist_.clear();
@@ -1930,7 +1929,7 @@ FontSize Paragraph::highestFontInRange
 char_type Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 {
        char_type c = d->text_[pos];
-       if (!lyxrc.rtl_support || !getFontSettings(bparams, pos).isRightToLeft())
+       if (!getFontSettings(bparams, pos).isRightToLeft())
                return c;
 
        // FIXME: The arabic special casing is due to the difference of arabic
@@ -2140,17 +2139,17 @@ void Paragraph::setBeginOfBody()
        // remove unnecessary getChar() calls
        pos_type i = 0;
        pos_type end = size();
-       if (i < end && !isNewline(i)) {
+       if (i < end && !(isNewline(i) || isEnvSeparator(i))) {
                ++i;
                char_type previous_char = 0;
                char_type temp = 0;
                if (i < end) {
                        previous_char = d->text_[i];
-                       if (!isNewline(i)) {
+                       if (!(isNewline(i) || isEnvSeparator(i))) {
                                ++i;
                                while (i < end && previous_char != ' ') {
                                        temp = d->text_[i];
-                                       if (isNewline(i))
+                                       if (isNewline(i) || isEnvSeparator(i))
                                                break;
                                        ++i;
                                        previous_char = temp;
@@ -2245,7 +2244,8 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
 {
        int column = 0;
 
-       if (params_.noindent() && !layout_->pass_thru) {
+       if (params_.noindent() && !layout_->pass_thru
+           && (layout_->toggle_indent != ITOGGLE_NEVER)) {
                os << "\\noindent ";
                column += 10;
        }
@@ -2483,7 +2483,7 @@ void Paragraph::latex(BufferParams const & bparams,
                Change const & change = runparams.inDeletedInset
                        ? runparams.changeOfDeletedInset : lookupChange(i);
 
-               if (bparams.outputChanges && runningChange != change) {
+               if (bparams.output_changes && runningChange != change) {
                        if (open_font) {
                                column += running_font.latexWriteEndChanges(
                                                os, bparams, runparams, basefont, basefont);
@@ -2499,7 +2499,7 @@ void Paragraph::latex(BufferParams const & bparams,
 
                // do not output text which is marked deleted
                // if change tracking output is disabled
-               if (!bparams.outputChanges && change.deleted()) {
+               if (!bparams.output_changes && change.deleted()) {
                        continue;
                }
 
@@ -2831,17 +2831,20 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 }
 
 
-void doFontSwitch(XHTMLStream & xs, bool startrange,
-       bool & flag, FontState curstate, std::string tag, std::string attr = "")
+namespace {
+void doFontSwitch(vector<html::FontTag> & tagsToOpen,
+                  vector<html::EndFontTag> & tagsToClose,
+                  bool & flag, FontState curstate, html::FontTypes type)
 {
        if (curstate == FONT_ON) {
-               xs << html::StartTag(tag, attr);
+               tagsToOpen.push_back(html::FontTag(type));
                flag = true;
-       } else if (flag && !startrange) {
-               xs << html::EndTag(tag);
+       } else if (flag) {
+               tagsToClose.push_back(html::EndFontTag(type));
                flag = false;
        }
 }
+}
 
 
 docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
@@ -2852,6 +2855,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 {
        docstring retval;
 
+       // track whether we have opened these tags
        bool emph_flag = false;
        bool bold_flag = false;
        bool noun_flag = false;
@@ -2859,6 +2863,12 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
        bool dbar_flag = false;
        bool sout_flag = false;
        bool wave_flag = false;
+       // shape tags
+       bool shap_flag = false;
+       // family tags
+       bool faml_flag = false;
+       // size tags
+       bool size_flag = false;
 
        Layout const & style = *d->layout_;
 
@@ -2867,6 +2877,16 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
        FontInfo font_old =
                style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
 
+       FontShape  curr_fs   = INHERIT_SHAPE;
+       FontFamily curr_fam  = INHERIT_FAMILY;
+       FontSize   curr_size = FONT_SIZE_INHERIT;
+       
+       string const default_family = 
+               buf.masterBuffer()->params().fonts_default_family;              
+
+       vector<html::FontTag> tagsToOpen;
+       vector<html::EndFontTag> tagsToClose;
+       
        // parsing main loop
        for (pos_type i = initial; i < size(); ++i) {
                // let's not show deleted material in the output
@@ -2874,55 +2894,265 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
                        continue;
 
                Font const font = getFont(buf.masterBuffer()->params(), i, outerfont);
-               bool const at_start = (i == initial);
 
                // emphasis
                FontState curstate = font.fontInfo().emph();
                if (font_old.emph() != curstate)
-                       doFontSwitch(xs, at_start, emph_flag, curstate, "em");
+                       doFontSwitch(tagsToOpen, tagsToClose, emph_flag, curstate, html::FT_EMPH);
 
                // noun
                curstate = font.fontInfo().noun();
                if (font_old.noun() != curstate)
-                       doFontSwitch(xs, at_start, noun_flag, curstate, "dfn", "class='lyxnoun'");
+                       doFontSwitch(tagsToOpen, tagsToClose, noun_flag, curstate, html::FT_NOUN);
 
                // underbar
                curstate = font.fontInfo().underbar();
                if (font_old.underbar() != curstate)
-                       doFontSwitch(xs, at_start, ubar_flag, curstate, "u");
+                       doFontSwitch(tagsToOpen, tagsToClose, ubar_flag, curstate, html::FT_UBAR);
        
                // strikeout
                curstate = font.fontInfo().strikeout();
                if (font_old.strikeout() != curstate)
-                       doFontSwitch(xs, at_start, sout_flag, curstate, "del", "class='strikeout'");
-
-               // HTML does not really have an equivalent of the next two, so we will just
-               // output a single underscore with a class, and people can style it if they
-               // wish to do so
+                       doFontSwitch(tagsToOpen, tagsToClose, sout_flag, curstate, html::FT_SOUT);
 
                // double underbar
                curstate = font.fontInfo().uuline();
                if (font_old.uuline() != curstate)
-                       doFontSwitch(xs, at_start, dbar_flag, curstate, "u", "class='dline'");
+                       doFontSwitch(tagsToOpen, tagsToClose, dbar_flag, curstate, html::FT_DBAR);
 
                // wavy line
                curstate = font.fontInfo().uwave();
                if (font_old.uwave() != curstate)
-                       doFontSwitch(xs, at_start, wave_flag, curstate, "u", "class='wavyline'");
+                       doFontSwitch(tagsToOpen, tagsToClose, wave_flag, curstate, html::FT_WAVE);
 
                // bold
-               if (font_old.series() != font.fontInfo().series()) {
-                       if (font.fontInfo().series() == BOLD_SERIES) {
-                               xs << html::StartTag("b");
-                               bold_flag = true;
-                       } else if (bold_flag && !at_start) {
-                               xs << html::EndTag("b");
-                               bold_flag = false;
+               // a little hackish, but allows us to reuse what we have.
+               curstate = (font.fontInfo().series() == BOLD_SERIES ? FONT_ON : FONT_OFF);
+               if (font_old.series() != font.fontInfo().series())
+                       doFontSwitch(tagsToOpen, tagsToClose, bold_flag, curstate, html::FT_BOLD);
+
+               // Font shape
+               curr_fs = font.fontInfo().shape();
+               FontShape old_fs = font_old.shape();
+               if (old_fs != curr_fs) {
+                       if (shap_flag) {
+                               switch (old_fs) {
+                               case ITALIC_SHAPE:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_ITALIC));
+                                       break;
+                               case SLANTED_SHAPE:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SLANTED));
+                                       break;
+                               case SMALLCAPS_SHAPE:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SMALLCAPS));
+                                       break;
+                               case UP_SHAPE:
+                               case INHERIT_SHAPE:
+                                       break;
+                               default:
+                                       // the other tags are for internal use
+                                       LATTEST(false);
+                                       break;
+                               }
+                               shap_flag = false;
+                       }
+                       switch (curr_fs) {
+                       case ITALIC_SHAPE:
+                               tagsToOpen.push_back(html::FontTag(html::FT_ITALIC));
+                               shap_flag = true;
+                               break;
+                       case SLANTED_SHAPE:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SLANTED));
+                               shap_flag = true;
+                               break;
+                       case SMALLCAPS_SHAPE:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SMALLCAPS));
+                               shap_flag = true;
+                               break;
+                       case UP_SHAPE:
+                       case INHERIT_SHAPE:
+                               break;
+                       default:
+                               // the other tags are for internal use
+                               LATTEST(false);
+                               break;
+                       }
+               }
+
+               // Font family
+               curr_fam = font.fontInfo().family();
+               FontFamily old_fam = font_old.family();
+               if (old_fam != curr_fam) {
+                       if (faml_flag) {
+                               switch (old_fam) {
+                               case ROMAN_FAMILY:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_ROMAN));
+                                       break;
+                               case SANS_FAMILY:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SANS));
+                                       break;
+                               case TYPEWRITER_FAMILY:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_TYPE));
+                                       break;
+                               case INHERIT_FAMILY:
+                                       break;
+                               default:
+                                       // the other tags are for internal use
+                                       LATTEST(false);
+                                       break;
+                               }
+                               faml_flag = false;
+                       }
+                       switch (curr_fam) {
+                       case ROMAN_FAMILY:
+                               // we will treat a "default" font family as roman, since we have
+                               // no other idea what to do.
+                               if (default_family != "rmdefault" && default_family != "default") {
+                                       tagsToOpen.push_back(html::FontTag(html::FT_ROMAN));
+                                       faml_flag = true;
+                               }
+                               break;
+                       case SANS_FAMILY:
+                               if (default_family != "sfdefault") {
+                                       tagsToOpen.push_back(html::FontTag(html::FT_SANS));
+                                       faml_flag = true;
+                               }
+                               break;
+                       case TYPEWRITER_FAMILY:
+                               if (default_family != "ttdefault") {
+                                       tagsToOpen.push_back(html::FontTag(html::FT_TYPE));
+                                       faml_flag = true;
+                               }
+                               break;
+                       case INHERIT_FAMILY:
+                               break;
+                       default:
+                               // the other tags are for internal use
+                               LATTEST(false);
+                               break;
+                       }
+               }
+
+               // Font size
+               curr_size = font.fontInfo().size();
+               FontSize old_size = font_old.size();
+               if (old_size != curr_size) {
+                       if (size_flag) {
+                               switch (old_size) {
+                               case FONT_SIZE_TINY:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_TINY));
+                                       break;
+                               case FONT_SIZE_SCRIPT:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_SCRIPT));
+                                       break;
+                               case FONT_SIZE_FOOTNOTE:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_FOOTNOTE));
+                                       break;
+                               case FONT_SIZE_SMALL:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_SMALL));
+                                       break;
+                               case FONT_SIZE_LARGE:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_LARGE));
+                                       break;
+                               case FONT_SIZE_LARGER:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_LARGER));
+                                       break;
+                               case FONT_SIZE_LARGEST:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_LARGEST));
+                                       break;
+                               case FONT_SIZE_HUGE:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_HUGE));
+                                       break;
+                               case FONT_SIZE_HUGER:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_HUGER));
+                                       break;
+                               case FONT_SIZE_INCREASE:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_INCREASE));
+                                       break;
+                               case FONT_SIZE_DECREASE:
+                                       tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_DECREASE));
+                                       break;
+                               case FONT_SIZE_INHERIT:
+                               case FONT_SIZE_NORMAL:
+                                       break;
+                               default:
+                                       // the other tags are for internal use
+                                       LATTEST(false);
+                                       break;
+                               }
+                               size_flag = false;
+                       }
+                       switch (curr_size) {
+                       case FONT_SIZE_TINY:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_TINY));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_SCRIPT:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_SCRIPT));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_FOOTNOTE:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_FOOTNOTE));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_SMALL:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_SMALL));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_LARGE:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_LARGE));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_LARGER:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_LARGER));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_LARGEST:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_LARGEST));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_HUGE:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_HUGE));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_HUGER:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_HUGER));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_INCREASE:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_INCREASE));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_DECREASE:
+                               tagsToOpen.push_back(html::FontTag(html::FT_SIZE_DECREASE));
+                               size_flag = true;
+                               break;
+                       case FONT_SIZE_NORMAL:
+                       case FONT_SIZE_INHERIT:
+                               break;
+                       default:
+                               // the other tags are for internal use
+                               LATTEST(false);
+                               break;
                        }
                }
+
                // FIXME XHTML
                // Other such tags? What about the other text ranges?
 
+               vector<html::EndFontTag>::const_iterator cit = tagsToClose.begin();
+               vector<html::EndFontTag>::const_iterator cen = tagsToClose.end();
+               for (; cit != cen; ++cit)
+                       xs << *cit;
+
+               vector<html::FontTag>::const_iterator sit = tagsToOpen.begin();
+               vector<html::FontTag>::const_iterator sen = tagsToOpen.end();
+               for (; sit != sen; ++sit)
+                       xs << *sit;
+
+               tagsToClose.clear();
+               tagsToOpen.clear();
+
                Inset const * inset = getInset(i);
                if (inset) {
                        if (!runparams.for_toc || inset->isInToc()) {
@@ -2971,8 +3201,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 bool Paragraph::isHfill(pos_type pos) const
 {
        Inset const * inset = getInset(pos);
-       return inset && (inset->lyxCode() == SPACE_CODE &&
-                        inset->isStretchableSpace());
+       return inset && inset->isHfill();
 }
 
 
@@ -2983,6 +3212,13 @@ bool Paragraph::isNewline(pos_type pos) const
 }
 
 
+bool Paragraph::isEnvSeparator(pos_type pos) const
+{
+       Inset const * inset = getInset(pos);
+       return inset && inset->lyxCode() == SEPARATOR_CODE;
+}
+
+
 bool Paragraph::isLineSeparator(pos_type pos) const
 {
        char_type const c = d->text_[pos];
@@ -3069,8 +3305,7 @@ Paragraph::getParLanguage(BufferParams const & bparams) const
 
 bool Paragraph::isRTL(BufferParams const & bparams) const
 {
-       return lyxrc.rtl_support
-               && getParLanguage(bparams)->rightToLeft()
+       return getParLanguage(bparams)->rightToLeft()
                && !inInset().getLayout().forceLTR();
 }
 
@@ -3125,7 +3360,7 @@ docstring Paragraph::asString(int options) const
 }
 
 
-docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
+docstring Paragraph::asString(pos_type beg, pos_type end, int options, const OutputParams *runparams) const
 {
        odocstringstream os;
 
@@ -3142,9 +3377,12 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
                    || (c == '\n' && (options & AS_STR_NEWLINES)))
                        os.put(c);
                else if (c == META_INSET && (options & AS_STR_INSETS)) {
-                       getInset(i)->toString(os);
-                       if (getInset(i)->asInsetMath())
-                               os << " ";
+                       if (c == META_INSET && (options & AS_STR_PLAINTEXT)) {
+                               LASSERT(runparams != 0, return docstring());
+                               getInset(i)->plaintext(os, *runparams);
+                       } else {
+                               getInset(i)->toString(os);
+                       }
                }
        }
 
@@ -3152,7 +3390,7 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
 }
 
 
-void Paragraph::forToc(docstring & os, size_t maxlen) const
+void Paragraph::forOutliner(docstring & os, size_t maxlen) const
 {
        if (!d->params_.labelString().empty())
                os += d->params_.labelString() + ' ';
@@ -3165,35 +3403,8 @@ void Paragraph::forToc(docstring & os, size_t maxlen) const
                else if (c == '\t' || c == '\n')
                        os += ' ';
                else if (c == META_INSET)
-                       getInset(i)->forToc(os, maxlen);
-       }
-}
-
-
-docstring Paragraph::stringify(pos_type beg, pos_type end, int options,
-        OutputParams const & runparams) const
-{
-       odocstringstream os;
-
-       if (beg == 0
-               && options & AS_STR_LABEL
-               && !d->params_.labelString().empty())
-               os << d->params_.labelString() << ' ';
-
-       OutputParams op = runparams;
-       op.for_search = true;
-
-       for (pos_type i = beg; i < end; ++i) {
-               char_type const c = d->text_[i];
-               if (isPrintable(c) || c == '\t'
-                   || (c == '\n' && (options & AS_STR_NEWLINES)))
-                       os.put(c);
-               else if (c == META_INSET && (options & AS_STR_INSETS)) {
-                       getInset(i)->plaintext(os, op);
-               }
+                       getInset(i)->forOutliner(os, maxlen);
        }
-
-       return os.str();
 }
 
 
@@ -3283,46 +3494,6 @@ bool Paragraph::allowEmpty() const
 }
 
 
-char_type Paragraph::transformChar(char_type c, pos_type pos) const
-{
-       if (!Encodings::isArabicChar(c))
-               return c;
-
-       char_type prev_char = ' ';
-       char_type next_char = ' ';
-
-       for (pos_type i = pos - 1; i >= 0; --i) {
-               char_type const par_char = d->text_[i];
-               if (!Encodings::isArabicComposeChar(par_char)) {
-                       prev_char = par_char;
-                       break;
-               }
-       }
-
-       for (pos_type i = pos + 1, end = size(); i < end; ++i) {
-               char_type const par_char = d->text_[i];
-               if (!Encodings::isArabicComposeChar(par_char)) {
-                       next_char = par_char;
-                       break;
-               }
-       }
-
-       if (Encodings::isArabicChar(next_char)) {
-               if (Encodings::isArabicChar(prev_char) &&
-                       !Encodings::isArabicSpecialChar(prev_char))
-                       return Encodings::transformChar(c, Encodings::FORM_MEDIAL);
-               else
-                       return Encodings::transformChar(c, Encodings::FORM_INITIAL);
-       } else {
-               if (Encodings::isArabicChar(prev_char) &&
-                       !Encodings::isArabicSpecialChar(prev_char))
-                       return Encodings::transformChar(c, Encodings::FORM_FINAL);
-               else
-                       return Encodings::transformChar(c, Encodings::FORM_ISOLATED);
-       }
-}
-
-
 bool Paragraph::brokenBiblio() const
 {
        // there is a problem if there is no bibitem at position 0 or
@@ -3344,7 +3515,7 @@ int Paragraph::fixBiblio(Buffer const & buffer)
        if (d->layout_->labeltype != LABEL_BIBLIO)
                return 0;
 
-       bool const track_changes = buffer.params().trackChanges;
+       bool const track_changes = buffer.params().track_changes;
        int bibitem_pos = d->insetlist_.find(BIBITEM_CODE);
        bool const hasbibitem0 = bibitem_pos == 0;
 
@@ -3359,8 +3530,7 @@ int Paragraph::fixBiblio(Buffer const & buffer)
                // these, which there should be.
                // FIXME: why does it make sense to do that rather
                // than keep the first? (JMarc)
-               Inset * inset = d->insetlist_.release(bibitem_pos);
-               eraseChar(bibitem_pos, track_changes);
+               Inset * inset = releaseInset(bibitem_pos);
                d->insetlist_.begin()->inset = inset;
                return -bibitem_pos;
        }
@@ -3376,7 +3546,8 @@ int Paragraph::fixBiblio(Buffer const & buffer)
                inset = new InsetBibitem(const_cast<Buffer *>(&buffer),
                                         InsetCommandParams(BIBITEM_CODE));
 
-       insertInset(0, inset, Change(track_changes ? Change::INSERTED 
+       Font font(inherit_font, buffer.params().language);
+       insertInset(0, inset, font, Change(track_changes ? Change::INSERTED 
                                                   : Change::UNCHANGED));
 
        return 1;
@@ -3448,9 +3619,11 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
        // process sequences of modified characters; in change
        // tracking mode, this approach results in much better
        // usability than changing case on a char-by-char basis
-       docstring changes;
+       // We also need to track the current font, since font
+       // changes within sequences can occur.
+       vector<pair<char_type, Font> > changes;
 
-       bool const trackChanges = bparams.trackChanges;
+       bool const trackChanges = bparams.track_changes;
 
        bool capitalize = true;
 
@@ -3482,7 +3655,7 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
                }
 
                if (oldChar != newChar) {
-                       changes += newChar;
+                       changes.push_back(make_pair(newChar, getFontSettings(bparams, pos)));
                        if (pos != right - 1)
                                continue;
                        // step behind the changing area
@@ -3491,9 +3664,8 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
 
                int erasePos = pos - changes.size();
                for (size_t i = 0; i < changes.size(); i++) {
-                       insertChar(pos, changes[i],
-                                  getFontSettings(bparams,
-                                                  erasePos),
+                       insertChar(pos, changes[i].first,
+                                  changes[i].second,
                                   trackChanges);
                        if (!eraseChar(erasePos, trackChanges)) {
                                ++erasePos;
@@ -3632,20 +3804,28 @@ void Paragraph::locateWord(pos_type & from, pos_type & to,
 
 void Paragraph::collectWords()
 {
-       pos_type n = size();
-       for (pos_type pos = 0; pos < n; ++pos) {
+       for (pos_type pos = 0; pos < size(); ++pos) {
                if (isWordSeparator(pos))
                        continue;
                pos_type from = pos;
                locateWord(from, pos, WHOLE_WORD);
-               if ((pos - from) >= (int)lyxrc.completion_minlength) {
-                       docstring word = asString(from, pos, AS_STR_NONE);
-                       FontList::const_iterator cit = d->fontlist_.fontIterator(pos);
-                       if (cit == d->fontlist_.end())
-                               return;
-                       Language const * lang = cit->font().language();
-                       d->words_[*lang].insert(word);
-               }
+               // Work around MSVC warning: The statement
+               // if (pos < from + lyxrc.completion_minlength)
+               // triggers a signed vs. unsigned warning.
+               // I don't know why this happens, it could be a MSVC bug, or
+               // related to LLP64 (windows) vs. LP64 (unix) programming
+               // model, or the C++ standard might be ambigous in the section
+               // defining the "usual arithmetic conversions". However, using
+               // a temporary variable is safe and works on all compilers.
+               pos_type const endpos = from + lyxrc.completion_minlength;
+               if (pos < endpos)
+                       continue;
+               FontList::const_iterator cit = d->fontlist_.fontIterator(from);
+               if (cit == d->fontlist_.end())
+                       return;
+               Language const * lang = cit->font().language();
+               docstring const word = asString(from, pos, AS_STR_NONE);
+               d->words_[lang->lang()].insert(word);
        }
 }