#include "support/lstrings.h"
#include "support/os.h"
#include "support/Package.h"
+#include "support/TempFile.h"
#include "support/userinfo.h"
#include <fstream>
namespace {
-static unsigned int const LYXRC_FILEFORMAT = 10; // tommaso: new prefs option: close_buffer_with_last_view
+// The format should also be updated in configure.py, and conversion code
+// should be added to prefs2prefs_prefs.py.
+static unsigned int const LYXRC_FILEFORMAT = 17; // lasgouttes: remove \\rtl
// when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = {
{ "\\def_file", LyXRC::RC_DEFFILE },
{ "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_POINT },
{ "\\default_length_unit", LyXRC::RC_DEFAULT_LENGTH_UNIT },
+ { "\\default_otf_view_format", LyXRC::RC_DEFAULT_OTF_VIEW_FORMAT },
{ "\\default_view_format", LyXRC::RC_DEFAULT_VIEW_FORMAT },
{ "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN },
{ "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS },
{ "\\example_path", LyXRC::RC_EXAMPLEPATH },
{ "\\export_overwrite", LyXRC::RC_EXPORT_OVERWRITE },
{ "\\font_encoding", LyXRC::RC_FONT_ENCODING },
- { "\\force_paint_single_char", LyXRC::RC_FORCE_PAINT_SINGLE_CHAR },
{ "\\format", LyXRC::RC_FILEFORMAT },
{ "\\forward_search_dvi", LyXRC::RC_FORWARD_SEARCH_DVI },
{ "\\forward_search_pdf", LyXRC::RC_FORWARD_SEARCH_PDF },
{ "\\fullscreen_limit", LyXRC::RC_FULL_SCREEN_LIMIT },
{ "\\fullscreen_menubar", LyXRC::RC_FULL_SCREEN_MENUBAR },
{ "\\fullscreen_scrollbar", LyXRC::RC_FULL_SCREEN_SCROLLBAR },
+ { "\\fullscreen_statusbar", LyXRC::RC_FULL_SCREEN_STATUSBAR },
{ "\\fullscreen_tabbar", LyXRC::RC_FULL_SCREEN_TABBAR },
{ "\\fullscreen_toolbars", LyXRC::RC_FULL_SCREEN_TOOLBARS },
{ "\\fullscreen_width", LyXRC::RC_FULL_SCREEN_WIDTH },
{ "\\language_package_selection", LyXRC::RC_LANGUAGE_PACKAGE_SELECTION },
{ "\\load_session", LyXRC::RC_LOADSESSION },
{ "\\mac_dontswap_ctrl_meta", LyXRC::RC_MAC_DONTSWAP_CTRL_META },
- { "\\mac_like_word_movement", LyXRC::RC_MAC_LIKE_WORD_MOVEMENT },
+ { "\\mac_like_cursor_movement", LyXRC::RC_MAC_LIKE_CURSOR_MOVEMENT },
{ "\\macro_edit_style", LyXRC::RC_MACRO_EDIT_STYLE },
{ "\\make_backup", LyXRC::RC_MAKE_BACKUP },
{ "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
+ { "\\mouse_middlebutton_paste", LyXRC::RC_MOUSE_MIDDLEBUTTON_PASTE },
{ "\\mouse_wheel_speed", LyXRC::RC_MOUSE_WHEEL_SPEED },
{ "\\nomencl_command", LyXRC::RC_NOMENCL_COMMAND },
{ "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
{ "\\print_to_file", LyXRC::RC_PRINTTOFILE },
{ "\\print_to_printer", LyXRC::RC_PRINTTOPRINTER },
{ "\\printer", LyXRC::RC_PRINTER },
- { "\\rtl", LyXRC::RC_RTL_SUPPORT },
{ "\\save_compressed", LyXRC::RC_SAVE_COMPRESSED },
{ "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
{ "\\screen_font_roman", LyXRC::RC_SCREEN_FONT_ROMAN },
{ "\\use_qimage", LyXRC::RC_USE_QIMAGE },
// compatibility with versions older than 1.4.0 only
{ "\\use_system_colors", LyXRC::RC_USE_SYSTEM_COLORS },
+ { "\\use_system_theme_icons", LyXRC::RC_USE_SYSTEM_THEME_ICONS },
{ "\\use_tooltip", LyXRC::RC_USE_TOOLTIP },
{ "\\user_email", LyXRC::RC_USER_EMAIL },
{ "\\user_name", LyXRC::RC_USER_NAME },
void LyXRC::setDefaults()
{
icon_set = string();
+ use_system_theme_icons = false;
bind_file = "cua";
def_file = "default";
ui_file = "default";
document_path.erase();
view_dvi_paper_option.erase();
default_view_format = "pdf2";
+ default_otf_view_format = "pdf4";
chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
bibtex_command = "bibtex";
fontenc = "default";
completion_minlength = 6;
spellcheck_notes = true;
use_kbmap = false;
- rtl_support = true;
visual_cursor = false;
auto_number = true;
mark_foreign_language = true;
scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL;
paragraph_markers = false;
mac_dontswap_ctrl_meta = false;
- mac_like_word_movement = false;
+ mac_like_cursor_movement = false;
macro_edit_style = MACRO_EDIT_INLINE_BOX;
dialogs_iconify_with_main = false;
preview = PREVIEW_OFF;
default_length_unit = Length::CM;
cursor_width = 1;
close_buffer_with_last_view = "yes";
+ mouse_middlebutton_paste = true;
}
return retval == ReadOK;
LYXERR(Debug::FILES, "Converting LyXRC file to " << LYXRC_FILEFORMAT);
- FileName const tempfile = FileName::tempName("convert_lyxrc");
+ TempFile tmp("convert_lyxrc");
+ FileName const tempfile = tmp.name();
bool const success = prefs2prefs(filename, tempfile, false);
if (!success) {
LYXERR0 ("Unable to convert " << filename.absFileName() <<
LYXERR(Debug::LYXRC, "Reading '" << tempfile << "'...");
retval = read(lexrc2, check_format);
}
- tempfile.removeFile();
return retval == ReadOK;
}
if (!lexrc.isOK())
return ReadError;
- // default for current rowpainter capabilities
- force_paint_single_char = true;
-
// format prior to 2.0 and introduction of format tag
unsigned int format = 0;
lexrc >> fontenc;
break;
- case RC_FORCE_PAINT_SINGLE_CHAR:
- lexrc >> force_paint_single_char;
- break;
-
case RC_PRINTER:
lexrc >> printer;
break;
lexrc >> icon_set;
break;
+ case RC_USE_SYSTEM_THEME_ICONS:
+ lexrc >> use_system_theme_icons;
+ break;
+
case RC_SCREEN_FONT_ROMAN:
if (lexrc.next()) {
roman_font_name = lexrc.getString();
lexrc >> mac_dontswap_ctrl_meta;
break;
- case RC_MAC_LIKE_WORD_MOVEMENT:
- lexrc >> mac_like_word_movement;
+ case RC_MAC_LIKE_CURSOR_MOVEMENT:
+ lexrc >> mac_like_cursor_movement;
break;
case RC_MACRO_EDIT_STYLE:
case RC_LANGUAGE_COMMAND_LOCAL:
lexrc >> language_command_local;
break;
- case RC_RTL_SUPPORT:
- lexrc >> rtl_support;
- break;
case RC_VISUAL_CURSOR:
lexrc >> visual_cursor;
break;
break;
}
+ case RC_DEFAULT_OTF_VIEW_FORMAT:
+ lexrc >> default_otf_view_format;
+ break;
+
case RC_DEFAULT_VIEW_FORMAT:
lexrc >> default_view_format;
break;
case RC_FULL_SCREEN_SCROLLBAR:
lexrc >> full_screen_scrollbar;
break;
+ case RC_FULL_SCREEN_STATUSBAR:
+ lexrc >> full_screen_statusbar;
+ break;
case RC_FULL_SCREEN_TABBAR:
lexrc >> full_screen_tabbar;
break;
}
break;
+ case RC_MOUSE_MIDDLEBUTTON_PASTE:
+ lexrc >> mouse_middlebutton_paste;
+ break;
+
case RC_LAST:
break; // this is just a dummy
}
if (tag != RC_LAST)
break;
+ case RC_USE_SYSTEM_THEME_ICONS:
+ if (ignore_system_lyxrc ||
+ use_system_theme_icons != system_lyxrc.use_system_theme_icons) {
+ os << "\\use_system_theme_icons "
+ << convert<string>(use_system_theme_icons)
+ << "\n";
+ }
+ if (tag != RC_LAST)
+ break;
+
case RC_SCREEN_DPI:
if (ignore_system_lyxrc ||
dpi != system_lyxrc.dpi) {
}
if (tag != RC_LAST)
break;
- case RC_MAC_LIKE_WORD_MOVEMENT:
+ case RC_MAC_LIKE_CURSOR_MOVEMENT:
if (ignore_system_lyxrc ||
- mac_like_word_movement
- != system_lyxrc.mac_like_word_movement) {
- os << "\\mac_like_word_movement "
- << convert<string>(mac_like_word_movement) << '\n';
+ mac_like_cursor_movement
+ != system_lyxrc.mac_like_cursor_movement) {
+ os << "\\mac_like_cursor_movement "
+ << convert<string>(mac_like_cursor_movement) << '\n';
}
if (tag != RC_LAST)
break;
!= system_lyxrc.font_sizes[FONT_SIZE_HUGE] ||
font_sizes[FONT_SIZE_HUGER]
!= system_lyxrc.font_sizes[FONT_SIZE_HUGER]) {
+ streamsize old_prec = os.precision();
os.setf(ios::fixed);
os.precision(2);
os << "\\screen_font_sizes"
<< ' ' << font_sizes[FONT_SIZE_HUGE]
<< ' ' << font_sizes[FONT_SIZE_HUGER]
<< '\n';
+ os.precision(old_prec);
+ os.unsetf(ios::fixed);
}
if (tag != RC_LAST)
break;
}
if (tag != RC_LAST)
break;
+ case RC_FULL_SCREEN_STATUSBAR:
+ if (ignore_system_lyxrc ||
+ full_screen_statusbar != system_lyxrc.full_screen_statusbar) {
+ os << "\\fullscreen_statusbar "
+ << convert<string>(full_screen_statusbar)
+ << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
case RC_FULL_SCREEN_TABBAR:
if (ignore_system_lyxrc ||
full_screen_tabbar != system_lyxrc.full_screen_tabbar) {
if (tag != RC_LAST)
break;
- case RC_FORCE_PAINT_SINGLE_CHAR:
- if (ignore_system_lyxrc ||
- force_paint_single_char != system_lyxrc.force_paint_single_char) {
- os << "\\force_paint_single_char \"" << force_paint_single_char << "\"\n";
- }
- if (tag != RC_LAST)
- break;
-
os << "\n#\n"
<< "# FILE SECTION ######################################\n"
<< "#\n\n";
}
if (tag != RC_LAST)
break;
+ case RC_MOUSE_MIDDLEBUTTON_PASTE:
+ if (ignore_system_lyxrc ||
+ mouse_middlebutton_paste != system_lyxrc.mouse_middlebutton_paste) {
+ os << "\\mouse_middlebutton_paste "
+ << convert<string>(mouse_middlebutton_paste) << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
case RC_COMPLETION_INLINE_DELAY:
if (ignore_system_lyxrc ||
completion_inline_delay != system_lyxrc.completion_inline_delay) {
}
if (tag != RC_LAST)
break;
-
+
case RC_NUMLASTFILES:
if (ignore_system_lyxrc ||
num_lastfiles != system_lyxrc.num_lastfiles) {
if (tag != RC_LAST)
break;
- case RC_RTL_SUPPORT:
- if (ignore_system_lyxrc ||
- rtl_support != system_lyxrc.rtl_support) {
- os << "\\rtl " << convert<string>(rtl_support) << '\n';
- }
- if (tag != RC_LAST)
- break;
case RC_VISUAL_CURSOR:
if (ignore_system_lyxrc ||
visual_cursor != system_lyxrc.visual_cursor) {
|| sysfmt == sysend // format not found
|| sysfmt->second.count(cmd) == 0 // this command not found
)
- os << "\\viewer_alternatives " << fmt << " \"" << cmd << "\"\n";
+ os << "\\viewer_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n";
}
}
if (tag != RC_LAST)
|| sysfmt == sysend // format not found
|| sysfmt->second.count(cmd) == 0 // this command not found
)
- os << "\\editor_alternatives " << fmt << " \"" << cmd << "\"\n";
+ os << "\\editor_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n";
}
}
if (tag != RC_LAST)
break;
}
+ case RC_DEFAULT_OTF_VIEW_FORMAT:
+ if ((ignore_system_lyxrc ||
+ default_otf_view_format != system_lyxrc.default_otf_view_format)
+ && !default_otf_view_format.empty()) {
+ os << "\\default_otf_view_format " << default_otf_view_format << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
case RC_DEFAULT_VIEW_FORMAT:
if (ignore_system_lyxrc ||
default_view_format != system_lyxrc.default_view_format) {
for (Converters::const_iterator cit = theConverters().begin();
cit != theConverters().end(); ++cit) {
Converter const * converter =
- theSystemConverters().getConverter(cit->from,
- cit->to);
+ theSystemConverters().getConverter(cit->from(),
+ cit->to());
if (!converter ||
- converter->command != cit->command ||
- converter->flags != cit->flags)
- os << "\\converter \"" << cit->from << "\" \""
- << cit->to << "\" \""
- << escapeCommand(cit->command) << "\" \""
- << cit->flags << "\"\n";
+ converter->command() != cit->command() ||
+ converter->flags() != cit->flags())
+ os << "\\converter \"" << cit->from() << "\" \""
+ << cit->to() << "\" \""
+ << escapeCommand(cit->command()) << "\" \""
+ << cit->flags() << "\"\n";
}
// New/modifed converters
for (Converters::const_iterator cit = theSystemConverters().begin();
cit != theSystemConverters().end(); ++cit)
- if (!theConverters().getConverter(cit->from, cit->to))
- os << "\\converter \"" << cit->from
- << "\" \"" << cit->to << "\" \"\" \"\"\n";
+ if (!theConverters().getConverter(cit->from(), cit->to()))
+ os << "\\converter \"" << cit->from()
+ << "\" \"" << cit->to() << "\" \"\" \"\"\n";
if (tag != RC_LAST)
break;
case LyXRC::RC_SCROLL_BELOW_DOCUMENT:
case LyXRC::RC_DATE_INSERT_FORMAT:
case LyXRC::RC_GUI_LANGUAGE:
+ case LyXRC::RC_DEFAULT_OTF_VIEW_FORMAT:
case LyXRC::RC_DEFAULT_VIEW_FORMAT:
case LyXRC::RC_DEFFILE:
case LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN:
case LyXRC::RC_ESC_CHARS:
case LyXRC::RC_EXAMPLEPATH:
case LyXRC::RC_FONT_ENCODING:
- case LyXRC::RC_FORCE_PAINT_SINGLE_CHAR:
case LyXRC::RC_FILEFORMAT:
case LyXRC::RC_GROUP_LAYOUTS:
case LyXRC::RC_HUNSPELLDIR_PATH:
case LyXRC::RC_LANGUAGE_PACKAGE_SELECTION:
case LyXRC::RC_LYXRCFORMAT:
case LyXRC::RC_MAC_DONTSWAP_CTRL_META:
- case LyXRC::RC_MAC_LIKE_WORD_MOVEMENT:
+ case LyXRC::RC_MAC_LIKE_CURSOR_MOVEMENT:
case LyXRC::RC_MACRO_EDIT_STYLE:
case LyXRC::RC_MAKE_BACKUP:
case LyXRC::RC_MARK_FOREIGN_LANGUAGE:
case LyXRC::RC_MOUSE_WHEEL_SPEED:
+ case LyXRC::RC_MOUSE_MIDDLEBUTTON_PASTE:
case LyXRC::RC_NUMLASTFILES:
case LyXRC::RC_PARAGRAPH_MARKERS:
case LyXRC::RC_PATH_PREFIX:
if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) {
prependEnvPath("PATH", lyxrc_new.path_prefix);
+ // Resets python path
+ support::os::python(true);
}
case LyXRC::RC_PREVIEW:
case LyXRC::RC_PREVIEW_HASHED_LABELS:
case LyXRC::RC_PRINTTOPRINTER:
case LyXRC::RC_PRINT_ADAPTOUTPUT:
case LyXRC::RC_PRINT_COMMAND:
- case LyXRC::RC_RTL_SUPPORT:
case LyXRC::RC_SAVE_COMPRESSED:
case LyXRC::RC_SCREEN_DPI:
case LyXRC::RC_SCREEN_FONT_ROMAN:
case LyXRC::RC_USE_TOOLTIP:
case LyXRC::RC_USE_PIXMAP_CACHE:
case LyXRC::RC_USE_QIMAGE:
+ case LyXRC::RC_USE_SYSTEM_THEME_ICONS:
case LyXRC::RC_VIEWDVI_PAPEROPTION:
case LyXRC::RC_SINGLE_CLOSE_TAB_BUTTON:
case LyXRC::RC_SINGLE_INSTANCE:
case LyXRC::RC_FULL_SCREEN_LIMIT:
case LyXRC::RC_FULL_SCREEN_SCROLLBAR:
case LyXRC::RC_FULL_SCREEN_MENUBAR:
+ case LyXRC::RC_FULL_SCREEN_STATUSBAR:
case LyXRC::RC_FULL_SCREEN_TABBAR:
case LyXRC::RC_FULL_SCREEN_TOOLBARS:
case LyXRC::RC_FULL_SCREEN_WIDTH:
str = _("Make Apple key act as Meta and Control key as Ctrl.");
break;
- case RC_MAC_LIKE_WORD_MOVEMENT:
- str = _("Use the Mac OS X conventions for the word-level cursor movement");
+ case RC_MAC_LIKE_CURSOR_MOVEMENT:
+ str = _("Use the Mac OS X conventions for cursor movement");
break;
case RC_SHOW_MACRO_LABEL:
str = _("Command definition file. Can either specify an absolute path, or LyX will look in its global and local commands/ directories.");
break;
+ case RC_DEFAULT_OTF_VIEW_FORMAT:
+ str = _("The default format used with LFUN_BUFFER_[VIEW|UPDATE] with non-TeX fonts.");
+ break;
+
case RC_DEFAULT_VIEW_FORMAT:
str = _("The default format used with LFUN_BUFFER_[VIEW|UPDATE].");
break;
str = _("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages.");
break;
- case RC_FORCE_PAINT_SINGLE_CHAR:
- str = _("Disable any kerning and ligatures for text drawing on screen.");
- break;
-
case RC_FILEFORMAT:
break;
break;
case RC_AUTOCORRECTION_MATH:
- str = _("Allow TeXMacs shorthand, like => converting to \Rightarrow.");
+ str = _("Allow TeXMacs shorthand, like => converting to \\Rightarrow.");
break;
case RC_NUMLASTFILES:
str = _("Your favorite print program, e.g. \"dvips\", \"dvilj4\".");
break;
- case RC_RTL_SUPPORT:
- str = _("Select to enable support of right-to-left languages (e.g. Hebrew, Arabic).");
- break;
-
case RC_VISUAL_CURSOR:
str = _("Select to have visual bidi cursor movement, unselect for logical movement.");
break;
projects / lyx.git / blobdiff