From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 2 Jun 2011 19:51:22 +0000 (-0400)
Subject: Update cmd-doc.tlib to autogen-5.11.10pre5
X-Git-Tag: NTP_4_2_7P179~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93a85b6a2ac8b1407b2d4057b69483dabd586c74;p=thirdparty%2Fntp.git

Update cmd-doc.tlib to autogen-5.11.10pre5

bk: 4de7e9baAQTvHMsLZCWUYfXzaVgxKg
---

diff --git a/ChangeLog b/ChangeLog
index 203edf4a1..d3e79cbe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Update cmd-doc.tlib to autogen-5.11.10pre5.
 (4.2.7p178) 2011/06/02 Released by Harlan Stenn <stenn@ntp.org>
 * Update the std_def_list to include the ntp.lic file.
 * Distribute the ntp.lic file.
diff --git a/sntp/ag-tpl/cmd-doc.tlib b/sntp/ag-tpl/cmd-doc.tlib
index 71986e6ad..0efda2515 100644
--- a/sntp/ag-tpl/cmd-doc.tlib
+++ b/sntp/ag-tpl/cmd-doc.tlib
@@ -4,7 +4,7 @@
 
 ## cmd-doc.tlib -- Template for command line man/mdoc pages
 ##
-## Time-stamp:      "2011-05-27 17:51:16 bkorb"
+## Time-stamp:      "2011-05-30 14:24:12 bkorb"
 ##
 ##  This file is part of AutoOpts, a companion to AutoGen.
 ##  AutoOpts is free software.
@@ -135,13 +135,10 @@ FOR doc-section                       :+][+:
     (if (not (defined? 'cvt-fn))
         (error (sprintf "Cannot locate converter for %s"
                (get "ds-format" "man"))))
-    sec-type                          :+][+:
-
-    *==* " "                          :+]
-.Sh "[+: (. sec-type)                 :+]"[+:
-    == ""                             :+][+:
-    *                                 :+]
-.Sh [+: (. sec-type)                  :+][+:
+    sec-type :+][+:
+    == ""    :+][+: (error "unnamed doc-section") :+][+:
+    *==* " " :+].Sh "[+: (. sec-type) :+]"[+:
+    *        :+].Sh [+: (. sec-type)  :+][+:
     ESAC                              :+]
 [+:
     (shell (string-append
@@ -503,6 +500,8 @@ ENDDEF option-presets
 DEFINE exit-status                    :+][+:
 
 (set! tmp-val (string-append tmp-dir "/exit-status"))
+(set! tmp-str (shellf "sed 's/\\.Sh.*/.Pp/' %s 2>/dev/null" tmp-val))
+
 (out-push-new tmp-val)
 
 :+]
@@ -520,7 +519,9 @@ One of the following exit values will be returned:
 FOR exit-desc (for-from 2)            :+][+:
   (sprintf ".It %d\n%s\n"
     (for-index) (get "exit-desc"))    :+][+:
-ENDFOR exit-desc                      :+]
+ENDFOR exit-desc                      :+][+:
+(if (> (string-length tmp-str) 1)
+    (emit tmp-str)) :+]
 .El
 [+: (out-pop)                         :+][+: