* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ======================================================
*/
using std::make_pair;
using std::sort;
using std::endl;
+using std::find_if;
+using std::remove_if;
// Global variable: textclass table.
LyXTextClassList textclasslist;
while (!finished && lexrc.IsOK() && !error) {
int le = lexrc.lex();
// See comment in lyxrc.C.
- switch(le) {
+ switch (le) {
case LyXLex::LEX_FEOF:
continue;
continue;
default: break;
}
- switch(static_cast<LayoutTags>(le)) {
+ switch (static_cast<LayoutTags>(le)) {
case LT_END: // end of structure
finished = true;
break;
return;
default: break;
};
- switch(static_cast<AlignTags>(le)) {
+ switch (static_cast<AlignTags>(le)) {
case AT_BLOCK:
align = LYX_ALIGN_BLOCK;
break;
}
}
-static keyword_item endlabelTypeTags[] = {
+
+namespace {
+
+keyword_item endlabelTypeTags[] = {
{ "box", END_LABEL_BOX },
{ "filled_box", END_LABEL_FILLED_BOX },
{ "no_label", END_LABEL_NO_LABEL },
{ "static", END_LABEL_STATIC }
};
+} // namespace anon
+
+
void LyXLayout::readEndLabelType(LyXLex & lexrc)
{
pushpophelper pph(lexrc, endlabelTypeTags,
END_LABEL_ENUM_LAST-END_LABEL_ENUM_FIRST+1);
int le = lexrc.lex();
- switch(le) {
+ switch (le) {
case LyXLex::LEX_UNDEF:
lexrc.printError("Unknown labeltype tag `$$Token'");
break;
pushpophelper pph(lexrc, marginTags, MARGIN_RIGHT_ADDRESS_BOX);
int le = lexrc.lex();
- switch(le) {
+ switch (le) {
case LyXLex::LEX_UNDEF:
lexrc.printError("Unknown margin type tag `$$Token'");
return;
pushpophelper pph(lexrc, spacingTags, ST_OTHER);
int le = lexrc.lex();
- switch(le) {
+ switch (le) {
case LyXLex::LEX_UNDEF:
lexrc.printError("Unknown spacing token `$$Token'");
return;
default: break;
}
- switch(static_cast<SpacingTags>(le)) {
+ switch (static_cast<SpacingTags>(le)) {
case ST_SPACING_SINGLE:
spacing.set(Spacing::Single);
break;
// parsing
while (lexrc.IsOK() && !error) {
int le = lexrc.lex();
- switch(le) {
+ switch (le) {
case LyXLex::LEX_FEOF:
continue;
continue;
default: break;
}
- switch(static_cast<TextClassTags>(le)) {
+ switch (static_cast<TextClassTags>(le)) {
case TC_OUTPUTTYPE: // output type definition
readOutputType(lexrc);
break;
case TC_SIDES:
if (lexrc.next()) {
- switch(lexrc.GetInteger()) {
+ switch (lexrc.GetInteger()) {
case 1: sides_ = OneSide; break;
case 2: sides_ = TwoSides; break;
default:
pushpophelper pph(lexrc, outputTypeTags, LITERATE);
int le = lexrc.lex();
- switch(le) {
+ switch (le) {
case LyXLex::LEX_UNDEF:
lexrc.printError("Unknown output type `$$Token'");
return;
pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV);
int le = lexrc.lex();
- switch(le) {
+ switch (le) {
case LyXLex::LEX_UNDEF:
lexrc.printError("Unknown MaxCounter tag `$$Token'");
return;
bool LyXTextClass::hasLayout(string const & name) const
{
return find_if(layoutlist.begin(), layoutlist.end(),
- compare_memfun(&LyXLayout::name, name))
+ lyx::compare_memfun(&LyXLayout::name, name))
!= layoutlist.end();
}
LayoutList::const_iterator cit =
find_if(layoutlist.begin(),
layoutlist.end(),
- compare_memfun(&LyXLayout::name, name));
- Assert(cit != layoutlist.end()); // we require the name to exist
+ lyx::compare_memfun(&LyXLayout::name, name));
+ lyx::Assert(cit != layoutlist.end()); // we require the name to exist
return (*cit);
}
LayoutList::iterator it =
find_if(layoutlist.begin(),
layoutlist.end(),
- compare_memfun(&LyXLayout::name, name));
- Assert(it != layoutlist.end()); // we require the name to exist
+ lyx::compare_memfun(&LyXLayout::name, name));
+ lyx::Assert(it != layoutlist.end()); // we require the name to exist
return (*it);
}
{
LayoutList::iterator it =
remove_if(layoutlist.begin(), layoutlist.end(),
- compare_memfun(&LyXLayout::name, name));
+ lyx::compare_memfun(&LyXLayout::name, name));
LayoutList::iterator end = layoutlist.end();
bool const ret = (it != end);
layoutlist.erase(it, end);
{
ClassList::const_iterator cit =
find_if(classlist.begin(), classlist.end(),
- compare_memfun(&LyXTextClass::name, textclass));
+ lyx::compare_memfun(&LyXTextClass::name, textclass));
return cit != classlist.end() ?
make_pair(true, size_type(cit - classlist.begin())) :
make_pair(false, size_type(0));
string const & name) const
{
classlist[textclass].load();
- for(unsigned int i = 0; i < classlist[textclass].numLayouts(); ++i) {
+ for (unsigned int i = 0; i < classlist[textclass].numLayouts(); ++i) {
if (classlist[textclass][i].name() == name)
return make_pair(true, i);
}
LyXTextClassList::NameOfLayout(LyXTextClassList::size_type textclass,
LyXTextClass::size_type layout) const
{
- static string dummy("dummy");
+ static string const dummy("dummy");
classlist[textclass].load();
if (layout < classlist[textclass].numLayouts())
return classlist[textclass][layout].name();
string const &
LyXTextClassList::NameOfClass(LyXTextClassList::size_type number) const
{
- static string dummy("dummy");
+ static string const dummy("dummy");
if (classlist.size() == 0) {
return dummy;
}
- Assert(number < classlist.size());
+ lyx::Assert(number < classlist.size());
return classlist[number].name();
}
string const &
LyXTextClassList::LatexnameOfClass(LyXTextClassList::size_type number) const
{
- static string dummy("dummy");
+ static string const dummy("dummy");
classlist[number].load();
if (classlist.size() == 0) {
return dummy;
}
- Assert(number < classlist.size());
+ lyx::Assert(number < classlist.size());
return classlist[number].latexname();
}
string const &
LyXTextClassList::DescOfClass(LyXTextClassList::size_type number) const
{
- static string dummy("dummy");
+ static string const dummy("dummy");
if (classlist.size() == 0) {
return dummy;
}
- Assert(number < classlist.size());
+ lyx::Assert(number < classlist.size());
return classlist[number].description();
}