anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cosmetics

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29960 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-06-05 18:45:23 +00:00
parent f56275e896
commit 37a9bbebff
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/insets/InsetCollapsable.cpp
View File

@ -28,6 +28,7 @@
#include "LaTeXFeatures.h" #include "LaTeXFeatures.h"
#include "Lexer.h" #include "Lexer.h"
#include "MetricsInfo.h" #include "MetricsInfo.h"
#include "output_xhtml.h"
#include "paragraph_funcs.h" #include "paragraph_funcs.h"
#include "ParagraphParameters.h" #include "ParagraphParameters.h"
#include "sgml.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 void InsetCollapsable::validate(LaTeXFeatures & features) const
{ {
features.useInsetLayout(getLayout()); features.useInsetLayout(getLayout());

2
src/insets/InsetCollapsable.h
View File

@ -144,6 +144,8 @@ public:
/// ///
int docbook(odocstream &, OutputParams const &) const; int docbook(odocstream &, OutputParams const &) const;
/// ///
int xhtml(odocstream &, OutputParams const &) const;
///
void validate(LaTeXFeatures &) const; void validate(LaTeXFeatures &) const;
/// ///
InsetCode lyxCode() const { return COLLAPSABLE_CODE; } InsetCode lyxCode() const { return COLLAPSABLE_CODE; }

7
src/output_xhtml.cpp
View File

@ -186,7 +186,7 @@ ParagraphList::const_iterator searchEnvironment(
} }
ParagraphList::const_iterator makeParagraph(Buffer const & buf, ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
odocstream & os, odocstream & os,
OutputParams const & runparams, OutputParams const & runparams,
ParagraphList const & paragraphs, ParagraphList const & paragraphs,
@ -208,6 +208,7 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
return pend; return pend;
} }
ParagraphList::const_iterator makeEnvironment(Buffer const & buf, ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
odocstream & os, odocstream & os,
OutputParams const & runparams, OutputParams const & runparams,
@ -293,7 +294,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
} }
case LATEX_PARAGRAPH: case LATEX_PARAGRAPH:
send = searchParagraph(par, pend); send = searchParagraph(par, pend);
par = makeParagraph(buf, os, runparams, paragraphs, par, send); par = makeParagraphs(buf, os, runparams, paragraphs, par, send);
break; break;
// FIXME // FIXME
case LATEX_BIB_ENVIRONMENT: case LATEX_BIB_ENVIRONMENT:
@ -371,7 +372,7 @@ void xhtmlParagraphs(ParagraphList const & paragraphs,
} }
case LATEX_PARAGRAPH: case LATEX_PARAGRAPH:
send = searchParagraph(par, pend); send = searchParagraph(par, pend);
par = makeParagraph(buf, os, runparams, paragraphs, par,send); par = makeParagraphs(buf, os, runparams, paragraphs, par,send);
break; break;
default: default:
break; break;