#include "support/FileZipListDir.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/os.h"
#include "support/Package.h"
#include "support/Path.h"
string result;
if (bp.papersize != PAPER_CUSTOM) {
- string const paper_size = bp.paperSizeName();
- if (paper_size != "b5" && paper_size != "foolscap")
+ string const paper_size = bp.paperSizeName(BufferParams::DVIPDFM);
+ if (!paper_size.empty())
result = "-p "+ paper_size;
if (bp.orientation == ORIENTATION_LANDSCAPE)
string const to_base = removeExtension(to.absFilename());
string const to_extension = getExtension(to.absFilename());
- FileNameList const files = FileName(path).dirList(getExtension(from.absFilename()));
- for (FileNameList::const_iterator it = files.begin();
+ support::FileNameList const files = FileName(path).dirList(getExtension(from.absFilename()));
+ for (support::FileNameList::const_iterator it = files.begin();
it != files.end(); ++it) {
string const from2 = it->absFilename();
string const file2 = onlyFilename(from2);