mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2025-02-14 12:06:42 +00:00
Merge branch 'master' into int-new
This commit is contained in:
commit
8860e991f6
@ -125,7 +125,7 @@ more_end(void)
|
||||
}
|
||||
|
||||
static void
|
||||
sig_handler(int signal)
|
||||
sig_handler(int signal UNUSED)
|
||||
{
|
||||
cleanup();
|
||||
exit(0);
|
||||
|
@ -24,7 +24,7 @@ vlog(const char *msg, va_list args)
|
||||
int n = vsnprintf(buf, sizeof(buf), msg, args);
|
||||
if (n < 0)
|
||||
snprintf(buf, sizeof(buf), "???");
|
||||
if (n >= sizeof(buf))
|
||||
else if (n >= (int) sizeof(buf))
|
||||
snprintf(buf + sizeof(buf) - 100, 100, " ... <too long>");
|
||||
fputs(buf, stderr);
|
||||
fputc('\n', stderr);
|
||||
|
@ -24,6 +24,7 @@ $(o)cf-lex.c: $(s)cf-lex.l
|
||||
$(FLEX) $(FLEX_DEBUG) -s -B -8 -Pcf_ -o$@ $<
|
||||
|
||||
$(o)cf-lex.o: $(o)cf-parse.tab.h $(o)keywords.h
|
||||
$(o)cf-lex.o: CFLAGS+=-Wno-sign-compare -Wno-unused-function
|
||||
|
||||
$(addprefix $(o), cf-parse.y keywords.h commands.h cf-parse.tab.h cf-parse.tab.c cf-lex.c): $(objdir)/.dir-stamp
|
||||
|
||||
|
@ -577,7 +577,7 @@ cf_lex_init(int is_cli, struct config *c)
|
||||
cf_lex_init_kh();
|
||||
|
||||
ifs_head = ifs = push_ifs(NULL);
|
||||
if (!is_cli)
|
||||
if (!is_cli)
|
||||
{
|
||||
ifs->file_name = c->file_name;
|
||||
ifs->fd = c->file_fd;
|
||||
|
@ -85,7 +85,7 @@ int undo_available; /* Undo was not requested from last reconfiguration */
|
||||
* further use. Returns a pointer to the structure.
|
||||
*/
|
||||
struct config *
|
||||
config_alloc(byte *name)
|
||||
config_alloc(const byte *name)
|
||||
{
|
||||
pool *p = rp_new(&root_pool, "Config");
|
||||
linpool *l = lp_new(p, 4080);
|
||||
@ -405,7 +405,7 @@ config_confirm(void)
|
||||
* if it's been queued due to another reconfiguration being in progress now,
|
||||
* %CONF_UNQUEUED if a scheduled reconfiguration is removed, %CONF_NOTHING
|
||||
* if there is no relevant configuration to undo (the previous config request
|
||||
* was config_undo() too) or %CONF_SHUTDOWN if BIRD is in shutdown mode and
|
||||
* was config_undo() too) or %CONF_SHUTDOWN if BIRD is in shutdown mode and
|
||||
* no new configuration changes are accepted.
|
||||
*/
|
||||
int
|
||||
@ -450,7 +450,7 @@ config_undo(void)
|
||||
extern void cmd_reconfig_undo_notify(void);
|
||||
|
||||
static void
|
||||
config_timeout(struct timer *t)
|
||||
config_timeout(struct timer *t UNUSED)
|
||||
{
|
||||
log(L_INFO "Config timeout expired, starting undo");
|
||||
cmd_reconfig_undo_notify();
|
||||
@ -530,7 +530,7 @@ cf_error(const char *msg, ...)
|
||||
* and we want to preserve it for further use.
|
||||
*/
|
||||
char *
|
||||
cfg_strdup(char *c)
|
||||
cfg_strdup(const char *c)
|
||||
{
|
||||
int l = strlen(c) + 1;
|
||||
char *z = cfg_allocu(l);
|
||||
|
@ -20,7 +20,7 @@ struct config {
|
||||
linpool *mem; /* Linear pool containing configuration data */
|
||||
list protos; /* Configured protocol instances (struct proto_config) */
|
||||
list tables; /* Configured routing tables (struct rtable_config) */
|
||||
list logfiles; /* Configured log fils (sysdep) */
|
||||
list logfiles; /* Configured log files (sysdep) */
|
||||
|
||||
int mrtdump_file; /* Configured MRTDump file (sysdep, fd in unix) */
|
||||
char *syslog_name; /* Name used for syslog (NULL -> no syslog) */
|
||||
@ -60,7 +60,7 @@ struct config {
|
||||
extern struct config *config; /* Currently active configuration */
|
||||
extern struct config *new_config; /* Configuration being parsed */
|
||||
|
||||
struct config *config_alloc(byte *name);
|
||||
struct config *config_alloc(const byte *name);
|
||||
int config_parse(struct config *);
|
||||
int cli_parse(struct config *);
|
||||
void config_free(struct config *);
|
||||
@ -94,7 +94,7 @@ extern linpool *cfg_mem;
|
||||
#define cfg_alloc(size) lp_alloc(cfg_mem, size)
|
||||
#define cfg_allocu(size) lp_allocu(cfg_mem, size)
|
||||
#define cfg_allocz(size) lp_allocz(cfg_mem, size)
|
||||
char *cfg_strdup(char *c);
|
||||
char *cfg_strdup(const char *c);
|
||||
void cfg_copy_list(list *dest, list *src, unsigned node_size);
|
||||
|
||||
/* Lexer */
|
||||
|
@ -143,7 +143,7 @@ expr_us:
|
||||
/* Switches */
|
||||
|
||||
bool:
|
||||
expr {$$ = !!$1; }
|
||||
expr { $$ = !!$1; }
|
||||
| ON { $$ = 1; }
|
||||
| YES { $$ = 1; }
|
||||
| OFF { $$ = 0; }
|
||||
@ -202,7 +202,7 @@ net_roa4_: net_ip4_ MAX NUM AS NUM
|
||||
{
|
||||
$$ = cfg_alloc(sizeof(net_addr_roa4));
|
||||
net_fill_roa4($$, net4_prefix(&$1), net4_pxlen(&$1), $3, $5);
|
||||
if ($3 < net4_pxlen(&$1) || $3 > IP4_MAX_PREFIX_LENGTH)
|
||||
if ($3 < (int) net4_pxlen(&$1) || $3 > IP4_MAX_PREFIX_LENGTH)
|
||||
cf_error("Invalid max prefix length %d", $3);
|
||||
};
|
||||
|
||||
@ -210,7 +210,7 @@ net_roa6_: net_ip6_ MAX NUM AS NUM
|
||||
{
|
||||
$$ = cfg_alloc(sizeof(net_addr_roa6));
|
||||
net_fill_roa6($$, net6_prefix(&$1), net6_pxlen(&$1), $3, $5);
|
||||
if ($3 < net6_pxlen(&$1) || $3 > IP6_MAX_PREFIX_LENGTH)
|
||||
if ($3 < (int) net6_pxlen(&$1) || $3 > IP6_MAX_PREFIX_LENGTH)
|
||||
cf_error("Invalid max prefix length %d", $3);
|
||||
};
|
||||
|
||||
|
@ -88,11 +88,13 @@ fi
|
||||
|
||||
if test "$bird_cflags_default" = yes ; then
|
||||
BIRD_CHECK_GCC_OPTION(bird_cv_c_option_wno_pointer_sign, -Wno-pointer-sign, -Wall)
|
||||
BIRD_CHECK_GCC_OPTION(bird_cv_c_option_wno_missing_init, -Wno-missing-field-initializers, -Wall -Wextra)
|
||||
BIRD_CHECK_GCC_OPTION(bird_cv_c_option_fno_strict_aliasing, -fno-strict-aliasing)
|
||||
BIRD_CHECK_GCC_OPTION(bird_cv_c_option_fno_strict_overflow, -fno-strict-overflow)
|
||||
|
||||
CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wno-parentheses"
|
||||
CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -Wno-parentheses"
|
||||
BIRD_ADD_GCC_OPTION(bird_cv_c_option_wno_pointer_sign, -Wno-pointer-sign)
|
||||
BIRD_ADD_GCC_OPTION(bird_cv_c_option_wno_missing_init, -Wno-missing-field-initializers)
|
||||
BIRD_ADD_GCC_OPTION(bird_cv_c_option_fno_strict_aliasing, -fno-strict-aliasing)
|
||||
BIRD_ADD_GCC_OPTION(bird_cv_c_option_fno_strict_overflow, -fno-strict-overflow)
|
||||
fi
|
||||
|
11
doc/Makefile
11
doc/Makefile
@ -25,6 +25,9 @@ $(o)%.sgml: $(s)%.sgml $(objdir)/.dir-stamp
|
||||
$(o)%.html: $(o)%.sgml
|
||||
cd $(dir $@) && $(sgml2)html $(notdir $<)
|
||||
|
||||
$(o)%.tex: $(o)%.sgml
|
||||
cd $(dir $@) && $(sgml2)latex --output=tex $(notdir $<)
|
||||
|
||||
$(o)%.dvi: $(o)%.tex
|
||||
cd $(dir $@) && TEXINPUTS=$(TEXINPUTS):$(doc-srcdir)/tex latex $(notdir $<)
|
||||
cd $(dir $@) && TEXINPUTS=$(TEXINPUTS):$(doc-srcdir)/tex latex $(notdir $<)
|
||||
@ -32,11 +35,9 @@ $(o)%.dvi: $(o)%.tex
|
||||
$(o)%.ps: $(o)%.dvi
|
||||
dvips -D600 -ta4 -o $@ $<
|
||||
|
||||
$(o)%.pdf: $(o)%.ps
|
||||
ps2pdf $< $@
|
||||
|
||||
$(o)%.tex: $(o)%.sgml
|
||||
cd $(dir $@) && $(sgml2)latex --output=tex $(notdir $<)
|
||||
$(o)%.pdf: $(o)%.tex
|
||||
pdflatex -output-directory=$(dir $@) $<
|
||||
pdflatex -output-directory=$(dir $@) $<
|
||||
|
||||
$(o)%.txt: $(o)%.sgml
|
||||
cd $(dir $@) && $(sgml2)txt $(notdir $<)
|
||||
|
1179
doc/bird.sgml
1179
doc/bird.sgml
File diff suppressed because it is too large
Load Diff
144
doc/sbase/dist/birddoc/groff/mapping
vendored
144
doc/sbase/dist/birddoc/groff/mapping
vendored
@ -6,7 +6,7 @@
|
||||
% Based on qwertz replacement file by Tom Gordon
|
||||
% linuxdoc mods by mdw
|
||||
|
||||
% Groff dependencies are few. To port to another roff:
|
||||
% Groff dependencies are few. To port to another roff:
|
||||
% 1. Check and modify, if necessary, font changes. (e.g. In psroff the
|
||||
% same fonts have other names.)
|
||||
% 2. Check the code for including Encapsulated PostScript, generated
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
% Hacked by mdw
|
||||
".nr PI 3n\n"
|
||||
".ds CF \\\\n\%\n"
|
||||
".ds CF \\\\n\%\n"
|
||||
".ds CH \\&\n"
|
||||
".ds dR $\n" % dollar, to avoid EQN conflicts
|
||||
|
||||
% Start with no TOC
|
||||
".ds printtoc\n"
|
||||
|
||||
|
||||
% Footnote style
|
||||
".nr FF 1\n"
|
||||
|
||||
@ -51,16 +51,16 @@
|
||||
".nr HM 0i\n"
|
||||
".nr FM 0i\n"
|
||||
|
||||
% Turn off right-margin filling
|
||||
% Turn off right-margin filling
|
||||
".na\n"
|
||||
|
||||
|
||||
% h is 1 if first paragraph after heading
|
||||
|
||||
".nr h 0\n"
|
||||
".nr h 0\n"
|
||||
|
||||
% initialize heading level
|
||||
|
||||
".nr il 1\n"
|
||||
|
||||
".nr il 1\n"
|
||||
|
||||
% Number registers for list
|
||||
|
||||
@ -68,20 +68,20 @@
|
||||
".nr ll 0\n" % list level, stores current level
|
||||
".nr el 0\n" % current enumeration level
|
||||
|
||||
% Not all list levels are enumerations, as
|
||||
% Not all list levels are enumerations, as
|
||||
% itemizations can be embedded within enumerations
|
||||
% and vice versa
|
||||
|
||||
|
||||
% type of list level is in \n(t\n(ll, where
|
||||
% 0 : itemize, 1 : enumerate, 2: description
|
||||
|
||||
% enumerator for an enumeration level is in
|
||||
% \n(e\n(el -- i.e. \n(e1=2 means current item of
|
||||
% enumeration level 1 is 2
|
||||
|
||||
|
||||
% context-sensitive paragraph macro
|
||||
|
||||
% Bug: There's some problem using this to re-start paragraphs after the
|
||||
% Bug: There's some problem using this to re-start paragraphs after the
|
||||
% </verb> and </code>, so after verb and code I insert .LP. That's fine
|
||||
% except that is loses indentation when using verb or code inside of a list.
|
||||
|
||||
@ -95,21 +95,21 @@
|
||||
% for this enumeration level
|
||||
".if \\\\n(t\\\\n(ll=1 \\{.IP \\\\n+(e\\\\n(el.\\}\n"
|
||||
% if first par element of descrip, do nothing
|
||||
".\\}\n"
|
||||
".\\}\n"
|
||||
".el .sp \n" % subsequent par element of item
|
||||
".\\}\n"
|
||||
".el \\{\\\n" % not within list
|
||||
".ie \\\\nh=1 \\{\\\n" % first par after heading
|
||||
".LP\n"
|
||||
".ie \\\\nh=1 \\{\\\n" % first par after heading
|
||||
".LP\n"
|
||||
".nr h 0\n" % reset h flag
|
||||
".\\}\n"
|
||||
".\\}\n"
|
||||
".el .LP \n" % Changed from .PP, mdw
|
||||
".\\}\n"
|
||||
".nh\n"
|
||||
"..\n"
|
||||
"..\n"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
% for each level, a number register is created
|
||||
% to store its type and current item number, where
|
||||
% -1=bullet of an itemized list.
|
||||
@ -141,7 +141,7 @@
|
||||
% set initial level of headings, in register il
|
||||
|
||||
<article> + ".nr il 0" +
|
||||
</article> + ".if '\\*[printtoc]'true' .PX\n"
|
||||
</article> + ".if '\\*[printtoc]'true' .PX\n"
|
||||
|
||||
<report> + ".nr il 1" +
|
||||
</report> + ".bp\n"
|
||||
@ -153,23 +153,23 @@
|
||||
".bp\n"
|
||||
".TC" +
|
||||
|
||||
<notes>
|
||||
<notes>
|
||||
</notes>
|
||||
|
||||
<manpage> + ".nr il -1" +
|
||||
</manpage>
|
||||
</manpage>
|
||||
|
||||
<progdoc>
|
||||
</progdoc>
|
||||
|
||||
% Hacked up titlepag stuff to look more reasonable. Titles and author
|
||||
% names are now stored in strings, printed by the end of </titlepag>.
|
||||
% Wake up! This uses groff-like long string names. You must use groff
|
||||
% Wake up! This uses groff-like long string names. You must use groff
|
||||
% to format this.
|
||||
|
||||
<titlepag> + ".ds mdwtitle\n"
|
||||
".ds mdwsubtitle\n"
|
||||
".ds mdwdate\n"
|
||||
".ds mdwdate\n"
|
||||
".de printabstract\n"
|
||||
"..\n" +
|
||||
</titlepag> + "\\*[mdwtitle]\n"
|
||||
@ -181,10 +181,10 @@
|
||||
"\\*[mdwdate]\n"
|
||||
".br\n"
|
||||
".printabstract\n"
|
||||
".br\n"
|
||||
".br\n"
|
||||
|
||||
%<title> + ".TL" +
|
||||
%</title>
|
||||
%</title>
|
||||
|
||||
<title> + ".ds mdwtitle "
|
||||
</title> +
|
||||
@ -194,13 +194,13 @@
|
||||
% ".SM" +
|
||||
%</subtitle> + ".LG" +
|
||||
|
||||
<subtitle> + ".ds mdwsubtitle "
|
||||
<subtitle> + ".ds mdwsubtitle "
|
||||
</subtitle> +
|
||||
|
||||
<date> + ".ds mdwdate "
|
||||
<date> + ".ds mdwdate "
|
||||
</date> +
|
||||
|
||||
<abstract> + ".de printabstract\n"
|
||||
<abstract> + ".de printabstract\n"
|
||||
".LP\n"
|
||||
</abstract> + ".." +
|
||||
|
||||
@ -215,10 +215,10 @@
|
||||
<name> + ".br" +
|
||||
</name>
|
||||
|
||||
<and>
|
||||
<and>
|
||||
</and>
|
||||
|
||||
<thanks> "\\**\n"
|
||||
<thanks> "\\**\n"
|
||||
".FS" +
|
||||
</thanks> + ".FE" +
|
||||
|
||||
@ -229,11 +229,11 @@
|
||||
<newline> + ".br"
|
||||
</newline>
|
||||
|
||||
<label>
|
||||
</label>
|
||||
<label>
|
||||
</label>
|
||||
|
||||
<header>
|
||||
</header>
|
||||
<header>
|
||||
</header>
|
||||
|
||||
<lhead> + ".EH '"
|
||||
</lhead> "'''" +
|
||||
@ -263,13 +263,13 @@
|
||||
<toc>
|
||||
</toc>
|
||||
|
||||
<lof>
|
||||
<lof>
|
||||
</lof>
|
||||
|
||||
<lot>
|
||||
<lot>
|
||||
</lot>
|
||||
|
||||
<chapt> + ".bp\n"
|
||||
<chapt> + ".bp\n"
|
||||
".NH \\n(il " +
|
||||
</chapt>
|
||||
|
||||
@ -283,7 +283,7 @@
|
||||
</sect2>
|
||||
|
||||
<sect3> + ".NH 4+\\n(il" +
|
||||
</sect3>
|
||||
</sect3>
|
||||
|
||||
<sect4> + ".NH 5+\\n(il" +
|
||||
</sect4>
|
||||
@ -292,10 +292,10 @@
|
||||
</heading> + "\\*h\n"
|
||||
".XS \\n%\n"
|
||||
"\\*(SN \\*h\n"
|
||||
".XE\n"
|
||||
".XE\n"
|
||||
".nr h 1\n" % set heading flag to true
|
||||
|
||||
<p> + ".Pp" +
|
||||
<p> + ".Pp" +
|
||||
</p>
|
||||
|
||||
<itemize> + ".nr ll +1\n" % increment list level
|
||||
@ -309,9 +309,9 @@
|
||||
".af e\\n(el \\*(f\\n(el\n" % style of enumerator
|
||||
".if \\n(ll>1 .RS" +
|
||||
</enum> + ".if \\n(ll>1 .RE\n"
|
||||
".br\n"
|
||||
".br\n"
|
||||
".nr el -1\n" % decrement enumeration level
|
||||
".nr ll -1\n" % decrement list level
|
||||
".nr ll -1\n" % decrement list level
|
||||
|
||||
<descrip> + ".RS\n"
|
||||
".nr ll +1\n" % increment list level
|
||||
@ -324,7 +324,7 @@
|
||||
% If bi=1 then the paragraph is the first one of the item.
|
||||
|
||||
<item> + ".nr bi 1\n.Pp" +
|
||||
</item>
|
||||
</item>
|
||||
|
||||
<tag> + ".IP \"\\fB"
|
||||
</tag> "\\fR\"\n"
|
||||
@ -337,12 +337,12 @@
|
||||
</cf> ""
|
||||
|
||||
<cite> + ".\[\n[ID]\n.\]" +
|
||||
</cite>
|
||||
</cite>
|
||||
|
||||
<ncite> + ".\[\n[ID]\n.\]\n([NOTE])"
|
||||
</ncite>
|
||||
|
||||
<footnote> " (-- "
|
||||
<footnote> " (-- "
|
||||
</footnote> "--)" +
|
||||
|
||||
<sq> "\\*Q"
|
||||
@ -353,20 +353,20 @@
|
||||
</lq> + ".nr LL \\n(LL+\\n(PI\n"
|
||||
".RE" +
|
||||
|
||||
<em> "\\fI"
|
||||
</em> "\\fP"
|
||||
<em> "\\fI"
|
||||
</em> "\\fP"
|
||||
|
||||
<bf> "\\fB"
|
||||
</bf> "\\fR"
|
||||
<bf> "\\fB"
|
||||
</bf> "\\fR"
|
||||
|
||||
<it> "\\fI"
|
||||
</it> "\\fR"
|
||||
<it> "\\fI"
|
||||
</it> "\\fR"
|
||||
|
||||
<sf> "\\fR"
|
||||
</sf> "\\fR"
|
||||
<sf> "\\fR"
|
||||
</sf> "\\fR"
|
||||
|
||||
<sl> "\\fI"
|
||||
</sl> "\\fR"
|
||||
<sl> "\\fI"
|
||||
</sl> "\\fR"
|
||||
|
||||
% Changed by mdw
|
||||
<tt> "\\fC"
|
||||
@ -394,10 +394,10 @@
|
||||
<pageref> "??"
|
||||
</pageref>
|
||||
|
||||
<x>
|
||||
<x>
|
||||
</x>
|
||||
|
||||
<mc>
|
||||
<mc>
|
||||
</mc>
|
||||
|
||||
<biblio> + ".\[\n"
|
||||
@ -423,7 +423,7 @@
|
||||
% ".Pp" + % continue previous paragraph (changed mdw)
|
||||
".LP"
|
||||
|
||||
% tscreen added by mdw
|
||||
% tscreen added by mdw
|
||||
<tscreen> + ".br\n"
|
||||
".po 0.75i\n"
|
||||
".ll 6.0i\n"
|
||||
@ -487,8 +487,8 @@
|
||||
|
||||
% mathematics -- this nroff version needs work.
|
||||
|
||||
<f>
|
||||
</f>
|
||||
<f>
|
||||
</f>
|
||||
|
||||
<dm> + ".DS L" +
|
||||
</dm> + ".DE" +
|
||||
@ -496,8 +496,8 @@
|
||||
<eq> + ".DS L" +
|
||||
</eq> + ".DE" +
|
||||
|
||||
<fr>
|
||||
</fr>
|
||||
<fr>
|
||||
</fr>
|
||||
|
||||
<nu> "{"
|
||||
</nu> "} over "
|
||||
@ -505,7 +505,7 @@
|
||||
<de> "{"
|
||||
</de> "}"
|
||||
|
||||
<lim>
|
||||
<lim>
|
||||
</lim>
|
||||
|
||||
<op>
|
||||
@ -527,7 +527,7 @@
|
||||
</in>
|
||||
|
||||
<sum> " sum "
|
||||
</sum>
|
||||
</sum>
|
||||
|
||||
% limitation: eqn only does square roots!
|
||||
|
||||
@ -539,7 +539,7 @@
|
||||
"[ca]." +
|
||||
</ar> + ".TE" +
|
||||
|
||||
<arr> "\n"
|
||||
<arr> "\n"
|
||||
</arr>
|
||||
|
||||
<arc> "|"
|
||||
@ -567,8 +567,8 @@
|
||||
|
||||
% limitation: no calligraphic characters, using helvetica italics instead. Is there a better font?
|
||||
|
||||
<fi> "\\fI"
|
||||
</fi> "\\fP"
|
||||
<fi> "\\fI"
|
||||
</fi> "\\fP"
|
||||
|
||||
<phr> " roman }"
|
||||
</phr> "}"
|
||||
@ -584,12 +584,12 @@
|
||||
|
||||
<eps> + ".if t .PSPIC [file].ps\n"
|
||||
".if n .sp 4" +
|
||||
</eps>
|
||||
|
||||
</eps>
|
||||
|
||||
% Are TeX units properly handled by this translation of ph?
|
||||
|
||||
<ph> + ".sp [VSPACE]" +
|
||||
</ph>
|
||||
</ph>
|
||||
|
||||
<caption> + ".sp\n.ce" +
|
||||
</caption>
|
||||
@ -619,7 +619,7 @@
|
||||
<slides> + ".nr PS 18" +
|
||||
</slides>
|
||||
|
||||
<slide>
|
||||
<slide>
|
||||
</slide> + ".bp\n\\&" +
|
||||
|
||||
% letters -- replacement for email, using mh format.
|
||||
|
72
doc/sbase/dist/birddoc/html/mapping
vendored
72
doc/sbase/dist/birddoc/html/mapping
vendored
@ -21,7 +21,7 @@
|
||||
</notes> + "<@@enddoc>" +
|
||||
|
||||
% Manual Pages are expected to be formatted using nroff (or groff), unless
|
||||
% they are included as sections of other qwertz documents.
|
||||
% they are included as sections of other qwertz documents.
|
||||
|
||||
<manpage>
|
||||
</manpage>
|
||||
@ -35,7 +35,7 @@
|
||||
<title> + "<@@title>"
|
||||
</title>
|
||||
|
||||
<subtitle> + "<H2>"
|
||||
<subtitle> + "<H2>"
|
||||
</subtitle> "</H2>" +
|
||||
|
||||
<author>
|
||||
@ -48,26 +48,27 @@
|
||||
</and>
|
||||
|
||||
<thanks> + "Thanks "
|
||||
</thanks>
|
||||
</thanks>
|
||||
|
||||
<inst> + "<H3>"
|
||||
</inst> "</H3>" +
|
||||
|
||||
<newline> "<BR>"
|
||||
|
||||
|
||||
<label> + "<@@label>[ID]" +
|
||||
|
||||
<header>
|
||||
</header>
|
||||
</label>
|
||||
|
||||
<header>
|
||||
</header>
|
||||
|
||||
<lhead> + "<!-- "
|
||||
</lhead> " -->" +
|
||||
</lhead> " -->" +
|
||||
|
||||
<rhead> + "<!-- "
|
||||
</rhead> " -->" +
|
||||
|
||||
<comment> + "<H4>Comment</H4>" +
|
||||
</comment>
|
||||
</comment>
|
||||
|
||||
<abstract> + "<P><HR>\n<EM>"
|
||||
</abstract> "</EM>\n<HR>" +
|
||||
@ -99,7 +100,7 @@
|
||||
<sect3> + "<@@head>"
|
||||
</sect3>
|
||||
|
||||
<sect4> + "<@@head>"
|
||||
<sect4> + "<@@head>"
|
||||
</sect4>
|
||||
|
||||
<heading>
|
||||
@ -134,6 +135,9 @@
|
||||
<ncite> "[<I>[NOTE] ([ID])</I>]"
|
||||
</ncite>
|
||||
|
||||
<file> "<CODE>"
|
||||
</file> "</CODE>"
|
||||
|
||||
<footnote> + "<BLOCKQUOTE>"
|
||||
</footnote> "</BLOCKQUOTE>" +
|
||||
|
||||
@ -198,12 +202,14 @@
|
||||
"<@@endurl>" +
|
||||
</url>
|
||||
|
||||
<htmlurl> + "<@@url>[URL]\n"
|
||||
"[NAME]</A>\n"
|
||||
"<@@endurl>" +
|
||||
<htmlurl> "<A HREF=\"[URL]\">[NAME]</A>"
|
||||
</htmlurl>
|
||||
|
||||
% ref modified to have an optional name field
|
||||
<rfc> "<A HREF=\"http://www.rfc-editor.org/info/rfc[ID]\">RFC [ID]</A>"
|
||||
</rfc>
|
||||
|
||||
|
||||
% ref modified to have an optional name field
|
||||
<ref> + "<@@ref>[ID]\n"
|
||||
"[NAME]</A>\n"
|
||||
"<@@endref>" +
|
||||
@ -228,7 +234,7 @@
|
||||
</mc> "</MC>"
|
||||
|
||||
<biblio> + "<BIBLIO STYLE=\"[STYLE]\" FILES=\"[FILES]\">" +
|
||||
</biblio>
|
||||
</biblio>
|
||||
|
||||
<code> + "<HR>\n<PRE>" +
|
||||
</code> + "</PRE>\n<HR>" +
|
||||
@ -244,28 +250,28 @@
|
||||
|
||||
% theorems and such
|
||||
|
||||
<def> + "<DEF>"
|
||||
<def> + "<DEF>"
|
||||
</def> + "</DEF>" +
|
||||
|
||||
<prop> + "<PROP>"
|
||||
<prop> + "<PROP>"
|
||||
</prop> + "</PROP>" +
|
||||
|
||||
<lemma> + "<LEMMA>"
|
||||
<lemma> + "<LEMMA>"
|
||||
</lemma> + "</LEMMA>" +
|
||||
|
||||
<coroll> + "<COROLL>"
|
||||
<coroll> + "<COROLL>"
|
||||
</coroll> + "</COROLL>" +
|
||||
|
||||
<proof> + "<PROOF>"
|
||||
<proof> + "<PROOF>"
|
||||
</proof> + "</PROOF>" +
|
||||
|
||||
<theorem> + "<THEOREM>"
|
||||
<theorem> + "<THEOREM>"
|
||||
</theorem> + "</THEOREM>" +
|
||||
|
||||
<thtag> "<THTAG>"
|
||||
</thtag> "</THTAG>"
|
||||
|
||||
% mathematics
|
||||
% mathematics
|
||||
|
||||
<f>
|
||||
</f>
|
||||
@ -315,11 +321,11 @@
|
||||
<ar> "<AR>"
|
||||
</ar> "</AR>"
|
||||
|
||||
<arr> "<ARR>"
|
||||
</arr>
|
||||
<arr> "<ARR>"
|
||||
</arr>
|
||||
|
||||
<arc> "<ARC>"
|
||||
</arc>
|
||||
</arc>
|
||||
|
||||
<sup> "<SUP>"
|
||||
</sup> "</SUP>"
|
||||
@ -354,13 +360,13 @@
|
||||
</figure> + "</FIGURE>" +
|
||||
|
||||
<eps> + "<EPS FILE=\"[FILE]\">" +
|
||||
</eps>
|
||||
|
||||
</eps>
|
||||
|
||||
<img> + "<IMG SRC=\"[SRC]\">" +
|
||||
</img>
|
||||
|
||||
<ph> + "<PH VSPACE=\"[VSPACE]\">" +
|
||||
</ph>
|
||||
</ph>
|
||||
|
||||
<caption> + "<CAPTION>"
|
||||
</caption> "</CAPTION>" +
|
||||
@ -403,7 +409,7 @@
|
||||
</opening> "</OPENING>" +
|
||||
|
||||
|
||||
<from> + "<FROM>"
|
||||
<from> + "<FROM>"
|
||||
</from> + "</FROM>" +
|
||||
|
||||
|
||||
@ -419,7 +425,7 @@
|
||||
<email> + "<EMAIL>"
|
||||
</email> "</EMAIL>" +
|
||||
|
||||
<phone> + "<PHONE>"
|
||||
<phone> + "<PHONE>"
|
||||
</phone> "</PHONE>" +
|
||||
|
||||
|
||||
@ -430,16 +436,16 @@
|
||||
</subject> "</SUBJECT>" +
|
||||
|
||||
|
||||
<sref> + "<SREF>"
|
||||
<sref> + "<SREF>"
|
||||
</sref> "</SREF>" +
|
||||
|
||||
<rref> + "<RREF>"
|
||||
<rref> + "<RREF>"
|
||||
</rref> "</RREF>" +
|
||||
|
||||
<rdate> + "<RDATE>"
|
||||
</rdate> "</RDATE>" +
|
||||
|
||||
<closing> + "<CLOSING>"
|
||||
<closing> + "<CLOSING>"
|
||||
</closing> "</CLOSING>" +
|
||||
|
||||
<cc> + "<CC>"
|
||||
|
63
doc/sbase/dist/birddoc/latex2e/mapping
vendored
63
doc/sbase/dist/birddoc/latex2e/mapping
vendored
@ -2,7 +2,9 @@
|
||||
% birddoc to LaTeX replacement file
|
||||
|
||||
% The \relax is there to avoid sgml2latex rewriting the class
|
||||
<book> + "\\relax\\documentclass\[a4paper,10pt,openany\]{book}\n"
|
||||
<book> + "\\relax\\documentclass\[a4paper,10pt,openany,oneside\]{book}\n"
|
||||
"\\usepackage\[colorlinks=true,linkcolor=blue,pdftitle={BIRD User's Guide}\]{hyperref}\n"
|
||||
"\\usepackage{enumitem}\n"
|
||||
"\\usepackage{birddoc}\n"
|
||||
"\\usepackage{qwertz}\n"
|
||||
"\\usepackage{url}\n"
|
||||
@ -14,7 +16,7 @@
|
||||
</book> + "\\end{document}" +
|
||||
|
||||
% Manual Pages are expected to be formatted using nroff (or groff), unless
|
||||
% they are included as sections of other qwertz documents.
|
||||
% they are included as sections of other qwertz documents.
|
||||
|
||||
<manpage>
|
||||
</manpage>
|
||||
@ -26,17 +28,17 @@
|
||||
</titlepag> + "\n\n\\begin{document}\n"
|
||||
"\\maketitle\n" +
|
||||
|
||||
<title> + "\\title{"
|
||||
<title> + "\\title{"
|
||||
</title> "}" +
|
||||
|
||||
<subtitle> "\\\\\n"
|
||||
"{\\large "
|
||||
</subtitle> "}" +
|
||||
|
||||
<author> + "\\author{"
|
||||
<author> + "\\author{"
|
||||
</author> "}" +
|
||||
|
||||
<name>
|
||||
<name>
|
||||
</name>
|
||||
|
||||
<and> "\\and " +
|
||||
@ -51,14 +53,14 @@
|
||||
<date> + "\\date{"
|
||||
</date> "}" +
|
||||
|
||||
<newline> "\\\\ "
|
||||
<newline> "\\\\ "
|
||||
</newline>
|
||||
|
||||
<label> "\\label{[ID]}"
|
||||
</label>
|
||||
</label>
|
||||
|
||||
<header> + "\\markboth"
|
||||
</header>
|
||||
</header>
|
||||
|
||||
<lhead> "{"
|
||||
</lhead> "}"
|
||||
@ -73,7 +75,7 @@
|
||||
</comment> "}"
|
||||
|
||||
% Hacked by mdw to use linuxdoc-sgml \abstract{...}
|
||||
<abstract> + "\\abstract{"
|
||||
<abstract> + "\\abstract{"
|
||||
</abstract> "}" +
|
||||
|
||||
<appendix> + "\n \\appendix \n" +
|
||||
@ -101,15 +103,15 @@
|
||||
</sect2>
|
||||
|
||||
<sect3> + "\n\\paragraph"
|
||||
</sect3>
|
||||
</sect3>
|
||||
|
||||
<sect4> + "\n\\subparagraph"
|
||||
</sect4>
|
||||
|
||||
<heading> "{"
|
||||
</heading> "}\n\n"
|
||||
</heading> "}\n\n"
|
||||
|
||||
<p>
|
||||
<p> "\\phantomsection{}"
|
||||
</p> "\n\n"
|
||||
|
||||
<itemize> + "\\begin{itemize}" +
|
||||
@ -121,13 +123,13 @@
|
||||
<list> + "\\begin{list}{}{}\n" +
|
||||
</list> + "\\end{list}" +
|
||||
|
||||
<descrip> + "\\begin{description}" +
|
||||
<descrip> + "\\begin{description}\[style=unboxed\]" +
|
||||
</descrip> + "\\end{description}" +
|
||||
|
||||
<item> + "\\item "
|
||||
</item>
|
||||
|
||||
<tag> + "\\item\[{\\ttfamily "
|
||||
<tag> + "\\phantomsection\\item\[{\\ttfamily "
|
||||
</tag> "}\] \\hfil\\break\n" +
|
||||
|
||||
<tagp> + "\\item\[ "
|
||||
@ -154,7 +156,7 @@
|
||||
% The idea here is to automatically insert soft hyphens after every slash in
|
||||
% the filename, so long filenames will break naturally. The url{} macro is
|
||||
% a kluge but it works,
|
||||
<file> "\\url{"
|
||||
<file> "{\\tt "
|
||||
</file> "}"
|
||||
|
||||
<footnote> "\\footnote{"
|
||||
@ -223,29 +225,32 @@
|
||||
<cparam> "\\cparam{"
|
||||
</cparam> "}"
|
||||
|
||||
<ref> "\\ref{[ID]} {([NAME])}"
|
||||
<ref> "\\hyperref\[[ID]\]{[NAME]} (p.\\,\\getpagerefnumber{[ID]})"
|
||||
</ref>
|
||||
|
||||
<pageref> "\\pageref{[ID]}"
|
||||
</pageref>
|
||||
|
||||
%url added by HG
|
||||
<url> "\\nameurl{[URL]}{[NAME]}"
|
||||
<url> "\\href{[URL]}{[NAME]}"
|
||||
</url>
|
||||
|
||||
<htmlurl> "\\onlynameurl{[NAME]}"
|
||||
<htmlurl> "\\href{[URL]}{[NAME]}"
|
||||
</htmlurl>
|
||||
|
||||
<x>
|
||||
<rfc> "\\href{http://www.rfc-editor.org/info/rfc[ID]}{RFC [ID]}"
|
||||
</rfc>
|
||||
|
||||
<x>
|
||||
</x>
|
||||
|
||||
<mc>
|
||||
<mc>
|
||||
</mc>
|
||||
|
||||
<biblio> + "\\bibliographystyle{[STYLE]}\n"
|
||||
"\\bibliography{[FILES]}\n"
|
||||
"\\addbibtoc{}" +
|
||||
</biblio>
|
||||
</biblio>
|
||||
|
||||
% <macro> + "\\macro{[ID]}{\\qw[ID]}"
|
||||
% </macro>
|
||||
@ -300,19 +305,19 @@
|
||||
<thtag> "\["
|
||||
</thtag> "\]" +
|
||||
|
||||
% mathematics
|
||||
% mathematics
|
||||
|
||||
<f> "$"
|
||||
</f> "$"
|
||||
|
||||
<dm> + "\\\["
|
||||
<dm> + "\\\["
|
||||
</dm> "\\\]" +
|
||||
|
||||
<eq> + "\\begin{equation}" +
|
||||
</eq> + "\\end{equation}\n" +
|
||||
|
||||
<fr> "\\frac"
|
||||
</fr>
|
||||
</fr>
|
||||
|
||||
<nu> "{"
|
||||
</nu> "}"
|
||||
@ -320,7 +325,7 @@
|
||||
<de> "{"
|
||||
</de> "}"
|
||||
|
||||
<lim>
|
||||
<lim>
|
||||
</lim>
|
||||
|
||||
<op>
|
||||
@ -342,7 +347,7 @@
|
||||
</in>
|
||||
|
||||
<sum> "\\sum"
|
||||
</sum>
|
||||
</sum>
|
||||
|
||||
<root> "\\sqrt\[[n]\]{"
|
||||
</root> "}"
|
||||
@ -390,11 +395,11 @@
|
||||
</figure> + "\\end{figure}\n" +
|
||||
|
||||
<eps> + "\\centerline{\\epsfig{file=[FILE],height=[HEIGHT],angle=[ANGLE]}}" +
|
||||
</eps>
|
||||
|
||||
</eps>
|
||||
|
||||
|
||||
<ph> + "\\vspace{[VSPACE]}\n\\par" +
|
||||
</ph>
|
||||
</ph>
|
||||
|
||||
<caption> + "\\caption{"
|
||||
</caption> "}" +
|
||||
|
4
doc/sbase/dist/fmt_latex2e.pl
vendored
4
doc/sbase/dist/fmt_latex2e.pl
vendored
@ -284,11 +284,11 @@ $latex2e->{postASP} = sub
|
||||
# for nameurl
|
||||
if ( /\\nameurl/ )
|
||||
{
|
||||
($urlid, $urlnam) = ($_ =~ /\\nameurl{(.*)}{(.*)}/);
|
||||
($urlid, $urlnam) = ($_ =~ /\\nameurl\{(.*)\}\{(.*)\}/);
|
||||
print $urlnum . ": " . $urlid . "\n" if ( $global->{debug} );
|
||||
|
||||
$urldef = latex2e_defnam($urlnum) . "url";
|
||||
s/\\nameurl{.*}{.*}/{\\em $urlnam} {\\tt \\$urldef}/;
|
||||
s/\\nameurl\{.*\}\{.*\}/{\\em $urlnam} {\\tt \\$urldef}/;
|
||||
push @urlnames, $_;
|
||||
push @urldefines, "\\urldef{\\$urldef} \\url{$urlid}\n";
|
||||
$urlnum++;
|
||||
|
@ -1,6 +1,6 @@
|
||||
<!-- This is a DTD, but will be read as -*- sgml -*- -->
|
||||
<!-- ================================================= -->
|
||||
<!-- $Id$
|
||||
<!-- $Id$
|
||||
|
||||
This was heavilly modified for use with bird! Don't you dare to use it
|
||||
anywhere else. <pavel@ucw.cz>
|
||||
@ -79,7 +79,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
weren't in the original linuxdoc 1.3 DTD, and are
|
||||
superseded by the new if/unless facility. -->
|
||||
<!-- BK/97/05/09: this is the original Linuxdoc DTD,
|
||||
as of SGML Tools 0.99.0. It is not longer
|
||||
as of SGML Tools 0.99.0. It is not longer
|
||||
supported. Use only if in dire need, for backwards
|
||||
compabitlity. Backend support for undocumented
|
||||
QWERTZ leftovers not in the strict Linuxdoc DTD's
|
||||
@ -92,36 +92,36 @@ anywhere else. <pavel@ucw.cz>
|
||||
any changes to this, just replacing. -->
|
||||
<!-- ================================================= -->
|
||||
|
||||
<!entity % emph
|
||||
<!entity % emph
|
||||
" em|it|bf|sf|sl|tt|cf|m|cparam|const|func|struct|param|type|funcdef " >
|
||||
|
||||
<!entity % index "idx|cdx|nidx|ncdx" >
|
||||
|
||||
<!-- url added by HG; htmlurl added by esr -->
|
||||
<!entity % xref
|
||||
" label|ref|pageref|cite|url|htmlurl|ncite " >
|
||||
" label|ref|pageref|cite|url|htmlurl|rfc|ncite " >
|
||||
|
||||
<!entity % inline
|
||||
<!entity % inline
|
||||
" (#pcdata | f| x| %emph; |sq| %xref | %index | file )* " >
|
||||
|
||||
<!entity % list
|
||||
<!entity % list
|
||||
" list | itemize | enum | descrip " >
|
||||
|
||||
<!entity % par
|
||||
<!entity % par
|
||||
" %list; | comment | lq | quote | tscreen | hrule " >
|
||||
|
||||
<!entity % mathpar " dm | eq " >
|
||||
|
||||
<!entity % thrm
|
||||
<!entity % thrm
|
||||
" def | prop | lemma | coroll | proof | theorem " >
|
||||
|
||||
<!entity % litprog " code | verb " >
|
||||
|
||||
<!entity % sectpar
|
||||
" %par; | figure | tabular | table | %mathpar; |
|
||||
<!entity % sectpar
|
||||
" %par; | figure | tabular | table | %mathpar; |
|
||||
%thrm; | %litprog; | function ">
|
||||
<!element birddoc o o
|
||||
(sect | chapt | article | report |
|
||||
<!element birddoc o o
|
||||
(sect | chapt | article | report |
|
||||
book | letter | telefax | slides | notes | manpage ) >
|
||||
|
||||
<!-- `general' entity replaced with ISO entities - kwm -->
|
||||
@ -150,7 +150,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!element hrule - - EMPTY>
|
||||
|
||||
<!shortref pmap
|
||||
"&#RS;B" null
|
||||
"&#RS;B" null
|
||||
"&#RS;B&#RE;" psplit
|
||||
"&#RS;&#RE;" psplit
|
||||
-- '"' qtag --
|
||||
@ -189,7 +189,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!entity ftag '<f>' -- formula begin -- >
|
||||
<!entity qendtag '</sq>'>
|
||||
|
||||
<!shortref sqmap
|
||||
<!shortref sqmap
|
||||
"&#RS;B" null
|
||||
-- '"' qendtag --
|
||||
"[" lsqb
|
||||
@ -249,7 +249,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!shortref bodymap
|
||||
"&#RS;B&#RE;" ptag
|
||||
"&#RS;&#RE;" ptag
|
||||
'"' qtag
|
||||
'"' qtag
|
||||
"[" lsqb
|
||||
"~" nbsp
|
||||
"_" lowbar
|
||||
@ -285,7 +285,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
|
||||
<!shortref oneline
|
||||
"B&#RE;" space
|
||||
"&#RS;&#RE;" null
|
||||
"&#RS;&#RE;" null
|
||||
"&#RS;B&#RE;" null
|
||||
-- '"' qtag --
|
||||
"[" ftag
|
||||
@ -302,7 +302,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!usemap oneline caption>
|
||||
|
||||
<!entity % tabrow "(%inline, (colsep, %inline)*)" >
|
||||
<!element tabular - -
|
||||
<!element tabular - -
|
||||
(hline?, %tabrow, (rowsep, hline?, %tabrow)*, caption?) >
|
||||
|
||||
<!attlist tabular
|
||||
@ -323,7 +323,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
"B&#RE;" null
|
||||
"BB" space
|
||||
"@" rowsep
|
||||
"|" colsep
|
||||
"|" colsep
|
||||
"[" ftag
|
||||
-- '"' qtag --
|
||||
"_" thinsp
|
||||
@ -344,7 +344,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
|
||||
<!shortref ttmap -- also on one-line --
|
||||
"B&#RE;" space
|
||||
"&#RS;&#RE;" null
|
||||
"&#RS;&#RE;" null
|
||||
"&#RS;B&#RE;" null
|
||||
"&#RS;B" null
|
||||
'#' num
|
||||
@ -365,14 +365,14 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!entity % limits "pr|in|sum" >
|
||||
<!entity % fbu "fr|lim|ar|root" >
|
||||
<!entity % fph "unl|ovl|sup|inf" >
|
||||
<!entity % fbutxt "(%fbu;) | (%limits;) |
|
||||
<!entity % fbutxt "(%fbu;) | (%limits;) |
|
||||
(%fcstxt;)|(%fscs;)|(%fph;)" >
|
||||
<!entity % fphtxt "p|#pcdata" >
|
||||
<!element f - - ((%fbutxt;)*) >
|
||||
|
||||
<!entity fendtag '</f>' -- formula end -- >
|
||||
|
||||
<!shortref fmap
|
||||
<!shortref fmap
|
||||
"&#RS;B" null
|
||||
"&#RS;B&#RE;" null
|
||||
"&#RS;&#RE;" null
|
||||
@ -432,7 +432,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!shortref arrmap
|
||||
"&#RE;" space
|
||||
"@" arr
|
||||
"|" arc
|
||||
"|" arc
|
||||
"_" thinsp
|
||||
"~" nbsp
|
||||
"#" num
|
||||
@ -448,7 +448,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!element ovl - - ((%fbutxt;)*) >
|
||||
<!element rf - o (#pcdata) >
|
||||
<!element phr - o ((%fphtxt;)*) >
|
||||
<!element v - o ((%fcstxt;)*)
|
||||
<!element v - o ((%fcstxt;)*)
|
||||
-(tu|%limits;|%fbu;|%fph;) >
|
||||
<!element fi - o (#pcdata) >
|
||||
<!element tu - o empty >
|
||||
@ -468,7 +468,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
|
||||
<!shortref global
|
||||
"&#RS;B" null -- delete leading blanks --
|
||||
-- '"' qtag --
|
||||
-- '"' qtag --
|
||||
"[" ftag
|
||||
"~" nbsp
|
||||
"_" lowbar
|
||||
@ -485,22 +485,26 @@ anywhere else. <pavel@ucw.cz>
|
||||
|
||||
<!-- ref modified to have an optional name field HG -->
|
||||
<!element ref - o empty>
|
||||
<!attlist ref
|
||||
<!attlist ref
|
||||
id cdata #required
|
||||
name cdata "&refnam">
|
||||
|
||||
<!-- url entity added to have direct url references HG -->
|
||||
<!element url - o empty>
|
||||
<!attlist url
|
||||
<!attlist url
|
||||
url cdata #required
|
||||
name cdata "&urlnam" >
|
||||
|
||||
<!-- htmlurl entity added to have quieter url references esr -->
|
||||
<!element htmlurl - o empty>
|
||||
<!attlist htmlurl
|
||||
<!attlist htmlurl
|
||||
url cdata #required
|
||||
name cdata "&urlnam" >
|
||||
|
||||
<!element rfc - o empty>
|
||||
<!attlist rfc
|
||||
id cdata #required>
|
||||
|
||||
<!element pageref - o empty>
|
||||
<!attlist pageref
|
||||
id cdata #required>
|
||||
@ -510,22 +514,22 @@ anywhere else. <pavel@ucw.cz>
|
||||
|
||||
<!-- Hacked by mdw to exclude abstract; abstract now part of titlepag -->
|
||||
<!element article - -
|
||||
(titlepag, header?,
|
||||
toc?, lof?, lot?, p*, sect*,
|
||||
(titlepag, header?,
|
||||
toc?, lof?, lot?, p*, sect*,
|
||||
(appendix, sect+)?, biblio?) +(footnote)>
|
||||
|
||||
<!attlist article
|
||||
opts cdata "null">
|
||||
|
||||
<!-- Hacked by mdw to exclude abstract; abstract now part of titlepag -->
|
||||
<!element report - -
|
||||
<!element report - -
|
||||
(titlepag, header?, toc?, lof?, lot?, p*,
|
||||
chapt*, (appendix, chapt+)?, biblio?) +(footnote)>
|
||||
|
||||
<!attlist report
|
||||
opts cdata "null">
|
||||
<!element book - -
|
||||
(titlepag, header?, toc?, lof?, lot?, p*, chapt*,
|
||||
<!element book - -
|
||||
(titlepag, header?, toc?, lof?, lot?, p*, chapt*,
|
||||
(appendix, chapt+)?, biblio?) +(footnote) >
|
||||
|
||||
<!attlist book
|
||||
@ -536,7 +540,7 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!element title - o (%inline, subtitle?) +(newline)>
|
||||
<!element subtitle - o (%inline)>
|
||||
<!usemap oneline titlepag>
|
||||
<!element author - o (name, thanks?, inst?,
|
||||
<!element author - o (name, thanks?, inst?,
|
||||
(and, name, thanks?, inst?)*)>
|
||||
<!element name o o (%inline) +(newline)>
|
||||
<!element and - o empty>
|
||||
@ -545,9 +549,9 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!element date - o (#pcdata) >
|
||||
|
||||
<!usemap global thanks>
|
||||
|
||||
|
||||
<!element newline - o empty >
|
||||
<!entity nl "<newline>">
|
||||
<!entity nl "<newline>">
|
||||
|
||||
<!element progdoc - o empty>
|
||||
|
||||
@ -564,9 +568,9 @@ anywhere else. <pavel@ucw.cz>
|
||||
<!element rhead - o (%inline)>
|
||||
<!entity % sect "heading, header?, p* " >
|
||||
<!element heading o o (%inline)>
|
||||
<!element chapt - o (%sect, sect*) +(footnote)>
|
||||
<!element chapt - o (%sect, sect*) +(footnote)>
|
||||
<!element sect - o (%sect, sect1*) +(footnote)>
|
||||
<!element sect1 - o (%sect, sect2*)>
|
||||
<!element sect1 - o (%sect, sect2*) +(footnote)>
|
||||
<!element sect2 - o (%sect, sect3*)>
|
||||