Small things

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

diff --git a/ChangeLog b/ChangeLog
index edc14183d4001ff2bcafaf7303745c9db6142ad5..b15533e9f3134e0eb69efbf4ab02f693dcaac369 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-11  John Levon  <moz@compsoc.man.ac.uk>
+
+       * README: add mention of broken ghostscript versions, remove
+       reference to non-existent BUGS file
+
+2000-12-13  Angus Leeming <a.leeming@ic.ac.uk>
+
+       * src/support/lstrings.C (compare_no_case): small fix. When passed
+       length, should use it in the size comparison.
+
 2000-12-11  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * src/lyxlookup.C: do not condition on FL_REVISION.

diff --git a/README b/README
index b0a02db1461eb53b45188c1d1616623b4290ed63..d316f02abad45ce6e2c47a941382cd0f877a739a 100644 (file)
--- a/README
+++ b/README
@@ -69,6 +69,9 @@ What do I need to run LyX?
        A decent LaTeX2e installation (e.g. teTeX or NTeX) not older
           than 1995/12/01
        Optionally ghostscript and ghostview (or compatible)
+               - note that ghostscript versions 6.22 through 6.50 
+                 won't render inline figures in LyX. This is due to
+                 a ghostscript bug.
        Perl5.002 or later to import LaTeX files into LyX
 
 What's new?
@@ -188,8 +191,6 @@ How do I submit a bug report?
        Help menu.  You'll find detailed info on submitting bug reports
        there.
 
-       You should also check the BUGS file in this directory.
-
        If you can't do that, send details to the LyX Developers mailing
        list.  Don't forget to mention which version you are having
        problems with!

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index c270def0cea9f7b80bcea10a7d694bbd871970a3..6be5d94b1265038b22649bc1b421b44f840f82c1 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -34,7 +34,6 @@ using std::toupper;
 
 int compare_no_case(string const & s, string const & s2)
 {
-       // ANSI C
        string::const_iterator p = s.begin();
        string::const_iterator p2 = s2.begin();
 
@@ -46,7 +45,7 @@ int compare_no_case(string const & s, string const & s2)
                ++p;
                ++p2;
        }
-       
+
        if (s.size() == s2.size())
                return 0;
        if (s.size() < s2.size())
@@ -69,7 +68,8 @@ int compare_no_case(string const & s, string const & s2, unsigned int len)
                ++p;
                ++p2;
        }
-       if (s.size() == s2.size())
+
+       if (s.size() >= len && s2.size() >= len)
                return 0;
        if (s.size() < s2.size())
                return -1;