#include "Session.h"
#include "LaTeXFeatures.h"
#include "LyX.h"
-#include "LyXLayout.h"
+#include "Layout.h"
#include "LyXRC.h"
-#include "LyXText.h"
-#include "Paragraph.h"
+#include "Text.h"
#include "Undo.h"
#include "frontends/alert.h"
#include <cerrno>
#include <fstream>
+using std::back_inserter;
+using std::copy;
+using std::endl;
+using std::make_pair;
+using std::string;
+using std::ifstream;
+using std::ios;
+using std::istream_iterator;
+
+using boost::shared_ptr;
+
namespace lyx {
using support::tempName;
using support::unlink;
-using boost::shared_ptr;
-
namespace Alert = frontend::Alert;
namespace fs = boost::filesystem;
-using std::back_inserter;
-using std::copy;
-using std::endl;
-using std::make_pair;
-using std::string;
-using std::ifstream;
-using std::ios;
-using std::istream_iterator;
-
-
// this should be static, but I need it in Buffer.cpp
bool quitting; // flag, that we are quitting the program
docstring const file = makeDisplayPath(buffer->fileName(), 30);
docstring text = bformat(_("The document %1$s could not be saved.\n\n"
- "Do you want to rename the document and try again?"), file);
+ "Do you want to rename the document and "
+ "try again?"), file);
int const ret = Alert::prompt(_("Rename and save?"),
text, 0, 1, _("&Rename"), _("&Cancel"));
+/** Write a buffer to a new file name and rename the buffer
+ according to the new file name.
+
+ This function is e.g. used by menu callbacks and
+ LFUN_BUFFER_WRITE_AS.
+
+ If 'newname' is empty (the default), the user is asked via a
+ dialog for the buffer's new name and location.
+
+ If 'newname' is not empty, FileName::makeAbsPath() will indirectly
+ produce the following behaviour:
+
+ * If 'newname' has an absolute path, use that.
+
+ * If 'newname' has a relative path (or no path) and the buffer has
+ a path, that path is used as the base for 'newname'. Typically
+ this means that 'M-x buffer-write-as newname.lyx' will write to
+ the same directory as the original file.
+
+ * Otherwise use CWD as the base directory for 'newname'.
+ This behavour is arguably a bug, perhaps a system depedenant
+ "document directory" shoul be used instead. Note that CWD
+ isn't actually used according to a simple test on Linux.
+ Instead, it's based on '~', contrar to the documentation of
+ makeAbsPath(). Don't know what to do. *shrug*
+
+ Note: No checks are done on the extension etc of 'newname' when
+ it's non-empty. This may arguably also be a bug.
+
+ Note: The code may not code check that 'newname' is a valid for
+ the relevant file system?
+
+ Note: In Linux, it doesn't work with e.g. '~/file.lyx'. If it's
+ done from e.g. a buffer '/tmp/buf.lyx', it instead tries to write
+ to '/tmp/~/file.lyx'.
+*/
+
bool writeAs(Buffer * buffer, string const & newname)
{
string fname = buffer->fileName();
string const oldname = fname;
- if (newname.empty()) {
+ if (newname.empty()) { /// No argument? Ask user through dialog
// FIXME UNICODE
FileDialog fileDlg(_("Choose a filename to save document as"),
- LFUN_BUFFER_WRITE_AS,
- make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
- make_pair(_("Templates|#T#t"), from_utf8(lyxrc.template_path)));
+ LFUN_BUFFER_WRITE_AS,
+ make_pair(_("Documents|#o#O"),
+ from_utf8(lyxrc.document_path)),
+ make_pair(_("Templates|#T#t"),
+ from_utf8(lyxrc.template_path)));
if (!isLyXFilename(fname))
fname += ".lyx";
fname = makeAbsPath(fname).absFilename();
if (!isLyXFilename(fname))
fname += ".lyx";
- } else
- fname = newname;
- FileName const filename(fname);
- if (fs::exists(filename.toFilesystemEncoding())) {
+ } else
+ fname = makeAbsPath(newname, onlyPath(oldname)).absFilename();
+
+ if (fs::exists(FileName(fname).toFilesystemEncoding())) {
docstring const file = makeDisplayPath(fname, 30);
- docstring text = bformat(_("The document %1$s already exists.\n\n"
- "Do you want to over-write that document?"), file);
- int const ret = Alert::prompt(_("Over-write document?"),
- text, 0, 1, _("&Over-write"), _("&Cancel"));
+ docstring text = bformat(_("The document %1$s already "
+ "exists.\n\nDo you want to "
+ "overwrite that document?"),
+ file);
+ int const ret = Alert::prompt(_("Overwrite document?"),
+ text, 0, 1, _("&Overwrite"), _("&Cancel"));
if (ret == 1)
return false;
int AutoSaveBuffer::start()
{
- command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_.absFilename())));
+ command_ = to_utf8(bformat(_("Auto-saving %1$s"),
+ from_utf8(fname_.absFilename())));
return run(DontWait);
}
// assume successful write of tmp_ret
if (!rename(tmp_ret, fname_)) {
failed = true;
- // most likely couldn't move between filesystems
- // unless write of tmp_ret failed
- // so remove tmp file (if it exists)
+ // most likely couldn't move between
+ // filesystems unless write of tmp_ret
+ // failed so remove tmp file (if it
+ // exists)
unlink(tmp_ret);
}
} else {
if (!bv_.buffer()->writeFile(fname_)) {
// It is dangerous to do this in the child,
// but safe in the parent, so...
- if (pid == -1)
- // emit message signal.
- bv_.buffer()->message(_("Autosave failed!"));
+ if (pid == -1) // emit message signal.
+ bv_.buffer()
+ ->message(_("Autosave failed!"));
}
}
if (pid == 0) { // we are the child so...
if (!bv->buffer())
return;
- docstring const tmpstr = getContentsOfPlaintextFile(bv, f, asParagraph);
+ docstring const tmpstr =
+ getContentsOfPlaintextFile(bv, f, asParagraph);
+
if (tmpstr.empty())
return;
docstring const getContentsOfPlaintextFile(BufferView * bv, string const & f,
- bool asParagraph)
+ bool asParagraph)
{
FileName fname(f);
if (fname.empty()) {
FileDialog fileDlg(_("Select file to insert"),
- (asParagraph) ? LFUN_FILE_INSERT_PLAINTEXT_PARA : LFUN_FILE_INSERT_PLAINTEXT);
+ ( (asParagraph)
+ ? LFUN_FILE_INSERT_PLAINTEXT_PARA
+ : LFUN_FILE_INSERT_PLAINTEXT) );
FileDialog::Result result =
fileDlg.open(from_utf8(bv->buffer()->filePath()),
if (!fs::is_readable(fname.toFilesystemEncoding())) {
docstring const error = from_ascii(strerror(errno));
docstring const file = makeDisplayPath(fname.absFilename(), 50);
- docstring const text = bformat(_("Could not read the specified document\n"
- "%1$s\ndue to the error: %2$s"), file, error);
+ docstring const text =
+ bformat(_("Could not read the specified document\n"
+ "%1$s\ndue to the error: %2$s"), file, error);
Alert::error(_("Could not read file"), text);
return docstring();
}
if (!ifs) {
docstring const error = from_ascii(strerror(errno));
docstring const file = makeDisplayPath(fname.absFilename(), 50);
- docstring const text = bformat(_("Could not open the specified document\n"
- "%1$s\ndue to the error: %2$s"), file, error);
+ docstring const text =
+ bformat(_("Could not open the specified document\n"
+ "%1$s\ndue to the error: %2$s"), file, error);
Alert::error(_("Could not open file"), text);
return docstring();
}
#endif
// FIXME UNICODE: We don't know the encoding of the file
- return normalize_kc(from_utf8(tmpstr));
+ docstring file_content = from_utf8(tmpstr);
+ if (file_content.empty()) {
+ Alert::error(_("Reading not UTF-8 encoded file"),
+ _("The file is not UTF-8 encoded.\n"
+ "It will be read as local 8Bit-encoded.\n"
+ "If this does not give the correct result\n"
+ "then please change the encoding of the file\n"
+ "to UTF-8 with a program other than LyX.\n"));
+ file_content = from_local8bit(tmpstr);
+ }
+
+ return normalize_c(file_content);
}
Alert::information(_("System reconfigured"),
_("The system has been reconfigured.\n"
- "You need to restart LyX to make use of any\n"
- "updated document class specifications."));
+ "You need to restart LyX to make use of any\n"
+ "updated document class specifications."));
}
projects / lyx.git / blobdiff