{
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
cur.current_font.setLanguage(latex_language);
cur.real_current_font.setLanguage(latex_language);
}
+#endif
switch (cmd.action()) {
case LFUN_PASTE:
status.setEnabled(false);
return true;
}
- if (&buffer().inset() == this || !cur.paragraph().layout().latexargs().empty())
+ if (&buffer().inset() == this || !cur.paragraph().layout().args().empty())
return text_.getStatus(cur, cmd, status);
- Layout::LaTeXArgMap args = getLayout().latexargs();
- Layout::LaTeXArgMap::const_iterator const lait =
- args.find(convert<unsigned int>(arg));
+
+ Layout::LaTeXArgMap args = getLayout().args();
+ Layout::LaTeXArgMap::const_iterator const lait = args.find(arg);
if (lait != args.end()) {
status.setEnabled(true);
- InsetList::const_iterator it = cur.paragraph().insetList().begin();
- InsetList::const_iterator end = cur.paragraph().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;
+ 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;
+ }
}
}
}
if (runparams.moving_arg)
os << "\\protect";
os << '\\' << from_utf8(il.latexname());
- getOptArg(os, runparams);
+ if (!il.latexargs().empty())
+ getArgs(os, runparams);
if (!il.latexparam().empty())
os << from_utf8(il.latexparam());
os << '{';
} else if (il.latextype() == InsetLayout::ENVIRONMENT) {
if (il.isDisplay())
- os << breakln;
+ os << breakln;
else
- os << safebreakln;
+ os << safebreakln;
if (runparams.lastid != -1)
os.texrow().start(runparams.lastid,
runparams.lastpos);
- os << "\\begin{" << from_utf8(il.latexname()) << "}\n";
+ os << "\\begin{" << from_utf8(il.latexname()) << "}";
+ if (!il.latexargs().empty())
+ getArgs(os, runparams);
if (!il.latexparam().empty())
os << from_utf8(il.latexparam());
+ 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;
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) {
// A comment environment doesn't need a % before \n\end
if (il.isDisplay() || runparams.inComment)
- os << breakln;
+ os << breakln;
else
- os << safebreakln;
+ os << safebreakln;
os << "\\end{" << from_utf8(il.latexname()) << "}\n";
if (!il.isDisplay())
os.protectSpace(true);
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();
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::getOptArg(otexstream & os,
- OutputParams const & runparams) const
+void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in,
+ bool const post) const
{
- latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
+ 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());
}
}
+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;
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;
projects / lyx.git / blobdiff