/////////////////////////////////////////////////////////////////////
-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<Buffer &>(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();
}
}
-void InsetText::initParagraphs(UsePlain type)
-{
- 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);
-}
-
-
-void InsetText::setParagraphOwner()
-{
- for_each(paragraphs().begin(), paragraphs().end(),
- bind(&Paragraph::setInsetOwner, _1, this));
-}
-
-
void InsetText::clear()
{
ParagraphList & pars = paragraphs();
// FIXME: Change only the pasted paragraphs
fixParagraphsFont();
break;
+
+ 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 = nargs() == 1;
+
+ if (!main_inset && target_inset && one_cell) {
+ // Text::dissolveInset assumes that the cursor
+ // is inside the Inset.
+ if (&cur.inset() != this)
+ cur.pushBackward(*this);
+ cur.beginUndoGroup();
+ text_.dispatch(cur, cmd);
+ cur.endUndoGroup();
+ } else
+ cur.undispatched();
+ break;
+ }
+
default:
text_.dispatch(cur, cmd);
}
case LFUN_PARAGRAPH_UPDATE:
status.setEnabled(allowParagraphCustomization());
return true;
+
+ 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 = nargs() == 1;
+
+ if (target_inset)
+ status.setEnabled(!main_inset && one_cell);
+ return target_inset;
+ }
+
default:
// Dispatch only to text_ if the cursor is inside
// the text_. It is not for context menus (bug 5797).
}
-docstring InsetText::xhtml(odocstream & os, OutputParams const & runparams) const
+docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
+{
+ 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:
+// <em>word <div class='foot'>footnote text.</div> emph</em>
+// 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 <span>, 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 & runparams,
+ XHTMLOptions opts) const
{
- InsetLayout const & il = getLayout();
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 << 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());
// 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 << StartTag(il.htmllabeltag(), il.htmllabelattr());
+ xs << lbl;
+ xs << 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 (innertag_opened)
- html::closeTag(os, il.htmlinnertag());
- if (opened)
- html::closeTag(os, il.htmltag());
+ if (opts & WriteInnerTag)
+ xs << StartTag(il.htmlinnertag(), il.htmlinnerattr());
+ if (il.isMultiPar())
+ xhtmlParagraphs(text_, buffer(), xs, runparams);
+ else {
+ OutputParams ours = runparams;
+ ours.html_make_pars = false;
+ xhtmlParagraphs(text_, buffer(), xs, ours);
+ }
+ if (opts & WriteInnerTag)
+ xs << EndTag(il.htmlinnertag());
+ if (opts & WriteOuterTag)
+ xs << EndTag(il.htmltag());
return docstring();
}
}
-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<InsetText *>(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);
+ }
}
}
}
-void InsetText::updateLabels(ParIterator const & it)
+void InsetText::updateLabels(ParIterator const & it, bool out)
{
ParIterator it2 = it;
it2.forwardPos();
LASSERT(&it2.inset() == this && it2.pit() == 0, return);
if (producesOutput())
- buffer().updateLabels(it2);
+ buffer().updateLabels(it2, out);
else {
DocumentClass const & tclass = buffer().masterBuffer()->params().documentClass();
Counters const savecnt = tclass.counters();
- buffer().updateLabels(it2);
+ buffer().updateLabels(it2, out);
tclass.counters() = savecnt;
}
}
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::NextRaw() << def << '\n';
return ods.str();
}
+InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOptions a2)
+{
+ return static_cast<InsetText::XHTMLOptions>((int)a1 | (int)a2);
+}
+
} // namespace lyx
projects / lyx.git / blobdiff