Skip to content

Commit df230b1

Browse files
committed
Report whether HTTPS URLs are supported (Issue #339)
Also added documentation to INSTALL.md about the libraries that are needed (and other problematic ones) Updated copyright to 2019.
1 parent e0ca845 commit df230b1

File tree

6 files changed

+55
-17
lines changed

6 files changed

+55
-17
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
HTML keywords and lang values.
99
- Added support for the subject and language metadata in markdown input.
1010
- Fixed a buffer underflow bug (Issue #338)
11+
- `htmldoc --help` now reports whether HTTPS URLs are supported (Issue #339)
1112
- Fixed an issue with HTML title pages and EPUB output.
1213

1314
# Changes in HTMLDOC v1.9.4

INSTALL.md

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# How to Install HTMLDOC from Source
1+
How to Install HTMLDOC from Source
2+
==================================
23

34
To compile HTMLDOC you'll need C and C++ compilers (gcc is fine, most vendor
45
compilers work, too). The JPEG, PNG, and ZLIB libraries are provided with
@@ -9,8 +10,11 @@ platform GUI toolkit and can be downloaded from:
910

1011
http://www.fltk.org/
1112

13+
For HTTPS support you'll need GNU TLS on Linux and UNIX.
1214

13-
## Windows
15+
16+
Windows
17+
-------
1418

1519
A Visual Studio solution is included in the "vcnet" directory. You must add the
1620
FLTK include and library directories separately for the solution to build.
@@ -36,7 +40,8 @@ Then create the following registry entries with REGEDIT:
3640
HKEY_LOCAL_MACHINE\Software\HTMLDOC\data = C:\install\dir
3741

3842

39-
## Linux, macOS, and Other UNIX Platforms
43+
Linux, macOS, and Other UNIX Platforms
44+
--------------------------------------
4045

4146
To compile the software under UNIX you first need to run the "configure" script
4247
in the source directory. Usually this is just:
@@ -50,3 +55,23 @@ Then run "make" to build the software and generate the documentation:
5055
Finally, run "make install" (typically as root) to install the software:
5156

5257
sudo make install
58+
59+
60+
Ubuntu Notes
61+
------------
62+
63+
You should install the following packages:
64+
65+
sudo apt-get install build-essential autoconf libfltk1.3-dev \
66+
libgnutls28-dev libjpeg-dev libpng-dev zlib1g-dev
67+
68+
69+
CentOS, Fedora, and RHEL Notes
70+
------------------------------
71+
72+
The version of GCC bundled with older releases of these operating systems cannot
73+
handle the version of libpng that is bundled with HTMLDOC. Install the
74+
following packages to avoid this and get full functionality:
75+
76+
sudo yum install autoconf fltk-devel gnutls-devel libjpeg-devel \
77+
libpng-devel zlib-devel

README.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Introduction
1+
Introduction
2+
------------
23

34
HTMLDOC is a program that reads HTML and Markdown source files or web pages and
45
generates corresponding EPUB, HTML, PostScript, or PDF files with an optional
@@ -32,20 +33,22 @@ servers. However, it does not support many things in "the modern web", such as:
3233
- Emoji: The fonts bundled with HTMLDOC do not include Unicode Emoji characters.
3334

3435

35-
# Resources
36+
Resources
37+
---------
3638

3739
The following HTMLDOC resources are available online:
3840

3941
- Official web site and online documentation:
4042

41-
https://michaelrsweet.github.io/htmldoc
43+
https://www.msweet.org/htmldoc
4244

4345
- Issue tracker and questions:
4446

4547
https://github.com/michaelrsweet/htmldoc/issues
4648

4749

48-
# Using HTMLDOC
50+
Using HTMLDOC
51+
-------------
4952

5053
Note: Complete documentation for HTMLDOC is available in the "doc" subdirectory.
5154
The following provides basic information on using HTMLDOC at the command-line
@@ -87,7 +90,8 @@ A complete description of all command-line options and HTML guidelines can be
8790
found in the software users manual in the "doc" directory.
8891

8992

90-
# Credits
93+
Credits
94+
-------
9195

9296
Many thanks to Leonard Rosenthol for providing the original changes to support
9397
a macOS (9) version of HTMLDOC.
@@ -104,13 +108,14 @@ The MD5 hash code is from L. Peter Deutsch at Aladdin Enterprises (creators
104108
of Ghostscript, among other things).
105109

106110

107-
# Legal Stuff
111+
Legal Stuff
112+
-----------
108113

109-
HTMLDOC is copyright © 1997-2018 by Michael R Sweet. This program is free
114+
HTMLDOC is copyright © 1997-2019 by Michael R Sweet. This program is free
110115
software. Distribution and use rights are outlined in the file "COPYING".
111116

112117
HTMLDOC includes code to encrypt PDF document files using the RC4 algorithm
113-
with up to a 128-bit key. While this software and code may be freely used
118+
with up to a 128-bit key. While this software and code may be freely used
114119
and exported under current US laws, other countries may restrict your use
115120
and possession of this code and software.
116121

doc/1-intro.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<head>
33
<meta name="author" content="Michael R Sweet">
4-
<meta name="copyright" content="Copyright &copy; 1997-2018, All Rights Reserved.">
4+
<meta name="copyright" content="Copyright &copy; 1997-2019, All Rights Reserved.">
55
<meta name="docversion" content="htmldoc-1.9.5">
66
<meta name="keywords" content="Software">
77
<title>HTMLDOC Users Manual</title>
@@ -57,7 +57,7 @@ <h2>Encryption Support</h2>
5757

5858
<h2>Legal Stuff</h2>
5959

60-
<p>HTMLDOC is copyright &copy; 1997-2018 by Michael R Sweet. See <a href="#LICENSE">Appendix A - License Agreement</a> for the terms of use. This software is based in part on the work of the Independent JPEG Group and FLTK project.</p>
60+
<p>HTMLDOC is copyright &copy; 1997-2019 by Michael R Sweet. See <a href="#LICENSE">Appendix A - License Agreement</a> for the terms of use. This software is based in part on the work of the Independent JPEG Group and FLTK project.</p>
6161

6262
</div>
6363

htmldoc/gui.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// GUI routines for HTMLDOC, an HTML document processing program.
33
//
4-
// Copyright 2011-2018 by Michael R Sweet.
4+
// Copyright 2011-2019 by Michael R Sweet.
55
// Copyright 1997-2010 by Easy Software Products. All rights reserved.
66
//
77
// This program is free software. Distribution and use rights are outlined in
@@ -4226,7 +4226,7 @@ GUI::showAboutCB(void)
42264226
label->image(&logo);
42274227

42284228
label = new Fl_Box(60, 45, 530, 35,
4229-
"HTMLDOC " SVERSION "\nCopyright 2011-2017 by Michael R Sweet."
4229+
"HTMLDOC " SVERSION "\nCopyright 2011-2019 by Michael R Sweet."
42304230
);
42314231
label->align(FL_ALIGN_TOP_LEFT | FL_ALIGN_INSIDE | FL_ALIGN_WRAP);
42324232

htmldoc/htmldoc.cxx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Main entry for HTMLDOC, a HTML document processing program.
33
*
4-
* Copyright 2011-2017 by Michael R Sweet.
4+
* Copyright 2011-2019 by Michael R Sweet.
55
* Copyright 1997-2010 by Easy Software Products. All rights reserved.
66
*
77
* This program is free software. Distribution and use rights are outlined in
@@ -2590,12 +2590,19 @@ usage(const char *arg) // I - Bad argument string
25902590
if (CGIMode)
25912591
puts("Content-Type: text/plain\r\n\r");
25922592

2593-
puts("HTMLDOC Version " SVERSION " Copyright 2011-2017 by Michael R Sweet.");
2593+
puts("HTMLDOC Version " SVERSION " Copyright 2011-2019 by Michael R Sweet.");
25942594
puts("HTMLDOC is provided under the terms of the GNU General Public License and");
25952595
puts("comes with absolutely no warranty. This software is based in part on the work");
25962596
puts("of the Independent JPEG Group.");
25972597
puts("");
25982598

2599+
#ifdef HAVE_SSL
2600+
puts("This copy of HTMLDOC has been built to support both http: and https: URLs.");
2601+
#else
2602+
puts("This copy of HTMLDOC has been built to support http: URLs only.");
2603+
#endif /* HAVE_SSL */
2604+
puts("");
2605+
25992606
if (CGIMode)
26002607
{
26012608
puts("HTMLDOC is running in CGI mode. To disable CGI mode when running");

0 commit comments

Comments
 (0)