Fixed the tth HTML export feature.

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

diff --git a/ChangeLog b/ChangeLog
index 5491a597d1b7d602005264bf5a49e427f74ff42e..c0ba92cf5e9a5da55501f6c5d74916831a733220 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-23  Asger Alstrup Nielsen  <alstrup@alstrup.galaxy.dk>
+
+       * Fixed the tth support. I messed up with the Emacs patch apply feature
+       and omitted the changes in lyxrc.C.
+
 1999-10-22  Juergen Vigna  <jug@sad.it>
 
        * src/insets/figinset.C (CallbackFig): Just changed the defines a bit.

diff --git a/src/FontLoader.h b/src/FontLoader.h
index 853e2e44e9618b798797c25daee020e50919bb0b..4b3c167c5e0c6da0e1b7bfd901b13299c4acfef0 100644 (file)
--- a/src/FontLoader.h
+++ b/src/FontLoader.h
@@ -21,10 +21,11 @@
 class LString;
 class FontInfo;
 
-/** This class takes care of loading fonts. It uses FontInfo to make intelligent
-guesses about matching font size, and it tries different tags itself in order
-to match the font loading demands.  Later, I plan to extend this with support 
-for T1Lib, probably via a new class building on this. (Asger) */
+/** This class takes care of loading fonts. It uses FontInfo to make 
+intelligent guesses about matching font size, and it tries different tags 
+itself in order to match the font loading demands.  Later, I plan to extend 
+this with support for T1Lib, probably via a new class building on this. 
+(Asger) */
 class FontLoader {
 public:
        ///

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 4e8e9bd004251dc56d4aeb70769af547ab64451d..c05bf9ea66236d7e6259ff2c9efe810dece44813 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -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:
@@ -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();