Add an error check for correct formatting in Deflate uncompressed

[sgt/halibut] / bk_man.c

diff --git a/bk_man.c b/bk_man.c
index 1433dfd..bb4e5b5 100644 (file)
--- a/bk_man.c
+++ b/bk_man.c
@@ -235,7 +235,10 @@ void man_backend(paragraph *sourceform, keywordlist *keywords,
     /*
      * Open the output file.
      */
-    fp = fopen(conf.filename, "w");
+    if (!strcmp(conf.filename, "-"))
+       fp = stdout;
+    else
+       fp = fopen(conf.filename, "w");
     if (!fp) {
        error(err_cantopenw, conf.filename);
        return;
@@ -248,6 +251,12 @@ void man_backend(paragraph *sourceform, keywordlist *keywords,
            man_text(fp, p->words, TRUE, 0, &conf);
        }
 
+    /* Standard preamble */
+    /* Dodge to try to get literal U+0027 in output when required,
+     * bypassing groff's Unicode transform; pinched from pod2man */
+    fprintf(fp, ".ie \\n(.g .ds Aq \\(aq\n"
+               ".el       .ds Aq '\n");
+
     /* .TH name-of-program manual-section */
     fprintf(fp, ".TH");
     if (conf.th && *conf.th) {
@@ -419,7 +428,8 @@ void man_backend(paragraph *sourceform, keywordlist *keywords,
     /*
      * Tidy up.
      */
-    fclose(fp);
+    if (fp != stdout)
+       fclose(fp);
     man_conf_cleanup(conf);
 }
 
@@ -484,13 +494,27 @@ static int man_convert(wchar_t const *s, int maxlen,
                /* Turn backslashes into \e. */
                rdaddsc(&out, "\\e");
                continue;
-           } else if (*q == '-' && !(quote_props & QUOTE_LITERAL)) {
-               /* Turn nonbreakable hyphens into \(hy. */
-               rdaddsc(&out, "\\(hy");
-               continue;
+           } else if (*q == '-') {
+               if (quote_props & QUOTE_LITERAL) {
+                   /*
+                    * Try to preserve literal U+002D.
+                    * This is quite awkward. Debian hacks groff so that
+                    * \- and - both produce it; elsewhere it's not necessarily
+                    * possible to get it.
+                    * Apparently \- is the preferred compromise despite
+                    * having minus-sign semantics, as it is non-breaking.
+                    * (pod2man uses it, anyway.)
+                    */
+                   rdaddc(&out, '\\');
+               } else {
+                   /* Turn nonbreakable hyphens into \(hy. */
+                   rdaddsc(&out, "\\(hy");
+                   continue;
+               }
            } else if (*q == '\'' && (quote_props & QUOTE_LITERAL)) {
-               /* Try to preserve literal U+0027 */
-               rdaddsc(&out, "\\(aq"); /* "apostrophe quote" */
+               /* Try to preserve literal U+0027 (using string defined
+                * in preamble) */
+               rdaddsc(&out, "\\*(Aq"); /* "apostrophe quote" */
                continue;
            } else if (*q == '"' && (quote_props & QUOTE_QUOTES)) {
                /*