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

A little cleanup of the layout files.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29903 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-06-02 13:45:32 +00:00
parent a9ed2f18f4
commit 4df7d8ab1a
3 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Layout.cpp
View File

@ -758,30 +758,6 @@ void Layout::readSpacing(Lexer & lex)
}
docstring const & Layout::name() const
{
return name_;
}
void Layout::setName(docstring const & name)
{
name_ = name;
}
docstring const & Layout::obsoleted_by() const
{
return obsoleted_by_;
}
docstring const & Layout::depends_on() const
{
return depends_on_;
}
namespace {
docstring const i18npreamble(Language const * lang, docstring const & templ)

24
src/Layout.h
View File

@ -73,16 +73,18 @@ public:
///
void readSpacing(Lexer &);
///
docstring const & name() const;
docstring const & name() const { return name_; };
///
void setName(docstring const & n);
void setName(docstring const & n) { name_ = n; }
///
docstring const & obsoleted_by() const;
docstring const & obsoleted_by() const { return obsoleted_by_; }
///
docstring const & depends_on() const;
docstring const & depends_on() const { return depends_on_; }
///
std::string const & latexname() const { return latexname_; }
///
void setLatexName(std::string const & n) { latexname_ = n; }
///
docstring const & labelstring() const { return labelstring_; }
///
docstring const & endlabelstring() const { return endlabelstring_; }
@ -131,11 +133,6 @@ public:
////////////////////////////////////////////////////////////////
// members
////////////////////////////////////////////////////////////////
/** Is this layout the default layout for an unknown layout? If
* so, its name will be displayed as xxx (unknown).
*/
bool unknown_;
/** Default font for this layout/environment.
The main font for this kind of environment. If an attribute has
INHERITED_*, it means that the value is specified by
@ -235,12 +232,19 @@ public:
/// until it has proper support for the caption inset (JMarc)
static Layout * forCaption();
private:
/// Name of the layout/paragraph environment
docstring name_;
/// LaTeX name for environment
std::string latexname_;
private:
/** Is this layout the default layout for an unknown layout? If
* so, its name will be displayed as xxx (unknown).
*/
bool unknown_;
/** Name of an layout that has replaced this layout.
This is used to rename a layout, while keeping backward
compatibility

4
src/tex2lyx/text.cpp
View File

@ -441,8 +441,8 @@ Layout * captionlayout()
static Layout * lay = 0;
if (!lay) {
lay = new Layout;
lay->name_ = from_ascii("Caption");
lay->latexname_ = "caption";
lay->setName(from_ascii("Caption"));
lay->setLatexName("caption");
lay->latextype = LATEX_COMMAND;
lay->optionalargs = 1;
}