Cosmetics

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29960 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index ac1bc3a8e9a9211a6ed3072efae03a869e46ab9b..5eec355c68c4adb635f03185a2a69fd2e371b453 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -28,6 +28,7 @@
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
+#include "output_xhtml.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "sgml.h"
@@ -871,6 +872,19 @@ int InsetCollapsable::docbook(odocstream & os, OutputParams const & runparams) c
 }
 
 
+int InsetCollapsable::xhtml(odocstream & os, OutputParams const & runparams) const
+{
+       InsetLayout const & il = getLayout();
+       bool opened = false;
+       if (!undefined())
+               opened = html::openTag(os, il.htmltag(), il.htmlattr());
+       InsetText::xhtml(os, runparams);
+       if (opened && !undefined())
+               html::closeTag(os, il.htmltag());
+       return 0;
+}
+
+
 void InsetCollapsable::validate(LaTeXFeatures & features) const
 {
        features.useInsetLayout(getLayout());

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 73fde24e8c2de0342ac0139f6ed34c989758b8a2..4e69f893c3d92c3911d8013f46aea5ed971f36c0 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -144,6 +144,8 @@ public:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
+       int xhtml(odocstream &, OutputParams const &) const;
+       ///
        void validate(LaTeXFeatures &) const;
        ///
        InsetCode lyxCode() const { return COLLAPSABLE_CODE; }

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 610888f474ef1679f8c14ad0c048d09a4c5a9b8a..b4bf21bef2e5015c78f2993aac800809846a7a68 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -186,7 +186,7 @@ ParagraphList::const_iterator searchEnvironment(
 }
 
 
-ParagraphList::const_iterator makeParagraph(Buffer const & buf,
+ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
                                            odocstream & os,
                                            OutputParams const & runparams,
                                            ParagraphList const & paragraphs,
@@ -208,6 +208,7 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
        return pend;
 }
 
+
 ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                                              odocstream & os,
                                              OutputParams const & runparams,
@@ -293,7 +294,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                }
                case LATEX_PARAGRAPH:
                        send = searchParagraph(par, pend);
-                       par = makeParagraph(buf, os, runparams, paragraphs, par, send);
+                       par = makeParagraphs(buf, os, runparams, paragraphs, par, send);
                        break;
                // FIXME
                case LATEX_BIB_ENVIRONMENT:
@@ -371,7 +372,7 @@ void xhtmlParagraphs(ParagraphList const & paragraphs,
                }
                case LATEX_PARAGRAPH:
                        send = searchParagraph(par, pend);
-                       par = makeParagraph(buf, os, runparams, paragraphs, par,send);
+                       par = makeParagraphs(buf, os, runparams, paragraphs, par,send);
                        break;
                default:
                        break;