From 05775b52485a0d37033b26d696f36c622a4aa32e Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 11 Nov 2016 15:10:57 +0100
Subject: [PATCH] doc: Fix regression in macro handling

--

The way macros are handled seem to have changed since 2008.  Fix that:

Reported-by: dkg@fifthhorseman.net
Signed-off-by: Werner Koch <wk@gnupg.org>
---
 doc/gpgme.texi    |  8 ++++----
 doc/uiserver.texi | 30 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index c790537d..ee5ba6d4 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -31,11 +31,11 @@ General Public License for more details.
 @end copying
 
 @c Macros used by the description of the UI server protocol
-@macro clnt
-  @sc{c:} @c
+@macro clnt{string}
+  @sc{c:} \string\
 @end macro
-@macro srvr
-  @sc{s:} @c
+@macro srvr{string}
+  @sc{s:} \string\
 @end macro
 
 
diff --git a/doc/uiserver.texi b/doc/uiserver.texi
index 16e8f85d..aae3b606 100644
--- a/doc/uiserver.texi
+++ b/doc/uiserver.texi
@@ -158,21 +158,21 @@ indicated by a @sc{c:}, server responses by @sc{c:}:
 
 @smallexample
 @group
-  @clnt RESET
-  @srvr OK
-  @clnt RECIPIENT foo@@example.net
-  @srvr OK
-  @clnt RECIPIENT bar@@example.com
-  @srvr OK
-  @clnt PREP_ENCRYPT
-  @srvr S PROTOCOL OpenPGP
-  @srvr OK
-  @clnt INPUT FD=17
-  @srvr OK
-  @clnt OUTPUT FD=18
-  @srvr OK
-  @clnt ENCRYPT
-  @srvr OK
+  @clnt{RESET}
+  @srvr{OK}
+  @clnt{RECIPIENT foo@@example.net}
+  @srvr{OK}
+  @clnt{RECIPIENT bar@@example.com}
+  @srvr{OK}
+  @clnt{PREP_ENCRYPT}
+  @srvr{S PROTOCOL OpenPGP}
+  @srvr{OK}
+  @clnt{INPUT FD=17}
+  @srvr{OK}
+  @clnt{OUTPUT FD=18}
+  @srvr{OK}
+  @clnt{ENCRYPT}
+  @srvr{OK}
 @end group
 @end smallexample