anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

A bit more empty-->plain. I've also changed createEmptyLayout() to createBasicLayout(),

Browse Source 
as the former could be confusing. It's not really empty....


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26027 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-08-01 21:13:03 +00:00
parent 36ce36f341
commit 0a8d713fad
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/TextClass.cpp
View File

@ -114,7 +114,7 @@ std::string translateRT(TextClass::ReadType rt)
docstring const TextClass::plain_layout_ = from_ascii("Plain Layout");
InsetLayout DocumentClass::empty_insetlayout_;
InsetLayout DocumentClass::plain_insetlayout_;
/////////////////////////////////////////////////////////////////////////
@ -243,11 +243,11 @@ bool TextClass::read(FileName const & filename, ReadType rt)
LYXERR(Debug::TCLASS, "Reading " + translateRT(rt) + ": " +
to_utf8(makeDisplayPath(filename.absFilename())));
// Define the `empty' layout used in table cells, ert, etc. Note that
// Define the plain layout used in table cells, ert, etc. Note that
// we do this before loading any layout file, so that classes can
// override features of this layout if they should choose to do so.
if (rt == BASECLASS && !hasLayout(plain_layout_))
layoutlist_.push_back(createEmptyLayout(plain_layout_));
layoutlist_.push_back(createBasicLayout(plain_layout_));
Lexer lexrc(textClassTags);
lexrc.setFile(filename);
@ -1000,7 +1000,7 @@ bool TextClass::load(string const & path) const
void DocumentClass::addLayoutIfNeeded(docstring const & n) const
{
if (!hasLayout(n))
layoutlist_.push_back(createEmptyLayout(n, true));
layoutlist_.push_back(createBasicLayout(n, true));
}
@ -1019,7 +1019,7 @@ InsetLayout const & DocumentClass::insetLayout(docstring const & name) const
break;
n = n.substr(0,i);
}
return empty_insetlayout_;
return plain_insetlayout_;
}
@ -1048,7 +1048,7 @@ bool TextClass::isPlainLayout(Layout const & layout) const
}
Layout TextClass::createEmptyLayout(docstring const & name, bool unknown) const
Layout TextClass::createBasicLayout(docstring const & name, bool unknown) const
{
static Layout * defaultLayout = NULL;

19
src/TextClass.h
View File

@ -190,12 +190,15 @@ protected:
/// Protect construction
TextClass();
///
Layout & operator[](docstring const & vname);
/// Create an new, empty layout for this textclass.
/** \param unknown Set to true if this layout is an empty layout used to
* represent an unknown layout
Layout & operator[](docstring const & name);
/** Create an new, very basic layout for this textclass. This is used for
the Plain Layout common to all TextClass objects and also, in
DocumentClass, for the creation of new layouts `on the fly' when
previously unknown layouts are encountered.
\param unknown Set to true if this layout is used to represent an
unknown layout
*/
Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
Layout createBasicLayout(docstring const & name, bool unknown = false) const;
///////////////////////////////////////////////////////////////////
// non-const iterators
@ -341,8 +344,8 @@ public:
/// happen). -- Idea JMarc, comment MV
InsetLayout const & insetLayout(docstring const & name) const;
/// a plain inset layout for use as a default
static InsetLayout const & plainInsetLayout() { return empty_insetlayout_; }
/// add a new, empty layout \c name if it does not exist in layoutlist_
static InsetLayout const & plainInsetLayout() { return plain_insetlayout_; }
/// add a new layout \c name if it does not exist in layoutlist_
void addLayoutIfNeeded(docstring const & name) const;
///////////////////////////////////////////////////////////////////
@ -406,7 +409,7 @@ private:
/// DocumentClassBundle, which calls the protected constructor.
friend class DocumentClassBundle;
///
static InsetLayout empty_insetlayout_;
static InsetLayout plain_insetlayout_;
};