X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.cpp;h=09a52150509e0ea62dc2ef7a52779f98024f9769;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=dd053d017b71938a2eacc05e37bd66912616391d;hpb=604ed2571f2b705f7b7102c9a4dae353faa2bf14;p=lyx.git diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index dd053d017b..09a5215050 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -12,7 +12,7 @@ #include "InsetText.h" -#include "insets/InsetOptArg.h" +#include "insets/InsetArgument.h" #include "buffer_funcs.h" #include "Buffer.h" @@ -99,6 +99,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(); @@ -326,16 +346,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,14 +390,13 @@ 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 @@ -389,33 +407,44 @@ int InsetText::latex(odocstream & os, OutputParams const & runparams) const 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()) << "}\n"; if (!il.latexparam().empty()) os << from_utf8(il.latexparam()); - rows += 2; } } OutputParams rp = runparams; if (il.isPassThru()) - rp.verbatim = true; + 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.latexname().empty()) { if (il.latextype() == InsetLayout::COMMAND) { os << "}"; } 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; } @@ -481,9 +510,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(); @@ -659,39 +694,45 @@ void InsetText::updateBuffer(ParIterator const & it, UpdateType utype) // tclass.counters().clearLastLayout() // since we are saving and restoring the existing counters, etc. Counters const savecnt = tclass.counters(); + 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) { @@ -699,29 +740,22 @@ 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; 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); + 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)); } @@ -814,21 +848,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 +{ + string context_menu = contextMenuName(); + if (context_menu != InsetText::contextMenuName()) + context_menu += ";" + InsetText::contextMenuName(); + return context_menu; +} + + +string InsetText::contextMenuName() const { - return from_ascii("context-edit"); + return "context-edit"; } -docstring InsetText::toolTipText() const +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 ods; - // do not remove InsetText::, otherwise there - // will be no tooltip text for InsetNotes - InsetText::plaintext(ods, rp); - docstring const content_tip = ods.str(); - return support::wrapParas(content_tip, 4); + 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); } @@ -873,7 +930,7 @@ docstring InsetText::getCaptionHTML(OutputParams const & runparams) const docstring def = ins->getCaptionAsHTML(xs, runparams); if (!def.empty()) // should already have been escaped - xs << XHTMLStream::NextRaw() << def << '\n'; + xs << XHTMLStream::ESCAPE_NONE << def << '\n'; return ods.str(); }