diff options
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp index d778c84c5f9..297844cb21d 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp @@ -52,7 +52,7 @@ #ifndef DISABLE_WOFF #include <brotli/encode.h> -#include <woff2/version.h> +//#include <woff2/version.h> #include "ffwrapper.h" #include "TTFAutohint.hpp" #endif @@ -252,7 +252,7 @@ static void print_version (bool extended) { versionInfo.add("Ghostscript", Ghostscript().revisionstr(), true); #ifndef DISABLE_WOFF versionInfo.add("brotli", BrotliEncoderVersion(), 3, 0x1000); - versionInfo.add("woff2", woff2::version, 3, 0x100); +// versionInfo.add("woff2", woff2::version, 3, 0x100); versionInfo.add("fontforge", ff_version()); versionInfo.add("ttfautohint", TTFAutohint().version(), true); #endif @@ -320,6 +320,19 @@ static void set_variables (const CommandLine &cmdline) { } +static void timer_message (double start_time, const pair<int,int> *pageinfo) { + Message::mstream().indent(0); + if (!pageinfo) + Message::mstream(false, Message::MC_PAGE_NUMBER) << "\n" << "file"; + else { + Message::mstream(false, Message::MC_PAGE_NUMBER) << "\n" << pageinfo->first << " of " << pageinfo->second << " page"; + if (pageinfo->second > 1) + Message::mstream(false, Message::MC_PAGE_NUMBER) << 's'; + } + Message::mstream(false, Message::MC_PAGE_NUMBER) << " converted in " << (System::time()-start_time) << " seconds\n"; +} + + int main (int argc, char *argv[]) { try { CommandLine cmdline; @@ -364,20 +377,15 @@ int main (int argc, char *argv[]) { SVGOutput out(cmdline.stdoutOpt.given() ? "" : srcin.getFileName(), cmdline.outputOpt.value(), cmdline.zipOpt.given() ? cmdline.zipOpt.value() : 0); + pair<int,int> pageinfo; if (cmdline.epsOpt.given() || cmdline.pdfOpt.given()) { auto img2svg = unique_ptr<ImageToSVG>( cmdline.epsOpt.given() ? static_cast<ImageToSVG*>(new EPSToSVG(srcin.getFilePath(), out)) : static_cast<ImageToSVG*>(new PDFToSVG(srcin.getFilePath(), out))); - img2svg->convert(); - Message::mstream().indent(0); - Message::mstream(false, Message::MC_PAGE_NUMBER) << "file converted in " << (System::time()-start_time) << " seconds\n"; - } - else if (cmdline.pdfOpt.given()) { - PDFToSVG pdf2svg(srcin.getFilePath(), out); - pdf2svg.convert(); - Message::mstream().indent(0); - Message::mstream(false, Message::MC_PAGE_NUMBER) << "file converted in " << (System::time()-start_time) << " seconds\n"; + img2svg->setPageTransformation(get_transformation_string(cmdline)); + img2svg->convert(cmdline.pageOpt.value(), &pageinfo); + timer_message(start_time, img2svg->isSinglePageFormat() ? nullptr : &pageinfo); } else { init_fontmap(cmdline); @@ -389,13 +397,8 @@ int main (int argc, char *argv[]) { dvi2svg.setPageTransformation(get_transformation_string(cmdline)); dvi2svg.setPageSize(cmdline.bboxOpt.value()); - pair<int,int> pageinfo; dvi2svg.convert(cmdline.pageOpt.value(), &pageinfo); - Message::mstream().indent(0); - Message::mstream(false, Message::MC_PAGE_NUMBER) << "\n" << pageinfo.first << " of " << pageinfo.second << " page"; - if (pageinfo.second > 1) - Message::mstream(false, Message::MC_PAGE_NUMBER) << 's'; - Message::mstream(false, Message::MC_PAGE_NUMBER) << " converted in " << (System::time()-start_time) << " seconds\n"; + timer_message(start_time, &pageinfo); } } catch (DVIException &e) { |