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

Renaming.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31769 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-10-27 14:14:24 +00:00
parent e90add4f15
commit 2e871e1ae3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Layout.cpp
View File

@ -101,7 +101,7 @@ enum LayoutTags {
LT_HTMLLABELFIRST,
LT_HTMLPREAMBLE,
LT_HTMLSTYLE,
LT_HTMLFORCEDEFAULT,
LT_HTMLFORCECSS,
LT_INTITLE // keep this last!
};
@ -141,7 +141,7 @@ Layout::Layout()
toclevel = NOT_IN_TOC;
commanddepth = 0;
htmllabelfirst_ = false;
htmlforcedefault_ = false;
htmlforcecss_ = false;
}
@ -165,7 +165,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
{ "font", LT_FONT },
{ "freespacing", LT_FREE_SPACING },
{ "htmlattr", LT_HTMLATTR },
{ "htmlforcedefault", LT_HTMLFORCEDEFAULT },
{ "htmlforcecss", LT_HTMLFORCECSS },
{ "htmlitem", LT_HTMLITEM },
{ "htmlitemattr", LT_HTMLITEMATTR },
{ "htmllabel", LT_HTMLLABEL },
@ -517,8 +517,8 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle"));
break;
case LT_HTMLFORCEDEFAULT:
lex >> htmlforcedefault_;
case LT_HTMLFORCECSS:
lex >> htmlforcecss_;
case LT_HTMLPREAMBLE:
htmlpreamble_ = from_utf8(lex.getLongString("EndPreamble"));
@ -918,7 +918,7 @@ string const & Layout::htmllabelattr() const
docstring Layout::htmlstyle() const {
if (!htmlstyle_.empty() && !htmlforcedefault_)
if (!htmlstyle_.empty() && !htmlforcecss_)
return htmlstyle_;
if (htmldefaultstyle_.empty())
makeDefaultCSS();

10
src/Layout.h
View File

@ -254,9 +254,9 @@ private:
///
std::string defaultCSSClass() const;
///
std::string defaultCSSItemClass() const { return to_utf8(name()) + "item"; }
std::string defaultCSSItemClass() const { return to_utf8(name()) + "_item"; }
///
std::string defaultCSSLabelClass() const { return to_utf8(name()) + "label"; }
std::string defaultCSSLabelClass() const { return to_utf8(name()) + "_label"; }
/// Name of the layout/paragraph environment
docstring name_;
@ -317,7 +317,7 @@ private:
/// Note that when I said "environment", I meant it: This has no
/// effect for LATEX_PARAGRAPH type layouts.
mutable std::string htmlitemtag_;
/// Attributes for htmlitemtag_. Default is: class="layoutnameitem".
/// Attributes for htmlitemtag_. Default is: class="layoutname_item".
mutable std::string htmlitemattr_;
/// Tag for labels, of whatever sort. One use for this is in setting
/// descriptions, in which case it would be: dt. Another use is to
@ -325,7 +325,7 @@ private:
/// sections. Defaults to "span".
/// If set to "NONE", this suppresses the printing of the label.
mutable std::string htmllabeltag_;
/// Attributes for the label. Defaults to: class="layoutnamelabel".
/// Attributes for the label. Defaults to: class="layoutname_label".
mutable std::string htmllabelattr_;
/// Whether to put the label before the item, or within the item.
/// I.e., do we have (true):
@ -340,7 +340,7 @@ private:
/// has been given? Default is false.
/// Note that the default CSS is output first, then the user CSS, so it is
/// possible to override what one does not want.
bool htmlforcedefault_;
bool htmlforcecss_;
/// A cache for the default style info so generated.
mutable docstring htmldefaultstyle_;
/// Any other info for the HTML header.