// 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 = 20; // tommaso: 'needauth' options
-
+static unsigned int const LYXRC_FILEFORMAT = 29; // spitz: remove \\date_insert_format
// when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = {
{ "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
{ "\\copier", LyXRC::RC_COPIER },
{ "\\cursor_follows_scrollbar", LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR },
{ "\\cursor_width", LyXRC::RC_CURSOR_WIDTH },
- { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT },
{ "\\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_platex_view_format", LyXRC::RC_DEFAULT_PLATEX_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 },
{ "\\escape_chars", LyXRC::RC_ESC_CHARS },
{ "\\example_path", LyXRC::RC_EXAMPLEPATH },
{ "\\export_overwrite", LyXRC::RC_EXPORT_OVERWRITE },
- { "\\font_encoding", LyXRC::RC_FONT_ENCODING },
{ "\\format", LyXRC::RC_FILEFORMAT },
{ "\\forward_search_dvi", LyXRC::RC_FORWARD_SEARCH_DVI },
{ "\\forward_search_pdf", LyXRC::RC_FORWARD_SEARCH_PDF },
{ "\\index_alternatives", LyXRC::RC_INDEX_ALTERNATIVES },
{ "\\index_command", LyXRC::RC_INDEX_COMMAND },
{ "\\input", LyXRC::RC_INPUT },
+ { "\\jbibtex_alternatives", LyXRC::RC_JBIBTEX_ALTERNATIVES },
{ "\\jbibtex_command", LyXRC::RC_JBIBTEX_COMMAND },
{ "\\jindex_command", LyXRC::RC_JINDEX_COMMAND },
{ "\\kbmap", LyXRC::RC_KBMAP },
{ "\\print_landscape_flag", LyXRC::RC_PRINTLANDSCAPEFLAG },
{ "\\print_paper_dimension_flag", LyXRC::RC_PRINTPAPERDIMENSIONFLAG },
{ "\\print_paper_flag", LyXRC::RC_PRINTPAPERFLAG },
+ { "\\pygmentize_command", LyXRC::RC_PYGMENTIZE_COMMAND },
{ "\\save_compressed", LyXRC::RC_SAVE_COMPRESSED },
{ "\\save_origin", LyXRC::RC_SAVE_ORIGIN },
{ "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
{ "\\use_converter_needauth", LyXRC::RC_USE_CONVERTER_NEEDAUTH },
{ "\\use_converter_needauth_forbidden", LyXRC::RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN },
{ "\\use_lastfilepos", LyXRC::RC_USELASTFILEPOS },
- { "\\use_pixmap_cache", LyXRC::RC_USE_PIXMAP_CACHE },
- { "\\use_qimage", LyXRC::RC_USE_QIMAGE },
+ { "\\use_native_filedialog", LyXRC::RC_USE_NATIVE_FILEDIALOG },
// 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 },
const int lyxrcCount = sizeof(lyxrcTags) / sizeof(lyxrcTags[0]);
-} // namespace anon
+} // namespace
LyXRC::LyXRC()
view_dvi_paper_option.erase();
default_view_format = "pdf2";
default_otf_view_format = "pdf4";
+ default_platex_view_format = "pdf3";
chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
bibtex_command = "automatic";
- fontenc = "default";
index_command = "makeindex -c -q";
nomencl_command = "makeindex -s nomencl.ist";
+ pygmentize_command = string();
dpi = 75;
// Because a screen is typically wider than a piece of paper:
- zoom = 150;
+ defaultZoom = 150;
+ currentZoom = defaultZoom;
allow_geometry_session = true;
// Default LaTeX font size:
font_sizes[FONT_SIZE_TINY] = "5.0";
num_lastfiles = 20;
check_lastfiles = true;
use_lastfilepos = true;
+ use_native_filedialog = true;
load_session = false;
make_backup = true;
save_compressed = false;
// FIXME: this check should test the target platform (darwin)
#if defined(USE_MACOSX_PACKAGING)
spellchecker = "native";
+#elif defined(USE_ENCHANT)
+ spellchecker = "enchant";
#elif defined(USE_ASPELL)
spellchecker = "aspell";
#elif defined(USE_HUNSPELL)
show_banner = true;
windows_style_tex_paths = false;
tex_allows_spaces = false;
- date_insert_format = "%x";
cursor_follows_scrollbar = false;
scroll_below_document = false;
scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL;
use_converter_needauth = true;
use_system_colors = false;
use_tooltip = true;
- use_pixmap_cache = false;
- use_qimage = true;
converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months
user_name = to_utf8(support::user_name());
user_email = to_utf8(support::user_email());
foundry.erase();
}
-} // namespace anon
+} // namespace
bool LyXRC::read(FileName const & filename, bool check_format)
lexrc2.setFile(tempfile);
LYXERR(Debug::LYXRC, "Reading '" << tempfile << "'...");
retval = read(lexrc2, check_format);
+ if (retval == FormatMismatch)
+ LYXERR0("Conversion failed for " << filename.absFileName());
}
return retval == ReadOK;
}
return ReadError;
// format prior to 2.0 and introduction of format tag
- unsigned int format = 0;
+ unsigned int rc_format = 0;
while (lexrc.isOK()) {
// By using two switches we take advantage of the compiler
switch (static_cast<LyXRCTags>(le)) {
case RC_LYXRCFORMAT:
if (lexrc.next())
- format = lexrc.getInteger();
+ rc_format = lexrc.getInteger();
break;
case RC_INPUT: // Include file
if (lexrc.next()) {
FileName const tmp =
libFileSearch(string(),
lexrc.getString());
- if (read(tmp, check_format)) {
+ if (!read(tmp, check_format)) {
lexrc.printError(
"Error reading included file: " + tmp.absFileName());
}
}
break;
- case RC_FONT_ENCODING:
- lexrc >> fontenc;
- break;
-
case RC_PRINTLANDSCAPEFLAG:
lexrc >> print_landscape_flag;
break;
lexrc >> print_paper_flag;
break;
+ case RC_PYGMENTIZE_COMMAND:
+ if (lexrc.next(true)) {
+ pygmentize_command = lexrc.getString();
+ }
+ break;
+
case RC_VIEWDVI_PAPEROPTION:
if (lexrc.next())
view_dvi_paper_option = lexrc.getString();
}
break;
+ case RC_JBIBTEX_ALTERNATIVES:
+ if (lexrc.next(true)) {
+ jbibtex_alternatives.insert(lexrc.getString());
+ }
+ break;
+
case RC_INDEX_ALTERNATIVES:
if (lexrc.next(true)) {
index_alternatives.insert(lexrc.getString());
break;
case RC_SCREEN_ZOOM:
- lexrc >> zoom;
- if (zoom < 10)
- zoom = 10;
+ lexrc >> defaultZoom;
+ if (defaultZoom < 10)
+ defaultZoom = 10;
break;
case RC_GEOMETRY_SESSION:
case RC_ACCEPT_COMPOUND:
lexrc >> spellchecker_accept_compound;
break;
+ case RC_USE_NATIVE_FILEDIALOG:
+ lexrc >> use_native_filedialog;
+ break;
case RC_USE_SYSTEM_COLORS:
lexrc >> use_system_colors;
break;
case RC_USE_TOOLTIP:
lexrc >> use_tooltip;
break;
- case RC_USE_PIXMAP_CACHE:
- lexrc >> use_pixmap_cache;
- break;
- case RC_USE_QIMAGE:
- lexrc >> use_qimage;
- break;
case RC_SPELLCHECKER:
lexrc >> spellchecker;
break;
if (lexrc.next())
default_length_unit = (Length::UNIT) lexrc.getInteger();
break;
- case RC_DATE_INSERT_FORMAT:
- lexrc >> date_insert_format;
- break;
case RC_LANGUAGE_CUSTOM_PACKAGE:
lexrc >> language_custom_package;
break;
case RC_VIEWER: {
string format, command;
lexrc >> format >> command;
- formats.setViewer(format, command);
+ theFormats().setViewer(format, command);
break;
}
case RC_FILEFORMAT: {
if (theConverters().formatIsUsed(format))
LYXERR0("Can't delete format " << format);
else
- formats.erase(format);
+ theFormats().erase(format);
} else {
- formats.add(format, extensions, prettyname,
+ theFormats().add(format, extensions, prettyname,
shortcut, viewer, editor, mime, flgs);
}
break;
lexrc >> default_otf_view_format;
break;
+ case RC_DEFAULT_PLATEX_VIEW_FORMAT:
+ lexrc >> default_platex_view_format;
+ break;
+
case RC_DEFAULT_VIEW_FORMAT:
lexrc >> default_view_format;
break;
// This is triggered the first time through the loop unless
// we hit a format tag.
- if (check_format && format != LYXRC_FILEFORMAT)
+ if (check_format && rc_format != LYXRC_FILEFORMAT)
return FormatMismatch;
}
/// Update converters data-structures
- theConverters().update(formats);
+ theConverters().update(theFormats());
theConverters().buildGraph();
theBufferList().invalidateConverterCache();
"\"", "\\\"");
}
-}
+} // namespace
void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) const
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_DEFFILE:
if (ignore_system_lyxrc ||
def_file != system_lyxrc.def_file) {
<< "# MISC SECTION ######################################\n"
<< "#\n\n";
// bind files are not done here.
-
+ // fall through
case RC_PATH_PREFIX:
if (ignore_system_lyxrc ||
path_prefix != system_lyxrc.path_prefix) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_UIFILE:
if (ignore_system_lyxrc ||
ui_file != system_lyxrc.ui_file) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_AUTOREGIONDELETE:
if (ignore_system_lyxrc ||
auto_region_delete != system_lyxrc.auto_region_delete) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_AUTORESET_OPTIONS:
if (ignore_system_lyxrc ||
auto_reset_options != system_lyxrc.auto_reset_options) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_AUTOSAVE:
if (ignore_system_lyxrc ||
autosave != system_lyxrc.autosave) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_DISPLAY_GRAPHICS:
if (ignore_system_lyxrc ||
display_graphics != system_lyxrc.display_graphics) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SORT_LAYOUTS:
if (ignore_system_lyxrc ||
sort_layouts != system_lyxrc.sort_layouts) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_GROUP_LAYOUTS:
if (ignore_system_lyxrc ||
group_layouts != system_lyxrc.group_layouts) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_VIEWDVI_PAPEROPTION:
if (ignore_system_lyxrc ||
view_dvi_paper_option
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_CHKTEX_COMMAND:
if (ignore_system_lyxrc ||
chktex_command != system_lyxrc.chktex_command) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_BIBTEX_ALTERNATIVES: {
CommandSet::const_iterator it = bibtex_alternatives.begin();
CommandSet::const_iterator end = bibtex_alternatives.end();
if (tag != RC_LAST)
break;
}
+ // fall through
case RC_BIBTEX_COMMAND:
if (ignore_system_lyxrc ||
bibtex_command != system_lyxrc.bibtex_command) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_JBIBTEX_COMMAND:
if (ignore_system_lyxrc ||
jbibtex_command != system_lyxrc.jbibtex_command) {
}
if (tag != RC_LAST)
break;
+ // fall through
+ case RC_JBIBTEX_ALTERNATIVES: {
+ CommandSet::const_iterator it = jbibtex_alternatives.begin();
+ CommandSet::const_iterator end = jbibtex_alternatives.end();
+ for ( ; it != end; ++it) {
+ if (ignore_system_lyxrc
+ || !system_lyxrc.jbibtex_alternatives.count(*it))
+ os << "\\jbibtex_alternatives \""
+ << *it << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
+ }
+ // fall through
case RC_INDEX_ALTERNATIVES: {
CommandSet::const_iterator it = index_alternatives.begin();
CommandSet::const_iterator end = index_alternatives.end();
if (tag != RC_LAST)
break;
}
+ // fall through
case RC_INDEX_COMMAND:
if (ignore_system_lyxrc ||
index_command != system_lyxrc.index_command) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_JINDEX_COMMAND:
if (ignore_system_lyxrc ||
jindex_command != system_lyxrc.jindex_command) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SPLITINDEX_COMMAND:
if (ignore_system_lyxrc ||
splitindex_command != system_lyxrc.splitindex_command) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_NOMENCL_COMMAND:
if (ignore_system_lyxrc ||
nomencl_command != system_lyxrc.nomencl_command) {
}
if (tag != RC_LAST)
break;
+ // fall through
+ case RC_PYGMENTIZE_COMMAND:
+ if (ignore_system_lyxrc ||
+ pygmentize_command != system_lyxrc.pygmentize_command) {
+ os << "\\pygmentize_command \"" << escapeCommand(pygmentize_command) << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
+ // fall through
case RC_TEX_EXPECTS_WINDOWS_PATHS:
// Don't write this setting to the preferences file,
// but allow temporary changes (bug 7557).
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_TEX_ALLOWS_SPACES:
if (tex_allows_spaces != system_lyxrc.tex_allows_spaces) {
os << "\\tex_allows_spaces "
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_KBMAP:
if (ignore_system_lyxrc ||
use_kbmap != system_lyxrc.use_kbmap) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_KBMAP_PRIMARY:
if (ignore_system_lyxrc ||
primary_kbmap != system_lyxrc.primary_kbmap) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_KBMAP_SECONDARY:
if (ignore_system_lyxrc ||
secondary_kbmap != system_lyxrc.secondary_kbmap) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SERVERPIPE:
if (ignore_system_lyxrc ||
lyxpipes != system_lyxrc.lyxpipes) {
}
if (tag != RC_LAST)
break;
- case RC_DATE_INSERT_FORMAT:
- if (ignore_system_lyxrc ||
- date_insert_format != system_lyxrc.date_insert_format) {
- os << "\\date_insert_format \"" << date_insert_format
- << "\"\n";
- }
- if (tag != RC_LAST)
- break;
-
+ // fall through
case RC_USER_NAME:
os << "\\user_name \"" << user_name << "\"\n";
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_USER_EMAIL:
os << "\\user_email \"" << user_email << "\"\n";
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_SHOW_BANNER:
if (ignore_system_lyxrc ||
show_banner != system_lyxrc.show_banner) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_PREVIEW:
if (ignore_system_lyxrc ||
preview != system_lyxrc.preview) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_PREVIEW_HASHED_LABELS:
if (ignore_system_lyxrc ||
preview_hashed_labels !=
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_PREVIEW_SCALE_FACTOR:
if (ignore_system_lyxrc ||
preview_scale_factor != system_lyxrc.preview_scale_factor) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_USE_CONVERTER_CACHE:
if (ignore_system_lyxrc ||
use_converter_cache != system_lyxrc.use_converter_cache) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN:
if (ignore_system_lyxrc ||
use_converter_needauth_forbidden != system_lyxrc.use_converter_needauth_forbidden) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_USE_CONVERTER_NEEDAUTH:
if (ignore_system_lyxrc ||
use_converter_needauth != system_lyxrc.use_converter_needauth) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_CONVERTER_CACHE_MAXAGE:
if (ignore_system_lyxrc ||
converter_cache_maxage != system_lyxrc.converter_cache_maxage) {
os << "\n#\n"
<< "# SCREEN & FONTS SECTION ############################\n"
<< "#\n\n";
-
+ // fall through
case RC_ICON_SET:
if (ignore_system_lyxrc ||
icon_set != system_lyxrc.icon_set) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_USE_SYSTEM_THEME_ICONS:
if (ignore_system_lyxrc ||
use_system_theme_icons != system_lyxrc.use_system_theme_icons) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_SCREEN_DPI:
if (ignore_system_lyxrc ||
dpi != system_lyxrc.dpi) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SCREEN_ZOOM:
if (ignore_system_lyxrc ||
- zoom != system_lyxrc.zoom) {
- os << "\\screen_zoom " << zoom << '\n';
+ defaultZoom != system_lyxrc.defaultZoom) {
+ os << "\\screen_zoom " << defaultZoom << '\n';
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_GEOMETRY_SESSION:
if (ignore_system_lyxrc ||
allow_geometry_session != system_lyxrc.allow_geometry_session) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_CURSOR_FOLLOWS_SCROLLBAR:
if (ignore_system_lyxrc ||
cursor_follows_scrollbar
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_CURSOR_WIDTH:
if (ignore_system_lyxrc ||
cursor_width
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SCROLL_BELOW_DOCUMENT:
if (ignore_system_lyxrc ||
scroll_below_document
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_PARAGRAPH_MARKERS:
if (ignore_system_lyxrc ||
paragraph_markers
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_MAC_DONTSWAP_CTRL_META:
if (ignore_system_lyxrc ||
mac_dontswap_ctrl_meta
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_MAC_LIKE_CURSOR_MOVEMENT:
if (ignore_system_lyxrc ||
mac_like_cursor_movement
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_MACRO_EDIT_STYLE:
if (ignore_system_lyxrc ||
macro_edit_style
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_DIALOGS_ICONIFY_WITH_MAIN:
if (ignore_system_lyxrc ||
dialogs_iconify_with_main
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SCREEN_FONT_ROMAN:
if (ignore_system_lyxrc ||
roman_font_name != system_lyxrc.roman_font_name) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SCREEN_FONT_ROMAN_FOUNDRY:
if (ignore_system_lyxrc ||
roman_font_foundry != system_lyxrc.roman_font_foundry) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SCREEN_FONT_SANS:
if (ignore_system_lyxrc ||
sans_font_name != system_lyxrc.sans_font_name) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SCREEN_FONT_SANS_FOUNDRY:
if (ignore_system_lyxrc ||
sans_font_foundry != system_lyxrc.sans_font_foundry) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SCREEN_FONT_TYPEWRITER:
if (ignore_system_lyxrc ||
typewriter_font_name != system_lyxrc.typewriter_font_name) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SCREEN_FONT_TYPEWRITER_FOUNDRY:
if (ignore_system_lyxrc ||
typewriter_font_foundry != system_lyxrc.typewriter_font_foundry) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_SCREEN_FONT_SCALABLE:
if (ignore_system_lyxrc ||
use_scalable_fonts != system_lyxrc.use_scalable_fonts) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SCREEN_FONT_SIZES:
if (ignore_system_lyxrc ||
font_sizes[FONT_SIZE_TINY]
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_FULL_SCREEN_LIMIT:
if (ignore_system_lyxrc ||
full_screen_limit != system_lyxrc.full_screen_limit) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_FULL_SCREEN_TOOLBARS:
if (ignore_system_lyxrc ||
full_screen_toolbars != system_lyxrc.full_screen_toolbars) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_FULL_SCREEN_SCROLLBAR:
if (ignore_system_lyxrc ||
full_screen_scrollbar != system_lyxrc.full_screen_scrollbar) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_FULL_SCREEN_STATUSBAR:
if (ignore_system_lyxrc ||
full_screen_statusbar != system_lyxrc.full_screen_statusbar) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_FULL_SCREEN_TABBAR:
if (ignore_system_lyxrc ||
full_screen_tabbar != system_lyxrc.full_screen_tabbar) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_FULL_SCREEN_MENUBAR:
if (ignore_system_lyxrc ||
full_screen_menubar != system_lyxrc.full_screen_menubar) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_FULL_SCREEN_WIDTH:
if (ignore_system_lyxrc ||
full_screen_width != system_lyxrc.full_screen_width) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_OPEN_BUFFERS_IN_TABS:
if (ignore_system_lyxrc ||
open_buffers_in_tabs != system_lyxrc.open_buffers_in_tabs) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SINGLE_CLOSE_TAB_BUTTON:
if (ignore_system_lyxrc ||
single_close_tab_button != system_lyxrc.single_close_tab_button) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SINGLE_INSTANCE:
if (ignore_system_lyxrc ||
single_instance != system_lyxrc.single_instance) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_FORWARD_SEARCH_DVI:
if (ignore_system_lyxrc ||
forward_search_dvi != system_lyxrc.forward_search_dvi) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_FORWARD_SEARCH_PDF:
if (ignore_system_lyxrc ||
forward_search_pdf != system_lyxrc.forward_search_pdf) {
<< "# COLOR SECTION ###################################\n"
<< "#\n\n";
+ // fall through
case RC_SET_COLOR:
for (int i = 0; i < Color_ignore; ++i) {
ColorCode lc = static_cast<ColorCode>(i);
<< "# PRINTER SECTION ###################################\n"
<< "#\n\n";
+ // fall through
case RC_PRINTLANDSCAPEFLAG:
if (ignore_system_lyxrc ||
print_landscape_flag != system_lyxrc.print_landscape_flag) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_PRINTPAPERFLAG:
if (ignore_system_lyxrc ||
print_paper_flag != system_lyxrc.print_paper_flag) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_PRINTPAPERDIMENSIONFLAG:
if (ignore_system_lyxrc ||
print_paper_dimension_flag
<< "# TEX SECTION #######################################\n"
<< "#\n\n";
+ // fall through
case RC_TEXINPUTS_PREFIX:
if (ignore_system_lyxrc ||
texinputs_prefix != system_lyxrc.texinputs_prefix) {
}
if (tag != RC_LAST)
break;
-
- case RC_FONT_ENCODING:
- if (ignore_system_lyxrc ||
- fontenc != system_lyxrc.fontenc) {
- os << "\\font_encoding \"" << fontenc << "\"\n";
- }
- if (tag != RC_LAST)
- break;
-
+ // fall through
os << "\n#\n"
<< "# FILE SECTION ######################################\n"
<< "#\n\n";
-
+ // fall through
case RC_DOCUMENTPATH:
if (ignore_system_lyxrc ||
document_path != system_lyxrc.document_path) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_USELASTFILEPOS:
if (ignore_system_lyxrc ||
use_lastfilepos != system_lyxrc.use_lastfilepos) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_LOADSESSION:
if (ignore_system_lyxrc ||
load_session != system_lyxrc.load_session) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_MOUSE_WHEEL_SPEED:
if (ignore_system_lyxrc ||
mouse_wheel_speed != system_lyxrc.mouse_wheel_speed) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_MOUSE_MIDDLEBUTTON_PASTE:
if (ignore_system_lyxrc ||
mouse_middlebutton_paste != system_lyxrc.mouse_middlebutton_paste) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_INLINE_DELAY:
if (ignore_system_lyxrc ||
completion_inline_delay != system_lyxrc.completion_inline_delay) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_INLINE_MATH:
if (ignore_system_lyxrc ||
completion_inline_math != system_lyxrc.completion_inline_math) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_INLINE_TEXT:
if (ignore_system_lyxrc ||
completion_inline_text != system_lyxrc.completion_inline_text) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_INLINE_DOTS:
if (ignore_system_lyxrc ||
completion_inline_dots != system_lyxrc.completion_inline_dots) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_AUTOCORRECTION_MATH:
if (ignore_system_lyxrc ||
autocorrection_math != system_lyxrc.autocorrection_math) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_POPUP_DELAY:
if (ignore_system_lyxrc ||
completion_popup_delay != system_lyxrc.completion_popup_delay) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_POPUP_MATH:
if (ignore_system_lyxrc ||
completion_popup_math != system_lyxrc.completion_popup_math) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_POPUP_TEXT:
if (ignore_system_lyxrc ||
completion_popup_text != system_lyxrc.completion_popup_text) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_CURSOR_TEXT:
if (ignore_system_lyxrc ||
completion_cursor_text != system_lyxrc.completion_cursor_text) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_POPUP_AFTER_COMPLETE:
if (ignore_system_lyxrc ||
completion_popup_after_complete
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_COMPLETION_MINLENGTH:
if (ignore_system_lyxrc ||
completion_minlength != system_lyxrc.completion_minlength) {
}
if (tag != RC_LAST)
break;
-
- case RC_NUMLASTFILES:
+ // fall through
+ case RC_NUMLASTFILES:
if (ignore_system_lyxrc ||
num_lastfiles != system_lyxrc.num_lastfiles) {
os << "\\num_lastfiles " << num_lastfiles << '\n';
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_CHECKLASTFILES:
if (ignore_system_lyxrc ||
check_lastfiles != system_lyxrc.check_lastfiles) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_EXAMPLEPATH:
if (ignore_system_lyxrc ||
example_path != system_lyxrc.example_path) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_TEMPLATEPATH:
if (ignore_system_lyxrc ||
template_path != system_lyxrc.template_path) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_TEMPDIRPATH:
if (ignore_system_lyxrc ||
tempdir_path != system_lyxrc.tempdir_path) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_THESAURUSDIRPATH:
if (ignore_system_lyxrc ||
thesaurusdir_path != system_lyxrc.thesaurusdir_path) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_HUNSPELLDIR_PATH:
if (ignore_system_lyxrc ||
hunspelldir_path != system_lyxrc.hunspelldir_path) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_PLAINTEXT_LINELEN:
if (ignore_system_lyxrc ||
plaintext_linelen != system_lyxrc.plaintext_linelen) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_MAKE_BACKUP:
if (ignore_system_lyxrc ||
make_backup != system_lyxrc.make_backup) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SAVE_COMPRESSED:
if (ignore_system_lyxrc ||
save_compressed != system_lyxrc.save_compressed) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_SAVE_ORIGIN:
if (ignore_system_lyxrc ||
save_origin != system_lyxrc.save_origin) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_BACKUPDIR_PATH:
if (ignore_system_lyxrc ||
backupdir_path != system_lyxrc.backupdir_path) {
<< "# SPELLCHECKER SECTION ##############################\n"
<< "#\n\n";
+ // fall through
case RC_ACCEPT_COMPOUND:
if (ignore_system_lyxrc ||
spellchecker_accept_compound != system_lyxrc.spellchecker_accept_compound) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_ALT_LANG:
if (ignore_system_lyxrc ||
spellchecker_alt_lang != system_lyxrc.spellchecker_alt_lang) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_ESC_CHARS:
if (ignore_system_lyxrc ||
spellchecker_esc_chars != system_lyxrc.spellchecker_esc_chars) {
}
if (tag != RC_LAST)
break;
+ // fall through
+ case RC_USE_NATIVE_FILEDIALOG:
+ if (ignore_system_lyxrc ||
+ use_native_filedialog != system_lyxrc.use_native_filedialog) {
+ os << "\\use_native_filedialog "
+ << convert<string>(use_native_filedialog)
+ << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
+ // fall through
case RC_USE_SYSTEM_COLORS:
if (ignore_system_lyxrc ||
use_system_colors != system_lyxrc.use_system_colors) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_USE_TOOLTIP:
if (ignore_system_lyxrc ||
use_tooltip != system_lyxrc.use_tooltip) {
}
if (tag != RC_LAST)
break;
- case RC_USE_PIXMAP_CACHE:
- if (ignore_system_lyxrc ||
- use_pixmap_cache != system_lyxrc.use_pixmap_cache) {
- os << "\\use_pixmap_cache "
- << convert<string>(use_pixmap_cache)
- << '\n';
- }
- if (tag != RC_LAST)
- break;
- case RC_USE_QIMAGE:
- if (ignore_system_lyxrc ||
- use_qimage != system_lyxrc.use_qimage) {
- os << "\\use_qimage "
- << convert<string>(use_qimage)
- << '\n';
- }
- if (tag != RC_LAST)
- break;
+ // fall through
os << "\n#\n"
<< "# LANGUAGE SUPPORT SECTION ##########################\n"
<< "#\n\n";
+ // fall through
case RC_DEFAULT_DECIMAL_POINT:
if (ignore_system_lyxrc ||
default_decimal_point != system_lyxrc.default_decimal_point) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_DEFAULT_LENGTH_UNIT:
if (ignore_system_lyxrc ||
default_length_unit != system_lyxrc.default_length_unit) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_SPELLCHECKER:
if (ignore_system_lyxrc ||
spellchecker != system_lyxrc.spellchecker) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_SPELLCHECK_CONTINUOUSLY:
if (ignore_system_lyxrc ||
spellcheck_continuously != system_lyxrc.spellcheck_continuously) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_SPELLCHECK_NOTES:
if (ignore_system_lyxrc ||
spellcheck_notes != system_lyxrc.spellcheck_notes) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_VISUAL_CURSOR:
if (ignore_system_lyxrc ||
visual_cursor != system_lyxrc.visual_cursor) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_CLOSE_BUFFER_WITH_LAST_VIEW:
if (ignore_system_lyxrc ||
close_buffer_with_last_view != system_lyxrc.close_buffer_with_last_view) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_LANGUAGE_CUSTOM_PACKAGE:
if (ignore_system_lyxrc ||
language_custom_package != system_lyxrc.language_custom_package) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_LANGUAGE_GLOBAL_OPTIONS:
if (ignore_system_lyxrc ||
language_global_options
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_LANGUAGE_PACKAGE_SELECTION:
if (ignore_system_lyxrc ||
language_package_selection != system_lyxrc.language_package_selection) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_LANGUAGE_COMMAND_BEGIN:
if (ignore_system_lyxrc ||
language_command_begin
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_LANGUAGE_COMMAND_END:
if (ignore_system_lyxrc ||
language_command_end
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_LANGUAGE_COMMAND_LOCAL:
if (ignore_system_lyxrc ||
language_command_local
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_LANGUAGE_AUTO_BEGIN:
if (ignore_system_lyxrc ||
language_auto_begin != system_lyxrc.language_auto_begin) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_LANGUAGE_AUTO_END:
if (ignore_system_lyxrc ||
language_auto_end != system_lyxrc.language_auto_end) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_MARK_FOREIGN_LANGUAGE:
if (ignore_system_lyxrc ||
mark_foreign_language
<< "# 2nd MISC SUPPORT SECTION ##########################\n"
<< "#\n\n";
+ // fall through
case RC_AUTO_NUMBER:
if (ignore_system_lyxrc ||
auto_number != system_lyxrc.auto_number) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_GUI_LANGUAGE:
if (ignore_system_lyxrc ||
gui_language != system_lyxrc.gui_language) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_EXPORT_OVERWRITE:
if (ignore_system_lyxrc ||
export_overwrite != system_lyxrc.export_overwrite) {
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_SCROLL_WHEEL_ZOOM:
if (ignore_system_lyxrc ||
scroll_wheel_zoom != system_lyxrc.scroll_wheel_zoom) {
<< "# FORMATS SECTION ##########################\n"
<< "#\n\n";
+ // fall through
case RC_FILEFORMAT:
// New/modified formats
- for (Formats::const_iterator cit = formats.begin();
- cit != formats.end(); ++cit) {
+ for (Formats::const_iterator cit = theFormats().begin();
+ cit != theFormats().end(); ++cit) {
Format const * format =
- system_formats.getFormat(cit->name());
+ theSystemFormats().getFormat(cit->name());
if (!format ||
format->extensions() != cit->extensions() ||
format->prettyname() != cit->prettyname() ||
}
// Look for deleted formats
- for (Formats::const_iterator cit = system_formats.begin();
- cit != system_formats.end(); ++cit)
- if (!formats.getFormat(cit->name()))
+ for (Formats::const_iterator cit = theSystemFormats().begin();
+ cit != theSystemFormats().end(); ++cit)
+ if (!theFormats().getFormat(cit->name()))
os << "\\format \"" << cit->name()
<< "\" \"\" \"\" \"\" \"\" \"\" \"\" \"\"\n";
if (tag != RC_LAST)
break;
+ // fall through
case RC_VIEWER_ALTERNATIVES: {
Alternatives::const_iterator it = viewer_alternatives.begin();
Alternatives::const_iterator const en = viewer_alternatives.end();
if (tag != RC_LAST)
break;
}
+ // fall through
case RC_EDITOR_ALTERNATIVES: {
Alternatives::const_iterator it = editor_alternatives.begin();
Alternatives::const_iterator const en = editor_alternatives.end();
if (tag != RC_LAST)
break;
}
+ // fall through
case RC_DEFAULT_OTF_VIEW_FORMAT:
if ((ignore_system_lyxrc ||
default_otf_view_format != system_lyxrc.default_otf_view_format)
}
if (tag != RC_LAST)
break;
+ // fall through
+ case RC_DEFAULT_PLATEX_VIEW_FORMAT:
+ if ((ignore_system_lyxrc ||
+ default_platex_view_format != system_lyxrc.default_platex_view_format)
+ && !default_platex_view_format.empty()) {
+ os << "\\default_platex_view_format " << default_platex_view_format << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
+ // fall through
case RC_DEFAULT_VIEW_FORMAT:
if (ignore_system_lyxrc ||
default_view_format != system_lyxrc.default_view_format) {
}
if (tag != RC_LAST)
break;
+ // fall through
case RC_VIEWER:
// Ignore it
if (tag != RC_LAST)
<< "# CONVERTERS SECTION ##########################\n"
<< "#\n\n";
+ // fall through
case RC_CONVERTER:
// Look for new converters
for (Converters::const_iterator cit = theConverters().begin();
<< "\" \"" << cit->to() << "\" \"\" \"\"\n";
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_COPIER:
if (tag == RC_LAST)
os << "\n#\n"
case LyXRC::RC_COPIER:
case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR:
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_PLATEX_VIEW_FORMAT:
case LyXRC::RC_DEFAULT_VIEW_FORMAT:
case LyXRC::RC_DEFFILE:
case LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN:
case LyXRC::RC_EDITOR_ALTERNATIVES:
case LyXRC::RC_ESC_CHARS:
case LyXRC::RC_EXAMPLEPATH:
- case LyXRC::RC_FONT_ENCODING:
case LyXRC::RC_FILEFORMAT:
case LyXRC::RC_GROUP_LAYOUTS:
case LyXRC::RC_HUNSPELLDIR_PATH:
case LyXRC::RC_INDEX_ALTERNATIVES:
case LyXRC::RC_INDEX_COMMAND:
case LyXRC::RC_JBIBTEX_COMMAND:
+ case LyXRC::RC_JBIBTEX_ALTERNATIVES:
case LyXRC::RC_JINDEX_COMMAND:
case LyXRC::RC_NOMENCL_COMMAND:
+ case LyXRC::RC_PYGMENTIZE_COMMAND:
case LyXRC::RC_INPUT:
case LyXRC::RC_KBMAP:
case LyXRC::RC_KBMAP_PRIMARY:
case LyXRC::RC_USE_CONVERTER_CACHE:
case LyXRC::RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN:
case LyXRC::RC_USE_CONVERTER_NEEDAUTH:
+ case LyXRC::RC_USE_NATIVE_FILEDIALOG:
case LyXRC::RC_USE_SYSTEM_COLORS:
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:
}
+set<string> LyXRC::getRCs()
+{
+ set<string> res;
+ for (int i = 0; i != lyxrcCount; ++i)
+ res.insert(ltrim(lyxrcTags[i].tag, "\\"));
+ return res;
+}
+
+
#if 0
string const LyXRC::getDescription(LyXRCTags tag)
{
str = _("Show a small box around a Math Macro with the macro name when the cursor is inside.");
break;
- case RC_DATE_INSERT_FORMAT:
- //xgettext:no-c-format
- str = _("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\".");
- break;
-
case RC_DEFFILE:
str = _("Command definition file. Can either specify an absolute path, or LyX will look in its global and local commands/ directories.");
break;
str = _("The path that LyX will set when offering to choose an example. An empty value selects the directory LyX was started from.");
break;
- case RC_FONT_ENCODING:
- str = _("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages.");
- break;
-
case RC_FILEFORMAT:
break;
str = _("Define the options of makeindex (cf. man makeindex) to be used for nomenclatures. This might differ from the index processing options.");
break;
+ case RC_PYGMENTIZE_COMMAND:
+ str = _("The command to run the python pygments syntax highlighter.");
+ break;
+
case RC_INPUT:
break;
str = _("Enable the automatic appearance of tool tips in the work area.");
break;
- case RC_USE_PIXMAP_CACHE:
- str = _("Enable the pixmap cache that might improve performance on Mac and Windows.");
- break;
-
case RC_VIEWDVI_PAPEROPTION:
_("Specify the paper command to DVI viewer (leave empty or use \"-paper\")");
break;