parselog fixes, i18n fix, menu separator fix

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

ANNOUNCE

@@ -1,4 +1,4 @@
-Public release of LyX version 1.1.6
+Public release of LyX version 1.2.0
 ===================================
 
 What is LyX?
@@ -19,7 +19,7 @@ All in all, LyX is a complete environment for writing documents. It has
 superior support for scientific writing, but works well for any kind of
 document.
 
-Read more about LyX (including screen shots) at:
+Read more about LyX (including screenshots) at:
 
     http://www.lyx.org/
 
@@ -32,7 +32,7 @@ A very incomplete feature list:
 - footnotes, citations, cross-referencing, faxes, spellchecking
 - almost any math expression (with a simple, but powerfull interface)
 - automatic, multilevel outline support (enumerated or bullets)
-- tables and embedded postscript figures support
+- tables and embedded figures support (with automatic conversion)
 - import LaTeX or ASCII
 - export LaTeX, ASCII, DVI, PostScript, LinuxDoc-SGML, DocBook-SGML
 - fair support for non-English documents and/or menus
@@ -67,20 +67,20 @@ with mirrors at
 	
 The source code package is available at:
 
-        ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.1.6.tar.gz
-	ftp://ftp.devel.lyx.org/pub/lyx/lyx-1.1.6.tar.gz
+        ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.2.0.tar.gz
+	ftp://ftp.devel.lyx.org/pub/lyx/lyx-1.2.0.tar.gz
 
 and at the mirrors listed above.
 
 You need to have XForms version 0.88 or newer to compile your own 
-version.  Version 0.88 is highly recommended. LyX should also compile
-with 0.89.
+version.  Version 0.89 is highly recommended. LyX should also compile
+with 0.88.
 
 Credits
 -------
 
 The LyX Team is composed of volunteers from around the world.  Many, many 
-people have helped make the 1.1.x releases possible, including:
+people have helped make the 1.2.0 release possible, including:
 
     Lars Gullik Bjoennes, Alejandro Aguilar Sierra, Asger Alstrup,
     Jean-Marc Lasgouttes, Juergen Vigna, John P. Weiss, Bernhard Iselborn,

ChangeLog

@@ -1,5 +1,6 @@
 2002-03-26  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
+	* ANNOUNCE: 
 	* INSTALL: 
 	* README: 
 	* NEWS: update somewhat for 1.2.0

NEWS

@@ -28,8 +28,9 @@ are now possible:
 
 - New minipage inset
 
-Note that another consequence of this change is that older LyX version
-will almost certainly fail to read files produced by LyX 1.2.0.
+Note that another consequence of these changes is that older LyX
+versions will almost certainly fail to read files produced by LyX
+1.2.0.
 
 
 Other more traditional insets have been improved too:

lib/examples/Literate.lyx

@@ -44,6 +44,19 @@ Modified by Bernard Michael Hurley bernardh@westherts.ac.uk ---- Don't blame
 \end_inset 
 
 
+\layout Abstract
+
+
+\series bold 
+Note:
+\series default 
+ This example program is provided for educational use only.
+ The functionality in this C program has been superceded by the equivalent
+ Python code in 
+\emph on 
+examples/listerrors.lyx
+\emph default 
+ which should be installed in the LyX scripts directory.
 \layout Date
 
 

src/ChangeLog

@@ -1,3 +1,16 @@
+2002-03-27  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* MenuBackend.C (expand): translate the name of floats
+
+	* FloatList.C (FloatList): mark the float names for translation
+
+	* converter.C (convert): use LibScriptSearch
+
+2002-03-26  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* MenuBackend.C (defaults): fix default menu (we might as well get
+	rid of it...)
+
 2002-03-26  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* lyxvc.C (registrer): register the file with CVS if it's in a CVS

src/FloatList.C

@@ -5,6 +5,7 @@
 #endif
 
 #include "FloatList.h"
+#include "gettext.h"
 
 // This class is now mostly finished, except one thing, it is a global
 // object. This will not do. The user (and layout files) are free to
@@ -29,18 +30,19 @@ FloatList::FloatList()
 	// (these will later be read from a layout file)
 
 	// table
-	Floating table("table", "htbp", "lot", "", "plain", "Table", true);
+	Floating table("table", "htbp", "lot", "", "plain", N_("Table"), true);
 	newFloat(table);
 
 	// figure
-	Floating figure("figure", "htbp", "lof", "", "plain", "Figure", true);
+	Floating figure("figure", "htbp", "lof",
+			"", "plain", N_("Figure"), true);
 	newFloat(figure);
 
 	// And we add algorithm too since LyX has
 	// supported that for a long time,
 	// but support for this should probably be moved to a layout file.
 	Floating algorithm("algorithm", "htbp", "loa",
-			   "", "ruled", "Algorithm");
+			   "", "ruled", N_("Algorithm"));
 	newFloat(algorithm);
 }
 

src/MenuBackend.C

@@ -385,7 +385,7 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const
 				int const action = lyxaction
 					.getPseudoAction(LFUN_INSET_FLOAT,
 							 cit->second.type());
-				string const label = cit->second.name();
+				string const label = _(cit->second.name());
 				tomenu.add(MenuItem(MenuItem::Command,
 						    label, action));
 
@@ -492,7 +492,7 @@ void MenuBackend::defaults()
 	Menu file("file");
 	file
 		.add(MenuItem(MenuItem::Command, _("New...|N"), "buffer-new"))
-		.add(MenuItem(MenuItem::Command, _("Open...|O"), "buffer-open"))
+		.add(MenuItem(MenuItem::Command, _("Open...|O"), "file-open"))
 		.add(MenuItem(MenuItem::Submenu, _("Import|I"), "import"))
 		.add(MenuItem(MenuItem::Command, _("Quit|Q"), "lyx-quit"))
 		.add(MenuItem(MenuItem::Separator))

src/converter.C

@@ -657,11 +657,7 @@ bool Converters::convert(Buffer const * buffer,
 
 			if (!conv.parselog.empty()) {
 				string const logfile =  infile2 + ".log";
-				string script =
-					LibFileSearch("scripts",
-						      conv.parselog);
-				if (script.empty())
-					script = conv.parselog;
+				string const script = LibScriptSearch(conv.parselog);
 				string const command2 = script +
 					" < " + QuoteName(infile2 + ".out") +
 					" > " + QuoteName(logfile);

src/insets/ChangeLog

@@ -1,3 +1,8 @@
+2002-03-27  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* insetspecialchar.C (isLineSeparator): disable the nice code to
+	allow linebreaks after hyphenation and menu separators.
+
 2002-03-26  Herbert Voss  <voss@lyx.org>
 
 	* insetgraphics.C (figinsetRead): set the right lyxview

src/insets/insetspecialchar.C

@@ -344,5 +344,13 @@ bool InsetSpecialChar::isSpace() const
 
 bool InsetSpecialChar::isLineSeparator() const
 {
+#if 0
+	// this would be nice, but it does not work, since
+	// Paragraph::stripLeadingSpaces nukes the characters which
+	// have this property. I leave the code here, since it should
+	// eventually be made to work. (JMarc 20020327)
 	return kind_ == HYPHENATION || kind_ == MENU_SEPARATOR;
+#else
+	return false;
+#endif
 }

src/support/ChangeLog

@@ -1,3 +1,8 @@
+2002-03-27  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* filetools.C (LibScriptSearch): new command. Searches for scripts
+	in lyx data directories.
+
 2002-03-21  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* most files: ws cleanup

src/support/filetools.C

@@ -329,6 +329,21 @@ i18nLibFileSearch(string const & dir, string const & name,
 }
 
 
+string const LibScriptSearch(string const & command)
+{
+	string script = command;
+	string args;
+	split(script, args, ' ');
+	script = LibFileSearch("scripts", script);
+	if (script.empty())
+		return command;
+	else if (args.empty())
+		return script;
+	else
+		return script + ' ' + args;
+}
+
+
 string const GetEnv(string const & envname)
 {
 	// f.ex. what about error checking?

src/support/filetools.h

@@ -98,6 +98,12 @@ string const
 i18nLibFileSearch(string const & dir, string const & name,
 		  string const & ext = string());
 
+/** Takes a command with arguments as input and tries to see whether
+  the command itself can be found in one of the scripts/ directories.
+  If it is found, return the command with fully qualified script name,
+  either return it unchanged */
+string const LibScriptSearch(string const & command);
+
 ///
 string const GetEnv(string const & envname);