* remove outdated RC_CUSTOM_EXPORT_COMMAND and RC_CUSTOM_EXPORT_FORMAT.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29183 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6a7f087e5efe71250b695518ddceca10b8c5edf3..0343eec44ff1ce0c5fb34418addb2a5fbcd88482 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,7 @@ The following variables are obsoleted in 2.0
 
 - \plaintext_roff_command (was not used anymore)
 - \spell_command and \use_spell_lib (ispell support has been removed)
+- \custom_export_command and \custom_export_format
 
 
 The following new LyX functions have been introduced:

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 93a83139f1c846d1e0deed98ea34160ace18b7db..a08aa07d4a2c47ba869437ed9e4db4d5fb2c6444 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -1891,8 +1891,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_COPIER:
        case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR:
        case LyXRC::RC_SCROLL_BELOW_DOCUMENT:
-       case LyXRC::RC_CUSTOM_EXPORT_COMMAND:
-       case LyXRC::RC_CUSTOM_EXPORT_FORMAT:
        case LyXRC::RC_DATE_INSERT_FORMAT:
        case LyXRC::RC_DEFAULT_LANGUAGE:
        case LyXRC::RC_GUI_LANGUAGE:

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 8397f70cbbda5fba64e495502b6e45f028fbd339..d4e214b4d5a7b22606f94c5a27769210113b9235 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -78,8 +78,6 @@ LexerKeyword lyxrcTags[] = {
        { "\\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 },
        { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT },
        { "\\def_file", LyXRC::RC_DEFFILE },
        { "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE },
@@ -227,7 +225,6 @@ void LyXRC::setDefaults()
        document_path.erase();
        view_dvi_paper_option.erase();
        default_papersize = PAPER_DEFAULT;
-       custom_export_format = "ps";
        default_view_format = "pdf2";
        chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
        bibtex_command = "bibtex";
@@ -557,14 +554,6 @@ int LyXRC::read(Lexer & lexrc)
                        lexrc >> print_paper_flag;
                        break;
 
-               case RC_CUSTOM_EXPORT_COMMAND:
-                       lexrc >> custom_export_command;
-                       break;
-
-               case RC_CUSTOM_EXPORT_FORMAT:
-                       lexrc >> custom_export_format;
-                       break;
-
                case RC_DEFAULT_PAPERSIZE:
                        if (lexrc.next()) {
                                string const size = ascii_lowercase(lexrc.getString());
@@ -1898,30 +1887,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                if (tag != RC_LAST)
                        break;
 
-               os << "\n#\n"
-                  << "# EXPORT SECTION ####################################\n"
-                  << "#\n\n";
-
-       case RC_CUSTOM_EXPORT_COMMAND:
-               if (ignore_system_lyxrc ||
-                   custom_export_command
-                   != system_lyxrc.custom_export_command) {
-                       os << "\\custom_export_command \""
-                          << custom_export_command
-                          << "\"\n";
-               }
-               if (tag != RC_LAST)
-                       break;
-       case RC_CUSTOM_EXPORT_FORMAT:
-               if (ignore_system_lyxrc ||
-                   custom_export_format
-                   != system_lyxrc.custom_export_format) {
-                       os << "\\custom_export_format \"" << custom_export_format
-                          << "\"\n";
-               }
-               if (tag != RC_LAST)
-                       break;
-
                os << "\n#\n"
                   << "# TEX SECTION #######################################\n"
                   << "#\n\n";
@@ -2552,12 +2517,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("Show a small box around a Math Macro with the macro name when the cursor is inside.");
                break;
 
-       case RC_CUSTOM_EXPORT_COMMAND:
-               break;
-
-       case RC_CUSTOM_EXPORT_FORMAT:
-               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\".");

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 329c79201c1c3ac06bcfa5f1fa27b67c5410d3e0..15268b850a0121083d927af1779282e8ec9e997b 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -64,8 +64,6 @@ public:
                RC_COPIER,
                RC_CURSOR_FOLLOWS_SCROLLBAR,
                RC_MAC_LIKE_WORD_MOVEMENT,
-               RC_CUSTOM_EXPORT_COMMAND,
-               RC_CUSTOM_EXPORT_FORMAT,
                RC_DATE_INSERT_FORMAT,
                RC_DEFFILE,
                RC_DEFAULT_LANGUAGE,
@@ -238,10 +236,6 @@ public:
        std::string print_paper_flag;
        ///
        std::string print_paper_dimension_flag;
-       ///
-       std::string custom_export_command;
-       ///
-       std::string custom_export_format;
        /// option for telling the dvi viewer about the paper size
        std::string view_dvi_paper_option;
        /// default paper size for local xdvi/dvips/ghostview/whatever

diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp
index 3eff7f4cc37ba7bc66ad7164b86e35e07fe70aca..8aece21b81d995d6b3249ee862465a024b80be39 100644 (file)
--- a/src/frontends/qt4/GuiSendto.cpp
+++ b/src/frontends/qt4/GuiSendto.cpp
@@ -142,7 +142,6 @@ bool GuiSendTo::isValid()
 bool GuiSendTo::initialiseParams(string const &)
 {
        format_ = 0;
-       command_ = toqstr(lyxrc.custom_export_command);
        paramsToDialog(format_, command_);
        return true;
 }