[groff] 07/07: src/preproc/html/pre-html.cpp: Honor -v option.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 835c0f5b083ebb7b68fa7d7b9a9502b9485b3a42
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat May 22 22:35:41 2021 +1000

    src/preproc/html/pre-html.cpp: Honor -v option.
    
    * src/preproc/html/pre-html.cpp (main): Call `scanArguments()` earlier,
      before trying to load a font description, so that -v, --version, and
      --help work.
---
 ChangeLog                     | 6 ++++++
 src/preproc/html/pre-html.cpp | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7507a4d..0c5638c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2021-05-22  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * src/preproc/html/pre-html.cpp (main): Call `scanArguments()`
+       earlier, before trying to load a font description, so that -v,
+       --version, and --help work.
+
+2021-05-22  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        Add -C and -G options to grohtml output driver, to suppress the
        output of CreationDate and Creator HTML comments, respectively.
        These can inject unwanted noise into build artifacts.
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index 2b80663..90fb517 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -1786,13 +1786,13 @@ int main(int argc, char **argv)
   exit(1);
 #endif /* CAPTURE_MODE */
   device = "html";
+  i = scanArguments(argc, argv);
   if (!font::load_desc())
     fatal("cannot find devhtml/DESC exiting");
   image_gen = font::image_generator;
   if (image_gen == NULL || (strcmp(image_gen, "") == 0))
     fatal("devhtml/DESC must set the image_generator field, exiting");
   postscriptRes = get_resolution();
-  i = scanArguments(argc, argv);
   setupAntiAlias();
   checkImageDir();
   makeFileName();