fix 459; support epsi and fig formats; fix bug in hu.po

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

lib/ChangeLog

@@ -1,3 +1,7 @@
+2002-06-19 Herbert Voss  <voss@perce.de>
+
+	* configure.m4: add converters for epsi and (x)fig
+	
 2002-07-03  Vitaly Lipatov  <LAV@VL3143.spb.edu>
 
 	* languages: add support for belarusian and kazakh

lib/configure.m4

@@ -489,6 +489,14 @@ EOF
 ### the graphic converter part with the predefined ones
 #### Search for tne nonstandard converting progs
 #
+SEARCH_PROG([for an FIG -> EPS/XPM converter], FIG2DEV, fig2dev)
+if test "$FIG2DEV" = "fig2dev"; then
+cat >>$outfile <<EOF
+\\converter fig eps "fig2dev -L eps \$\$i \$\$o" ""
+\\converter fig xpm "fig2dev -L xpm \$\$i \$\$o" ""
+EOF
+fi
+
 SEARCH_PROG([for an TIFF -> PS converter], TIFF2PS, tiff2ps)
 if test "$TIFF2PS" = "tiff2ps"; then
 cat >>$outfile <<EOF
@@ -510,7 +518,15 @@ SEARCH_PROG([for an EPS -> PDF converter], EPSTOPDF, epstopdf)
 if test "$EPSTOPDF" = "epstopdf"; then
 cat >>$outfile <<EOF
 \\converter eps pdf "epstopdf --outfile=\$\$o \$\$i" ""
+EOF
+fi
+
+SEARCH_PROG([for an EPSI ->  EPS/XPM converter], EPS2EPS, eps2eps)
+if test "$EPS2EPS" = "eps2eps"; then
+cat >>$outfile <<EOF
 \\converter epsi pdf "epstopdf --outfile=\$\$o \$\$i" ""
+\\converter epsi eps "eps2eps \$\$i $$o" ""
+\\converter epsi xpm "eps2eps -sOutputFile=- \$\$i dummy.eps | convert - \$\$o" ""
 EOF
 fi
 

po/ChangeLog

@@ -1,3 +1,7 @@
+2002-07-03  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* hu.po: remove space as binding of 'replace all' in search dialog
+
 2002-06-11  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* ru.po: update from Vitaly Lipatov

po/hu.po

@@ -4927,7 +4927,7 @@ msgstr "Cser
 #: src/ext_l10n.h:1127
 #, fuzzy
 msgid "Replace &All "
-msgstr "Mindet|#M "
+msgstr "Mindet|#M"
 
 #: src/ext_l10n.h:1128
 msgid "Search &backwards"

src/frontends/controllers/ChangeLog

@@ -1,3 +1,8 @@
+2002-06-27  Juergen Spitzmueller <j.spitzmueller@gmx.de>
+
+	* ControlInclude.C: Add warning if absolute path name and
+	check_typeset is used together
+
 2002-06-28  Angus Leeming  <leeming@lyx.org>
 
 	* ControlGraphics.C: changes associated with the name changes

src/frontends/controllers/ControlInclude.C

@@ -78,10 +78,21 @@ void ControlInclude::load(string const & file)
 
 bool ControlInclude::fileExists(string const & file)
 {
-    string const fileWithAbsPath = MakeAbsPath(file, OnlyPath(params().masterFilename_));
+	string const fileWithAbsPath = MakeAbsPath(file, OnlyPath(params().masterFilename_));
-    if (IsFileReadable(fileWithAbsPath))
+
-	return true;
+	if (params().noload){
-    else
+
-	Alert::alert(_("Specified file doesn't exist !"));
+		if (prefixIs(file, "../") || prefixIs(file, "/"))
-    return false;
+			Alert::alert(_("Warning!"),
+				_("On some systems, with this options only relative path names"),
+				_("inside the master file dir are allowed. You might get a LaTeX error!"));
+	}
+
+	if (IsFileReadable(fileWithAbsPath))
+		return true;
+	
+	else
+		Alert::alert(_("Warning!"),
+			_("Specified file doesn't exist"));
+		return false;
 }

src/frontends/xforms/ChangeLog

@@ -1,3 +1,9 @@
+2002-06-27  Juergen Spitzmueller <j.spitzmueller@gmx.de>
+
+	* FormInclude.C: Comment out unneeded and wrong update mechanism 
+	(related to bug #459)
+	*forms/form_include.fd: define missing callbacks (bug #459)
+
 2002-07-03  Vitaly Lipatov  <LAV@VL3143.spb.edu>
 
 	* FormDocument.C (build): add pt154 encoding

src/frontends/xforms/FormInclude.C

@@ -52,6 +52,9 @@ void FormInclude::build()
 
 void FormInclude::update()
 {
+	#if 0
+	// I believe this is not needed.
+	// Anyway, it is plain wrong (JSpitzm 3/7/02)
 	if (controller().params().noload) {
 		fl_set_input(dialog_->input_filename, "");
 		fl_set_button(dialog_->check_typeset, 0);
@@ -63,6 +66,7 @@ void FormInclude::update()
 		fl_set_object_lcol(dialog_->check_visiblespace, FL_INACTIVE);
 		return;
 	}
+	#endif
 
 	fl_set_input(dialog_->input_filename,
 		     controller().params().cparams.getContents().c_str());

src/frontends/xforms/forms/form_include.fd

@@ -81,8 +81,8 @@ shortcut:
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: check_typeset
-callback: 
+callback: C_FormBaseInputCB
-argument: 
+argument: 0
 
 --------------------
 class: FL_BUTTON
@@ -171,8 +171,8 @@ shortcut:
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: check_visiblespace
-callback: 
+callback: C_FormBaseInputCB
-argument: 
+argument: 0
 
 --------------------
 class: FL_BEGIN_GROUP
@@ -188,7 +188,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name:
+name: 
 callback: 
 argument: 
 

src/support/ChangeLog

@@ -1,4 +1,8 @@
+2002-06-20  Herbert Voss  <voss@perce.de>
 
+	* filetools.[C]: (readExtFromContents) add support for
+	(x)fig format images
+		
 2002-06-26  André Pönitz <poenitz@gmx.net>
 
 	* filetools.[Ch]: small whitespace, more compact 'return' statement

src/support/filetools.C

@@ -993,6 +993,7 @@ string const GetExtension(string const & name)
 // EPS	%!PS-Adobe-3.0 EPSF...
 // EPSI like EPS and with
 //      %%BeginPreview...
+// FIG	#FIG...
 // FITS ...BITPIX...
 // GIF	GIF...
 // JPG	JFIF
@@ -1054,10 +1055,6 @@ string const getExtFromContents(string const & filename)
 		}
 
 		getline(ifs, str);
-
-		lyxerr[Debug::GRAPHICS] << "Scanstring: " << str.substr(0,60)
-					<< endl;
-
 		string const stamp = str.substr(0,2);
 		if (firstLine && str.size() >= 2) {
 			// at first we check for a zipped file, because this
@@ -1105,6 +1102,9 @@ string const getExtFromContents(string const & filename)
 			} else if (prefixIs(str,"%TGIF")) {
 				format =  "tgif";
 
+			} else if (prefixIs(str,"#FIG")) {
+				format =  "fig";
+
 			} else if (prefixIs(str,"GIF")) {
 				format =  "gif";