From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 22 Sep 2000 12:16:02 +0000 (+0000)
Subject: A few small fixes
X-Git-Tag: 1.6.10~21982
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=55e638e486176891c9667d70ca277c509e9ceb37;p=features.git

A few small fixes


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

diff --git a/ChangeLog b/ChangeLog
index e51f20cf8a..b35fde8e6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-09-22  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* lib/doc/LaTeXConfig.lyx.in: updated.
+
+	* src/language.C (initL): remove language "francais" and change a
+	bit the names of the two other french variations.
+
+	* src/support/lyxstring.C (lyxstring): do not apply strlen() on a
+	string that may not be 0-terminated.
+
 2000-09-20  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* src/Makefile.am (lyx_SOURCES): remove table.C and Table.h
diff --git a/lib/doc/LaTeXConfig.lyx.in b/lib/doc/LaTeXConfig.lyx.in
index 445b090d95..c4a344dce7 100644
--- a/lib/doc/LaTeXConfig.lyx.in
+++ b/lib/doc/LaTeXConfig.lyx.in
@@ -1062,21 +1062,6 @@ a4
 Other packages
 \layout Subsection
 
-array
-\layout Description
-
-Found: @chk_array@
-\layout Description
-
-CTAN: 
-\family typewriter 
-macros/latex/required/tools/array.dtx
-\layout Description
-
-Notes: The package array is needed by LyX to be able to output vertical
- alignment other then ''top'' for tabulars.
-\layout Subsection
-
 algorithm
 \layout Description
 
@@ -1113,6 +1098,21 @@ index of algorithms
  too.
 \layout Subsection
 
+array
+\layout Description
+
+Found: @chk_array@
+\layout Description
+
+CTAN: 
+\family typewriter 
+macros/latex/required/tools/array.dtx
+\layout Description
+
+Notes: The package array is needed by LyX to be able to output vertical
+ alignment other then ''top'' for tabulars.
+\layout Subsection
+
 babel
 \layout Description
 
@@ -1311,6 +1311,38 @@ default
 .
 \layout Subsection
 
+longtable
+\layout Description
+
+Found: @chk_longtable@
+\layout Description
+
+CTAN: 
+\family typewriter 
+macros/latex/packages/tools/longtable.dtx
+\layout Description
+
+Notes: The package 
+\family sans 
+longtable
+\family default 
+ is needed by LyX to be able to output correctly multipage tables.
+\layout Subsection
+
+prettyref
+\layout Description
+
+Found: @chk_prettyref@
+\layout Description
+
+CTAN: 
+\family typewriter 
+macros/latex/contrib/supported/prettyref
+\layout Description
+
+Notes: none yet
+\layout Subsection
+
 rotating
 \layout Description
 
@@ -1368,24 +1400,6 @@ setspace
  is needed by LyX to change the line spacing of your document.
 \layout Subsection
 
-longtable
-\layout Description
-
-Found: @chk_longtable@
-\layout Description
-
-CTAN: 
-\family typewriter 
-macros/latex/packages/tools/longtable.dtx
-\layout Description
-
-Notes: The package 
-\family sans 
-longtable
-\family default 
- is needed by LyX to be able to output correctly multipage tables.
-\layout Subsection
-
 url
 \layout Description
 
@@ -1404,25 +1418,15 @@ url
  is needed by LyX to be able to output url's corrently.
 \layout Subsection
 
-prettyref
-\layout Description
-
-Found: @chk_prettyref@
-\layout Description
-
-CTAN: ??
-\layout Description
-
-Notes: none yet
-\layout Subsection
-
 varioref
 \layout Description
 
 Found: @chk_varioref@
 \layout Description
 
-CTAN: ??
+CTAN: 
+\family typewriter 
+macros/latex/required/tools/
 \layout Description
 
 Notes: none yet
diff --git a/src/language.C b/src/language.C
index ec9dadd28e..a6f4e8a05f 100644
--- a/src/language.C
+++ b/src/language.C
@@ -70,9 +70,8 @@ void LangInit::initL()
 	{ "esperanto", N_("Esperanto"), false, &iso8859_3 },
 	{ "estonian", N_("Estonian"), false, &iso8859_4 },
 	{ "finnish", N_("Finnish"), false, &iso8859_1 },
-	{ "francais", N_("Francais"), false, &iso8859_1 },
-	{ "french", N_("French"), false, &iso8859_1 },
-	{ "frenchb", N_("Frenchb"), false, &iso8859_1 },
+	{ "frenchb", N_("French"), false, &iso8859_1 },
+	{ "french", N_("French (GUTenberg)"), false, &iso8859_1 },
 	{ "galician", N_("Galician"), false, &iso8859_1 },
 	{ "german", N_("German"), false, &iso8859_1 },
 	{ "greek", N_("Greek"), false, &iso8859_7 },
diff --git a/src/support/lyxstring.C b/src/support/lyxstring.C
index 1e3b542a6d..a15cac0f37 100644
--- a/src/support/lyxstring.C
+++ b/src/support/lyxstring.C
@@ -415,7 +415,11 @@ lyxstring::lyxstring(value_type const * s, size_type n)
 	Assert(s && n < npos); // STD!
 	static Srep empty_rep(0, "");
 	if (*s && n) { // s is not empty string and n > 0
-		rep = new Srep(min(strlen(s), n), s);
+		size_type l = 0;
+		while (l < n && s[l])
+			l++;
+		rep = new Srep(l, s);
+		// rep = new Srep(min(strlen(s),n), s);
 	} else {
 		++empty_rep.ref;
 		rep = &empty_rep;