That didn't really work. So revert to old CSS for gray notes.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 0580b10e0d63d5b739277cdc890d5f4c38de1aae..0266c2e6ff9cf19a5b7875a12ebee99a7fceed7e 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -5,6 +5,7 @@
  *
  * \author Asger Alstrup
  * \author Lars Gullik Bjønnes
+ * \author Richard Heck (XHTML output)
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
@@ -1071,6 +1072,18 @@ bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
 
 void Paragraph::Private::validate(LaTeXFeatures & features) const
 {
+       if (layout_->inpreamble && inset_owner_) {
+               Buffer const & buf = inset_owner_->buffer();
+               BufferParams const & bp = buf.params();
+               Font f;
+               TexRow tr;
+               odocstringstream ods;
+               owner_->latex(bp, f, ods, tr, features.runparams());
+               docstring d = ods.str();
+               if (!d.empty())
+                       features.addPreambleSnippet(to_utf8(d));
+       }
+       
        // check the params.
        if (!params_.spacing().isDefault())
                features.require("setspace");
@@ -1945,6 +1958,9 @@ bool Paragraph::latex(BufferParams const & bparams,
 {
        LYXERR(Debug::LATEX, "Paragraph::latex...     " << this);
 
+       if (layout().inpreamble)
+               return true;
+
        bool return_value = false;
 
        bool const allowcust = allowParagraphCustomization();
@@ -2285,18 +2301,18 @@ pos_type Paragraph::firstWordDocBook(odocstream & os, OutputParams const & runpa
 }
 
 
-pos_type Paragraph::firstWordLyXHTML(odocstream & os, OutputParams const & runparams)
+pos_type Paragraph::firstWordLyXHTML(XHTMLStream & xs, OutputParams const & runparams)
        const
 {
        pos_type i;
        for (i = 0; i < size(); ++i) {
                if (Inset const * inset = getInset(i)) {
-                       inset->xhtml(os, runparams);
+                       inset->xhtml(xs, runparams);
                } else {
                        char_type c = d->text_[i];
                        if (c == ' ')
                                break;
-                       os << html::escapeChar(c);
+                       xs << c;
                }
        }
        return i;
@@ -2375,20 +2391,26 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 
 
 docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
-                                   odocstream & os,
+                                   XHTMLStream & xs,
                                    OutputParams const & runparams,
                                    Font const & outerfont,
+                                               bool fortoc,
                                    pos_type initial) const
 {
        docstring retval;
 
-       // FIXME We really need to manage the tag nesting here.
-       // Probably in the same sort of way as in output_xhtml.
        bool emph_flag = false;
        bool bold_flag = false;
        std::string closing_tag;
 
        Layout const & style = *d->layout_;
+
+       if (!fortoc) {
+               // generate a magic label for this paragraph
+               string const attr = "id='" + magicLabel() + "'";
+               xs << CompTag("a", attr);
+       }
+
        FontInfo font_old =
                style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
 
@@ -2399,37 +2421,41 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
                // emphasis
                if (font_old.emph() != font.fontInfo().emph()) {
                        if (font.fontInfo().emph() == FONT_ON) {
-                               os << "<em>";
+                               xs << StartTag("em");
                                emph_flag = true;
                        } else if (emph_flag && i != initial) {
-                               os << "</em>";
+                               xs << EndTag("em");
                                emph_flag = false;
                        }
                }
                // bold
                if (font_old.series() != font.fontInfo().series()) {
                        if (font.fontInfo().series() == BOLD_SERIES) {
-                               os << "<strong>";
+                               xs << StartTag("strong");
                                bold_flag = true;
                        } else if (bold_flag && i != initial) {
-                               os << "</strong>";
+                               xs << EndTag("strong");
                                bold_flag = false;
                        }
                }
-               // FIXME Other such tags? 
+               // FIXME XHTML
+               // Other such tags? What about the other text ranges?
 
                Inset const * inset = getInset(i);
                if (inset) {
+                       InsetCommand const * ic = inset->asInsetCommand();
                        InsetLayout const & il = inset->getLayout();
-                       OutputParams np = runparams;
-                       if (!il.htmlisblock())
-                               np.html_in_par = true;
-                       retval += inset->xhtml(os, np);
+                       if (!fortoc || il.isInToc() || (ic && ic->isInToc())) {
+                               OutputParams np = runparams;
+                               if (!il.htmlisblock())
+                                       np.html_in_par = true;
+                               retval += inset->xhtml(xs, np);
+                       }
                } else {
                        char_type c = d->text_[i];
 
                        if (style.pass_thru)
-                               os.put(c);
+                               xs << c;
                        else if (c == '-') {
                                docstring str;
                                int j = i + 1;
@@ -2445,19 +2471,17 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
                                }
                                else
                                        str += c;
-                               os << str;
+                               // We don't want to escape the entities. Note that
+                               // it is safe to do this, since str can otherwise
+                               // only be "-". E.g., it can't be "<".
+                               xs << XHTMLStream::NextRaw() << str;
                        } else
-                               os << html::escapeChar(c);
+                               xs << c;
                }
                font_old = font.fontInfo();
        }
 
-       // FIXME This could be out of order. See above.
-       if (emph_flag)
-               os << "</em>";
-       if (bold_flag)
-               os << "</strong>";
-
+       xs.closeFontTags();
        return retval;
 }
 
@@ -3124,4 +3148,12 @@ bool Paragraph::isMisspelled(pos_type pos) const
 }
 
 
+string Paragraph::magicLabel() const
+{
+       stringstream ss;
+       ss << "magicparlabel-" << id();
+       return ss.str();
+}
+
+
 } // namespace lyx