DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 04:50:09 +00:00
Code

Merge pull request #70 from jahewson/master

Browse Source 
new option --version: Enhanced version information
This commit is contained in:
Lu Wang 2013-01-23 12:14:49 -08:00
commit ca43b6ba4a
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pdf2htmlEX.cc
View File

@ -12,6 +12,8 @@
#include <iostream> #include <iostream>
#include <getopt.h> #include <getopt.h>
#include <poppler-config.h>
#include <goo/GooString.h> #include <goo/GooString.h>
#include <Object.h> #include <Object.h>
@ -24,6 +26,7 @@
#include "HTMLRenderer/HTMLRenderer.h" #include "HTMLRenderer/HTMLRenderer.h"
#include "util/ArgParser.h" #include "util/ArgParser.h"
#include "util/path.h" #include "util/path.h"
#include "util/ffw.h"
using namespace std; using namespace std;
using namespace pdf2htmlEX; using namespace pdf2htmlEX;
@ -33,10 +36,6 @@ ArgParser argparser;
void show_usage_and_exit(const char * dummy = nullptr) void show_usage_and_exit(const char * dummy = nullptr)
{ {
cerr << "pdftohtmlEX version " << PDF2HTMLEX_VERSION << endl;
cerr << endl;
cerr << "Copyright 2012 Lu Wang <coolwanglu@gmail.com>" << endl;
cerr << endl;
cerr << "Usage: pdf2htmlEX [Options] <input.pdf> [<output.html>]" << endl; cerr << "Usage: pdf2htmlEX [Options] <input.pdf> [<output.html>]" << endl;
cerr << endl; cerr << endl;
cerr << "Options:" << endl; cerr << "Options:" << endl;
@ -47,11 +46,21 @@ void show_usage_and_exit(const char * dummy = nullptr)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
void show_version_and_exit(const char * dummy = nullptr)
{
cerr << "pdftohtmlEX version " << PDF2HTMLEX_VERSION << endl;
cerr << "Copyright 2012 Lu Wang <coolwanglu@gmail.com>" << endl;
cerr << "Libraries: ";
cerr << "poppler " << POPPLER_VERSION << ", ";
cerr << "libfontforge " << ffw_get_version() << endl;
exit(EXIT_FAILURE);
}
void parse_options (int argc, char **argv) void parse_options (int argc, char **argv)
{ {
argparser argparser
.add("help,h", "show all options", &show_usage_and_exit) .add("help,h", "show all options", &show_usage_and_exit)
.add("version,v", "show copyright and version info", &show_usage_and_exit) .add("version,v", "show copyright and version info", &show_version_and_exit)
.add("owner-password,o", &param.owner_password, "", "owner password (for encrypted files)", nullptr, true) .add("owner-password,o", &param.owner_password, "", "owner password (for encrypted files)", nullptr, true)
.add("user-password,u", &param.user_password, "", "user password (for encrypted files)", nullptr, true) .add("user-password,u", &param.user_password, "", "user password (for encrypted files)", nullptr, true)

5
src/util/ffw.c
View File

@ -400,3 +400,8 @@ void ffw_auto_hint(void)
FVAutoHint(cur_fv); FVAutoHint(cur_fv);
FVAutoInstr(cur_fv); FVAutoInstr(cur_fv);
} }
long ffw_get_version(void)
{
return library_version_configuration.library_source_versiondate;
}

1
src/util/ffw.h
View File

@ -23,6 +23,7 @@ extern "C" {
// global // global
void ffw_init(int debug); void ffw_init(int debug);
void ffw_finalize(void); void ffw_finalize(void);
long ffw_get_version(void);
//////////////////////// ////////////////////////
// load & save // load & save