Routines for calculating numerical labels for BibTeX citations.

[lyx.git] / src / insets / InsetText.cpp

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 1dcf068a4079421ffc07746453d0a1f124e49f16..3c85bfd4702fb888470734d2e6423c5aa2ad198c 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -75,20 +75,17 @@ using graphics::PreviewLoader;
 /////////////////////////////////////////////////////////////////////
 
 InsetText::InsetText(Buffer * buf, UsePlain type)
-       : Inset(buf), drawFrame_(false), frame_color_(Color_insetframe), text_(this)
+       : Inset(buf), drawFrame_(false), frame_color_(Color_insetframe),
+       text_(this, type == DefaultLayout)
 {
-       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();
 }
 
 
@@ -101,27 +98,6 @@ void InsetText::setBuffer(Buffer & buf)
 }
 
 
-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();
@@ -501,6 +477,19 @@ docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) con
 }
 
 
+// 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
 {
@@ -628,16 +617,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<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);
+               }
        }
 }
 
@@ -654,17 +651,17 @@ ParagraphList & InsetText::paragraphs()
 }
 
 
-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;
        }
 }
@@ -861,11 +858,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::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