* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 00aeb0b56cd25758565120877b6633bb9085dd66..8208bb2103d240b3632203685e0692ac3c14e77b 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -68,8 +68,6 @@ namespace {
 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 },
@@ -114,6 +112,8 @@ keyword_item lyxrcTags[] = {
        { "\\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 },
@@ -254,7 +254,7 @@ void LyXRC::setDefaults() {
        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;
@@ -295,9 +295,9 @@ void LyXRC::setDefaults() {
        use_converter_cache = false;
        converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months
 
-       user_name = support::user_name();
+       user_name = to_utf8(support::user_name());
 
-       user_email = support::user_email();
+       user_email = to_utf8(support::user_email());
 }
 
 
@@ -892,14 +892,14 @@ int LyXRC::read(LyXLex & lexrc)
                        }
                        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:
@@ -1033,7 +1033,7 @@ int LyXRC::read(LyXLex & lexrc)
                        if (lexrc.next()) {
                                command = lexrc.getString();
                        }
-                       movers.set(fmt, command);
+                       setMover(fmt, command);
                        break;
                }
 
@@ -1052,9 +1052,9 @@ int LyXRC::read(LyXLex & lexrc)
                                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;
                }
@@ -1118,7 +1118,7 @@ int LyXRC::read(LyXLex & lexrc)
                                               << format << "'." << endl;
                        }
                        if (prettyname.empty()) {
-                               if (converters.formatIsUsed(format)) {
+                               if (theConverters().formatIsUsed(format)) {
                                        lyxerr << "Can't delete format "
                                               << format << endl;
                                } else {
@@ -1208,8 +1208,8 @@ int LyXRC::read(LyXLex & lexrc)
        }
 
        /// Update converters data-structures
-       converters.update(formats);
-       converters.buildGraph();
+       theConverters().update(formats);
+       theConverters().buildGraph();
 
        return 0;
 }
@@ -1856,10 +1856,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                }
        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 ||
@@ -1874,13 +1874,13 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                }
 
                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";
                }
 
@@ -2084,10 +2084,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
 
        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 ||
@@ -2099,9 +2099,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                }
 
                // 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";
 
@@ -2111,12 +2111,13 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                   << "#\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;
@@ -2172,12 +2173,12 @@ string const LyXRC::getDescription(LyXRCTags tag)
                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: