RC_EXAMPLEPATH,
RC_EXPORT_OVERWRITE,
RC_FONT_ENCODING,
- RC_FORMAT,
+ RC_FILEFORMAT,
RC_FORWARD_SEARCH_DVI,
RC_FORWARD_SEARCH_PDF,
RC_FULL_SCREEN_LIMIT,
RC_LANGUAGE_COMMAND_END,
RC_LANGUAGE_COMMAND_LOCAL,
RC_LANGUAGE_GLOBAL_OPTIONS,
- RC_LANGUAGE_PACKAGE,
- RC_LANGUAGE_USE_BABEL,
+ RC_LANGUAGE_CUSTOM_PACKAGE,
+ RC_LANGUAGE_PACKAGE_SELECTION,
RC_LOADSESSION,
+ RC_LYXRCFORMAT,
RC_MACRO_EDIT_STYLE,
+ RC_MAC_DONTSWAP_CTRL_META,
RC_MAC_LIKE_WORD_MOVEMENT,
RC_MAKE_BACKUP,
RC_MARK_FOREIGN_LANGUAGE,
RC_OPEN_BUFFERS_IN_TABS,
RC_PARAGRAPH_MARKERS,
RC_PATH_PREFIX,
- RC_PERS_DICT,
RC_PLAINTEXT_LINELEN,
- RC_PLAINTEXT_ROFF_COMMAND,
RC_PREVIEW,
RC_PREVIEW_HASHED_LABELS,
RC_PREVIEW_SCALE_FACTOR,
RC_SCREEN_FONT_TYPEWRITER_FOUNDRY,
RC_SCREEN_ZOOM,
RC_SCROLL_BELOW_DOCUMENT,
+ RC_SCROLL_WHEEL_ZOOM,
RC_SERVERPIPE,
RC_SET_COLOR,
RC_SHOW_BANNER,
RC_SINGLE_CLOSE_TAB_BUTTON,
+ RC_SINGLE_INSTANCE,
RC_SORT_LAYOUTS,
- RC_SPELL_COMMAND,
RC_SPELLCHECK_CONTINUOUSLY,
RC_SPELLCHECK_NOTES,
RC_SPELLCHECKER,
- RC_SPELL_MINLENGTH,
RC_SPLITINDEX_COMMAND,
RC_TEMPDIRPATH,
RC_TEMPLATEPATH,
RC_USELASTFILEPOS,
RC_USER_EMAIL,
RC_USER_NAME,
- RC_USETEMPDIR,
- RC_USE_ALT_LANG,
RC_USE_CONVERTER_CACHE,
- RC_USE_ESC_CHARS,
- RC_USE_INP_ENC,
- RC_USE_PERS_DICT,
+ RC_USE_SYSTEM_COLORS,
RC_USE_TOOLTIP,
RC_USE_PIXMAP_CACHE,
- RC_USE_SPELL_LIB,
RC_VIEWDVI_PAPEROPTION,
RC_VIEWER,
RC_VIEWER_ALTERNATIVES,
LyXRC();
///
void setDefaults();
+ /// \param check_format: whether to try to convert the file format,
+ /// if it is not current. this should only be true, really, for the
+ /// user's own preferences file.
+ bool read(support::FileName const & filename, bool check_format);
///
- int read(support::FileName const & filename);
- ///
- int read(std::istream &);
+ bool read(std::istream &);
private:
+ enum ReturnValues {
+ ReadOK,
+ ReadError,
+ FormatMismatch
+ };
///
- int read(Lexer &);
+ ReturnValues read(Lexer &, bool check_format);
public:
- ///
+ ///
typedef std::set<std::string> CommandSet;
- /// maps a format to a set of commands that can be used to
+ /// maps a format to a set of commands that can be used to
/// edit or view it.
typedef std::map<std::string, CommandSet> Alternatives;
///
bool ignore_system_lyxrc) const;
/// write rc. If a specific tag is given, only output that one.
void write(std::ostream & os,
- bool ignore_system_lyxrc,
+ bool ignore_system_lyxrc,
std::string const & tag = std::string()) const;
///
void print() const;
bool paragraph_markers;
/// Use tooltips?
bool use_tooltip;
+ /// Use the colors from current system theme?
+ bool use_system_colors;
/// Use pixmap cache?
bool use_pixmap_cache;
/// Spellchecker engine: aspell, hunspell, etc
bool spellcheck_continuously;
/// spellcheck notes and comments?
bool spellcheck_notes;
- /// minimum length of words to complete
- unsigned int spellcheck_minlength;
///
bool use_kbmap;
///
///
std::string date_insert_format;
///
- std::string language_package;
+ std::string language_custom_package;
///
bool language_auto_begin;
///
///
bool language_global_options;
///
- bool language_use_babel;
+ enum LangPackageSelection {
+ LP_AUTO = 0,
+ LP_BABEL,
+ LP_CUSTOM,
+ LP_NONE
+ };
+ ///
+ LangPackageSelection language_package_selection;
///
bool rtl_support;
/// bidi cursor movement: true = visual, false = logical
/// all available editors
Alternatives editor_alternatives;
///
+ bool mac_dontswap_ctrl_meta;
+ ///
bool mac_like_word_movement;
///
bool cursor_follows_scrollbar;
///
bool single_close_tab_button;
///
+ bool single_instance;
+ ///
std::string forward_search_dvi;
///
std::string forward_search_pdf;
int export_overwrite;
/// Default decimal point when aligning table columns on decimal
std::string default_decimal_point;
+ ///
+ enum ScrollWheelZoom {
+ SCROLL_WHEEL_ZOOM_OFF,
+ SCROLL_WHEEL_ZOOM_CTRL,
+ SCROLL_WHEEL_ZOOM_SHIFT,
+ SCROLL_WHEEL_ZOOM_ALT
+ };
+ ///
+ ScrollWheelZoom scroll_wheel_zoom;
};