removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 8ab22566df45b31c35ea6c72171a7be3a1bbc65d..c05bf9ea66236d7e6259ff2c9efe810dece44813 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -22,7 +22,7 @@
 #include "lyx_main.h"
 #include "intl.h"
 #include "tex-strings.h"
-#include "pathstack.h"
+#include "support/path.h"
 #include "support/filetools.h"
 #include "lyxtext.h"
 
@@ -120,6 +120,7 @@ enum _LyXRCTags {
        RC_EXIT_CONFIRMATION,
        RC_DISPLAY_SHORTCUTS,
        RC_RELYX_COMMAND,
+       RC_TTH_COMMAND,
        RC_LAST 
 };
 
@@ -198,6 +199,7 @@ static keyword_item lyxrcTags[] = {
        { "\\spell_command", RC_SPELL_COMMAND },
        { "\\tempdir_path", RC_TEMPDIRPATH },
        { "\\template_path", RC_TEMPLATEPATH },
+       { "\\tth_command", RC_TTH_COMMAND },
        { "\\use_alt_language", RC_USE_ALT_LANG },
        { "\\use_escape_chars", RC_USE_ESC_CHARS },
        { "\\use_input_encoding", RC_USE_INP_ENC },
@@ -254,6 +256,7 @@ LyXRC::LyXRC()
        default_papersize = PAPER_USLETTER;
        custom_export_format = "ps";
        chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
+       tth_command = "tth -t";
        fontenc = "default";
        dpi = 75;
        // Because a screen typically is wider than a piece of paper:
@@ -448,7 +451,7 @@ int LyXRC::Read(string const &filename)
                        break;
                        
                case RC_PRINTEXSTRAOPTIONS:
-                       if (lexrc.EatLine())
+                       if (lexrc.next())
                                print_extra_options = lexrc.GetString();
                        break;
                        
@@ -561,6 +564,11 @@ int LyXRC::Read(string const &filename)
                                chktex_command = lexrc.GetString();
                        break;
 
+               case RC_TTH_COMMAND:
+                       if (lexrc.next())
+                               tth_command = lexrc.GetString();
+                       break;
+
                case RC_SCREEN_DPI:
                        if (lexrc.next())
                                dpi = lexrc.GetInteger();