fix display of right quote inset; fix off-by-one error in placement of error insets...

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 62bc8bcbe3d9264f4fbfc27b4ffed689cae50c31..f7f99f27bef657bb6a5ea95d5146375033a64b4f 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-14  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * chkconfig.ltx: information is in LaTeXConfig.lyx, not
+       LyXConfig.lyx
+
+       * configure.m4: fix detection of fax programs
+
 2003-02-14  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
 
        * scripts/TeXFiles.sh: Add search for *.bib-files (>bibFiles.lst)

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index cb720f1cf2debc7ca8f851ba59f4edc9f6673869..3604fdc386b21902acfb89dd6e16291649395efe 100644 (file)
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -256,6 +256,6 @@
 \immediate\closeout\vars
 \immediate\closeout\packages
 \typeout{\prefix Inspection done.}
-\typeout{\prefix Read the file doc/LyXConfig.lyx for more information.}
+\typeout{\prefix Read the file doc/LaTeXConfig.lyx for more information.}
 % Get the real \end command, that has been hidden by LaTeX
 \@@end

diff --git a/lib/configure.m4 b/lib/configure.m4
index c4a27b7901e3e60ee62781c5772f620022f9a0fb..a2cc687dd052be786c5a31a4c8f42955cfeed735 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -300,8 +300,7 @@ dnl fi
 
 # Search a GUI Fax program
 SEARCH_PROG([for a fax program], fax_command, kdeprintfax ksendfax)
-test $fax_command = "kdeprintfax" && fax_command="kdeprintfax \$\$i"
-test $fax_command = "ksendfax" && fax_command="ksendfax \$\$i"
+test $fax_command != "none" && fax_command="$fax_command \$\$i"
 
 # Search for LinuxDoc support
 SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx)

diff --git a/src/ChangeLog b/src/ChangeLog
index 54b5648e6c2cd088d8e01e5d529e6143c11e41f6..273c9e3a6aa8f99b4984b89141db1fca3ef64306 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-14  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * buffer.C (makeLaTeXFile): fix counting of number of line feeds
+       in preamble
+
+2003-02-14  Michael Schmitt <michael.schmitt@teststep.org>
+
+       * text.C (drawLengthMarker): also draw an arrow marker for
+       symbolic lengths (medskip...)
+
 2003-02-14  John Levon  <levon@movementarian.org>
 
        * tabular.h:

diff --git a/src/buffer.C b/src/buffer.C
index a22e2294cb07eb535ef8e0fa8bd9cc414a129606..0ea325d36dbd77eef2e17352c44a65db46eba539 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2122,12 +2122,6 @@ void Buffer::makeLaTeXFile(ostream & os,
                if (!bullets_def.empty())
                  preamble += bullets_def + "}\n\n";
 
-               int const nlines =
-                       int(lyx::count(preamble.begin(), preamble.end(), '\n'));
-               for (int j = 0; j != nlines; ++j) {
-                       texrow.newline();
-               }
-
                // We try to load babel late, in case it interferes
                // with other packages.
                if (use_babel) {
@@ -2152,6 +2146,12 @@ void Buffer::makeLaTeXFile(ostream & os,
                        preamble += "\\dvipost{cbend color pop} \n";
                }
 
+               int const nlines =
+                       int(lyx::count(preamble.begin(), preamble.end(), '\n'));
+               for (int j = 0; j != nlines; ++j) {
+                       texrow.newline();
+               }
+
                os << preamble;
 
                if (only_preamble)

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 6251eb31c15c84ecb30a7c69b558dc45b5c9df6e..f66d33b73e04e144cfbfe83df2f0d1ac8dac4be5 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-14  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * insetquotes.C (dispString): remove use of acute accent for "'"
+       right quote.
+
 2003-02-14  John Levon  <levon@movementarian.org>
 
        * insettabular.C: changed method names in tabular.C

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 103b05f393750bc89201cfd03f05f84cb3889327..fe90f3e5639329cc1541e2e788149f5bd1a221a6 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -152,15 +152,6 @@ string const InsetQuotes::dispString(Language const * loclang) const
        if (times_ == DoubleQ)
                disp += disp;
 
-       if (lyxrc.font_norm_type == LyXRC::ISO_8859_1
-           || lyxrc.font_norm_type == LyXRC::ISO_8859_3
-           || lyxrc.font_norm_type == LyXRC::ISO_8859_4
-           || lyxrc.font_norm_type == LyXRC::ISO_8859_9) {
-               if (disp == "'")
-                       disp = "´";
-               else if (disp == "''")
-                       disp = "´´";
-       }
        if (lyxrc.font_norm_type == LyXRC::ISO_8859_1
            || lyxrc.font_norm_type == LyXRC::ISO_8859_9
            || lyxrc.font_norm_type == LyXRC::ISO_8859_15) {

diff --git a/src/text.C b/src/text.C
index e331ab68c2861d60a0143ca8b76f3be706002cc3..fa06fdbd08d6245579e5158f6636883204e3d9f5 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -3234,20 +3234,17 @@ int LyXText::drawLengthMarker(DrawRowParams & p, string const & prefix,
 
        str = prefix + " (" + vsp.asLyXCommand() + ")";
 
-       switch (vsp.kind()) {
-       case VSpace::LENGTH: {
+       if (vsp.kind() == VSpace::VFILL ) {
+               ty1 = ty2 = start;
+               by1 = by2 = end;
+       } else {
                // adding or removing space
-               bool const added = !(vsp.length().len().value() < 0.0);
+               bool const added = vsp.kind() != VSpace::LENGTH ||
+                                  vsp.length().len().value() > 0.0;
                ty1 = added ? (start + arrow_size) : start;
                ty2 = added ? start : (start + arrow_size);
                by1 = added ? (end - arrow_size) : end;
                by2 = added ? end : (end - arrow_size);
-               break;
-       }
-       default:
-               ty1 = ty2 = start;
-               by1 = by2 = end;
-               break;
        }
 
        int const leftx = p.xo + leftMargin(p.bv, p.row);
@@ -3260,16 +3257,13 @@ int LyXText::drawLengthMarker(DrawRowParams & p, string const & prefix,
        int d = 0;
 
        LyXFont font;
-       font.setColor(LColor::added_space).decSize();
+       font.setColor(LColor::added_space).decSize().decSize();
        font_metrics::rectText(str, font, w, a, d);
 
        p.pain->rectText(leftx + 2 * arrow_size + 5,
                         start + ((end - start) / 2) + d,
                         str, font);
 
-       if (vsp.kind() != VSpace::LENGTH && vsp.kind() != VSpace::VFILL )
-               return size;
-
        // top arrow
        p.pain->line(leftx, ty1, midx, ty2, LColor::added_space);
        p.pain->line(midx, ty2, rightx, ty1, LColor::added_space);