#include "converter.h"
#include "format.h"
#include "gettext.h"
+#include "lastfiles.h"
#include "LColor.h"
#include "lyxlex.h"
#include "lyxfont.h"
+#include "mover.h"
#include "graphics/GraphicsTypes.h"
#include "support/filetools.h"
#include "support/lstrings.h"
-#include "support/translator.h"
#include "support/tostr.h"
#include "support/userinfo.h"
using lyx::support::ascii_lowercase;
+using lyx::support::bformat;
using lyx::support::ExpandPath;
using lyx::support::GetEnv;
using lyx::support::LibFileSearch;
{ "\\auto_reset_options", LyXRC::RC_AUTORESET_OPTIONS },
{ "\\autosave", LyXRC::RC_AUTOSAVE },
{ "\\backupdir_path", LyXRC::RC_BACKUPDIR_PATH },
+ { "\\bibtex_command", LyXRC::RC_BIBTEX_COMMAND },
{ "\\bind_file", LyXRC::RC_BINDFILE },
{ "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES },
{ "\\chktex_command", LyXRC::RC_CHKTEX_COMMAND },
{ "\\converter", LyXRC::RC_CONVERTER },
+ { "\\copier", LyXRC::RC_COPIER },
{ "\\cursor_follows_scrollbar", LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR },
{ "\\custom_export_command", LyXRC::RC_CUSTOM_EXPORT_COMMAND },
{ "\\custom_export_format", LyXRC::RC_CUSTOM_EXPORT_FORMAT },
{ "\\escape_chars", LyXRC::RC_ESC_CHARS },
{ "\\font_encoding", LyXRC::RC_FONT_ENCODING },
{ "\\format", LyXRC::RC_FORMAT },
+ { "\\index_command", LyXRC::RC_INDEX_COMMAND },
{ "\\input", LyXRC::RC_INPUT },
{ "\\kbmap", LyXRC::RC_KBMAP },
{ "\\kbmap_primary", LyXRC::RC_KBMAP_PRIMARY },
{ "\\print_to_file", LyXRC::RC_PRINTTOFILE },
{ "\\print_to_printer", LyXRC::RC_PRINTTOPRINTER },
{ "\\printer", LyXRC::RC_PRINTER },
- { "\\ps_command", LyXRC::RC_PS_COMMAND },
{ "\\rtl", LyXRC::RC_RTL_SUPPORT },
{ "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
{ "\\screen_font_encoding", LyXRC::RC_SCREEN_FONT_ENCODING },
{ "\\user_email", LyXRC::RC_USER_EMAIL },
{ "\\user_name", LyXRC::RC_USER_NAME },
{ "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION },
+ // compatibility with versions older than 1.4.0 only
{ "\\viewer" ,LyXRC::RC_VIEWER},
{ "\\wheel_jump", LyXRC::RC_WHEEL_JUMP }
};
print_paper_dimension_flag = "-T";
document_path.erase();
tempdir_path = "/tmp";
- ps_command = "gs";
view_dvi_paper_option.erase();
default_papersize = PAPER_USLETTER;
custom_export_format = "ps";
chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
+ bibtex_command = "bibtex";
fontenc = "default";
+ index_command = "makeindex -c -q";
dpi = 75;
// Because a screen typically is wider than a piece of paper:
zoom = 150;
auto_region_delete = true;
auto_reset_options = false;
ascii_linelen = 65;
- num_lastfiles = 4;
+ num_lastfiles = maxlastfiles;
check_lastfiles = true;
make_backup = true;
backupdir_path.erase();
cursor_follows_scrollbar = false;
dialogs_iconify_with_main = false;
label_init_length = 3;
- preview = false;
+ preview = PREVIEW_OFF;
preview_hashed_labels = false;
preview_scale_factor = 0.9;
user_name = lyx::support::user_name();
user_email = lyx::support::user_email();
-
- if (user_email.empty())
- user_email = _("email address unknown");
}
lyxerr[Debug::LYXRC] << "Reading '" << filename << "'..." << endl;
+ return read(lexrc);
+}
+
+
+int LyXRC::read(std::istream & is)
+{
+ LyXLex lexrc(lyxrcTags, lyxrcCount);
+ if (lyxerr.debugging(Debug::PARSER))
+ lexrc.printTable(lyxerr);
+
+ lexrc.setStream(is);
+ if (!lexrc.isOK()) return -2;
+
+ lyxerr[Debug::LYXRC] << "Reading istream..." << endl;
+
+ return read(lexrc);
+}
+
+
+int LyXRC::read(LyXLex & lexrc)
+{
+ if (!lexrc.isOK()) return -2;
+
while (lexrc.isOK()) {
// By using two switches we take advantage of the compiler
// telling us if we have missed a LyXRCTags element in
}
break;
- case RC_PS_COMMAND:
+ case RC_CHKTEX_COMMAND:
+ if (lexrc.next()) {
+ chktex_command = lexrc.getString();
+ }
+ break;
+
+ case RC_BIBTEX_COMMAND:
if (lexrc.next()) {
- ps_command = lexrc.getString();
+ bibtex_command = lexrc.getString();
}
break;
- case RC_CHKTEX_COMMAND:
+ case RC_INDEX_COMMAND:
if (lexrc.next()) {
- chktex_command = lexrc.getString();
+ index_command = lexrc.getString();
}
break;
break;
}
- LColor::color col = lcolor.getFromLyXName(lyx_name);
+ LColor::color const col =
+ lcolor.getFromLyXName(lyx_name);
+ if (col == LColor::none ||
+ col == LColor::inherit ||
+ col == LColor::ignore)
+ break;
+
if (!lcolor.setColor(col, x11_name)) {
lyxerr << "Bad lyxrc set_color for "
<< lyx_name << endl;
}
break;
+ case RC_COPIER: {
+ string fmt, command;
+ if (lexrc.next()) {
+ fmt = lexrc.getString();
+ }
+ if (lexrc.next()) {
+ command = lexrc.getString();
+ }
+ movers.set(fmt, command);
+ break;
+ }
+
case RC_CONVERTER: {
string from, to, command, flags;
if (lexrc.next()) {
}
break;
}
+ // compatibility with versions older than 1.4.0 only
case RC_VIEWER: {
string format, command;
if (lexrc.next()) {
if (lexrc.next()) {
shortcut = lexrc.getString();
}
+ string viewer, editor;
+ // Hack to ensure compatibility with versions older
+ // than 1.4.0
+ int le = lexrc.lex();
+ if (le != LyXLex::LEX_FEOF && le != LyXLex::LEX_UNDEF) {
+ viewer = lexrc.getString();
+ if (le == LyXLex::LEX_DATA) {
+ if (token(viewer, ' ', 0) == "none")
+ viewer.erase();
+ if (lexrc.next()) {
+ editor = lexrc.getString();
+ if (token(editor, ' ', 0) == "none")
+ editor.erase();
+ }
+ } else {
+ // We have got a known token.
+ // Therefore this is an old style
+ // format definition without
+ // viewer and editor.
+ lexrc.pushToken(viewer);
+ viewer.erase();
+ }
+ }
if (prettyname.empty()) {
if (converters.formatIsUsed(format)) {
lyxerr << "Can't delete format "
}
} else {
formats.add(format, extension, prettyname,
- shortcut);
+ shortcut, viewer, editor);
}
break;
}
case RC_PREVIEW:
if (lexrc.next()) {
- preview = lexrc.getBool();
+ string const tmp = lexrc.getString();
+ if (tmp == "true" || tmp == "on")
+ preview = PREVIEW_ON;
+ else if (tmp == "no_math")
+ preview = PREVIEW_NO_MATH;
+ else {
+ preview = PREVIEW_OFF;
+ if (tmp != "false" && tmp != "off")
+ lyxerr << "Unrecognized "
+ "preview status \""
+ << tmp << '\n' << endl;
+ }
}
break;
}
-void LyXRC::write(string const & filename) const
+void LyXRC::write(string const & filename, bool ignore_system_lyxrc) const
{
ofstream ofs(filename.c_str());
if (ofs)
- output(ofs);
+ write(ofs, ignore_system_lyxrc);
}
void LyXRC::print() const
{
if (lyxerr.debugging())
- output(lyxerr);
+ write(lyxerr, false);
else
- output(cout);
+ write(cout, false);
}
-void LyXRC::output(ostream & os) const
+struct SameMover {
+ typedef std::pair<std::string, SpecialisedMover> Data;
+
+ SameMover(Data const & comparison)
+ : comparison_(comparison) {}
+
+ bool operator()(Data const & data) const
+ {
+ return data.first == comparison_.first &&
+ data.second.command() == comparison_.second.command();
+ }
+
+private:
+ Data comparison_;
+};
+
+
+void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
{
os << "### This file is part of\n"
<< "### ========================================================\n"
case RC_INPUT:
// input/include files are not done here
case RC_BINDFILE:
- if (bind_file != system_lyxrc.bind_file) {
+ if (ignore_system_lyxrc ||
+ bind_file != system_lyxrc.bind_file) {
os << "\\bind_file " << bind_file << "\n";
}
//
// bind files are not done here.
case RC_UIFILE:
- if (ui_file != system_lyxrc.ui_file) {
+ if (ignore_system_lyxrc ||
+ ui_file != system_lyxrc.ui_file) {
os << "\\ui_file \"" << ui_file << "\"\n";
}
case RC_AUTOREGIONDELETE:
- if (auto_region_delete != system_lyxrc.auto_region_delete) {
+ if (ignore_system_lyxrc ||
+ auto_region_delete != system_lyxrc.auto_region_delete) {
os << "# Set to false to inhibit automatic replacement of\n"
<< "# the current selection.\n"
<< "\\auto_region_delete " << tostr(auto_region_delete)
<< '\n';
}
case RC_AUTORESET_OPTIONS:
- if (auto_reset_options != system_lyxrc.auto_reset_options) {
+ if (ignore_system_lyxrc ||
+ auto_reset_options != system_lyxrc.auto_reset_options) {
os << "# Set to false to inhibit automatic reset of\n"
<< "# the class options to defaults on class change.\n"
<< "\\auto_reset_options " << tostr(auto_reset_options)
<< '\n';
}
case RC_AUTOSAVE:
- if (autosave != system_lyxrc.autosave) {
+ if (ignore_system_lyxrc ||
+ autosave != system_lyxrc.autosave) {
os << "# The time interval between auto-saves in seconds.\n"
<< "\\autosave " << autosave << '\n';
}
case RC_DISPLAY_GRAPHICS:
- if (display_graphics != system_lyxrc.display_graphics) {
+ if (ignore_system_lyxrc ||
+ display_graphics != system_lyxrc.display_graphics) {
os << "# Display graphics within LyX\n"
<< "# monochrome|grayscale|color|none\n"
<< "\\display_graphics "
}
case RC_VIEWDVI_PAPEROPTION:
- if (view_dvi_paper_option
+ if (ignore_system_lyxrc ||
+ view_dvi_paper_option
!= system_lyxrc.view_dvi_paper_option) {
os << "# Options used to specify paper size to the\n"
<< "# view_dvi_command (e.g. -paper)\n"
<< view_dvi_paper_option << "\"\n";
}
case RC_DEFAULT_PAPERSIZE:
- if (default_papersize != system_lyxrc.default_papersize) {
+ if (ignore_system_lyxrc ||
+ default_papersize != system_lyxrc.default_papersize) {
os << "# The default papersize to use.\n"
<< "\\default_papersize \"";
switch (default_papersize) {
}
os << "\"\n";
}
- case RC_PS_COMMAND:
- if (ps_command != system_lyxrc.ps_command) {
- os << "# Program used for interpreting postscript.\n"
- << "\\ps_command \"" << ps_command << "\"\n";
- }
case RC_CHKTEX_COMMAND:
- if (chktex_command != system_lyxrc.chktex_command) {
+ if (ignore_system_lyxrc ||
+ chktex_command != system_lyxrc.chktex_command) {
os << "\\chktex_command \"" << chktex_command << "\"\n";
}
+ case RC_BIBTEX_COMMAND:
+ if (ignore_system_lyxrc ||
+ bibtex_command != system_lyxrc.bibtex_command) {
+ os << "\\bibtex_command \"" << bibtex_command << "\"\n";
+ }
+ case RC_INDEX_COMMAND:
+ if (ignore_system_lyxrc ||
+ index_command != system_lyxrc.index_command) {
+ os << "\\index_command \"" << index_command << "\"\n";
+ }
case RC_KBMAP:
- if (use_kbmap != system_lyxrc.use_kbmap) {
+ if (ignore_system_lyxrc ||
+ use_kbmap != system_lyxrc.use_kbmap) {
os << "\\kbmap " << tostr(use_kbmap) << '\n';
}
case RC_KBMAP_PRIMARY:
- if (primary_kbmap != system_lyxrc.primary_kbmap) {
+ if (ignore_system_lyxrc ||
+ primary_kbmap != system_lyxrc.primary_kbmap) {
os << "\\kbmap_primary \"" << primary_kbmap << "\"\n";
}
case RC_KBMAP_SECONDARY:
- if (secondary_kbmap != system_lyxrc.secondary_kbmap) {
+ if (ignore_system_lyxrc ||
+ secondary_kbmap != system_lyxrc.secondary_kbmap) {
os << "\\kbmap_secondary \"" << secondary_kbmap
<< "\"\n";
}
case RC_SERVERPIPE:
- if (lyxpipes != system_lyxrc.lyxpipes) {
+ if (ignore_system_lyxrc ||
+ lyxpipes != system_lyxrc.lyxpipes) {
os << "\\serverpipe \"" << lyxpipes << "\"\n";
}
case RC_DATE_INSERT_FORMAT:
- if (date_insert_format != system_lyxrc.date_insert_format) {
+ if (ignore_system_lyxrc ||
+ date_insert_format != system_lyxrc.date_insert_format) {
os << "\\date_insert_format \"" << date_insert_format
<< "\"\n";
}
case RC_LABEL_INIT_LENGTH:
- if (label_init_length != system_lyxrc.label_init_length) {
+ if (ignore_system_lyxrc ||
+ label_init_length != system_lyxrc.label_init_length) {
os << "\\label_init_length " << label_init_length
<< '\n';
}
os << "\\user_email \"" << user_email << "\"\n";
case RC_SHOW_BANNER:
- if (show_banner != system_lyxrc.show_banner) {
+ if (ignore_system_lyxrc ||
+ show_banner != system_lyxrc.show_banner) {
os << "\\show_banner " << tostr(show_banner) << '\n';
}
case RC_PREVIEW:
- if (preview != system_lyxrc.preview) {
- os << "\\preview " << tostr(preview) << '\n';
+ if (ignore_system_lyxrc ||
+ preview != system_lyxrc.preview) {
+ string status;
+ switch (preview) {
+ case PREVIEW_ON:
+ status = "on";
+ break;
+ case PREVIEW_NO_MATH:
+ status = "no_math";
+ break;
+ case PREVIEW_OFF:
+ status = "off";
+ break;
+ }
+ os << "\\preview " << status << '\n';
}
case RC_PREVIEW_HASHED_LABELS:
- if (preview_hashed_labels !=
+ if (ignore_system_lyxrc ||
+ preview_hashed_labels !=
system_lyxrc.preview_hashed_labels) {
os << "\\preview_hashed_labels "
<< tostr(preview_hashed_labels) << '\n';
}
case RC_PREVIEW_SCALE_FACTOR:
- if (preview_scale_factor != system_lyxrc.preview_scale_factor) {
+ if (ignore_system_lyxrc ||
+ preview_scale_factor != system_lyxrc.preview_scale_factor) {
os << "\\preview_scale_factor "
<< preview_scale_factor << '\n';
}
<< "#\n\n";
case RC_POPUP_NORMAL_FONT:
- if (popup_normal_font != system_lyxrc.popup_normal_font) {
+ if (ignore_system_lyxrc ||
+ popup_normal_font != system_lyxrc.popup_normal_font) {
os << "\\popup_normal_font \"" << popup_normal_font
<< "\"\n";
}
case RC_POPUP_BOLD_FONT:
- if (popup_bold_font != system_lyxrc.popup_bold_font) {
+ if (ignore_system_lyxrc ||
+ popup_bold_font != system_lyxrc.popup_bold_font) {
os << "\\popup_bold_font \"" << popup_bold_font
<< "\"\n";
}
case RC_POPUP_FONT_ENCODING:
- if (popup_font_encoding != system_lyxrc.popup_font_encoding) {
+ if (ignore_system_lyxrc ||
+ popup_font_encoding != system_lyxrc.popup_font_encoding) {
os << "\\popup_font_encoding \"" << popup_font_encoding
<< "\"\n";
}
case RC_SCREEN_DPI:
- if (dpi != system_lyxrc.dpi) {
+ if (ignore_system_lyxrc ||
+ dpi != system_lyxrc.dpi) {
os << "\\screen_dpi " << dpi << '\n';
}
case RC_SCREEN_ZOOM:
- if (zoom != system_lyxrc.zoom) {
+ if (ignore_system_lyxrc ||
+ zoom != system_lyxrc.zoom) {
os << "\\screen_zoom " << zoom << '\n';
}
case RC_WHEEL_JUMP:
- if (wheel_jump != system_lyxrc.wheel_jump) {
+ if (ignore_system_lyxrc ||
+ wheel_jump != system_lyxrc.wheel_jump) {
os << "\\wheel_jump " << wheel_jump << '\n';
}
case RC_CURSOR_FOLLOWS_SCROLLBAR:
- if (cursor_follows_scrollbar
+ if (ignore_system_lyxrc ||
+ cursor_follows_scrollbar
!= system_lyxrc.cursor_follows_scrollbar) {
os << "\\cursor_follows_scrollbar "
<< tostr(cursor_follows_scrollbar) << '\n';
}
case RC_DIALOGS_ICONIFY_WITH_MAIN:
- if (dialogs_iconify_with_main
+ if (ignore_system_lyxrc ||
+ dialogs_iconify_with_main
!= system_lyxrc.dialogs_iconify_with_main) {
os << "\\dialogs_iconify_with_main "
<< tostr(dialogs_iconify_with_main) << '\n';
}
case RC_SCREEN_FONT_ROMAN:
- if (roman_font_name != system_lyxrc.roman_font_name) {
+ if (ignore_system_lyxrc ||
+ roman_font_name != system_lyxrc.roman_font_name) {
os << "\\screen_font_roman \"" << roman_font_name
<< "\"\n";
}
case RC_SCREEN_FONT_ROMAN_FOUNDRY:
- if (roman_font_foundry != system_lyxrc.roman_font_foundry) {
+ if (ignore_system_lyxrc ||
+ roman_font_foundry != system_lyxrc.roman_font_foundry) {
os << "\\screen_font_roman_foundry \"" << roman_font_foundry
<< "\"\n";
}
case RC_SCREEN_FONT_SANS:
- if (sans_font_name != system_lyxrc.sans_font_name) {
+ if (ignore_system_lyxrc ||
+ sans_font_name != system_lyxrc.sans_font_name) {
os << "\\screen_font_sans \"" << sans_font_name
<< "\"\n";
}
case RC_SCREEN_FONT_SANS_FOUNDRY:
- if (sans_font_foundry != system_lyxrc.sans_font_foundry) {
+ if (ignore_system_lyxrc ||
+ sans_font_foundry != system_lyxrc.sans_font_foundry) {
os << "\\screen_font_sans_foundry \"" << sans_font_foundry
<< "\"\n";
}
case RC_SCREEN_FONT_TYPEWRITER:
- if (typewriter_font_name != system_lyxrc.typewriter_font_name) {
+ if (ignore_system_lyxrc ||
+ typewriter_font_name != system_lyxrc.typewriter_font_name) {
os << "\\screen_font_typewriter \""
<< typewriter_font_name << "\"\n";
}
case RC_SCREEN_FONT_TYPEWRITER_FOUNDRY:
- if (typewriter_font_foundry != system_lyxrc.typewriter_font_foundry) {
+ if (ignore_system_lyxrc ||
+ typewriter_font_foundry != system_lyxrc.typewriter_font_foundry) {
os << "\\screen_font_typewriter_foundry \""
<< typewriter_font_foundry << "\"\n";
}
case RC_SCREEN_FONT_SCALABLE:
- if (use_scalable_fonts != system_lyxrc.use_scalable_fonts) {
+ if (ignore_system_lyxrc ||
+ use_scalable_fonts != system_lyxrc.use_scalable_fonts) {
os << "\\screen_font_scalable "
<< tostr(use_scalable_fonts)
<< '\n';
}
case RC_SCREEN_FONT_ENCODING:
- if (font_norm != system_lyxrc.font_norm) {
+ if (ignore_system_lyxrc ||
+ font_norm != system_lyxrc.font_norm) {
os << "\\screen_font_encoding \"" << font_norm
<< "\"\n";
}
case RC_SCREEN_FONT_SIZES:
- if (font_sizes[LyXFont::SIZE_TINY]
+ 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] ||
LColor::color lc = static_cast<LColor::color>(i);
string const col(lcolor.getX11Name(lc));
- if (col != system_lcolor.getX11Name(lc)) {
+ if (ignore_system_lyxrc ||
+ col != system_lcolor.getX11Name(lc)) {
os << "\\set_color \""
<< lcolor.getLyXName(lc) << "\" \""
<< col << "\"\n";
<< "#\n\n";
case RC_PRINTER:
- if (printer != system_lyxrc.printer) {
+ if (ignore_system_lyxrc ||
+ printer != system_lyxrc.printer) {
os << "\\printer \"" << printer << "\"\n";
}
case RC_PRINT_ADAPTOUTPUT:
- if (print_adapt_output != system_lyxrc.print_adapt_output) {
+ if (ignore_system_lyxrc ||
+ print_adapt_output != system_lyxrc.print_adapt_output) {
os << "\\print_adapt_output "
<< tostr(print_adapt_output)
<< '\n';
}
case RC_PRINT_COMMAND:
- if (print_command != system_lyxrc.print_command) {
+ if (ignore_system_lyxrc ||
+ print_command != system_lyxrc.print_command) {
os << "\\print_command \"" << print_command << "\"\n";
}
case RC_PRINTEXSTRAOPTIONS:
- if (print_extra_options != system_lyxrc.print_extra_options) {
+ if (ignore_system_lyxrc ||
+ print_extra_options != system_lyxrc.print_extra_options) {
os << "\\print_extra_options \"" << print_extra_options
<< "\"\n";
}
case RC_PRINTSPOOL_COMMAND:
- if (print_spool_command != system_lyxrc.print_spool_command) {
+ if (ignore_system_lyxrc ||
+ print_spool_command != system_lyxrc.print_spool_command) {
os << "\\print_spool_command \"" << print_spool_command
<< "\"\n";
}
case RC_PRINTSPOOL_PRINTERPREFIX:
- if (print_spool_printerprefix
+ if (ignore_system_lyxrc ||
+ print_spool_printerprefix
!= system_lyxrc.print_spool_printerprefix) {
os << "\\print_spool_printerprefix \""
<< print_spool_printerprefix << "\"\n";
}
case RC_PRINTEVENPAGEFLAG:
- if (print_evenpage_flag != system_lyxrc.print_evenpage_flag) {
+ if (ignore_system_lyxrc ||
+ print_evenpage_flag != system_lyxrc.print_evenpage_flag) {
os << "\\print_evenpage_flag \"" << print_evenpage_flag
<< "\"\n";
}
case RC_PRINTODDPAGEFLAG:
- if (print_oddpage_flag != system_lyxrc.print_oddpage_flag) {
+ if (ignore_system_lyxrc ||
+ print_oddpage_flag != system_lyxrc.print_oddpage_flag) {
os << "\\print_oddpage_flag \"" << print_oddpage_flag
<< "\"\n";
}
case RC_PRINTREVERSEFLAG:
- if (print_reverse_flag != system_lyxrc.print_reverse_flag) {
+ if (ignore_system_lyxrc ||
+ print_reverse_flag != system_lyxrc.print_reverse_flag) {
os << "\\print_reverse_flag \"" << print_reverse_flag
<< "\"\n";
}
case RC_PRINTLANDSCAPEFLAG:
- if (print_landscape_flag != system_lyxrc.print_landscape_flag) {
+ if (ignore_system_lyxrc ||
+ print_landscape_flag != system_lyxrc.print_landscape_flag) {
os << "\\print_landscape_flag \"" << print_landscape_flag
<< "\"\n";
}
case RC_PRINTPAGERANGEFLAG:
- if (print_pagerange_flag != system_lyxrc.print_pagerange_flag) {
+ if (ignore_system_lyxrc ||
+ print_pagerange_flag != system_lyxrc.print_pagerange_flag) {
os << "\\print_pagerange_flag \"" << print_pagerange_flag
<< "\"\n";
}
case RC_PRINTCOPIESFLAG:
- if (print_copies_flag != system_lyxrc.print_copies_flag) {
+ if (ignore_system_lyxrc ||
+ print_copies_flag != system_lyxrc.print_copies_flag) {
os << "\\print_copies_flag \"" << print_copies_flag
<< "\"\n";
}
case RC_PRINTCOLLCOPIESFLAG:
- if (print_collcopies_flag
+ if (ignore_system_lyxrc ||
+ print_collcopies_flag
!= system_lyxrc.print_collcopies_flag) {
os << "\\print_collcopies_flag \""
<< print_collcopies_flag
<< "\"\n";
}
case RC_PRINTPAPERFLAG:
- if (print_paper_flag != system_lyxrc.print_paper_flag) {
+ if (ignore_system_lyxrc ||
+ print_paper_flag != system_lyxrc.print_paper_flag) {
os << "\\print_paper_flag \"" << print_paper_flag
<< "\"\n";
}
case RC_PRINTPAPERDIMENSIONFLAG:
- if (print_paper_dimension_flag
+ if (ignore_system_lyxrc ||
+ print_paper_dimension_flag
!= system_lyxrc.print_paper_dimension_flag) {
os << "\\print_paper_dimension_flag \""
<< print_paper_dimension_flag << "\"\n";
}
case RC_PRINTTOPRINTER:
- if (print_to_printer != system_lyxrc.print_to_printer) {
+ if (ignore_system_lyxrc ||
+ print_to_printer != system_lyxrc.print_to_printer) {
os << "\\print_to_printer \"" << print_to_printer
<< "\"\n";
}
case RC_PRINTTOFILE:
- if (print_to_file != system_lyxrc.print_to_file) {
+ if (ignore_system_lyxrc ||
+ print_to_file != system_lyxrc.print_to_file) {
os << "\\print_to_file \"" << print_to_file << "\"\n";
}
case RC_PRINTFILEEXTENSION:
- if (print_file_extension != system_lyxrc.print_file_extension) {
+ if (ignore_system_lyxrc ||
+ print_file_extension != system_lyxrc.print_file_extension) {
os << "\\print_file_extension \""
<< print_file_extension
<< "\"\n";
<< "#\n\n";
case RC_CUSTOM_EXPORT_COMMAND:
- if (custom_export_command
+ if (ignore_system_lyxrc ||
+ custom_export_command
!= system_lyxrc.custom_export_command) {
os << "\\custom_export_command \""
<< custom_export_command
<< "\"\n";
}
case RC_CUSTOM_EXPORT_FORMAT:
- if (custom_export_format
+ if (ignore_system_lyxrc ||
+ custom_export_format
!= system_lyxrc.custom_export_format) {
os << "\\custom_export_format \"" << custom_export_format
<< "\"\n";
<< "#\n\n";
case RC_FONT_ENCODING:
- if (fontenc != system_lyxrc.fontenc) {
+ if (ignore_system_lyxrc ||
+ fontenc != system_lyxrc.fontenc) {
os << "\\font_encoding \"" << fontenc << "\"\n";
}
<< "#\n\n";
case RC_DOCUMENTPATH:
- if (document_path != system_lyxrc.document_path) {
+ if (ignore_system_lyxrc ||
+ document_path != system_lyxrc.document_path) {
os << "\\document_path \"" << document_path << "\"\n";
}
case RC_LASTFILES:
- if (lastfiles != system_lyxrc.lastfiles) {
+ if (ignore_system_lyxrc ||
+ lastfiles != system_lyxrc.lastfiles) {
os << "\\lastfiles \"" << lastfiles << "\"\n";
}
case RC_NUMLASTFILES:
- if (num_lastfiles != system_lyxrc.num_lastfiles) {
+ if (ignore_system_lyxrc ||
+ num_lastfiles != system_lyxrc.num_lastfiles) {
os << "\\num_lastfiles " << num_lastfiles << '\n';
}
case RC_CHECKLASTFILES:
- if (check_lastfiles != system_lyxrc.check_lastfiles) {
+ if (ignore_system_lyxrc ||
+ check_lastfiles != system_lyxrc.check_lastfiles) {
os << "\\check_lastfiles " << tostr(check_lastfiles)
<< '\n';
}
case RC_TEMPLATEPATH:
- if (template_path != system_lyxrc.template_path) {
+ if (ignore_system_lyxrc ||
+ template_path != system_lyxrc.template_path) {
os << "\\template_path \"" << template_path << "\"\n";
}
case RC_TEMPDIRPATH:
- if (tempdir_path != system_lyxrc.tempdir_path) {
+ if (ignore_system_lyxrc ||
+ tempdir_path != system_lyxrc.tempdir_path) {
os << "\\tempdir_path \"" << tempdir_path << "\"\n";
}
case RC_USETEMPDIR:
// Ignore it
case RC_ASCII_LINELEN:
- if (ascii_linelen != system_lyxrc.ascii_linelen) {
+ if (ignore_system_lyxrc ||
+ ascii_linelen != system_lyxrc.ascii_linelen) {
os << "\\ascii_linelen " << ascii_linelen << '\n';
}
case RC_MAKE_BACKUP:
- if (make_backup != system_lyxrc.make_backup) {
+ if (ignore_system_lyxrc ||
+ make_backup != system_lyxrc.make_backup) {
os << "\\make_backup " << tostr(make_backup) << '\n';
}
case RC_BACKUPDIR_PATH:
- if (backupdir_path != system_lyxrc.backupdir_path) {
+ if (ignore_system_lyxrc ||
+ backupdir_path != system_lyxrc.backupdir_path) {
os << "\\backupdir_path \"" << backupdir_path << "\"\n";
}
<< "#\n\n";
case RC_ASCIIROFF_COMMAND:
- if (ascii_roff_command != system_lyxrc.ascii_roff_command) {
+ if (ignore_system_lyxrc ||
+ ascii_roff_command != system_lyxrc.ascii_roff_command) {
os << "\\ascii_roff_command \"" << ascii_roff_command
<< "\"\n";
}
<< "# SPELLCHECKER SECTION ##############################\n"
<< "#\n\n";
case RC_USE_SPELL_LIB:
- if (use_spell_lib != system_lyxrc.use_spell_lib) {
+ if (ignore_system_lyxrc ||
+ use_spell_lib != system_lyxrc.use_spell_lib) {
os << "\\use_spell_lib " << tostr(use_spell_lib) << '\n';
}
case RC_SPELL_COMMAND:
- if (isp_command != system_lyxrc.isp_command) {
+ if (ignore_system_lyxrc ||
+ isp_command != system_lyxrc.isp_command) {
os << "\\spell_command \"" << isp_command << "\"\n";
}
case RC_ACCEPT_COMPOUND:
- if (isp_accept_compound != system_lyxrc.isp_accept_compound) {
+ if (ignore_system_lyxrc ||
+ isp_accept_compound != system_lyxrc.isp_accept_compound) {
os << "\\accept_compound " << tostr(isp_accept_compound)
<< '\n';
}
case RC_USE_ALT_LANG:
- if (isp_use_alt_lang != system_lyxrc.isp_use_alt_lang) {
+ if (ignore_system_lyxrc ||
+ isp_use_alt_lang != system_lyxrc.isp_use_alt_lang) {
os << "\\use_alt_language " << tostr(isp_use_alt_lang)
<< '\n';
}
case RC_ALT_LANG:
- if (isp_alt_lang != system_lyxrc.isp_alt_lang) {
+ if (ignore_system_lyxrc ||
+ isp_alt_lang != system_lyxrc.isp_alt_lang) {
os << "\\alternate_language \"" << isp_alt_lang
<< "\"\n";
}
case RC_USE_ESC_CHARS:
- if (isp_use_esc_chars != system_lyxrc.isp_use_esc_chars) {
+ if (ignore_system_lyxrc ||
+ isp_use_esc_chars != system_lyxrc.isp_use_esc_chars) {
os << "\\use_escape_chars " << tostr(isp_use_esc_chars)
<< '\n';
}
case RC_ESC_CHARS:
- if (isp_esc_chars != system_lyxrc.isp_esc_chars) {
+ if (ignore_system_lyxrc ||
+ isp_esc_chars != system_lyxrc.isp_esc_chars) {
os << "\\escape_chars \"" << isp_esc_chars << "\"\n";
}
case RC_USE_PERS_DICT:
- if (isp_use_pers_dict != system_lyxrc.isp_use_pers_dict) {
+ if (ignore_system_lyxrc ||
+ isp_use_pers_dict != system_lyxrc.isp_use_pers_dict) {
os << "\\use_personal_dictionary "
<< tostr(isp_use_pers_dict)
<< '\n';
<< "\"\n";
}
case RC_USE_INP_ENC:
- if (isp_use_input_encoding
+ if (ignore_system_lyxrc ||
+ isp_use_input_encoding
!= system_lyxrc.isp_use_input_encoding) {
os << "\\use_input_encoding "
<< tostr(isp_use_input_encoding)
<< "#\n\n";
case RC_RTL_SUPPORT:
- if (rtl_support != system_lyxrc.rtl_support) {
+ if (ignore_system_lyxrc ||
+ rtl_support != system_lyxrc.rtl_support) {
os << "\\rtl " << tostr(rtl_support) << '\n';
}
case RC_LANGUAGE_PACKAGE:
- if (language_package != system_lyxrc.language_package) {
+ if (ignore_system_lyxrc ||
+ language_package != system_lyxrc.language_package) {
os << "\\language_package \"" << language_package
<< "\"\n";
}
case RC_LANGUAGE_GLOBAL_OPTIONS:
- if (language_global_options
+ if (ignore_system_lyxrc ||
+ language_global_options
!= system_lyxrc.language_global_options) {
os << "\\language_global_options \""
<< tostr(language_global_options)
<< "\"\n";
}
case RC_LANGUAGE_USE_BABEL:
- if (language_use_babel != system_lyxrc.language_use_babel) {
+ if (ignore_system_lyxrc ||
+ language_use_babel != system_lyxrc.language_use_babel) {
os << "\\language_use_babel \""
<< tostr(language_use_babel)
<< "\"\n";
}
case RC_LANGUAGE_COMMAND_BEGIN:
- if (language_command_begin
+ if (ignore_system_lyxrc ||
+ language_command_begin
!= system_lyxrc.language_command_begin) {
os << "\\language_command_begin \""
<< language_command_begin
<< "\"\n";
}
case RC_LANGUAGE_COMMAND_END:
- if (language_command_end
+ if (ignore_system_lyxrc ||
+ language_command_end
!= system_lyxrc.language_command_end) {
os << "\\language_command_end \"" << language_command_end
<< "\"\n";
}
case RC_LANGUAGE_COMMAND_LOCAL:
- if (language_command_local
+ if (ignore_system_lyxrc ||
+ language_command_local
!= system_lyxrc.language_command_local) {
os << "\\language_command_local \""
<< language_command_local
<< "\"\n";
}
case RC_LANGUAGE_AUTO_BEGIN:
- if (language_auto_begin != system_lyxrc.language_auto_begin) {
+ if (ignore_system_lyxrc ||
+ language_auto_begin != system_lyxrc.language_auto_begin) {
os << "\\language_auto_begin "
<< tostr(language_auto_begin) << '\n';
}
case RC_LANGUAGE_AUTO_END:
- if (language_auto_end != system_lyxrc.language_auto_end) {
+ if (ignore_system_lyxrc ||
+ language_auto_end != system_lyxrc.language_auto_end) {
os << "\\language_auto_end "
<< tostr(language_auto_end) << '\n';
}
case RC_MARK_FOREIGN_LANGUAGE:
- if (mark_foreign_language
+ if (ignore_system_lyxrc ||
+ mark_foreign_language
!= system_lyxrc.mark_foreign_language) {
os << "\\mark_foreign_language " <<
tostr(mark_foreign_language) << '\n';
<< "#\n\n";
case RC_AUTO_NUMBER:
- if (auto_number != system_lyxrc.auto_number) {
+ if (ignore_system_lyxrc ||
+ auto_number != system_lyxrc.auto_number) {
os << "\\auto_number " << tostr(auto_number) << '\n';
}
case RC_DEFAULT_LANGUAGE:
- if (default_language != system_lyxrc.default_language) {
+ if (ignore_system_lyxrc ||
+ default_language != system_lyxrc.default_language) {
os << "\\default_language " << default_language << '\n';
}
<< "#\n\n";
case RC_FORMAT:
- // Look for deleted formats
+ // New/modifed formats
for (Formats::const_iterator cit = formats.begin();
cit != formats.end(); ++cit) {
Format const * format =
if (!format ||
format->extension() != cit->extension() ||
format->prettyname() != cit->prettyname() ||
- format->shortcut() != cit->shortcut())
+ format->shortcut() != cit->shortcut() ||
+ format->viewer() != cit->viewer() ||
+ format->editor() != cit->editor())
os << "\\format \"" << cit->name() << "\" \""
<< cit->extension() << "\" \""
<< cit->prettyname() << "\" \""
- << cit->shortcut() << "\"\n";
+ << cit->shortcut() << "\" \""
+ << cit->viewer() << "\" \""
+ << cit->editor() << "\"\n";
}
- // New/modifed formats
+ // Look for deleted formats
for (Formats::const_iterator cit = system_formats.begin();
cit != system_formats.end(); ++cit)
if (!formats.getFormat(cit->name()))
os << "\\format \"" << cit->name()
- << "\" \"\" \"\" \"\"\n";
+ << "\" \"\" \"\" \"\" \"\" \"\"\n";
case RC_VIEWER:
- for (Formats::const_iterator cit = formats.begin();
- cit != formats.end(); ++cit) {
- Format const * format =
- system_formats.getFormat(cit->name());
- if ((!format || format->viewer() != cit->viewer()) &&
- (format || !cit->viewer().empty()))
- os << "\\viewer \"" << cit->name() << "\" \""
- << cit->viewer() << "\"\n";
- }
+ // Ignore it
os << "\n#\n"
<< "# CONVERTERS SECTION ##########################\n"
os << "\\converter \"" << cit->from
<< "\" \"" << cit->to << "\" \"\" \"\"\n";
+ case RC_COPIER:
+ os << "\n#\n"
+ << "# COPIERS SECTION ##########################\n"
+ << "#\n\n";
+
+ // Look for new movers
+ Movers::iterator const sysbegin = system_movers.begin();
+ Movers::iterator const sysend = system_movers.end();
+
+ for (Movers::iterator it = movers.begin(), end = movers.end();
+ it != end; ++it) {
+ Movers::iterator const sysit =
+ std::find_if(sysbegin, sysend, SameMover(*it));
+ if (sysit == sysend) {
+ std::string const & fmt = it->first;
+ std::string const & command =
+ it->second.command();
+
+ os << "\\copier " << fmt
+ << " \"" << command << "\"\n";
+ }
+ }
+
+ // We don't actually delete SpecialisedMover(s) from the
+ // map, just clear their 'command', so there's no need
+ // to test for anything else.
}
+
os.flush();
}
break;
case RC_NUMLASTFILES:
- str = _("Maximal number of lastfiles. Up to 9 can appear in the file menu.");
+ str = bformat(_("Maximal number of lastfiles. Up to %1$s can appear in the file menu."), tostr(maxlastfiles));
break;
case RC_CHECKLASTFILES:
str = _("Specify the default paper size.");
break;
- case RC_PS_COMMAND:
- break;
-
case RC_ACCEPT_COMPOUND:
str = _("Consider run-together words, such as \"diskdrive\" for \"disk drive\", as legal words?");
break;
str = _("Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\" Refer to the ChkTeX documentation.");
break;
+ case RC_BIBTEX_COMMAND:
+ str = _("Define the options of bibtex (cf. man bibtex) or select an alternative compiler (e.g. mlbibtex or bibulus).");
+ break;
+
+ case RC_INDEX_COMMAND:
+ str = _("Define the options of makeindex (cf. man makeindex) or select an alternative compiler. E.g., using xindy/make-rules, the command string would be \"makeindex.sh -m $$lang\".");
+ break;
+
case RC_CURSOR_FOLLOWS_SCROLLBAR:
str = _("LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen.");
break;
projects / lyx.git / blobdiff