#include "Format.h"
#include "gettext.h"
#include "Session.h"
-#include "LColor.h"
-#include "LyXLex.h"
-#include "LyXFont.h"
+#include "Color.h"
+#include "Lexer.h"
+#include "Font.h"
#include "Mover.h"
#include "graphics/GraphicsTypes.h"
geometry_height = 0;
geometry_xysaved = true;
// Default LaTeX font size:
- font_sizes[LyXFont::SIZE_TINY] = "5.0";
- font_sizes[LyXFont::SIZE_SCRIPT] = "7.0";
- font_sizes[LyXFont::SIZE_FOOTNOTE] = "8.0";
- font_sizes[LyXFont::SIZE_SMALL] = "9.0";
- font_sizes[LyXFont::SIZE_NORMAL] = "10.0";
- font_sizes[LyXFont::SIZE_LARGE] = "12.0";
- font_sizes[LyXFont::SIZE_LARGER] = "14.4";
- font_sizes[LyXFont::SIZE_LARGEST] = "17.26";
- font_sizes[LyXFont::SIZE_HUGE] = "20.74";
- font_sizes[LyXFont::SIZE_HUGER] = "24.88";
+ font_sizes[Font::SIZE_TINY] = "5.0";
+ font_sizes[Font::SIZE_SCRIPT] = "7.0";
+ font_sizes[Font::SIZE_FOOTNOTE] = "8.0";
+ font_sizes[Font::SIZE_SMALL] = "9.0";
+ font_sizes[Font::SIZE_NORMAL] = "10.0";
+ font_sizes[Font::SIZE_LARGE] = "12.0";
+ font_sizes[Font::SIZE_LARGER] = "14.4";
+ font_sizes[Font::SIZE_LARGEST] = "17.26";
+ font_sizes[Font::SIZE_HUGE] = "20.74";
+ font_sizes[Font::SIZE_HUGER] = "24.88";
use_scalable_fonts = true;
roman_font_name = "";
sans_font_name = "";
int LyXRC::read(FileName const & filename)
{
- LyXLex lexrc(lyxrcTags, lyxrcCount);
+ Lexer lexrc(lyxrcTags, lyxrcCount);
if (lyxerr.debugging(Debug::PARSER))
lexrc.printTable(lyxerr);
int LyXRC::read(std::istream & is)
{
- LyXLex lexrc(lyxrcTags, lyxrcCount);
+ Lexer lexrc(lyxrcTags, lyxrcCount);
if (lyxerr.debugging(Debug::PARSER))
lexrc.printTable(lyxerr);
}
-int LyXRC::read(LyXLex & lexrc)
+int LyXRC::read(Lexer & lexrc)
{
if (!lexrc.isOK()) return -2;
// By using two switches we take advantage of the compiler
// telling us if we have missed a LyXRCTags element in
// the second switch.
- // Note that this also shows a problem with LyXLex since it
+ // Note that this also shows a problem with Lexer since it
// helps us avoid taking advantage of the strictness of the
// compiler.
int le = lexrc.lex();
switch (le) {
- case LyXLex::LEX_UNDEF:
+ case Lexer::LEX_UNDEF:
lexrc.printError("Unknown tag `$$Token'");
continue;
- case LyXLex::LEX_FEOF:
+ case Lexer::LEX_FEOF:
continue;
default: break;
}
case RC_SCREEN_FONT_SIZES:
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_TINY] =
+ font_sizes[Font::SIZE_TINY] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_SCRIPT] =
+ font_sizes[Font::SIZE_SCRIPT] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_FOOTNOTE] =
+ font_sizes[Font::SIZE_FOOTNOTE] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_SMALL] =
+ font_sizes[Font::SIZE_SMALL] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_NORMAL] =
+ font_sizes[Font::SIZE_NORMAL] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_LARGE] =
+ font_sizes[Font::SIZE_LARGE] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_LARGER] =
+ font_sizes[Font::SIZE_LARGER] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_LARGEST] =
+ font_sizes[Font::SIZE_LARGEST] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_HUGE] =
+ font_sizes[Font::SIZE_HUGE] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[LyXFont::SIZE_HUGER] =
+ font_sizes[Font::SIZE_HUGER] =
lexrc.getString();
}
break;
break;
}
- LColor::color const col =
+ Color::color const col =
lcolor.getFromLyXName(lyx_name);
- if (col == LColor::none ||
- col == LColor::inherit ||
- col == LColor::ignore)
+ if (col == Color::none ||
+ col == Color::inherit ||
+ col == Color::ignore)
break;
if (!lcolor.setColor(col, x11_name)) {
// Hack to ensure compatibility with versions older
// than 1.5.0
int le = lexrc.lex();
- if (le != LyXLex::LEX_FEOF && le != LyXLex::LEX_UNDEF) {
+ if (le != Lexer::LEX_FEOF && le != Lexer::LEX_UNDEF) {
flags = lexrc.getString();
- if (le != LyXLex::LEX_DATA) {
+ if (le != Lexer::LEX_DATA) {
// We have got a known token.
// Therefore this is an old style
// format definition without
}
case RC_SCREEN_FONT_SIZES:
if (ignore_system_lyxrc ||
- font_sizes[LyXFont::SIZE_TINY]
- != system_lyxrc.font_sizes[LyXFont::SIZE_TINY] ||
- font_sizes[LyXFont::SIZE_SCRIPT]
- != system_lyxrc.font_sizes[LyXFont::SIZE_SCRIPT] ||
- font_sizes[LyXFont::SIZE_FOOTNOTE]
- != system_lyxrc.font_sizes[LyXFont::SIZE_FOOTNOTE] ||
- font_sizes[LyXFont::SIZE_SMALL]
- != system_lyxrc.font_sizes[LyXFont::SIZE_SMALL] ||
- font_sizes[LyXFont::SIZE_NORMAL]
- != system_lyxrc.font_sizes[LyXFont::SIZE_NORMAL] ||
- font_sizes[LyXFont::SIZE_LARGE]
- != system_lyxrc.font_sizes[LyXFont::SIZE_LARGE] ||
- font_sizes[LyXFont::SIZE_LARGER]
- != system_lyxrc.font_sizes[LyXFont::SIZE_LARGER] ||
- font_sizes[LyXFont::SIZE_LARGEST]
- != system_lyxrc.font_sizes[LyXFont::SIZE_LARGEST] ||
- font_sizes[LyXFont::SIZE_HUGE]
- != system_lyxrc.font_sizes[LyXFont::SIZE_HUGE] ||
- font_sizes[LyXFont::SIZE_HUGER]
- != system_lyxrc.font_sizes[LyXFont::SIZE_HUGER]) {
+ font_sizes[Font::SIZE_TINY]
+ != system_lyxrc.font_sizes[Font::SIZE_TINY] ||
+ font_sizes[Font::SIZE_SCRIPT]
+ != system_lyxrc.font_sizes[Font::SIZE_SCRIPT] ||
+ font_sizes[Font::SIZE_FOOTNOTE]
+ != system_lyxrc.font_sizes[Font::SIZE_FOOTNOTE] ||
+ font_sizes[Font::SIZE_SMALL]
+ != system_lyxrc.font_sizes[Font::SIZE_SMALL] ||
+ font_sizes[Font::SIZE_NORMAL]
+ != system_lyxrc.font_sizes[Font::SIZE_NORMAL] ||
+ font_sizes[Font::SIZE_LARGE]
+ != system_lyxrc.font_sizes[Font::SIZE_LARGE] ||
+ font_sizes[Font::SIZE_LARGER]
+ != system_lyxrc.font_sizes[Font::SIZE_LARGER] ||
+ font_sizes[Font::SIZE_LARGEST]
+ != system_lyxrc.font_sizes[Font::SIZE_LARGEST] ||
+ font_sizes[Font::SIZE_HUGE]
+ != system_lyxrc.font_sizes[Font::SIZE_HUGE] ||
+ font_sizes[Font::SIZE_HUGER]
+ != system_lyxrc.font_sizes[Font::SIZE_HUGER]) {
os.setf(ios::fixed);
os.precision(2);
os << "\\screen_font_sizes"
- << ' ' << font_sizes[LyXFont::SIZE_TINY]
- << ' ' << font_sizes[LyXFont::SIZE_SCRIPT]
- << ' ' << font_sizes[LyXFont::SIZE_FOOTNOTE]
- << ' ' << font_sizes[LyXFont::SIZE_SMALL]
- << ' ' << font_sizes[LyXFont::SIZE_NORMAL]
- << ' ' << font_sizes[LyXFont::SIZE_LARGE]
- << ' ' << font_sizes[LyXFont::SIZE_LARGER]
- << ' ' << font_sizes[LyXFont::SIZE_LARGEST]
- << ' ' << font_sizes[LyXFont::SIZE_HUGE]
- << ' ' << font_sizes[LyXFont::SIZE_HUGER]
+ << ' ' << font_sizes[Font::SIZE_TINY]
+ << ' ' << font_sizes[Font::SIZE_SCRIPT]
+ << ' ' << font_sizes[Font::SIZE_FOOTNOTE]
+ << ' ' << font_sizes[Font::SIZE_SMALL]
+ << ' ' << font_sizes[Font::SIZE_NORMAL]
+ << ' ' << font_sizes[Font::SIZE_LARGE]
+ << ' ' << font_sizes[Font::SIZE_LARGER]
+ << ' ' << font_sizes[Font::SIZE_LARGEST]
+ << ' ' << font_sizes[Font::SIZE_HUGE]
+ << ' ' << font_sizes[Font::SIZE_HUGER]
<< '\n';
}
<< "#\n\n";
case RC_SET_COLOR:
- for (int i = 0; i < LColor::ignore; ++i) {
- LColor::color lc = static_cast<LColor::color>(i);
+ for (int i = 0; i < Color::ignore; ++i) {
+ Color::color lc = static_cast<Color::color>(i);
string const col(lcolor.getX11Name(lc));
if (ignore_system_lyxrc ||