#include "LyXRC.h"
-#include "debug.h"
+#include "support/debug.h"
#include "Color.h"
#include "Converter.h"
#include "Format.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "Session.h"
#include "Lexer.h"
#include "FontEnums.h"
// when adding something to this array keep it sorted!
keyword_item lyxrcTags[] = {
{ "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
+ { "\\allow_geometry_session", LyXRC::RC_GEOMETRY_SESSION },
{ "\\alternate_language", LyXRC::RC_ALT_LANG },
{ "\\auto_number", LyXRC::RC_AUTO_NUMBER },
{ "\\auto_region_delete", LyXRC::RC_AUTOREGIONDELETE },
{ "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS },
{ "\\document_path", LyXRC::RC_DOCUMENTPATH },
{ "\\escape_chars", LyXRC::RC_ESC_CHARS },
+ { "\\example_path", LyXRC::RC_EXAMPLEPATH },
{ "\\font_encoding", LyXRC::RC_FONT_ENCODING },
{ "\\format", LyXRC::RC_FORMAT },
{ "\\index_command", LyXRC::RC_INDEX_COMMAND },
{ "\\language_global_options", LyXRC::RC_LANGUAGE_GLOBAL_OPTIONS },
{ "\\language_package", LyXRC::RC_LANGUAGE_PACKAGE },
{ "\\language_use_babel", LyXRC::RC_LANGUAGE_USE_BABEL },
- { "\\sort_layouts", LyXRC::RC_SORT_LAYOUTS },
{ "\\load_session", LyXRC::RC_LOADSESSION },
{ "\\make_backup", LyXRC::RC_MAKE_BACKUP },
{ "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
{ "\\screen_font_sizes", LyXRC::RC_SCREEN_FONT_SIZES },
{ "\\screen_font_typewriter", LyXRC::RC_SCREEN_FONT_TYPEWRITER },
{ "\\screen_font_typewriter_foundry", LyXRC::RC_SCREEN_FONT_TYPEWRITER_FOUNDRY },
- { "\\screen_geometry_height", LyXRC::RC_SCREEN_GEOMETRY_HEIGHT },
- { "\\screen_geometry_width", LyXRC::RC_SCREEN_GEOMETRY_WIDTH },
- { "\\screen_geometry_xysaved", LyXRC::RC_SCREEN_GEOMETRY_XYSAVED },
{ "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM },
{ "\\serverpipe", LyXRC::RC_SERVERPIPE },
{ "\\set_color", LyXRC::RC_SET_COLOR },
{ "\\show_banner", LyXRC::RC_SHOW_BANNER },
+ { "\\sort_layouts", LyXRC::RC_SORT_LAYOUTS },
{ "\\spell_command", LyXRC::RC_SPELL_COMMAND },
{ "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
{ "\\template_path", LyXRC::RC_TEMPLATEPATH },
{ "\\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}
+ { "\\viewer", LyXRC::RC_VIEWER}
};
const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
dpi = 75;
// Because a screen typically is wider than a piece of paper:
zoom = 150;
- geometry_width = 0;
- geometry_height = 0;
- geometry_xysaved = true;
+ allow_geometry_session = true;
// Default LaTeX font size:
font_sizes[FONT_SIZE_TINY] = "5.0";
font_sizes[FONT_SIZE_SCRIPT] = "7.0";
lexrc.setFile(filename);
if (!lexrc.isOK()) return -2;
- LYXERR(Debug::LYXRC) << "Reading '" << filename << "'..." << endl;
+ LYXERR(Debug::LYXRC, "Reading '" << filename << "'...");
return read(lexrc);
}
lexrc.setStream(is);
if (!lexrc.isOK()) return -2;
- LYXERR(Debug::LYXRC) << "Reading istream..." << endl;
+ LYXERR(Debug::LYXRC, "Reading istream...");
return read(lexrc);
}
}
break;
- case RC_SCREEN_GEOMETRY_HEIGHT:
- if (lexrc.next()) {
- geometry_height = lexrc.getInteger();
- }
- break;
-
- case RC_SCREEN_GEOMETRY_WIDTH:
- if (lexrc.next()) {
- geometry_width = lexrc.getInteger();
- }
- break;
-
- case RC_SCREEN_GEOMETRY_XYSAVED:
+ case RC_GEOMETRY_SESSION:
if (lexrc.next()) {
- geometry_xysaved = lexrc.getBool();
+ allow_geometry_session = lexrc.getBool();
}
break;
}
break;
+ case RC_EXAMPLEPATH:
+ if (lexrc.next()) {
+ example_path = os::internal_path(lexrc.getString());
+ example_path = expandPath(example_path);
+ }
+ break;
+
case RC_TEMPLATEPATH:
if (lexrc.next()) {
template_path = os::internal_path(lexrc.getString());
}
if (tag != RC_LAST)
break;
- case RC_SCREEN_GEOMETRY_HEIGHT:
- if (ignore_system_lyxrc ||
- geometry_height != system_lyxrc.geometry_height) {
- os << "\\screen_geometry_height " << geometry_height
- << '\n';
- }
- if (tag != RC_LAST)
- break;
- case RC_SCREEN_GEOMETRY_WIDTH:
- if (ignore_system_lyxrc ||
- geometry_width != system_lyxrc.geometry_width) {
- os << "\\screen_geometry_width " << geometry_width
- << '\n';
- }
- if (tag != RC_LAST)
- break;
- case RC_SCREEN_GEOMETRY_XYSAVED:
+ case RC_GEOMETRY_SESSION:
if (ignore_system_lyxrc ||
- geometry_xysaved != system_lyxrc.geometry_xysaved) {
- os << "\\screen_geometry_xysaved " << convert<string>(geometry_xysaved)
+ allow_geometry_session != system_lyxrc.allow_geometry_session) {
+ os << "\\allow_geometry_session " << convert<string>(allow_geometry_session)
<< '\n';
}
if (tag != RC_LAST)
}
if (tag != RC_LAST)
break;
+ case RC_EXAMPLEPATH:
+ if (ignore_system_lyxrc ||
+ example_path != system_lyxrc.example_path) {
+ string const path = os::external_path(example_path);
+ os << "\\example_path \"" << path << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
case RC_TEMPLATEPATH:
if (ignore_system_lyxrc ||
template_path != system_lyxrc.template_path) {
str = _("Specify additional chars that can be part of a word.");
break;
+ case RC_EXAMPLEPATH:
+ 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;
str = _("The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper.");
break;
- case RC_SCREEN_GEOMETRY_HEIGHT:
- case RC_SCREEN_GEOMETRY_WIDTH:
- str = _("Specify geometry of the main view in width x height (values from last session will not be used if non-zero values are specified).");
- break;
-
- case RC_SCREEN_GEOMETRY_XYSAVED:
- str = _("Allow session manager to save and restore windows position.");
+ case RC_GEOMETRY_SESSION:
+ str = _("Allow session manager to save and restore windows geometry.");
break;
case RC_SERVERPIPE: