mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
Update documentation.
* doc/gpg.texi, doc/specify-user-id.texi, doc/yat2m.c: Update from current GnuPG master (commit bdde44a).
This commit is contained in:
parent
b99e77d59c
commit
422774a1d9
1566
doc/gpg.texi
1566
doc/gpg.texi
File diff suppressed because it is too large
Load Diff
@ -59,9 +59,10 @@ avoids any ambiguities in case that there are duplicated key IDs.
|
||||
@end cartouche
|
||||
|
||||
@noindent
|
||||
(@command{gpgsm} also accepts colons between each pair of hexadecimal
|
||||
@command{gpgsm} also accepts colons between each pair of hexadecimal
|
||||
digits because this is the de-facto standard on how to present X.509
|
||||
fingerprints.)
|
||||
fingerprints. @command{gpg} also allows the use of the space
|
||||
separated SHA-1 fingerprint as printed by the key listing commands.
|
||||
|
||||
@item By exact match on OpenPGP user ID.
|
||||
This is denoted by a leading equal sign. It does not make sense for
|
||||
|
53
doc/yat2m.c
53
doc/yat2m.c
@ -1,6 +1,6 @@
|
||||
/* yat2m.c - Yet Another Texi 2 Man converter
|
||||
* Copyright (C) 2005 g10 Code GmbH
|
||||
* Copyright (C) 2006 2006 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -72,7 +72,21 @@
|
||||
extracted from one file, either using the --store or the --select
|
||||
option.
|
||||
|
||||
If you want to indent tables in the source use this style:
|
||||
|
||||
@table foo
|
||||
@item
|
||||
@item
|
||||
@table
|
||||
@item
|
||||
@end
|
||||
@end
|
||||
|
||||
Don't change the indentation within a table and keep the same
|
||||
number of white space at the start of the line. yat2m simply
|
||||
detects the number of white spaces in front of an @item and remove
|
||||
this number of spaces from all following lines until a new @item
|
||||
is found or there are less spaces than for the last @item.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
@ -87,7 +101,7 @@
|
||||
|
||||
|
||||
#define PGM "yat2m"
|
||||
#define VERSION "0.5"
|
||||
#define VERSION "1.0"
|
||||
|
||||
/* The maximum length of a line including the linefeed and one extra
|
||||
character. */
|
||||
@ -414,6 +428,8 @@ write_th (FILE *fp)
|
||||
{
|
||||
char *name, *p;
|
||||
|
||||
fputs (".\\\" Created from Texinfo source by yat2m " VERSION "\n", fp);
|
||||
|
||||
name = ascii_strupr (xstrdup (thepage.name));
|
||||
p = strrchr (name, '.');
|
||||
if (!p || !p[1])
|
||||
@ -449,9 +465,9 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
|
||||
{ "code", 0, "\\fB", "\\fR" },
|
||||
{ "sc", 0, "\\fB", "\\fR" },
|
||||
{ "var", 0, "\\fI", "\\fR" },
|
||||
{ "samp", 0, "\\(aq", "\\(aq'" },
|
||||
{ "file", 0, "`\\fI","\\fR'" },
|
||||
{ "env", 0, "`\\fI","\\fR'" },
|
||||
{ "samp", 0, "\\(aq", "\\(aq" },
|
||||
{ "file", 0, "\\(oq\\fI","\\fR\\(cq" },
|
||||
{ "env", 0, "\\(oq\\fI","\\fR\\(cq" },
|
||||
{ "acronym", 0 },
|
||||
{ "dfn", 0 },
|
||||
{ "option", 0, "\\fB", "\\fR" },
|
||||
@ -854,6 +870,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
|
||||
int in_gpgone = 0; /* Keep track of "@ifset gpgone" parts. */
|
||||
int not_in_gpgone = 0; /* Keep track of "@ifclear gpgone" parts. */
|
||||
int not_in_man = 0; /* Keep track of "@ifclear isman" parts. */
|
||||
int item_indent = 0; /* How far is the current @item indented. */
|
||||
|
||||
/* Helper to define a macro. */
|
||||
char *macroname = NULL;
|
||||
@ -877,6 +894,24 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
|
||||
}
|
||||
line[--n] = 0;
|
||||
|
||||
/* Kludge to allow indentation of tables. */
|
||||
for (p=line; *p == ' ' || *p == '\t'; p++)
|
||||
;
|
||||
if (*p)
|
||||
{
|
||||
if (*p == '@' && !strncmp (p+1, "item", 4))
|
||||
item_indent = p - line; /* Set a new indent level. */
|
||||
else if (p - line < item_indent)
|
||||
item_indent = 0; /* Switch off indention. */
|
||||
|
||||
if (item_indent)
|
||||
{
|
||||
memmove (line, line+item_indent, n - item_indent + 1);
|
||||
n -= item_indent;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (*line == '@')
|
||||
{
|
||||
for (p=line+1, n=1; *p && *p != ' ' && *p != '\t'; p++)
|
||||
@ -1168,10 +1203,10 @@ top_parse_file (const char *fname, FILE *fp)
|
||||
if not in a section. */
|
||||
while (macrolist)
|
||||
{
|
||||
macro_t m = macrolist->next;
|
||||
free (m->value);
|
||||
free (m);
|
||||
macrolist = m;
|
||||
macro_t next = macrolist->next;
|
||||
free (macrolist->value);
|
||||
free (macrolist);
|
||||
macrolist = next;
|
||||
}
|
||||
|
||||
parse_file (fname, fp, §ion_name, 0);
|
||||
|
Loading…
x
Reference in New Issue
Block a user