#include "support/os.h"
#include "support/userinfo.h"
-namespace os = lyx::support::os;
-using lyx::support::ascii_lowercase;
-using lyx::support::bformat;
-using lyx::support::expandPath;
-using lyx::support::getEnv;
-using lyx::support::libFileSearch;
-using lyx::support::token;
+namespace lyx {
+
+namespace os = support::os;
+
+using support::ascii_lowercase;
+using support::bformat;
+using support::expandPath;
+using support::FileName;
+using support::getEnv;
+using support::libFileSearch;
+using support::token;
using std::cout;
using std::endl;
keyword_item lyxrcTags[] = {
{ "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
{ "\\alternate_language", LyXRC::RC_ALT_LANG },
- { "\\ascii_linelen", LyXRC::RC_ASCII_LINELEN },
- { "\\ascii_roff_command", LyXRC::RC_ASCIIROFF_COMMAND },
{ "\\auto_number", LyXRC::RC_AUTO_NUMBER },
{ "\\auto_region_delete", LyXRC::RC_AUTOREGIONDELETE },
{ "\\auto_reset_options", LyXRC::RC_AUTORESET_OPTIONS },
{ "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES },
{ "\\chktex_command", LyXRC::RC_CHKTEX_COMMAND },
{ "\\converter", LyXRC::RC_CONVERTER },
+ { "\\converter_cache_maxage", LyXRC::RC_CONVERTER_CACHE_MAXAGE },
{ "\\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 },
- { "\\cygwin_path_fix_needed", LyXRC::RC_CYGWIN_PATH_FIX },
{ "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT },
{ "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE },
{ "\\default_papersize", LyXRC::RC_DEFAULT_PAPERSIZE },
{ "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
{ "\\path_prefix", LyXRC::RC_PATH_PREFIX },
{ "\\personal_dictionary", LyXRC::RC_PERS_DICT },
+ { "\\plaintext_linelen", LyXRC::RC_PLAINTEXT_LINELEN },
+ { "\\plaintext_roff_command", LyXRC::RC_PLAINTEXT_ROFF_COMMAND },
{ "\\popup_bold_font", LyXRC::RC_POPUP_BOLD_FONT },
{ "\\popup_font_encoding", LyXRC::RC_POPUP_FONT_ENCODING },
{ "\\popup_normal_font", LyXRC::RC_POPUP_NORMAL_FONT },
{ "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
{ "\\template_path", LyXRC::RC_TEMPLATEPATH },
{ "\\tex_allows_spaces", LyXRC::RC_TEX_ALLOWS_SPACES },
+ { "\\tex_expects_windows_paths", LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS },
{ "\\ui_file", LyXRC::RC_UIFILE },
{ "\\use_alt_language", LyXRC::RC_USE_ALT_LANG },
+ { "\\use_converter_cache", LyXRC::RC_USE_CONVERTER_CACHE },
{ "\\use_escape_chars", LyXRC::RC_USE_ESC_CHARS },
{ "\\use_input_encoding", LyXRC::RC_USE_INP_ENC },
{ "\\use_lastfilepos", LyXRC::RC_USELASTFILEPOS },
{ "\\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 }
+ { "\\viewer" ,LyXRC::RC_VIEWER}
};
const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
geometry_width = 0;
geometry_height = 0;
geometry_xysaved = true;
- wheel_jump = 5;
// Default LaTeX font size:
font_sizes[LyXFont::SIZE_TINY] = "5.0";
font_sizes[LyXFont::SIZE_SCRIPT] = "7.0";
autosave = 300;
auto_region_delete = true;
auto_reset_options = false;
- ascii_linelen = 65;
+ plaintext_linelen = 65;
num_lastfiles = maxlastfiles;
check_lastfiles = true;
use_lastfilepos = true;
load_session = false;
make_backup = true;
backupdir_path.erase();
- display_graphics = lyx::graphics::ColorDisplay;
+ display_graphics = graphics::ColorDisplay;
// Spellchecker settings:
use_spell_lib = true;
isp_command = "ispell";
language_command_local = "\\foreignlanguage{$$lang}{";
default_language = "english";
show_banner = true;
- cygwin_path_fix = false;
+ windows_style_tex_paths = false;
tex_allows_spaces = false;
- date_insert_format = "%A, %e %B %Y";
+ date_insert_format = "%x";
cursor_follows_scrollbar = false;
dialogs_iconify_with_main = false;
label_init_length = 3;
preview = PREVIEW_OFF;
preview_hashed_labels = false;
preview_scale_factor = "0.9";
+ use_converter_cache = false;
+ converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months
- user_name = lyx::support::user_name();
+ user_name = to_utf8(support::user_name());
- user_email = lyx::support::user_email();
+ user_email = to_utf8(support::user_email());
}
} // namespace anon
-int LyXRC::read(string const & filename)
+int LyXRC::read(FileName const & filename)
{
LyXLex lexrc(lyxrcTags, lyxrcCount);
if (lyxerr.debugging(Debug::PARSER))
switch (static_cast<LyXRCTags>(le)) {
case RC_INPUT: // Include file
if (lexrc.next()) {
- string const tmp =
+ FileName const tmp =
libFileSearch(string(),
lexrc.getString());
if (read(tmp)) {
lexrc.printError("Error reading "
- "included file: "+tmp);
+ "included file: " + tmp.absFilename());
}
}
break;
case RC_DISPLAY_GRAPHICS:
if (lexrc.next()) {
- display_graphics = lyx::graphics::displayTranslator().find(lexrc.getString());
+ display_graphics = graphics::displayTranslator().find(lexrc.getString());
}
break;
- case RC_CYGWIN_PATH_FIX:
+ case RC_TEX_EXPECTS_WINDOWS_PATHS:
if (lexrc.next()) {
- cygwin_path_fix = lexrc.getBool();
+ windows_style_tex_paths = lexrc.getBool();
}
break;
}
break;
- case RC_WHEEL_JUMP:
- if (lexrc.next()) {
- wheel_jump = lexrc.getInteger();
- }
- break;
-
case RC_SCREEN_FONT_SIZES:
if (lexrc.next()) {
font_sizes[LyXFont::SIZE_TINY] =
}
break;
- case RC_ASCIIROFF_COMMAND:
+ case RC_PLAINTEXT_ROFF_COMMAND:
if (lexrc.next()) {
- ascii_roff_command = lexrc.getString();
+ plaintext_roff_command = lexrc.getString();
}
break;
- case RC_ASCII_LINELEN:
+ case RC_PLAINTEXT_LINELEN:
if (lexrc.next()) {
- ascii_linelen = lexrc.getInteger();
+ plaintext_linelen = lexrc.getInteger();
}
break;
// Spellchecker settings:
if (lexrc.next()) {
command = lexrc.getString();
}
- movers.set(fmt, command);
+ setMover(fmt, command);
break;
}
if (lexrc.next()) {
flags = lexrc.getString();
}
- if (command.empty()
- || token(command, ' ', 0) == "none") {
- converters.erase(from, to);
+ if (command.empty()) {
+ theConverters().erase(from, to);
} else {
- converters.add(from, to, command, flags);
+ theConverters().add(from, to, command, flags);
}
break;
}
shortcut = lexrc.getString();
}
string viewer, editor;
+ if (lexrc.next())
+ viewer = lexrc.getString();
+ if (lexrc.next())
+ editor = lexrc.getString();
+ string flags;
// Hack to ensure compatibility with versions older
- // than 1.4.0
+ // than 1.5.0
int le = lexrc.lex();
if (le != LyXLex::LEX_FEOF && le != LyXLex::LEX_UNDEF) {
- viewer = lexrc.getString();
- if (le == LyXLex::LEX_DATA) {
- if (lexrc.next()) {
- editor = lexrc.getString();
- }
- } else {
+ flags = lexrc.getString();
+ if (le != LyXLex::LEX_DATA) {
// We have got a known token.
// Therefore this is an old style
// format definition without
- // viewer and editor.
- lexrc.pushToken(viewer);
- viewer.erase();
+ // flags.
+ lexrc.pushToken(flags);
+ flags.erase();
}
}
+ int flgs = Format::none;
+ while (!flags.empty()) {
+ string flag;
+ flags = support::split(flags, flag, ',');
+ if (flag == "document")
+ flgs |= Format::document;
+ else if (flag == "vector")
+ flgs |= Format::vector;
+ else
+ lyxerr << "Ignoring unknown flag `"
+ << flag << "' for format `"
+ << format << "'." << endl;
+ }
if (prettyname.empty()) {
- if (converters.formatIsUsed(format)) {
+ if (theConverters().formatIsUsed(format)) {
lyxerr << "Can't delete format "
<< format << endl;
} else {
}
} else {
formats.add(format, extension, prettyname,
- shortcut, viewer, editor);
+ shortcut, viewer, editor, flgs);
}
break;
}
path_prefix = lexrc.getString();
break;
+ case RC_USE_CONVERTER_CACHE:
+ if (lexrc.next())
+ use_converter_cache = lexrc.getBool();
+ break;
+
+ case RC_CONVERTER_CACHE_MAXAGE:
+ if (lexrc.next())
+ converter_cache_maxage =
+ convert<unsigned int>(lexrc.getString());
+ break;
+
case RC_LAST: break; // this is just a dummy
}
}
/// Update converters data-structures
- converters.update(formats);
- converters.buildGraph();
+ theConverters().update(formats);
+ theConverters().buildGraph();
return 0;
}
-void LyXRC::write(string const & filename, bool ignore_system_lyxrc) const
+void LyXRC::write(FileName const & filename, bool ignore_system_lyxrc) const
{
- ofstream ofs(filename.c_str());
+ ofstream ofs(filename.toFilesystemEncoding().c_str());
if (ofs)
write(ofs, ignore_system_lyxrc);
}
os << "# Display graphics within LyX\n"
<< "# monochrome|grayscale|color|none\n"
<< "\\display_graphics "
- << lyx::graphics::displayTranslator().find(display_graphics)
+ << graphics::displayTranslator().find(display_graphics)
<< '\n';
}
index_command != system_lyxrc.index_command) {
os << "\\index_command \"" << index_command << "\"\n";
}
- case RC_CYGWIN_PATH_FIX:
+ case RC_TEX_EXPECTS_WINDOWS_PATHS:
if (ignore_system_lyxrc ||
- cygwin_path_fix != system_lyxrc.cygwin_path_fix) {
- os << "\\cygwin_path_fix_needed "
- << convert<string>(cygwin_path_fix) << '\n';
+ windows_style_tex_paths != system_lyxrc.windows_style_tex_paths) {
+ os << "\\tex_expects_windows_paths "
+ << convert<string>(windows_style_tex_paths) << '\n';
}
case RC_TEX_ALLOWS_SPACES:
if (tex_allows_spaces != system_lyxrc.tex_allows_spaces) {
<< preview_scale_factor << '\n';
}
+ case RC_USE_CONVERTER_CACHE:
+ if (ignore_system_lyxrc ||
+ use_converter_cache != system_lyxrc.use_converter_cache) {
+ os << "\\use_converter_cache "
+ << convert<string>(use_converter_cache) << '\n';
+ }
+
+ case RC_CONVERTER_CACHE_MAXAGE:
+ if (ignore_system_lyxrc ||
+ converter_cache_maxage != system_lyxrc.converter_cache_maxage) {
+ os << "\\converter_cache_maxage "
+ << converter_cache_maxage << '\n';
+ }
+
os << "\n#\n"
<< "# SCREEN & FONTS SECTION ############################\n"
<< "#\n\n";
os << "\\screen_geometry_xysaved " << convert<string>(geometry_xysaved)
<< '\n';
}
- case RC_WHEEL_JUMP:
- if (ignore_system_lyxrc ||
- wheel_jump != system_lyxrc.wheel_jump) {
- os << "\\wheel_jump " << wheel_jump << '\n';
- }
case RC_CURSOR_FOLLOWS_SCROLLBAR:
if (ignore_system_lyxrc ||
cursor_follows_scrollbar
}
case RC_USETEMPDIR:
// Ignore it
- case RC_ASCII_LINELEN:
+ case RC_PLAINTEXT_LINELEN:
if (ignore_system_lyxrc ||
- ascii_linelen != system_lyxrc.ascii_linelen) {
- os << "\\ascii_linelen " << ascii_linelen << '\n';
+ plaintext_linelen != system_lyxrc.plaintext_linelen) {
+ os << "\\plaintext_linelen " << plaintext_linelen << '\n';
}
case RC_MAKE_BACKUP:
if (ignore_system_lyxrc ||
}
os << "\n#\n"
- << "# ASCII EXPORT SECTION ##############################\n"
+ << "# PLAIN TEXT EXPORT SECTION ##############################\n"
<< "#\n\n";
- case RC_ASCIIROFF_COMMAND:
+ case RC_PLAINTEXT_ROFF_COMMAND:
if (ignore_system_lyxrc ||
- ascii_roff_command != system_lyxrc.ascii_roff_command) {
- os << "\\ascii_roff_command \"" << ascii_roff_command
+ plaintext_roff_command != system_lyxrc.plaintext_roff_command) {
+ os << "\\plaintext_roff_command \"" << plaintext_roff_command
<< "\"\n";
}
<< "#\n\n";
case RC_FORMAT:
- // New/modifed formats
+ // New/modified formats
for (Formats::const_iterator cit = formats.begin();
cit != formats.end(); ++cit) {
Format const * format =
format->prettyname() != cit->prettyname() ||
format->shortcut() != cit->shortcut() ||
format->viewer() != cit->viewer() ||
- format->editor() != cit->editor())
+ format->editor() != cit->editor() ||
+ format->documentFormat() != cit->documentFormat() ||
+ format->vectorFormat() != cit->vectorFormat()) {
os << "\\format \"" << cit->name() << "\" \""
<< cit->extension() << "\" \""
<< cit->prettyname() << "\" \""
<< cit->shortcut() << "\" \""
<< cit->viewer() << "\" \""
- << cit->editor() << "\"\n";
+ << cit->editor() << "\" \"";
+ std::vector<string> flags;
+ if (cit->documentFormat())
+ flags.push_back("document");
+ if (cit->vectorFormat())
+ flags.push_back("vector");
+ os << support::getStringFromVector(flags);
+ os << "\"\n";
+ }
}
// Look for deleted formats
cit != system_formats.end(); ++cit)
if (!formats.getFormat(cit->name()))
os << "\\format \"" << cit->name()
- << "\" \"\" \"\" \"\" \"\" \"\"\n";
+ << "\" \"\" \"\" \"\" \"\" \"\" \"\"\n";
case RC_VIEWER:
// Ignore it
case RC_CONVERTER:
// Look for new converters
- for (Converters::const_iterator cit = converters.begin();
- cit != converters.end(); ++cit) {
+ for (Converters::const_iterator cit = theConverters().begin();
+ cit != theConverters().end(); ++cit) {
Converter const * converter =
- system_converters.getConverter(cit->from,
+ theSystemConverters().getConverter(cit->from,
cit->to);
if (!converter ||
converter->command != cit->command ||
}
// New/modifed converters
- for (Converters::const_iterator cit = system_converters.begin();
- cit != system_converters.end(); ++cit)
- if (!converters.getConverter(cit->from, cit->to))
+ 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";
<< "#\n\n";
// Look for new movers
- Movers::iterator const sysbegin = system_movers.begin();
- Movers::iterator const sysend = system_movers.end();
+ Movers::const_iterator const sysbegin = theSystemMovers().begin();
+ Movers::const_iterator const sysend = theSystemMovers().end();
+ Movers::const_iterator it = theMovers().begin();
+ Movers::const_iterator end = theMovers().end();
- for (Movers::iterator it = movers.begin(), end = movers.end();
- it != end; ++it) {
- Movers::iterator const sysit =
+ for (; it != end; ++it) {
+ Movers::const_iterator const sysit =
std::find_if(sysbegin, sysend, SameMover(*it));
if (sysit == sysend) {
std::string const & fmt = it->first;
}
+#if 0
string const LyXRC::getDescription(LyXRCTags tag)
{
- string str;
+ docstring str;
switch (tag) {
case RC_ACCEPT_COMPOUND:
str = _("Specify an alternate language. The default is to use the language of the document.");
break;
- case RC_ASCIIROFF_COMMAND:
- str = _("Use to define an external program to render tables in plain text output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used.");
+ case RC_PLAINTEXT_ROFF_COMMAND:
+ str = _("Use to define an external program to render tables in plain text output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"\" is specified, an internal routine is used.");
break;
- case RC_ASCII_LINELEN:
- str = _("This is the maximum line length of an exported text file (LaTeX, SGML or plain text).");
+ case RC_PLAINTEXT_LINELEN:
+ str = _("The maximum line length of exported plain text/LaTeX/SGML files. If set to 0, paragraphs are output in a single line; if the line length is > 0, paragraphs are separated by a blank line.");
break;
case RC_AUTOREGIONDELETE:
case RC_CUSTOM_EXPORT_FORMAT:
break;
- case RC_CYGWIN_PATH_FIX:
- 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_NUMLASTFILES:
- str = bformat(_("Maximal number of lastfiles. Up to %1$d can appear in the file menu."), maxlastfiles);
+ str = bformat(_("Maximal number of lastfiles. Up to %1$d can appear in the file menu."),
+ maxlastfiles);
break;
case RC_PATH_PREFIX:
break;
case RC_PRINTPAPERDIMENSIONFLAG:
- str = _("Option to specify the dimensions of the print paper.");
+ str = _("Option to specify the dimensions of the print paper.");
break;
case RC_PRINTPAPERFLAG:
case RC_TEX_ALLOWS_SPACES:
break;
+ case RC_TEX_EXPECTS_WINDOWS_PATHS:
+ break;
+
case RC_UIFILE:
str = _("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories.");
break;
break;
case RC_VIEWDVI_PAPEROPTION:
- str = _("Specify the paper command to DVI viewer (leave empty or use \"-paper\")");
+ _("Specify the paper command to DVI viewer (leave empty or use \"-paper\")");
break;
case RC_VIEWER:
break;
- case RC_WHEEL_JUMP:
- str = _("The number of lines that are scrolled by mice with wheels or five button mice.");
- break;
-
case RC_LAST:
break;
}
return str;
}
+#endif
+
// The global instance
LyXRC lyxrc;
// The global copy of the system lyxrc entries (everything except preferences)
LyXRC system_lyxrc;
+
+
+} // namespace lyx
projects / lyx.git / blobdiff