* Text3.cpp (doDispatch): fix the behaviour of word-delete-forward,

[lyx.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 4aed81f0a6b52886442d472e666d1427e411c7e1..03a5200080b206e13c95817c04d2e0cb1ffa9f97 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -26,9 +26,9 @@
 #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"
@@ -222,16 +222,16 @@ void LyXRC::setDefaults() {
        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 = "";
@@ -256,7 +256,7 @@ void LyXRC::setDefaults() {
        isp_use_pers_dict = false;
        isp_use_esc_chars = false;
        use_kbmap = false;
-       rtl_support = false;
+       rtl_support = true;
        auto_number = true;
        mark_foreign_language = true;
        language_auto_begin = true;
@@ -277,7 +277,7 @@ void LyXRC::setDefaults() {
        preview = PREVIEW_OFF;
        preview_hashed_labels  = false;
        preview_scale_factor = "0.9";
-       use_converter_cache = false;
+       use_converter_cache = true;
        converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months
 
        user_name = to_utf8(support::user_name());
@@ -303,7 +303,7 @@ void oldFontFormat(string & family, string & foundry)
 
 int LyXRC::read(FileName const & filename)
 {
-       LyXLex lexrc(lyxrcTags, lyxrcCount);
+       Lexer lexrc(lyxrcTags, lyxrcCount);
        if (lyxerr.debugging(Debug::PARSER))
                lexrc.printTable(lyxerr);
 
@@ -318,7 +318,7 @@ int LyXRC::read(FileName const & filename)
 
 int LyXRC::read(std::istream & is)
 {
-       LyXLex lexrc(lyxrcTags, lyxrcCount);
+       Lexer lexrc(lyxrcTags, lyxrcCount);
        if (lyxerr.debugging(Debug::PARSER))
                lexrc.printTable(lyxerr);
 
@@ -331,7 +331,7 @@ int LyXRC::read(std::istream & is)
 }
 
 
-int LyXRC::read(LyXLex & lexrc)
+int LyXRC::read(Lexer & lexrc)
 {
        if (!lexrc.isOK()) return -2;
 
@@ -339,16 +339,16 @@ int LyXRC::read(LyXLex & lexrc)
                // 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;
                }
@@ -649,43 +649,43 @@ int LyXRC::read(LyXLex & lexrc)
 
                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;
@@ -812,11 +812,11 @@ int LyXRC::read(LyXLex & lexrc)
                                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)) {
@@ -1053,9 +1053,9 @@ int LyXRC::read(LyXLex & lexrc)
                        // 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
@@ -1086,7 +1086,7 @@ int LyXRC::read(LyXLex & lexrc)
                                }
                        } else {
                                formats.add(format, extension, prettyname,
-                                           shortcut, viewer, editor, flgs);
+                                           shortcut, viewer, editor, flgs);
                        }
                        break;
                }
@@ -1545,39 +1545,39 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                }
        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';
                }
 
@@ -1586,8 +1586,8 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                   << "#\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 ||
@@ -2239,7 +2239,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_LOADSESSION:
-               str = _("De-select to prevent loading files opened from the last lyx session.");
+               str = _("De-select to prevent loading files opened from the last LyX session.");
                break;
 
        case RC_MAKE_BACKUP: