]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph_pimpl.C
couple more fixes
[lyx.git] / src / paragraph_pimpl.C
index 76355805cc46f70a9c7abbb985811379a204081a..42ec28da89bfc29a2794968895aa9ea4b034bfda 100644 (file)
 #endif
 
 #include "paragraph_pimpl.h"
+#include "LaTeXFeatures.h"
 #include "texrow.h"
 #include "language.h"
 #include "bufferparams.h"
 #include "encoding.h"
 #include "lyxrc.h"
 #include "debug.h"
-#include "lyxtextclasslist.h"
 
 #include "support/LAssert.h"
 
@@ -31,9 +31,6 @@ using std::ostream;
 using std::upper_bound;
 using std::lower_bound;
 
-extern int tex_code_break_column;
-
-
 // Initialize static member.
 ShareContainer<LyXFont> Paragraph::Pimpl::FontTable::container;
 // Initialization of the counter for the paragraph id's,
@@ -41,14 +38,20 @@ unsigned int Paragraph::Pimpl::paragraph_id = 0;
 
 namespace {
 
-string special_phrases[][2] = {
-       { "LyX", "\\LyX{}" },
-       { "TeX", "\\TeX{}" },
-       { "LaTeX2e", "\\LaTeXe{}" },
-       { "LaTeX", "\\LaTeX{}" },
-       };
+struct special_phrase {
+       string phrase;
+       string macro;
+       bool builtin;
+};
+
+special_phrase special_phrases[] = {
+       { "LyX", "\\LyX{}", false },
+       { "TeX", "\\TeX{}", true },
+       { "LaTeX2e", "\\LaTeXe{}", true },
+       { "LaTeX", "\\LaTeX{}", true },
+};
 
-size_t phrases_nr = sizeof(special_phrases)/sizeof(special_phrases[0]);
+size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase);
 
 } // namespace anon
 
@@ -136,15 +139,9 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
                it->pos(it->pos() + 1);
        }
 
-       // Update the inset table.
-       InsetTable search_inset(pos, 0);
-       for (InsetList::iterator it = lower_bound(owner_->insetlist.begin(),
-                                                      owner_->insetlist.end(),
-                                                      search_inset, matchIT());
-            it != owner_->insetlist.end(); ++it)
-       {
-               ++it->pos;
-       }
+       // Update the insets
+       owner_->insetlist.increasePosAfterPos(pos);
+
        owner_->setFont(pos, font);
 }
 
@@ -158,18 +155,9 @@ void Paragraph::Pimpl::insertInset(pos_type pos,
        insertChar(pos, META_INSET, font);
        lyx::Assert(text[pos] == META_INSET);
 
-       // Add a new entry in the inset table.
-       InsetTable search_inset(pos, 0);
-       InsetList::iterator it = lower_bound(owner_->insetlist.begin(),
-                                                 owner_->insetlist.end(),
-                                                 search_inset, matchIT());
-       if (it != owner_->insetlist.end() && it->pos == pos) {
-               lyxerr << "ERROR (Paragraph::InsertInset): "
-                       "there is an inset in position: " << pos << endl;
-       } else {
-               owner_->insetlist.insert(it, InsetTable(pos, inset));
-               inset->parOwner(owner_);
-       }
+       // Add a new entry in the insetlist.
+       owner_->insetlist.insert(inset, pos);
+       inset->parOwner(owner_);
 
        if (inset_owner)
                inset->setOwner(inset_owner);
@@ -181,16 +169,7 @@ void Paragraph::Pimpl::erase(pos_type pos)
        lyx::Assert(pos < size());
        // if it is an inset, delete the inset entry
        if (text[pos] == Paragraph::META_INSET) {
-               // find the entry
-               InsetTable search_inset(pos, 0);
-               InsetList::iterator it =
-                       lower_bound(owner_->insetlist.begin(),
-                                        owner_->insetlist.end(),
-                                        search_inset, matchIT());
-               if (it != owner_->insetlist.end() && it->pos == pos) {
-                       delete it->inset;
-                       owner_->insetlist.erase(it);
-               }
+               owner_->insetlist.erase(pos);
        }
 
        text.erase(text.begin() + pos);
@@ -225,15 +204,8 @@ void Paragraph::Pimpl::erase(pos_type pos)
        for (; it != fend; ++it)
                it->pos(it->pos() - 1);
 
-       // Update the inset table.
-       InsetTable search_inset(pos, 0);
-       InsetList::iterator lend = owner_->insetlist.end();
-       for (InsetList::iterator it =
-                    upper_bound(owner_->insetlist.begin(),
-                                     lend,
-                                     search_inset, matchIT());
-            it != lend; ++it)
-               --it->pos;
+       // Update the insetlist.
+       owner_->insetlist.decreasePosAfterPos(pos);
 }
 
 
@@ -243,7 +215,7 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
                                       LyXLayout const & style)
 {
        if (style.pass_thru) return;
-       if (column > tex_code_break_column
+       if (column > lyxrc.ascii_linelen
            && i
            && getChar(i - 1) != ' '
            && (i < size() - 1)
@@ -257,13 +229,7 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
                     || getChar(i - 1) == '?'
                     || getChar(i - 1) == ':'
                     || getChar(i - 1) == '!'))) {
-               if (tex_code_break_column == 0) {
-                       // in batchmode we need LaTeX to still
-                       // see it as a space not as an extra '\n'
-                       os << " %\n";
-               } else {
-                       os << '\n';
-               }
+               os << '\n';
                texrow.newline();
                texrow.start(owner_, i + 1);
                column = 0;
@@ -275,7 +241,7 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
 }
 
 
-bool Paragraph::Pimpl::isTextAt(string const & str, pos_type pos)
+bool Paragraph::Pimpl::isTextAt(string const & str, pos_type pos) const
 {
        pos_type const len = str.length();
 
@@ -339,6 +305,23 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                close = true;
                        }
 
+#ifdef WITH_WARNINGS
+#warning Bug: we can have an empty font change here!
+// if there has just been a font change, we are going to close it
+// right now, which means stupid latex code like \textsf{}. AFAIK,
+// this does not harm dvi output. A minor bug, thus (JMarc)
+#endif
+                       // some insets cannot be inside a font change command
+                       if (open_font && inset->noFontChange()) {
+                               column +=running_font.
+                                       latexWriteEndChanges(os,
+                                                            basefont,
+                                                            basefont);
+                               open_font = false;
+                               basefont = owner_->getLayoutFont(bparams);
+                               running_font = basefont;
+                       }
+
                        int tmp = inset->latex(buf, os, moving_arg,
                                               style.free_spacing);
 
@@ -511,17 +494,19 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 
                        // LyX, LaTeX etc.
 
-                       // FIXME: if we have "LaTeX" with a font change in the middle (before
-                       // the 'T', then the "TeX" part is still special cased. Really we
-                       // should only operate this on "words" for some definition of word
+                       // FIXME: if we have "LaTeX" with a font
+                       // change in the middle (before the 'T', then
+                       // the "TeX" part is still special cased.
+                       // Really we should only operate this on
+                       // "words" for some definition of word
 
                        size_t pnr = 0;
 
                        for (; pnr < phrases_nr; ++pnr) {
-                               if (isTextAt(special_phrases[pnr][0], i)) {
-                                       os << special_phrases[pnr][1];
-                                       i += special_phrases[pnr][0].length() - 1;
-                                       column += special_phrases[pnr][1].length() - 1;
+                               if (isTextAt(special_phrases[pnr].phrase, i)) {
+                                       os << special_phrases[pnr].macro;
+                                       i += special_phrases[pnr].phrase.length() - 1;
+                                       column += special_phrases[pnr].macro.length() - 1;
                                        break;
                                }
                        }
@@ -558,13 +543,97 @@ Paragraph * Paragraph::Pimpl::TeXDeeper(Buffer const * buf,
 }
 
 
+void Paragraph::Pimpl::validate(LaTeXFeatures & features,
+                               LyXLayout const & layout) const
+{
+       BufferParams const & bparams = features.bufferParams();
+
+       // check the params.
+       if (params.lineTop() || params.lineBottom())
+               features.require("lyxline");
+       if (!params.spacing().isDefault())
+               features.require("setspace");
+
+       // then the layouts
+       features.useLayout(layout.name());
+
+       // then the fonts
+       Language const * doc_language = bparams.language;
+
+       FontList::const_iterator fcit = fontlist.begin();
+       FontList::const_iterator fend = fontlist.end();
+       for (; fcit != fend; ++fcit) {
+               if (fcit->font().noun() == LyXFont::ON) {
+                       lyxerr[Debug::LATEX] << "font.noun: "
+                                            << fcit->font().noun()
+                                            << endl;
+                       features.require("noun");
+                       lyxerr[Debug::LATEX] << "Noun enabled. Font: "
+                                            << fcit->font().stateText(0)
+                                            << endl;
+               }
+               switch (fcit->font().color()) {
+               case LColor::none:
+               case LColor::inherit:
+               case LColor::ignore:
+                       // probably we should put here all interface colors used for
+                       // font displaying! For now I just add this ones I know of (Jug)
+               case LColor::latex:
+               case LColor::note:
+                       break;
+               default:
+                       features.require("color");
+                       lyxerr[Debug::LATEX] << "Color enabled. Font: "
+                                            << fcit->font().stateText(0)
+                                            << endl;
+               }
+
+               Language const * language = fcit->font().language();
+               if (language->babel() != doc_language->babel() &&
+                   language != ignore_language &&
+                   language != latex_language)
+               {
+                       features.useLanguage(language);
+                       lyxerr[Debug::LATEX] << "Found language "
+                                            << language->babel() << endl;
+               }
+       }
+
+       if (!params.leftIndent().zero())
+               features.require("ParagraphLeftIndent");
+
+       // then the insets
+       InsetList::iterator icit = owner_->insetlist.begin();
+       InsetList::iterator iend = owner_->insetlist.end();
+       for (; icit != iend; ++icit) {
+               if (icit.getInset()) {
+                       icit.getInset()->validate(features);
+                       if (layout.needprotect &&
+                           icit.getInset()->lyxCode() == Inset::FOOT_CODE)
+                               features.require("NeedLyXFootnoteCode");
+               }
+       }
+
+       // then the contents
+       for (pos_type i = 0; i < size() ; ++i) {
+               for (size_t pnr = 0; pnr < phrases_nr; ++pnr) {
+                       if (!special_phrases[pnr].builtin
+                           && isTextAt(special_phrases[pnr].phrase, i)) {
+                               features.require(special_phrases[pnr].phrase);
+                               break;
+                       }
+               }
+       }
+}
+
+
 Paragraph * Paragraph::Pimpl::getParFromID(int id) const
 {
-       InsetList::const_iterator cit = owner_->insetlist.begin();
-       InsetList::const_iterator lend = owner_->insetlist.end();
+       InsetList::iterator cit = owner_->insetlist.begin();
+       InsetList::iterator lend = owner_->insetlist.end();
        Paragraph * result;
        for (; cit != lend; ++cit) {
-               if ((result = cit->inset->getParFromID(id)))
+               if ((result = cit.getInset()->getParFromID(id)))
                        return result;
        }
        return 0;
@@ -579,24 +648,16 @@ LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
        // check for environment font information
        char par_depth = owner_->getDepth();
        Paragraph const * par = owner_;
-       LyXTextClass const & tclass = textclasslist[bparams.textclass];
+       LyXTextClass const & tclass = bparams.getLyXTextClass();
 
        while (par && par->getDepth() && !tmpfont.resolved()) {
                par = par->outerHook();
                if (par) {
-                       tmpfont.realize(par->layout()->font
-#ifdef INHERIT_LANGUAGE
-                                       , bparams.language
-#endif
-                                       );
+                       tmpfont.realize(par->layout()->font);
                        par_depth = par->getDepth();
                }
        }
 
-       tmpfont.realize(tclass.defaultfont()
-#ifdef INHERIT_LANGUAGE
-               , bparams.language
-#endif
-               );
+       tmpfont.realize(tclass.defaultfont());
        return tmpfont;
 }