X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=1eaa6ac224b201a172bbe3f063f470252d4c52d7;hb=0a93c9b70f861b12e27239167d9ba59ddd6ece1e;hp=6c8194c84f270d843ccba7eec4b2f7e053764918;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 6c8194c84f..1eaa6ac224 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -659,6 +659,13 @@ BufferParams const & Buffer::masterParams() const
 }
 
 
+double Buffer::fontScalingFactor() const
+{
+	return isExporting() ? 75.0 * params().html_math_img_scale
+		: 0.01 * lyxrc.dpi * lyxrc.zoom * lyxrc.preview_scale_factor * params().display_pixel_ratio;
+}
+
+
 ParagraphList & Buffer::paragraphs()
 {
 	return text().paragraphs();
@@ -1293,18 +1300,24 @@ bool Buffer::save() const
 	// we first write the file to a new name, then move it to its
 	// proper location once that has been done successfully. that
 	// way we preserve the original file if something goes wrong.
-	TempFile tempfile(fileName().onlyPath(), "tmpXXXXXX.lyx");
-	FileName savefile(tempfile.name());
+	string const justname = fileName().onlyFileNameWithoutExt();
+	boost::scoped_ptr<TempFile>
+		tempfile(new TempFile(fileName().onlyPath(),
+	           justname + "-XXXXXX.lyx"));
+	bool const symlink = fileName().isSymLink();
+	if (!symlink)
+		tempfile->setAutoRemove(false);
 
+	FileName savefile(tempfile->name());
 	LYXERR(Debug::FILES, "Saving to " << savefile.absFileName());
 	if (!writeFile(savefile))
 		return false;
 
 	// we will set this to false if we fail
 	bool made_backup = true;
-	bool const symlink = fileName().isSymLink();
+
+	FileName backupName(absFileName() + '~');
 	if (lyxrc.make_backup) {
-		FileName backupName(absFileName() + '~');
 		if (!lyxrc.backupdir_path.empty()) {
 			string const mangledName =
 				subst(subst(backupName.absFileName(), '/', '!'), ':', '!');
@@ -1312,6 +1325,8 @@ bool Buffer::save() const
 						      mangledName));
 		}
 
+		LYXERR(Debug::FILES, "Backing up original file to " <<
+				backupName.absFileName());
 		// Except file is symlink do not copy because of #6587.
 		// Hard links have bad luck.
 		made_backup = symlink ?
@@ -1327,24 +1342,45 @@ bool Buffer::save() const
 		}
 	}
 
+	// Destroy tempfile since it keeps the file locked on windows (bug 9234)
+	// Only do this if tempfile is not in autoremove mode
+	if (!symlink)
+		tempfile.reset();
 	// If we have no symlink, we can simply rename the temp file.
 	// Otherwise, we need to copy it so the symlink stays intact.
-	if (!symlink)
-		tempfile.setAutoRemove(false);
-	if (made_backup &&
-	    (symlink ? savefile.copyTo(fileName(), true) : savefile.moveTo(fileName()))) {
+	if (made_backup && symlink ? savefile.copyTo(fileName(), true) :
+		                           savefile.moveTo(fileName()))
+	{
 		// saveCheckSum() was already called by writeFile(), but the
 		// time stamp is invalidated by copying/moving
 		saveCheckSum();
 		markClean();
 		return true;
 	}
-	// else
-	Alert::error(_("Write failure"),
-		     bformat(_("Cannot move saved file to:\n  %1$s.\n"
-			       "But the file has successfully been saved as:\n  %2$s."),
-			     from_utf8(fileName().absFileName()),
-	         from_utf8(savefile.absFileName())));
+	// else we saved the file, but failed to move it to the right location.
+
+	if (lyxrc.make_backup && made_backup && !symlink) {
+		// the original file was moved to filename.lyx~, so it will look
+		// to the user as if it was deleted. (see bug #9234.) we could try
+		// to restore it, but that would basically mean trying to do again
+		// what we just failed to do. better to leave things as they are.
+		Alert::error(_("Write failure"),
+			     bformat(_("The file has successfully been saved as:\n  %1$s.\n"
+		           "But LyX could not move it to:\n  %2$s.\n"
+							 "Your original file has been backed up to:\n  %3$s"),
+				     from_utf8(savefile.absFileName()),
+             from_utf8(fileName().absFileName()),
+		         from_utf8(backupName.absFileName())));
+	} else {
+		// either we did not try to make a backup, or else we tried and failed,
+		// or else the original file was a symlink, in which case it was copied,
+		// not moved. so the original file is intact.
+		Alert::error(_("Write failure"),
+			     bformat(_("Cannot move saved file to:\n  %1$s.\n"
+				       "But the file has successfully been saved as:\n  %2$s."),
+				     from_utf8(fileName().absFileName()),
+		         from_utf8(savefile.absFileName())));
+	}
 	return false;
 }
 
@@ -1549,13 +1585,12 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 		writeLaTeXSource(os, original_path, runparams, output);
 	}
 	catch (EncodingException const & e) {
-		odocstringstream ods;
-		ods.put(e.failed_char);
+		docstring const failed(1, e.failed_char);
 		ostringstream oss;
 		oss << "0x" << hex << e.failed_char << dec;
 		docstring msg = bformat(_("Could not find LaTeX command for character '%1$s'"
 					  " (code point %2$s)"),
-					  ods.str(), from_utf8(oss.str()));
+					  failed, from_utf8(oss.str()));
 		errorList.push_back(ErrorItem(msg, _("Some characters of your document are probably not "
 				"representable in the chosen encoding.\n"
 				"Changing the document encoding to utf8 could help."),
@@ -3953,7 +3988,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		Graph::EdgePath::const_iterator it = path.begin();
 		Graph::EdgePath::const_iterator en = path.end();
 		for (; it != en; ++it)
-			if (theConverters().get(*it).nice) {
+			if (theConverters().get(*it).nice()) {
 				need_nice_file = true;
 				break;
 			}
@@ -4148,6 +4183,7 @@ Buffer::ExportStatus Buffer::preview(string const & format) const
 	return preview(format, update_unincluded);
 }
 
+
 Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) const
 {
 	MarkAsExporting exporting(this);