X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Ffiginset.C;h=9bf32f5e6b47ba5a17f68a63a033ffbcb43e9815;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=659e489c974d3ab9867014ab15c571ce16c17d33;hpb=85e30074c271cb2d13b984e9dcb223d7bdde19f4;p=lyx.git

diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index 659e489c97..9bf32f5e6b 100644
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -28,46 +28,47 @@
 
 #include <config.h>
 
-#include <fstream>
-#include <queue>
-#include <list>
-#include <algorithm>
-#include <vector>
-#include <utility>
-
-#include <unistd.h>
-#include <csignal>
-#include <sys/wait.h>
-
-#include FORMS_H_LOCATION
-#include <cstdlib>
-#include <cctype>
-#include <cmath>
-#include <cerrno>
-
 #include "figinset.h"
+
 #include "lyx_main.h"
 #include "buffer.h"
-#include "frontends/FileDialog.h"
-#include "support/filetools.h"
 #include "LyXView.h" // just because of form_main
 #include "debug.h"
 #include "LaTeXFeatures.h"
 #include "lyxrc.h"
 #include "gettext.h"
 #include "lyx_gui_misc.h" // CancelCloseBoxCB
-#include "frontends/Alert.h" 
-#include "support/FileInfo.h"
-#include "support/lyxlib.h"
-#include "support/os.h"
 #include "Painter.h"
 #include "font.h"
 #include "bufferview_funcs.h"
 #include "ColorHandler.h"
 #include "converter.h"
-#include "frontends/Dialogs.h" // redrawGUI
 #include "BufferView.h"
 
+#include "frontends/FileDialog.h"
+#include "frontends/Alert.h" 
+#include "frontends/Dialogs.h" // redrawGUI
+
+#include "support/FileInfo.h"
+#include "support/lyxlib.h"
+#include "support/os.h"
+#include "support/filetools.h"
+
+#include <fstream>
+#include <queue>
+#include <list>
+#include <algorithm>
+#include <vector>
+#include <utility>
+
+#include <unistd.h>
+#include <csignal>
+#include <sys/wait.h>
+#include <cstdlib>
+#include <cctype>
+#include <cmath>
+#include <cerrno>
+
 using std::ostream;
 using std::istream;
 using std::ofstream;
@@ -81,6 +82,8 @@ using std::endl;
 using std::copy;
 using std::pair;
 using std::make_pair;
+using std::ios;
+using std::ostream_iterator;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::memcpy;
@@ -157,7 +160,7 @@ void addpidwait(int pid)
 	if (lyxerr.debugging()) {
 		lyxerr << "Pids to wait for: \n";
 		copy(pidwaitlist.begin(), pidwaitlist.end(),
-		     std::ostream_iterator<int>(lyxerr, "\n"));
+		     ostream_iterator<int>(lyxerr, "\n"));
 		lyxerr << flush;
 	}
 }
@@ -418,10 +421,10 @@ void InitFigures()
 			       vi->visualid, vi->c_class, 
 			       vi->bits_per_rgb, vi->map_entries);
 		}
-		color_visual = ( (vi->c_class == StaticColor) ||
+		color_visual = ((vi->c_class == StaticColor) ||
 				 (vi->c_class == PseudoColor) ||
 				 (vi->c_class == TrueColor) ||
-				 (vi->c_class == DirectColor) );
+				 (vi->c_class == DirectColor));
 		if ((vi->c_class & 1) == 0) return;
 		// now allocate colors
 		if (vi->c_class == GrayScale) {
@@ -517,7 +520,7 @@ void runqueue()
 
 			// create translation file
 			ofstream ofs;
-			ofs.open(make_tmp(getpid()).c_str());
+			ofs.open(make_tmp(getpid()).c_str(), ios::binary);
 			ofs << "gsave clippath pathbbox grestore\n"
 			    << "4 dict begin\n"
 			    << "/ury exch def /urx exch def /lly exch def "
@@ -646,7 +649,7 @@ void runqueue()
 			env = new char_p[ne + 2];
 			string tmp = t2.str().c_str();
 			env[0] = new char[tmp.size() + 1];
-			std::copy(tmp.begin(), tmp.end(), env[0]);
+			copy(tmp.begin(), tmp.end(), env[0]);
 			env[0][tmp.size()] = '\0';
 			memcpy(&env[1], environ,
 			       sizeof(char*) * (ne + 1));
@@ -1188,7 +1191,7 @@ int InsetFig::docbook(Buffer const *, ostream & os) const
 	if (suffixIs(figurename, ".eps"))
 		figurename.erase(figurename.length() - 4);
 
-	os << "@<graphic fileref=\"" << figurename << "\"></graphic>";
+	os << "<graphic fileref=\"" << figurename << "\"></graphic>";
 	return 0;
 } 
 
@@ -1923,7 +1926,7 @@ void InsetFig::restoreForm()
 	fl_set_input(form->Width, tostr(xwid).c_str());
 	fl_set_input(form->Height, tostr(xhgh).c_str());
 	fl_set_input(form->Angle, tostr(angle).c_str());
-	if (!fname.empty()){
+	if (!fname.empty()) {
 		string buf1 = OnlyPath(owner->fileName());
 		string fname2 = MakeRelPath(fname, buf1);
 		fl_set_input(form->EpsFile, fname2.c_str());
@@ -1979,8 +1982,8 @@ void InsetFig::browseFile()
 
 	FileDialog fileDlg(current_view->owner(), _("Select an EPS figure"),
 		LFUN_SELECT_FILE_SYNC,
-		make_pair(string(_("Clip art")), string(bufclip)),
-		make_pair(string(_("Documents")), string(buf)));
+		make_pair(string(_("Clip art|#C#c")), string(bufclip)),
+		make_pair(string(_("Documents|#o#O")), string(buf)));
 
 	bool error = false;
 	do {