Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / output.cpp

diff --git a/src/output.cpp b/src/output.cpp
index 0a9e86ee822b0fef6630dc16093cd82e3dad6ff4..149ba78cea6e9a7fbf3b196784bf20b9cbe635eb 100644 (file)
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,36 +12,32 @@
 
 #include "output.h"
 
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "frontends/alert.h"
 
+#include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::FileName;
-using support::makeDisplayPath;
-
-using std::ofstream;
-using std::string;
-
 namespace {
 
 template<typename OFStream>
 bool doOpenFileWrite(OFStream & ofs, FileName const & fname)
 {
        ofs.open(fname.toFilesystemEncoding().c_str());
-       if (!ofs) {
-               docstring const file = makeDisplayPath(fname.absFilename(), 50);
-               docstring text = bformat(_("Could not open the specified "
-                                                    "document\n%1$s."), file);
-               frontend::Alert::error(_("Could not open file"), text);
-               return false;
-       }
-       return true;
+       if (ofs)
+               return true;
+       docstring const file = fname.displayName(50);
+       docstring text = bformat(_("Could not open the specified "
+                                                        "document\n%1$s."), file);
+       frontend::Alert::error(_("Could not open file"), text);
+       return false;
 }
 
 }
@@ -53,7 +49,7 @@ bool openFileWrite(ofstream & ofs, FileName const & fname)
 }
 
 
-bool openFileWrite(odocfstream & ofs, FileName const & fname)
+bool openFileWrite(ofdocstream & ofs, FileName const & fname)
 {
        return doOpenFileWrite(ofs, fname);
 }