]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetText.cpp
Update my email and status.
[lyx.git] / src / insets / InsetText.cpp
index ea4273fe32efbcfb4b8d9523c402b9dddf39d876..3ec6f40492288ea6c56736bfa6336c8db74c141b 100644 (file)
@@ -13,6 +13,7 @@
 #include "InsetText.h"
 
 #include "insets/InsetArgument.h"
+#include "insets/InsetLayout.h"
 
 #include "buffer_funcs.h"
 #include "Buffer.h"
@@ -30,6 +31,7 @@
 #include "InsetList.h"
 #include "Intl.h"
 #include "Language.h"
+#include "Layout.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "lyxfind.h"
@@ -54,6 +56,7 @@
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -99,6 +102,26 @@ void InsetText::setBuffer(Buffer & buf)
 }
 
 
+void InsetText::setMacrocontextPositionRecursive(DocIterator const & pos)
+{
+       text_.setMacrocontextPosition(pos);
+
+       ParagraphList::const_iterator pit = paragraphs().begin();
+       ParagraphList::const_iterator pend = paragraphs().end();
+       for (; pit != pend; ++pit) {
+               InsetList::const_iterator iit = pit->insetList().begin();
+               InsetList::const_iterator end = pit->insetList().end();
+               for (; iit != end; ++iit) {
+                       if (InsetText * txt = iit->inset->asInsetText()) {
+                               DocIterator ppos(pos);
+                               ppos.push_back(CursorSlice(*txt));
+                               iit->inset->asInsetText()->setMacrocontextPositionRecursive(ppos);
+                       }
+               }
+       }
+}
+
+
 void InsetText::clear()
 {
        ParagraphList & pars = paragraphs();
@@ -241,10 +264,12 @@ Inset * InsetText::editXY(Cursor & cur, int x, int y)
 
 void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       LYXERR(Debug::ACTION, "InsetText::doDispatch()"
-               << " [ cmd.action() = " << cmd.action() << ']');
+       LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd);
 
-       if (getLayout().isPassThru()) {
+#if 0
+// FIXME: This code does not seem to be necessary anymore
+// Remove for 2.1 if no counter-evidence is found.
+       if (isPassThru() && lyxCode() != ARG_CODE) {
                // Force any new text to latex_language FIXME: This
                // should only be necessary in constructor, but new
                // paragraphs that are created by pressing enter at
@@ -254,6 +279,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
                cur.current_font.setLanguage(latex_language);
                cur.real_current_font.setLanguage(latex_language);
        }
+#endif
 
        switch (cmd.action()) {
        case LFUN_PASTE:
@@ -310,6 +336,40 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
                return target_inset;
        }
 
+       case LFUN_ARGUMENT_INSERT: {
+               string const arg = cmd.getArg(0);
+               if (arg.empty()) {
+                       status.setEnabled(false);
+                       return true;
+               }
+               if (&buffer().inset() == this || !cur.paragraph().layout().args().empty())
+                       return text_.getStatus(cur, cmd, status);
+
+               Layout::LaTeXArgMap args = getLayout().args();
+               Layout::LaTeXArgMap::const_iterator const lait = args.find(arg);
+               if (lait != args.end()) {
+                       status.setEnabled(true);
+                       ParagraphList::const_iterator pit = paragraphs().begin();
+                       for (; pit != paragraphs().end(); ++pit) {
+                               InsetList::const_iterator it = pit->insetList().begin();
+                               InsetList::const_iterator end = pit->insetList().end();
+                               for (; it != end; ++it) {
+                                       if (it->inset->lyxCode() == ARG_CODE) {
+                                               InsetArgument const * ins =
+                                                       static_cast<InsetArgument const *>(it->inset);
+                                               if (ins->name() == arg) {
+                                                       // we have this already
+                                                       status.setEnabled(false);
+                                                       return true;
+                                               }
+                                       }
+                               }
+                       }
+               } else
+                       status.setEnabled(false);
+               return true;
+       }
+
        default:
                // Dispatch only to text_ if the cursor is inside
                // the text_. It is not for context menus (bug 5797).
@@ -326,16 +386,15 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetText::fixParagraphsFont()
 {
-       if (!getLayout().isPassThru())
-               return;
-
        Font font(inherit_font, buffer().params().language);
        font.setLanguage(latex_language);
        ParagraphList::iterator par = paragraphs().begin();
        ParagraphList::iterator const end = paragraphs().end();
        while (par != end) {
-               par->resetFonts(font);
-               par->params().clear();
+               if (par->isPassThru())
+                       par->resetFonts(font);
+               if (!par->allowParagraphCustomization())
+                       par->params().clear();
                ++par;
        }
 }
@@ -371,32 +430,51 @@ void InsetText::validate(LaTeXFeatures & features) const
 }
 
 
-int InsetText::latex(odocstream & os, OutputParams const & runparams) const
+void InsetText::latex(otexstream & os, OutputParams const & runparams) const
 {
        // This implements the standard way of handling the LaTeX
        // output of a text inset, either a command or an
        // environment. Standard collapsable insets should not
        // redefine this, non-standard ones may call this.
        InsetLayout const & il = getLayout();
-       int rows = 0;
        if (!il.latexname().empty()) {
                if (il.latextype() == InsetLayout::COMMAND) {
                        // FIXME UNICODE
                        if (runparams.moving_arg)
                                os << "\\protect";
                        os << '\\' << from_utf8(il.latexname());
+                       if (!il.latexargs().empty())
+                               getArgs(os, runparams);
                        if (!il.latexparam().empty())
                                os << from_utf8(il.latexparam());
                        os << '{';
                } else if (il.latextype() == InsetLayout::ENVIRONMENT) {
-                       os << "%\n\\begin{" << from_utf8(il.latexname()) << "}\n";
+                       if (il.isDisplay())
+                               os << breakln;
+                       else
+                               os << safebreakln;
+                       if (runparams.lastid != -1)
+                               os.texrow().start(runparams.lastid,
+                                                 runparams.lastpos);
+                       os << "\\begin{" << from_utf8(il.latexname()) << "}";
+                       if (!il.latexargs().empty())
+                               getArgs(os, runparams);
                        if (!il.latexparam().empty())
                                os << from_utf8(il.latexparam());
-                       rows += 2;
+                       os << '\n';
                }
+       } else {
+               if (!il.latexargs().empty())
+                       getArgs(os, runparams);
+               if (!il.latexparam().empty())
+                       os << from_utf8(il.latexparam());
        }
+
+       if (!il.leftdelim().empty())
+               os << il.leftdelim();
+
        OutputParams rp = runparams;
-       if (il.isPassThru())
+       if (isPassThru())
                rp.pass_thru = true;
        if (il.isNeedProtect())
                rp.moving_arg = true;
@@ -404,20 +482,28 @@ int InsetText::latex(odocstream & os, OutputParams const & runparams) const
        rp.par_end = paragraphs().size();
 
        // Output the contents of the inset
-       TexRow texrow;
-       latexParagraphs(buffer(), text_, os, texrow, rp);
-       rows += texrow.rows();
+       latexParagraphs(buffer(), text_, os, rp);
        runparams.encoding = rp.encoding;
 
+       if (!il.rightdelim().empty())
+               os << il.rightdelim();
+
        if (!il.latexname().empty()) {
                if (il.latextype() == InsetLayout::COMMAND) {
                        os << "}";
+                       if (!il.postcommandargs().empty())
+                               getArgs(os, runparams, true);
                } else if (il.latextype() == InsetLayout::ENVIRONMENT) {
-                       os << "\n\\end{" << from_utf8(il.latexname()) << "}\n";
-                       rows += 2;
+                       // A comment environment doesn't need a % before \n\end
+                       if (il.isDisplay() || runparams.inComment)
+                               os << breakln;
+                       else
+                               os << safebreakln;
+                       os << "\\end{" << from_utf8(il.latexname()) << "}\n";
+                       if (!il.isDisplay())
+                               os.protectSpace(true);
                }
        }
-       return rows;
 }
 
 
@@ -483,9 +569,15 @@ docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) con
 // if so, try to close fonts, etc. 
 // There are probably limits to how well we can do here, though, and we will
 // have to rely upon users not putting footnotes inside noun-type insets.
-docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & runparams,
+docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
                                   XHTMLOptions opts) const
 {
+       // we will always want to output all our paragraphs when we are
+       // called this way.
+       OutputParams runparams = rp;
+       runparams.par_begin = 0;
+       runparams.par_end = text().paragraphs().size();
+       
        if (undefined()) {
                xhtmlParagraphs(text_, buffer(), xs, runparams);
                return docstring();
@@ -494,6 +586,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & runpara
        InsetLayout const & il = getLayout();
        if (opts & WriteOuterTag)
                xs << html::StartTag(il.htmltag(), il.htmlattr());
+
        if ((opts & WriteLabel) && !il.counter().empty()) {
                BufferParams const & bp = buffer().masterBuffer()->params();
                Counters & cntrs = bp.documentClass().counters();
@@ -513,17 +606,38 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & runpara
 
        if (opts & WriteInnerTag)
                xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr());
-       OutputParams ours = runparams;
+
+       // we will eventually lose information about the containing inset
        if (!il.isMultiPar() || opts == JustText)
-               ours.html_make_pars = false;
-       xhtmlParagraphs(text_, buffer(), xs, ours);
+               runparams.html_make_pars = false;
+       if (il.isPassThru())
+               runparams.pass_thru = true;
+
+       xhtmlParagraphs(text_, buffer(), xs, runparams);
+
        if (opts & WriteInnerTag)
                xs << html::EndTag(il.htmlinnertag());
+
        if (opts & WriteOuterTag)
                xs << html::EndTag(il.htmltag());
+
        return docstring();
 }
 
+void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in,
+                       bool const post) const
+{
+       OutputParams runparams = runparams_in;
+       runparams.local_font =
+               &paragraphs()[0].getFirstFontSettings(buffer().masterBuffer()->params());
+       if (isPassThru())
+               runparams.pass_thru = true;
+       if (post)
+               latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().postcommandargs(), "post:");
+       else
+               latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().latexargs());
+}
+
 
 void InsetText::cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const
@@ -635,6 +749,18 @@ ParagraphList & InsetText::paragraphs()
 }
 
 
+bool InsetText::insetAllowed(InsetCode code) const
+{
+       switch (code) {
+       // Arguments are also allowed in PassThru insets
+       case ARG_CODE:
+               return true;
+       default:
+               return !isPassThru();
+       }
+}
+
+
 void InsetText::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        ParIterator it2 = it;
@@ -711,7 +837,7 @@ void InsetText::addToToc(DocIterator const & cdit) const
                                arginset = inset.asInsetText();
                }
                // now the toc entry for the paragraph
-               int const toclevel = par.layout().toclevel;
+               int const toclevel = text().getTocLevel(pit);
                if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel) {
                        // insert this into the table of contents
                        docstring tocstring;
@@ -815,18 +941,18 @@ void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
 }
 
 
-docstring InsetText::contextMenu(BufferView const &, int, int) const
+string InsetText::contextMenu(BufferView const &, int, int) const
 {
-       docstring context_menu = contextMenuName();
+       string context_menu = contextMenuName();
        if (context_menu != InsetText::contextMenuName())
                context_menu += ";" + InsetText::contextMenuName(); 
        return context_menu;
 }
 
 
-docstring InsetText::contextMenuName() const
+string InsetText::contextMenuName() const
 {
-       return from_ascii("context-edit");
+       return "context-edit";
 }