X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.cpp;h=3ec6f40492288ea6c56736bfa6336c8db74c141b;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=cb4d69a3fc97f30e088df0c70da5b3f7dbcade06;hpb=6e8312d1a46fc79af62f01fde116f7b12974c210;p=lyx.git diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index cb4d69a3fc..3ec6f40492 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -12,7 +12,8 @@ #include "InsetText.h" -#include "insets/InsetOptArg.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,18 +56,20 @@ #include "frontends/alert.h" #include "frontends/Painter.h" +#include "support/convert.h" #include "support/debug.h" #include "support/gettext.h" #include "support/lstrings.h" -#include +#include "support/bind.h" #include "support/lassert.h" +#include + + using namespace std; using namespace lyx::support; -using boost::bind; -using boost::ref; namespace lyx { @@ -74,22 +78,18 @@ using graphics::PreviewLoader; ///////////////////////////////////////////////////////////////////// -InsetText::InsetText(Buffer const & buf, UsePlain type) - : drawFrame_(false), frame_color_(Color_insetframe), text_(this) +InsetText::InsetText(Buffer * buf, UsePlain type) + : Inset(buf), drawFrame_(false), frame_color_(Color_insetframe), + text_(this, type == DefaultLayout) { - setBuffer(const_cast(buf)); - initParagraphs(type); } InsetText::InsetText(InsetText const & in) - : Inset(in), text_(this) + : Inset(in), text_(this, in.text_) { - text_.autoBreakRows_ = in.text_.autoBreakRows_; drawFrame_ = in.drawFrame_; frame_color_ = in.frame_color_; - text_.paragraphs() = in.text_.paragraphs(); - setParagraphOwner(); } @@ -102,24 +102,23 @@ void InsetText::setBuffer(Buffer & buf) } -void InsetText::initParagraphs(UsePlain type) +void InsetText::setMacrocontextPositionRecursive(DocIterator const & pos) { - LASSERT(paragraphs().empty(), /**/); - paragraphs().push_back(Paragraph()); - Paragraph & ourpar = paragraphs().back(); - ourpar.setInsetOwner(this); - DocumentClass const & dc = buffer_->params().documentClass(); - if (type == DefaultLayout) - ourpar.setDefaultLayout(dc); - else - ourpar.setPlainLayout(dc); -} + text_.setMacrocontextPosition(pos); - -void InsetText::setParagraphOwner() -{ - for_each(paragraphs().begin(), paragraphs().end(), - bind(&Paragraph::setInsetOwner, _1, this)); + 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); + } + } + } } @@ -265,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 @@ -278,8 +279,9 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) cur.current_font.setLanguage(latex_language); cur.real_current_font.setLanguage(latex_language); } +#endif - switch (cmd.action) { + switch (cmd.action()) { case LFUN_PASTE: case LFUN_CLIPBOARD_PASTE: case LFUN_SELECTION_PASTE: @@ -295,7 +297,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) bool const main_inset = &buffer().inset() == this; bool const target_inset = cmd.argument().empty() || cmd.getArg(0) == insetName(lyxCode()); - bool const one_cell = cur.inset().nargs() == 1; + bool const one_cell = nargs() == 1; if (!main_inset && target_inset && one_cell) { // Text::dissolveInset assumes that the cursor @@ -322,25 +324,50 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & status) const { - switch (cmd.action) { - case LFUN_LAYOUT: - status.setEnabled(!forcePlainLayout()); - return true; - - case LFUN_LAYOUT_PARAGRAPH: - case LFUN_PARAGRAPH_PARAMS: - case LFUN_PARAGRAPH_PARAMS_APPLY: - case LFUN_PARAGRAPH_UPDATE: - status.setEnabled(allowParagraphCustomization()); - return true; - + switch (cmd.action()) { case LFUN_INSET_DISSOLVE: { bool const main_inset = &buffer().inset() == this; bool const target_inset = cmd.argument().empty() || cmd.getArg(0) == insetName(lyxCode()); - bool const one_cell = cur.inset().nargs() == 1; + bool const one_cell = nargs() == 1; + + if (target_inset) + status.setEnabled(!main_inset && one_cell); + return target_inset; + } - return !main_inset && target_inset && one_cell; + 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(it->inset); + if (ins->name() == arg) { + // we have this already + status.setEnabled(false); + return true; + } + } + } + } + } else + status.setEnabled(false); + return true; } default: @@ -359,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; } } @@ -404,50 +430,80 @@ 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()) - rp.verbatim = true; + if (isPassThru()) + rp.pass_thru = true; if (il.isNeedProtect()) rp.moving_arg = true; + rp.par_begin = 0; + 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; } @@ -494,36 +550,94 @@ int InsetText::docbook(odocstream & os, OutputParams const & runparams) const } -docstring InsetText::xhtml(odocstream & os, OutputParams const & runparams) const +docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) const { - InsetLayout const & il = getLayout(); + return insetAsXHTML(xs, runparams, WriteEverything); +} + + +// FIXME XHTML +// There are cases where we may need to close open fonts and such +// and then re-open them when we are done. This would be the case, e.g., +// if we were otherwise about to write: +// word
footnote text.
emph +// The problem isn't so much that the footnote text will get emphasized: +// we can handle that with CSS. The problem is that this is invalid XHTML. +// One solution would be to make the footnote , but the problem is +// completely general, and so we'd have to make absolutely everything into +// span. What I think will work is to check if we're about to write "div" and, +// 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 & 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(), os, runparams); + xhtmlParagraphs(text_, buffer(), xs, runparams); return docstring(); } - bool const opened = html::openTag(os, il.htmltag(), il.htmlattr()); - if (!il.counter().empty()) { + 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(); - cntrs.step(il.counter()); + cntrs.step(il.counter(), OutputUpdate); // FIXME: translate to paragraph language - if (!il.htmllabel().empty()) - os << cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code()); + if (!il.htmllabel().empty()) { + docstring const lbl = + cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code()); + // FIXME is this check necessary? + if (!lbl.empty()) { + xs << html::StartTag(il.htmllabeltag(), il.htmllabelattr()); + xs << lbl; + xs << html::EndTag(il.htmllabeltag()); + } + } } - bool innertag_opened = false; - if (!il.htmlinnertag().empty()) - innertag_opened = html::openTag(os, il.htmlinnertag(), il.htmlinnerattr()); - xhtmlParagraphs(text_, buffer(), os, runparams); + if (opts & WriteInnerTag) + xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr()); + + // we will eventually lose information about the containing inset + if (!il.isMultiPar() || opts == JustText) + 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()); - if (innertag_opened) - html::closeTag(os, il.htmlinnertag()); - if (opened) - html::closeTag(os, il.htmltag()); return docstring(); } +void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in, + bool const post) const +{ + OutputParams runparams = runparams_in; + runparams.local_font = + ¶graphs()[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 @@ -533,12 +647,6 @@ void InsetText::cursorPos(BufferView const & bv, } -bool InsetText::showInsetDialog(BufferView *) const -{ - return false; -} - - void InsetText::setText(docstring const & data, Font const & font, bool trackChanges) { clear(); @@ -607,16 +715,24 @@ void InsetText::appendParagraphs(ParagraphList & plist) } -void InsetText::addPreview(PreviewLoader & loader) const +void InsetText::addPreview(DocIterator const & text_inset_pos, + PreviewLoader & loader) const { ParagraphList::const_iterator pit = paragraphs().begin(); ParagraphList::const_iterator pend = paragraphs().end(); + int pidx = 0; - for (; pit != pend; ++pit) { + DocIterator inset_pos = text_inset_pos; + inset_pos.push_back(CursorSlice(*const_cast(this))); + + for (; pit != pend; ++pit, ++pidx) { InsetList::const_iterator it = pit->insetList().begin(); InsetList::const_iterator end = pit->insetList().end(); - for (; it != end; ++it) - it->inset->addPreview(loader); + inset_pos.pit() = pidx; + for (; it != end; ++it) { + inset_pos.pos() = it->pos; + it->inset->addPreview(inset_pos, loader); + } } } @@ -633,49 +749,83 @@ ParagraphList & InsetText::paragraphs() } -void InsetText::updateLabels(ParIterator const & it) +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; it2.forwardPos(); LASSERT(&it2.inset() == this && it2.pit() == 0, return); - if (producesOutput()) - buffer().updateLabels(it2); - else { + if (producesOutput()) { + InsetLayout const & il = getLayout(); + bool const save_layouts = utype == OutputUpdate && il.htmlisblock(); + Counters & cnt = buffer().masterBuffer()->params().documentClass().counters(); + if (save_layouts) { + // LYXERR0("Entering " << name()); + cnt.clearLastLayout(); + // FIXME cnt.saveLastCounter()? + } + buffer().updateBuffer(it2, utype); + if (save_layouts) { + // LYXERR0("Exiting " << name()); + cnt.restoreLastLayout(); + // FIXME cnt.restoreLastCounter()? + } + } else { DocumentClass const & tclass = buffer().masterBuffer()->params().documentClass(); + // Note that we do not need to call: + // tclass.counters().clearLastLayout() + // since we are saving and restoring the existing counters, etc. Counters const savecnt = tclass.counters(); - buffer().updateLabels(it2); + tclass.counters().reset(); + buffer().updateBuffer(it2, utype); tclass.counters() = savecnt; } } -void InsetText::tocString(odocstream & os) const +void InsetText::toString(odocstream & os) const { - if (!getLayout().isInToc()) - return; os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS); } +void InsetText::forToc(docstring & os, size_t maxlen) const +{ + if (!getLayout().isInToc()) + return; + text().forToc(os, maxlen, false); +} + -void InsetText::addToToc(DocIterator const & cdit) +void InsetText::addToToc(DocIterator const & cdit) const { DocIterator dit = cdit; - dit.push_back(CursorSlice(*this)); + dit.push_back(CursorSlice(const_cast(*this))); Toc & toc = buffer().tocBackend().toc("tableofcontents"); BufferParams const & bufparams = buffer_->params(); - const int min_toclevel = bufparams.documentClass().min_toclevel(); + int const min_toclevel = bufparams.documentClass().min_toclevel(); // For each paragraph, traverse its insets and let them add // their toc items - ParagraphList & pars = paragraphs(); + ParagraphList const & pars = paragraphs(); pit_type pend = paragraphs().size(); for (pit_type pit = 0; pit != pend; ++pit) { Paragraph const & par = pars[pit]; dit.pit() = pit; - // the string that goes to the toc (could be the optarg) - docstring tocstring; + // if we find an optarg, we'll save it for use later. + InsetText const * arginset = 0; InsetList::const_iterator it = par.insetList().begin(); InsetList::const_iterator end = par.insetList().end(); for (; it != end; ++it) { @@ -683,30 +833,24 @@ void InsetText::addToToc(DocIterator const & cdit) dit.pos() = it->pos; //lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl; inset.addToToc(dit); - switch (inset.lyxCode()) { - case OPTARG_CODE: { - if (!tocstring.empty()) - break; - dit.pos() = 0; - Paragraph const & insetpar = - *static_cast(inset).paragraphs().begin(); - if (!par.labelString().empty()) - tocstring = par.labelString() + ' '; - tocstring += insetpar.asString(AS_STR_INSETS); - break; - } - default: - break; - } + if (inset.lyxCode() == ARG_CODE) + 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) { - dit.pos() = 0; // insert this into the table of contents - if (tocstring.empty()) - tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS); - toc.push_back(TocItem(dit, toclevel - min_toclevel, tocstring)); + docstring tocstring; + if (arginset) { + tocstring = par.labelString(); + if (!tocstring.empty()) + tocstring += ' '; + arginset->text().forToc(tocstring, TOC_ENTRY_LENGTH); + } else + par.forToc(tocstring, TOC_ENTRY_LENGTH); + dit.pos() = 0; + toc.push_back(TocItem(dit, toclevel - min_toclevel, + tocstring, tocstring)); } // And now the list of changes. @@ -797,9 +941,44 @@ 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 { - return from_ascii("context-edit"); + string context_menu = contextMenuName(); + if (context_menu != InsetText::contextMenuName()) + context_menu += ";" + InsetText::contextMenuName(); + return context_menu; +} + + +string InsetText::contextMenuName() const +{ + return "context-edit"; +} + + +docstring InsetText::toolTipText(docstring prefix, + size_t numlines, size_t len) const +{ + size_t const max_length = numlines * len; + OutputParams rp(&buffer().params().encoding()); + odocstringstream oss; + oss << prefix; + + ParagraphList::const_iterator beg = paragraphs().begin(); + ParagraphList::const_iterator end = paragraphs().end(); + ParagraphList::const_iterator it = beg; + bool ref_printed = false; + docstring str; + + for (; it != end; ++it) { + if (it != beg) + oss << '\n'; + writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed); + str = oss.str(); + if (str.length() > max_length) + break; + } + return support::wrapParas(str, 4, len, numlines); } @@ -840,11 +1019,18 @@ docstring InsetText::getCaptionHTML(OutputParams const & runparams) const return docstring(); odocstringstream ods; - docstring def = ins->getCaptionAsHTML(ods, runparams); + XHTMLStream xs(ods); + docstring def = ins->getCaptionAsHTML(xs, runparams); if (!def.empty()) - ods << def << '\n'; + // should already have been escaped + xs << XHTMLStream::ESCAPE_NONE << def << '\n'; return ods.str(); } +InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOptions a2) +{ + return static_cast((int)a1 | (int)a2); +} + } // namespace lyx