#include "support/os.h"
#include "support/userinfo.h"
-namespace os = lyx::support::os;
-using lyx::docstring;
-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 },
{ "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
{ "\\path_prefix", LyXRC::RC_PATH_PREFIX },
{ "\\personal_dictionary", LyXRC::RC_PERS_DICT },
- { "\\popup_bold_font", LyXRC::RC_POPUP_BOLD_FONT },
- { "\\popup_font_encoding", LyXRC::RC_POPUP_FONT_ENCODING },
- { "\\popup_normal_font", LyXRC::RC_POPUP_NORMAL_FONT },
+ { "\\plaintext_linelen", LyXRC::RC_PLAINTEXT_LINELEN },
+ { "\\plaintext_roff_command", LyXRC::RC_PLAINTEXT_ROFF_COMMAND },
{ "\\preview", LyXRC::RC_PREVIEW },
{ "\\preview_hashed_labels", LyXRC::RC_PREVIEW_HASHED_LABELS },
{ "\\preview_scale_factor", LyXRC::RC_PREVIEW_SCALE_FACTOR },
{ "\\printer", LyXRC::RC_PRINTER },
{ "\\rtl", LyXRC::RC_RTL_SUPPORT },
{ "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
- { "\\screen_font_encoding", LyXRC::RC_SCREEN_FONT_ENCODING },
- // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002
- { "\\screen_font_encoding_menu", LyXRC::RC_POPUP_FONT_ENCODING },
- // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002
- { "\\screen_font_menu", LyXRC::RC_POPUP_BOLD_FONT },
- // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002
- { "\\screen_font_popup", LyXRC::RC_POPUP_NORMAL_FONT },
{ "\\screen_font_roman", LyXRC::RC_SCREEN_FONT_ROMAN },
{ "\\screen_font_roman_foundry", LyXRC::RC_SCREEN_FONT_ROMAN_FOUNDRY },
{ "\\screen_font_sans", LyXRC::RC_SCREEN_FONT_SANS },
{ "\\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 },
roman_font_name = "";
sans_font_name = "";
typewriter_font_name = "";
- popup_bold_font = "-*-helvetica-bold-r";
- popup_normal_font = "-*-helvetica-medium-r";
- font_norm = "iso8859-1";
- font_norm_type = ISO_8859_1;
- popup_font_encoding.erase();
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";
show_banner = true;
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))
lexrc.setFile(filename);
if (!lexrc.isOK()) return -2;
- lyxerr[Debug::LYXRC] << "Reading '" << filename << "'..." << endl;
+ LYXERR(Debug::LYXRC) << "Reading '" << filename << "'..." << endl;
return read(lexrc);
}
lexrc.setStream(is);
if (!lexrc.isOK()) return -2;
- lyxerr[Debug::LYXRC] << "Reading istream..." << endl;
+ LYXERR(Debug::LYXRC) << "Reading istream..." << endl;
return read(lexrc);
}
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;
}
break;
- case RC_SCREEN_FONT_ENCODING:
- if (lexrc.next()) {
- font_norm = lexrc.getString();
- set_font_norm_type();
- }
- break;
-
- case RC_POPUP_BOLD_FONT:
- if (lexrc.next()) {
- popup_bold_font = lexrc.getString();
- }
- break;
-
- case RC_POPUP_NORMAL_FONT:
- if (lexrc.next()) {
- popup_normal_font = lexrc.getString();
- }
- break;
-
- case RC_POPUP_FONT_ENCODING:
- if (lexrc.next()) {
- popup_font_encoding = lexrc.getString();
- }
- break;
-
case RC_SET_COLOR:
{
string lyx_name, x11_name;
}
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;
}
flags = lexrc.getString();
}
if (command.empty()) {
- converters.erase(from, to);
+ theConverters().erase(from, to);
} else {
- converters.add(from, to, command, flags);
+ theConverters().add(from, to, command, flags);
}
break;
}
int flgs = Format::none;
while (!flags.empty()) {
string flag;
- flags = lyx::support::split(flags, flag, ',');
+ flags = support::split(flags, flag, ',');
if (flag == "document")
flgs |= Format::document;
else if (flag == "vector")
<< format << "'." << endl;
}
if (prettyname.empty()) {
- if (converters.formatIsUsed(format)) {
+ if (theConverters().formatIsUsed(format)) {
lyxerr << "Can't delete format "
<< format << endl;
} else {
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';
}
<< preview_scale_factor << '\n';
}
- os << "\n#\n"
- << "# SCREEN & FONTS SECTION ############################\n"
- << "#\n\n";
-
- case RC_POPUP_NORMAL_FONT:
+ case RC_USE_CONVERTER_CACHE:
if (ignore_system_lyxrc ||
- popup_normal_font != system_lyxrc.popup_normal_font) {
- os << "\\popup_normal_font \"" << popup_normal_font
- << "\"\n";
+ use_converter_cache != system_lyxrc.use_converter_cache) {
+ os << "\\use_converter_cache "
+ << convert<string>(use_converter_cache) << '\n';
}
- case RC_POPUP_BOLD_FONT:
+
+ case RC_CONVERTER_CACHE_MAXAGE:
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 (ignore_system_lyxrc ||
- popup_font_encoding != system_lyxrc.popup_font_encoding) {
- os << "\\popup_font_encoding \"" << popup_font_encoding
- << "\"\n";
+ 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";
+
case RC_SCREEN_DPI:
if (ignore_system_lyxrc ||
dpi != system_lyxrc.dpi) {
<< convert<string>(use_scalable_fonts)
<< '\n';
}
- case RC_SCREEN_FONT_ENCODING:
- if (ignore_system_lyxrc ||
- font_norm != system_lyxrc.font_norm) {
- os << "\\screen_font_encoding \"" << font_norm
- << "\"\n";
- }
case RC_SCREEN_FONT_SIZES:
if (ignore_system_lyxrc ||
font_sizes[LyXFont::SIZE_TINY]
}
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";
}
flags.push_back("document");
if (cit->vectorFormat())
flags.push_back("vector");
- os << lyx::support::getStringFromVector(flags);
+ os << support::getStringFromVector(flags);
os << "\"\n";
}
}
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;
os.flush();
}
-void LyXRC::set_font_norm_type()
-{
- if (font_norm == "iso10646-1")
- font_norm_type = ISO_10646_1;
- else if (font_norm == "iso8859-1")
- font_norm_type = ISO_8859_1;
- else if (font_norm == "iso8859-3")
- font_norm_type = ISO_8859_3;
- else if (font_norm == "iso8859-4")
- font_norm_type = ISO_8859_4;
- else if (font_norm == "iso8859-6.8x")
- font_norm_type = ISO_8859_6_8;
- else if (font_norm == "iso8859-9")
- font_norm_type = ISO_8859_9;
- else if (font_norm == "iso8859-15")
- font_norm_type = ISO_8859_15;
- else
- font_norm_type = OTHER_ENCODING;
-}
-
+#if 0
string const LyXRC::getDescription(LyXRCTags tag)
{
docstring str;
str = _("Specify an alternate language. The default is to use the language of the document.");
break;
- case RC_ASCIIROFF_COMMAND:
+ 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:
str = _("Specify an alternate personal dictionary file. E.g. \".ispell_english\".");
break;
- case RC_POPUP_BOLD_FONT:
- str = _("The bold font in the dialogs.");
- break;
-
- case RC_POPUP_FONT_ENCODING:
- str = _("The encoding for the menu/popups fonts.");
- break;
-
- case RC_POPUP_NORMAL_FONT:
- str = _("The normal font in the dialogs.");
- break;
-
case RC_PREVIEW:
str = _("Shows a typeset preview of things such as math");
break;
str = _("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here.");
break;
- case RC_SCREEN_FONT_ENCODING:
- str = _("The encoding for the screen fonts.");
- break;
-
case RC_SCREEN_FONT_ROMAN:
case RC_SCREEN_FONT_SANS:
case RC_SCREEN_FONT_TYPEWRITER:
break;
}
- return lyx::to_utf8(str);
+ 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