remove ISpell and PSpell support

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

diff --git a/src/ASpell.cpp b/src/ASpell.cpp
index 310f5dc38ff4063b7c266125084698257598bd6e..f55e358cb8320dafa1744369a51415d5447866a5 100644 (file)
--- a/src/ASpell.cpp
+++ b/src/ASpell.cpp
@@ -66,7 +66,7 @@ void ASpell::addSpeller(string const & lang)
        // platforms (cygwin, OS X). Therefore we use utf-8, that does
        // always work.
        aspell_config_replace(config, "encoding", "utf-8");
-       if (lyxrc.isp_accept_compound)
+       if (lyxrc.spellcheck_accept_compound)
                // Consider run-together words as legal compounds
                aspell_config_replace(config, "run-together", "true");
        else

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 912b3cd844d9f3a2660dd78e0a8fb614f5a7da4b..daf06c93f266a22a34fe1adc1194efbe0e9740b7 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -1825,7 +1825,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        switch (tag) {
        case LyXRC::RC_ACCEPT_COMPOUND:
        case LyXRC::RC_ALT_LANG:
-       case LyXRC::RC_PLAINTEXT_ROFF_COMMAND:
        case LyXRC::RC_PLAINTEXT_LINELEN:
        case LyXRC::RC_AUTOREGIONDELETE:
        case LyXRC::RC_AUTORESET_OPTIONS:

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 1a6fc2f3e0fec4980bca26d8dad5f333530448fe..e822fcbcfa4a7bb52c7d34635218ee5e634b3c1d 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -122,7 +122,6 @@ LexerKeyword lyxrcTags[] = {
        { "\\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 },
        { "\\preview", LyXRC::RC_PREVIEW },
        { "\\preview_hashed_labels", LyXRC::RC_PREVIEW_HASHED_LABELS },
        { "\\preview_scale_factor", LyXRC::RC_PREVIEW_SCALE_FACTOR },
@@ -828,11 +827,6 @@ int LyXRC::read(Lexer & lexrc)
                        lexrc >> dialogs_iconify_with_main;
                        break;
 
-               case RC_PLAINTEXT_ROFF_COMMAND:
-                       if (lexrc.next(true)) {
-                               plaintext_roff_command = lexrc.getString();
-                       }
-                       break;
                case RC_PLAINTEXT_LINELEN:
                        lexrc >> plaintext_linelen;
                        break;
@@ -2075,15 +2069,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                   << "# PLAIN TEXT EXPORT SECTION ##############################\n"
                   << "#\n\n";
 
-       case RC_PLAINTEXT_ROFF_COMMAND:
-               if (ignore_system_lyxrc ||
-                   plaintext_roff_command != system_lyxrc.plaintext_roff_command) {
-                       os << "\\plaintext_roff_command \"" << escapeCommand(plaintext_roff_command)
-                          << "\"\n";
-               }
-               if (tag != RC_LAST)
-                       break;
-
                os << "\n#\n"
                   << "# SPELLCHECKER SECTION ##############################\n"
                   << "#\n\n";

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 3cecd9b2907a59f9a0d912ca1c8eb8ab77c13362..f0aaa209f41056eb857bf3ddd1452ecee8065495 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -38,7 +38,6 @@ public:
        enum LyXRCTags {
                RC_ACCEPT_COMPOUND = 1,
                RC_ALT_LANG,
-               RC_PLAINTEXT_ROFF_COMMAND,
                RC_PLAINTEXT_LINELEN,
                RC_AUTOREGIONDELETE,
                RC_AUTORESET_OPTIONS,
@@ -303,8 +302,6 @@ public:
        ///
        unsigned int autosave;
        ///
-       std::string plaintext_roff_command;
-       ///
        unsigned int plaintext_linelen;
        /// use library instead of process
        bool use_spell_lib;

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 1245d7351aee49c50de80087a37f562265f66fd6..1346924ae5b585e8a324ce168899cfcd8c918d20 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -335,22 +335,18 @@ PrefPlaintext::PrefPlaintext(GuiPreferences * form)
        setupUi(this);
        connect(plaintextLinelengthSB, SIGNAL(valueChanged(int)),
                this, SIGNAL(changed()));
-       connect(plaintextRoffED, SIGNAL(textChanged(QString)),
-               this, SIGNAL(changed()));
 }
 
 
 void PrefPlaintext::apply(LyXRC & rc) const
 {
        rc.plaintext_linelen = plaintextLinelengthSB->value();
-       rc.plaintext_roff_command = fromqstr(plaintextRoffED->text());
 }
 
 
 void PrefPlaintext::update(LyXRC const & rc)
 {
        plaintextLinelengthSB->setValue(rc.plaintext_linelen);
-       plaintextRoffED->setText(toqstr(rc.plaintext_roff_command));
 }
 
 

diff --git a/src/frontends/qt4/ui/PrefPlaintextUi.ui b/src/frontends/qt4/ui/PrefPlaintextUi.ui
index e09d71e5b41e05b03803cade41cc8cde9e4eeb9f..c3db2fc73fb6e5be2853f7c9e66c9bed1d8b8891 100644 (file)
--- a/src/frontends/qt4/ui/PrefPlaintextUi.ui
+++ b/src/frontends/qt4/ui/PrefPlaintextUi.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PrefPlaintextUi</class>
- <widget class="QWidget" name="PrefPlaintextUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefPlaintextUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,25 +10,25 @@
     <height>99</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="2" column="0" colspan="3" >
+   <item row="1" column="0" colspan="3">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
@@ -35,15 +36,15 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="2" >
+   <item row="0" column="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
@@ -51,47 +52,30 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="1" >
-    <widget class="QSpinBox" name="plaintextLinelengthSB" >
-     <property name="toolTip" >
-      <string>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.</string>
+   <item row="0" column="1">
+    <widget class="QSpinBox" name="plaintextLinelengthSB">
+     <property name="toolTip">
+      <string>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 &gt; 0, paragraphs are separated by a blank line.</string>
      </property>
-     <property name="maximum" >
+     <property name="maximum">
       <number>120</number>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="plaintextLinelengthLA" >
-     <property name="text" >
+   <item row="0" column="0">
+    <widget class="QLabel" name="plaintextLinelengthLA">
+     <property name="text">
       <string>Output &amp;line length:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>plaintextLinelengthSB</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="plaintextRoffLA" >
-     <property name="text" >
-      <string>&amp;roff command:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>plaintextRoffED</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="2" >
-    <widget class="QLineEdit" name="plaintextRoffED" >
-     <property name="toolTip" >
-      <string>External app for formating tables in plain text output</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>