#include "format.h"
#include "lyxrc.h"
#include "buffer.h"
+#include "bufferparams.h"
#include "buffer_funcs.h"
#include "bufferview_funcs.h"
#include "errorlist.h"
return head + ' ' + options + ' ' + tail;
}
+
+string const dvipdfm_options(BufferParams const & bp)
+{
+ string result;
+
+ if (bp.papersize2 != VM_PAPER_CUSTOM) {
+ string const paper_size = bp.paperSizeName();
+ if (paper_size != "b5" && paper_size != "foolscap")
+ result = "-p "+ paper_size;
+
+ if (bp.orientation == ORIENTATION_LANDSCAPE)
+ result += " -l";
+ }
+
+ return result;
+}
+
} // namespace anon
}
-
class compare_Converter {
public:
compare_Converter(string const & f, string const & t)
if (conv.from == "dvi" && conv.to == "ps")
command = add_options(command,
- dvips_options(buffer));
+ buffer->params.dvips_options());
else if (conv.from == "dvi" && prefixIs(conv.to, "pdf"))
command = add_options(command,
- dvipdfm_options(buffer));
+ dvipdfm_options(buffer->params));
lyxerr[Debug::FILES] << "Calling " << command << endl;
if (buffer)
}
-string const Converters::dvips_options(Buffer const * buffer)
-{
- string result;
- if (!buffer)
- return result;
-
- if (buffer->params.use_geometry
- && buffer->params.papersize2 == BufferParams::VM_PAPER_CUSTOM
- && !lyxrc.print_paper_dimension_flag.empty()
- && !buffer->params.paperwidth.empty()
- && !buffer->params.paperheight.empty()) {
- // using a custom papersize
- result = lyxrc.print_paper_dimension_flag;
- result += ' ' + buffer->params.paperwidth;
- result += ',' + buffer->params.paperheight;
- } else {
- string const paper_option = papersize(buffer);
- if (paper_option != "letter" ||
- buffer->params.orientation != BufferParams::ORIENTATION_LANDSCAPE) {
- // dvips won't accept -t letter -t landscape. In all other
- // cases, include the paper size explicitly.
- result = lyxrc.print_paper_flag;
- result += ' ' + paper_option;
- }
- }
- if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE &&
- buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM)
- result += ' ' + lyxrc.print_landscape_flag;
- return result;
-}
-
-
-string const Converters::dvipdfm_options(Buffer const * buffer)
-{
- string result;
- if (!buffer)
- return result;
-
- if (buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM) {
- string const paper_size = papersize(buffer);
- if (paper_size != "b5" && paper_size != "foolscap")
- result = "-p "+ paper_size;
-
- if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
- result += " -l";
- }
-
- return result;
-}
-
void Converters::buildGraph()
{
vector<Format const *> const
Converters::getReachable(string const & from, bool only_viewable,
- bool clear_visited)
+ bool clear_visited)
{
vector<int> const & reachables =
G_.getReachable(formats.getNumber(from),