[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/DocBook.pm (%docbook_misc_el
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/DocBook.pm (%docbook_misc_elements_with_arg_map) (%def_argument_types_docbook, _convert): add exdent role for @exdent, use simpara and center role for @center. Use emphasis role="arg" instead of replaceable for arg def argument type. The idea is that replaceable is not used such that replaceable is only used if @var{} is present which should be more in line with the examples in the Texinfo manual. |
|
Date: |
Thu, 17 Feb 2022 09:37:52 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new e53746e94e * tp/Texinfo/Convert/DocBook.pm
(%docbook_misc_elements_with_arg_map) (%def_argument_types_docbook, _convert):
add exdent role for @exdent, use simpara and center role for @center. Use
emphasis role="arg" instead of replaceable for arg def argument type. The idea
is that replaceable is not used such that replaceable is only used if @var{} is
present which should be more in line with the examples in the Texinfo manual.
e53746e94e is described below
commit e53746e94e0d2283669b2042c914361965bab750
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Feb 17 15:37:28 2022 +0100
* tp/Texinfo/Convert/DocBook.pm (%docbook_misc_elements_with_arg_map)
(%def_argument_types_docbook, _convert): add exdent role for @exdent,
use simpara and center role for @center.
Use emphasis role="arg" instead of replaceable for arg def argument
type. The idea is that replaceable is not used such that replaceable
is only used if @var{} is present which should be more in line with
the examples in the Texinfo manual.
* tp/Texinfo/Convert/DocBook.pm: reindent.
---
ChangeLog | 12 +
tp/Texinfo/Convert/DocBook.pm | 71 ++--
tp/t/results/converters_tests/complex_nestings.pl | 10 +-
tp/t/results/converters_tests/line_breaks.pl | 4 +-
.../converters_tests/test_deftypefnnewline.pl | 4 +-
tp/t/results/coverage/center.pl | 2 +-
tp/t/results/coverage/def.pl | 26 +-
tp/t/results/coverage/exdent_and_commands.pl | 8 +-
tp/t/results/coverage/exdent_and_formats.pl | 28 +-
.../coverage/punctuation_in_line_commands.pl | 4 +-
tp/t/results/coverage/titlefont_in_center.pl | 2 +-
tp/t/results/def/ampchar.pl | 2 +-
tp/t/results/languages/multiple.pl | 10 +-
tp/t/results/languages/multiple_in_preamble.pl | 6 +-
.../languages/multiple_in_preamble_before_node.pl | 4 +-
tp/t/results/misc_commands/empty_center.pl | 2 +-
tp/t/results/misc_commands/footnote_in_center.pl | 4 +-
tp/t/results/misc_commands/ref_in_center.pl | 6 +-
tp/t/results/preformatted/def_in_example.pl | 2 +-
.../res_parser/formatting_docbook/formatting.xml | 396 ++++++++++-----------
20 files changed, 309 insertions(+), 294 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6193fc29c1..307cdda4c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-02-17 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/DocBook.pm (%docbook_misc_elements_with_arg_map)
+ (%def_argument_types_docbook, _convert): add exdent role for @exdent,
+ use simpara and center role for @center.
+ Use emphasis role="arg" instead of replaceable for arg def argument
+ type. The idea is that replaceable is not used such that replaceable
+ is only used if @var{} is present which should be more in line with
+ the examples in the Texinfo manual.
+
+ * tp/Texinfo/Convert/DocBook.pm: reindent.
+
2022-02-16 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/DocBook.pm (%docbook_preformatted_formats):
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index ecf027c466..aaa87b0625 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -151,7 +151,7 @@ my %style_commands_formatting;
foreach my $command(@all_style_commands) {
$style_commands_formatting{$command} = {};
if ($style_attribute_commands{$command}) {
- $style_commands_formatting{$command}->{'attribute'}
+ $style_commands_formatting{$command}->{'attribute'}
= $style_attribute_commands{$command};
}
if ($quoted_style_commands{$command}) {
@@ -164,13 +164,13 @@ foreach my $command(@all_style_commands) {
my %docbook_misc_elements_with_arg_map = (
'settitle' => 'title',
- 'exdent' => 'simpara',
- 'center' => '',
+ 'exdent' => 'simpara role="exdent"',
+ 'center' => 'simpara role="center"',
);
my %docbook_misc_commands = %Texinfo::Common::misc_commands;
-foreach my $command ('item', 'headitem', 'itemx', 'tab',
+foreach my $command ('item', 'headitem', 'itemx', 'tab',
keys %Texinfo::Common::def_commands) {
delete $docbook_misc_commands{$command};
}
@@ -179,7 +179,7 @@ my %docbook_global_commands = (
'documentlanguage' => 1,
);
-my %default_args_code_style
+my %default_args_code_style
= %Texinfo::Convert::Converter::default_args_code_style;
my %regular_font_style_commands =
%Texinfo::Common::regular_font_style_commands;
@@ -198,7 +198,10 @@ my %defcommand_name_type = (
my %def_argument_types_docbook = (
'type' => ['returnvalue'],
'class' => ['ooclass', 'classname'],
- 'arg' => ['replaceable'],
+ # FIXME or a simple emphasis?
+ # replaceable is not used here, such that replaceable is only
+ # used if there is an explicit @var{}
+ 'arg' => ['emphasis role="arg"'],
'typearg' => ['type'],
);
@@ -617,8 +620,10 @@ sub _convert($$;$)
return '';
}
my $docbook_element;
+ my $attribute_text = '';
if (exists ($docbook_misc_elements_with_arg_map{$element->{'cmdname'}}))
{
- $docbook_element =
$docbook_misc_elements_with_arg_map{$element->{'cmdname'}};
+ ($docbook_element, $attribute_text)
+ =
_parse_attribute($docbook_misc_elements_with_arg_map{$element->{'cmdname'}});
}
my $type = $docbook_misc_commands{$element->{'cmdname'}};
if ($type eq 'text') {
@@ -651,7 +656,7 @@ sub _convert($$;$)
$section_element = $element;
}
if ($section_element) {
- my $attribute = '';
+ my $section_attribute = $attribute_text;
# FIXME it is not clear that a label should be set for
# @appendix* or @chapter/@*section as the formatter should be
# able to figure it out. For @unnumbered or if ! NUMBER_SECTIONS
@@ -667,21 +672,21 @@ sub _convert($$;$)
my $docbook_sectioning_element
= $self->_docbook_section_element($section_element);
if (! $docbook_special_unnumbered{$docbook_sectioning_element}) {
- $attribute = " label=\"$label\"";
+ $section_attribute .= " label=\"$label\"";
}
if ($section_element->{'extra'} and
$section_element->{'extra'}->{'associated_node'}) {
- $attribute
+ $section_attribute
.= "
id=\"$section_element->{'extra'}->{'associated_node'}->{'extra'}->{'normalized'}\"";
}
my $language = '';
if (defined($self->get_conf('documentlanguage'))) {
$language = $self->get_conf('documentlanguage');
if ($self->{'lang_stack'}->[-1] ne
$self->get_conf('documentlanguage')) {
- $attribute .= '
lang="'.$self->get_conf('documentlanguage').'"';
+ $section_attribute .= '
lang="'.$self->get_conf('documentlanguage').'"';
}
}
push @{$self->{'lang_stack'}}, $language;
- $result .= "<$docbook_sectioning_element${attribute}>\n";
+ $result .= "<$docbook_sectioning_element${section_attribute}>\n";
if ($section_element->{'args'} and
$section_element->{'args'}->[0]) {
my ($arg, $end_line) =
$self->_convert_argument_and_end_line($section_element);
$result .= "<title>$arg</title>$end_line";
@@ -704,14 +709,13 @@ sub _convert($$;$)
}
return '';
} else {
- my $attribute = '';
if (defined($docbook_element)) {
my ($arg, $end_line)
= $self->_convert_argument_and_end_line($element);
if ($docbook_element eq '') {
$result .= "$arg$end_line";
} else {
- $result .=
"<$docbook_element${attribute}>$arg</$docbook_element>$end_line";
+ $result .=
"<$docbook_element${attribute_text}>$arg</$docbook_element>$end_line";
}
chomp ($result);
$result .= "\n";
@@ -845,9 +849,9 @@ sub _convert($$;$)
Texinfo::Convert::Text::copy_options_for_convert_text($self)}));
}
my $node;
- if (defined($element->{'args'}->[0]) and
@{$element->{'args'}->[0]->{'contents'}}) {
- $node = {'contents'
- => $element->{'args'}->[0]->{'contents'}};
+ if (defined($element->{'args'}->[0])
+ and @{$element->{'args'}->[0]->{'contents'}}) {
+ $node = {'contents' => $element->{'args'}->[0]->{'contents'}};
}
if ($node and defined($filename)) {
return $self->_convert($self->gdt(
@@ -863,35 +867,33 @@ sub _convert($$;$)
"See Info file \@file{{myfile}}",
{ 'myfile' => {'type' => '_converted', 'text' =>
$filename}}));
}
- #my $name;
- #if (scalar(@{$element->{'args'}}) >= 2
- # and defined($element->{'args'}->[1]) and
@{$element->{'args'}->[1]->{'contents'}}) {
- # $name = $self->_convert({'contents'
- # => $element->{'args'}->[0]->{'contents'}});
- #}
} else {
my $book_contents;
if (scalar(@{$element->{'args'}}) == 5
- and defined($element->{'args'}->[-1]) and
@{$element->{'args'}->[-1]->{'contents'}}) {
+ and defined($element->{'args'}->[-1])
+ and @{$element->{'args'}->[-1]->{'contents'}}) {
$book_contents = $element->{'args'}->[-1]->{'contents'};
}
my $manual_file_contents;
if (scalar(@{$element->{'args'}}) >= 4
- and defined($element->{'args'}->[3]) and
@{$element->{'args'}->[3]->{'contents'}}) {
+ and defined($element->{'args'}->[3])
+ and @{$element->{'args'}->[3]->{'contents'}}) {
$manual_file_contents = $element->{'args'}->[3]->{'contents'};
}
my ($section_name_contents, $section_name);
- if (defined($element->{'args'}->[2]) and
@{$element->{'args'}->[2]->{'contents'}}) {
- $section_name_contents
- = $element->{'args'}->[2]->{'contents'};
+ if (defined($element->{'args'}->[2])
+ and @{$element->{'args'}->[2]->{'contents'}}) {
+ $section_name_contents = $element->{'args'}->[2]->{'contents'};
$section_name = $self->_convert(
{'contents' => $section_name_contents});
- } elsif (defined($element->{'args'}->[1]) and
@{$element->{'args'}->[1]->{'contents'}}) {
+ } elsif (defined($element->{'args'}->[1])
+ and @{$element->{'args'}->[1]->{'contents'}}) {
$section_name_contents
= $element->{'args'}->[1]->{'contents'};
$section_name = $self->_convert(
{'contents' => $section_name_contents});
- } elsif (defined($element->{'args'}->[0]) and
@{$element->{'args'}->[0]->{'contents'}}) {
+ } elsif (defined($element->{'args'}->[0])
+ and @{$element->{'args'}->[0]->{'contents'}}) {
$section_name_contents
= $element->{'args'}->[0]->{'contents'};
$section_name = $self->_convert(
@@ -906,7 +908,7 @@ sub _convert($$;$)
}
# Note: it would be nice to re-use $section_name instead of
# having 'gdt' convert $section_name_contents again, but
- # there isn't a good way to pass an already-converted string
+ # there isn't a good way to pass an already-converted string
# into 'gdt'.
}
@@ -955,7 +957,7 @@ sub _convert($$;$)
my $argument = "<link${linkend}>".$section_name."</link>";
if ($element->{'cmdname'} eq 'ref') {
return $self->_convert(
- $self->gdt('{title_ref}', {'title_ref' =>
+ $self->gdt('{title_ref}', {'title_ref' =>
{'type' => '_converted',
'text' => $argument}}));
} elsif ($element->{'cmdname'} eq 'xref') {
@@ -1359,9 +1361,10 @@ sub _convert($$;$)
warn "BUG: no def_argument_types_docbook for $type";
next;
}
- foreach my $element (reverse (
+ foreach my $element_attribute (reverse (
@{$def_argument_types_docbook{$type}})) {
- $content = "<$element>$content</$element>";
+ my ($element, $attribute_text) =
_parse_attribute($element_attribute);
+ $content = "<$element${attribute_text}>$content</$element>";
}
$result .= $content;
}
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index edfc089eab..5b313e5011 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1517,12 +1517,12 @@ explanation
$result_converted{'docbook'}->{'complex_nestings'} = '<anchor id="Top"/>
<screen>deffs
-</screen><synopsis><indexterm role="fn"><primary>my
def</primary></indexterm><phrase role="category"><emphasis
role="bold">Function</emphasis>:</phrase> <function>my def</function>
<replaceable>args</replaceable>
<replaceable><replaceable>arg</replaceable></replaceable>
<replaceable>…</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>other def</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>other def</function> <replaceable>no</replaceable>
<replaceable>args</replaceable></synopsis>
-<blockquote><synopsis><indexterm
role="fn"><primary>name</primary></indexterm><phrase role="category"><emphasis
role="bold">type</emphasis>:</phrase> <function>name</function>
<replaceable>and</replaceable> <replaceable>now</replaceable>
<replaceable>the</replaceable> <replaceable>args</replaceable></synopsis>
-<blockquote><synopsis><indexterm
role="vr"><primary>variables</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>variables</varname> <replaceable>variable-name</replaceable></synopsis>
+</screen><synopsis><indexterm role="fn"><primary>my
def</primary></indexterm><phrase role="category"><emphasis
role="bold">Function</emphasis>:</phrase> <function>my def</function> <emphasis
role="arg">args</emphasis> <emphasis
role="arg"><replaceable>arg</replaceable></emphasis> <emphasis
role="arg">…</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>other def</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>other def</function> <emphasis role="arg">no</emphasis> <emphasis
role="arg">args</emphasis></synopsis>
+<blockquote><synopsis><indexterm
role="fn"><primary>name</primary></indexterm><phrase role="category"><emphasis
role="bold">type</emphasis>:</phrase> <function>name</function> <emphasis
role="arg">and</emphasis> <emphasis role="arg">now</emphasis> <emphasis
role="arg">the</emphasis> <emphasis role="arg">args</emphasis></synopsis>
+<blockquote><synopsis><indexterm
role="vr"><primary>variables</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>variables</varname> <emphasis
role="arg">variable-name</emphasis></synopsis>
<screen>
-</screen><synopsis><indexterm role="vr"><primary>variables
too</primary></indexterm><phrase role="category"><emphasis
role="bold">Variable</emphasis>:</phrase> <varname>variables too</varname>
<replaceable>other-variable</replaceable></synopsis>
+</screen><synopsis><indexterm role="vr"><primary>variables
too</primary></indexterm><phrase role="category"><emphasis
role="bold">Variable</emphasis>:</phrase> <varname>variables too</varname>
<emphasis role="arg">other-variable</emphasis></synopsis>
<blockquote><screen>THis is the defvar
A table within the def
diff --git a/tp/t/results/converters_tests/line_breaks.pl
b/tp/t/results/converters_tests/line_breaks.pl
index 3fcbba206e..7c121c8b08 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -674,8 +674,8 @@ $result_converted{'docbook'}->{'line_breaks'} = '<para>a
document
<title>the manual
new version</title>
-in center
- line break
+<simpara role="center">in center
+ line break</simpara>
<variablelist><varlistentry><term><emphasis role="bold">with break
after</emphasis>
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 9490feb174..11dfb2971e 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3596,7 +3596,7 @@ $result_converted{'docbook'}->{'test_deftypefnnewline'} =
'
<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypecv_name</property></synopsis>
<blockquote><para>d–eftypecv
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<emphasis role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments
</para></blockquote>
<synopsis><indexterm role="fn"><primary>arg</primary></indexterm><phrase
role="category"><emphasis role="bold">fun</emphasis>:</phrase>
<function>arg</function></synopsis>
@@ -3618,7 +3618,7 @@ $result_converted{'docbook'}->{'test_deftypefnnewline'} =
'
<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue>
<property>d--eftypecv_name2</property></synopsis>
<blockquote><para>d–eftypecv2
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<replaceable>a--rguments2...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<emphasis role="arg">a--rguments2...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments2
</para></blockquote>
<synopsis><indexterm role="fn"><primary>arg2</primary></indexterm><phrase
role="category"><emphasis role="bold">fun2</emphasis>:</phrase>
<function>arg2</function></synopsis>
diff --git a/tp/t/results/coverage/center.pl b/tp/t/results/coverage/center.pl
index e160ef44dd..1ad6a701e2 100644
--- a/tp/t/results/coverage/center.pl
+++ b/tp/t/results/coverage/center.pl
@@ -124,7 +124,7 @@ $result_converted{'xml'}->{'center'} = '
$result_converted{'docbook'}->{'center'} = '
-in center <literal>in code</literal>
+<simpara role="center">in center <literal>in code</literal></simpara>
';
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index e50f5674f7..bab3ef764d 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -2528,28 +2528,28 @@ $result_converted{'xml'}->{'def'} = '
$result_converted{'docbook'}->{'def'} = '
-<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
-</replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable>
<replaceable>so</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <emphasis role="arg">ar--guments</emphasis>
<emphasis role="arg">more</emphasis> <emphasis role="arg">args</emphasis>
<emphasis role="arg">
+</emphasis> <emphasis role="arg">even</emphasis> <emphasis
role="arg">more</emphasis> <emphasis role="arg">so</emphasis></synopsis>
<blockquote><para>def–fn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <emphasis role="arg">truc</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<emphasis role="arg">truc</emphasis></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold"></emphasis>:</phrase>
<function>machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>bidule
machin</primary></indexterm><phrase role="category"><emphasis
role="bold"></emphasis>:</phrase> <function>bidule machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
-<synopsis><indexterm role="fn"><primary>after</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>after</function> <replaceable>a</replaceable>
<replaceable>deff</replaceable> <replaceable>item</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>after</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>after</function> <emphasis role="arg">a</emphasis> <emphasis
role="arg">deff</emphasis> <emphasis role="arg">item</emphasis></synopsis>
<!-- comment -->
-<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <replaceable>before</replaceable>
<replaceable>end</replaceable> <replaceable>deffn</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <emphasis role="arg">before</emphasis> <emphasis
role="arg">end</emphasis> <emphasis role="arg">deffn</emphasis></synopsis>
<blockquote><para>Various deff lines
</para></blockquote>';
diff --git a/tp/t/results/coverage/exdent_and_commands.pl
b/tp/t/results/coverage/exdent_and_commands.pl
index 2cc3319f3f..a75eb0faf8 100644
--- a/tp/t/results/coverage/exdent_and_commands.pl
+++ b/tp/t/results/coverage/exdent_and_commands.pl
@@ -483,16 +483,16 @@ $result_converted{'xml'}->{'exdent_and_commands'} =
'<quotation endspaces=" ">
$result_converted{'docbook'}->{'exdent_and_commands'} =
'<blockquote><para>quotation1
-</para><simpara>in exdented protected eol  </simpara>
+</para><simpara role="exdent">in exdented protected eol  </simpara>
<para>following
-</para><simpara>in exdented a @*
+</para><simpara role="exdent">in exdented a @*
and following</simpara>
<para>after exdented
</para></blockquote>
<screen>example
-</screen><simpara>in exdented protected eol  </simpara>
+</screen><simpara role="exdent">in exdented protected eol  </simpara>
<screen>following
-</screen><simpara>in exdented a @*
+</screen><simpara role="exdent">in exdented a @*
and following</simpara>
<screen>after exdented
</screen>';
diff --git a/tp/t/results/coverage/exdent_and_formats.pl
b/tp/t/results/coverage/exdent_and_formats.pl
index 9481a98a8d..92e3c0fc44 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -2072,13 +2072,13 @@ quotation2
$result_converted{'docbook'}->{'exdent_and_formats'} = '<screen> Example
Hoho. &tex; .
@.
-</screen><simpara>Other line</simpara>
+</screen><simpara role="exdent">Other line</simpara>
<screen>not exdented
</screen>
-<simpara>exdented and dash --- in example</simpara>
+<simpara role="exdent">exdented and dash --- in example</simpara>
<screen>Not exdented
-</screen><simpara>exdented</simpara>
+</screen><simpara role="exdent">exdented</simpara>
<screen>Not exdented
</screen>
<para>Para1.
@@ -2101,27 +2101,27 @@ quotation2
</para></blockquote>
<screen>Example Hoho.
</screen><screen>Nested Other line
-</screen><simpara>exdented nested other line</simpara>
+</screen><simpara role="exdent">exdented nested other line</simpara>
-<blockquote><simpara>exdented quotation line and dash — in
quotation</simpara>
+<blockquote><simpara role="exdent">exdented quotation line and dash —
in quotation</simpara>
</blockquote>
<blockquote><para>Not exdented followed by exdented
-</para><simpara>exdented quotation line</simpara>
+</para><simpara role="exdent">exdented quotation line</simpara>
</blockquote>
-<blockquote><simpara>exdented quotation line</simpara>
+<blockquote><simpara role="exdent">exdented quotation line</simpara>
<para>Followed by not exdented
</para></blockquote>
-<blockquote><simpara>exdented quotation line oidfjslsd aez a aze azaz aeae za
eaz az</simpara>
-<simpara>azeaz az az az az</simpara>
+<blockquote><simpara role="exdent">exdented quotation line oidfjslsd aez a aze
azaz aeae za eaz az</simpara>
+<simpara role="exdent">azeaz az az az az</simpara>
</blockquote>
-<blockquote><simpara>exdented quotation line oidfjslsd aez a aze azaz aeae za
eaz az azeaz end line</simpara>
-<simpara>az az az az</simpara>
+<blockquote><simpara role="exdent">exdented quotation line oidfjslsd aez a aze
azaz aeae za eaz az azeaz end line</simpara>
+<simpara role="exdent">az az az az</simpara>
</blockquote>
<blockquote><para>quotation line oidfjslsd aez a aze azaz aeae za eaz az zelef
aaa
-</para><simpara>ezkfjklezf</simpara>
+</para><simpara role="exdent">ezkfjklezf</simpara>
</blockquote>
-<blockquote><simpara>very loooooooooooooooooooooooooooooooooong exdented
quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line</simpara>
-<simpara>az az az az</simpara>
+<blockquote><simpara role="exdent">very loooooooooooooooooooooooooooooooooong
exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end
line</simpara>
+<simpara role="exdent">az az az az</simpara>
</blockquote>';
1;
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index cd4d98d20a..754ee4c554 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1292,7 +1292,7 @@
$result_converted{'docbook'}->{'punctuation_in_line_commands'} = '
<variablelist><varlistentry><term>item! After punc
</term></varlistentry></variablelist>
<blockquote><para><emphasis role="bold">quotation arg! After punc:</emphasis>
In quotation
-</para><simpara>exdent quotation! After punc</simpara>
+</para><simpara role="exdent">exdent quotation! After punc</simpara>
</blockquote>
<anchor id="float-label_0021-After-punc"/>
<para>In float
@@ -1309,7 +1309,7 @@
$result_converted{'docbook'}->{'punctuation_in_line_commands'} = '
titlefont! After punc
-center! After punc
+<simpara role="center">center! After punc</simpara>
<index role="cp"></index>
diff --git a/tp/t/results/coverage/titlefont_in_center.pl
b/tp/t/results/coverage/titlefont_in_center.pl
index 7582c38f25..29a9ac57ed 100644
--- a/tp/t/results/coverage/titlefont_in_center.pl
+++ b/tp/t/results/coverage/titlefont_in_center.pl
@@ -108,7 +108,7 @@ $result_converted{'xml'}->{'titlefont_in_center'} = '
$result_converted{'docbook'}->{'titlefont_in_center'} = '
-A manual
+<simpara role="center">A manual</simpara>
';
1;
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index 3d599ef321..0601892f29 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -415,7 +415,7 @@ $result_converted{'xml'}->{'ampchar'} = '<defop spaces=" "
endspaces=" "><defini
</para>';
-$result_converted{'docbook'}->{'ampchar'} = '<synopsis><indexterm
role="fn"><primary>b on a</primary></indexterm><phrase
role="category"><emphasis role="bold">Constructor</emphasis>:</phrase>
<ooclass><classname>a</classname></ooclass> <methodname>b</methodname>
(<replaceable>const std::vector<int>&</replaceable>)</synopsis>
+$result_converted{'docbook'}->{'ampchar'} = '<synopsis><indexterm
role="fn"><primary>b on a</primary></indexterm><phrase
role="category"><emphasis role="bold">Constructor</emphasis>:</phrase>
<ooclass><classname>a</classname></ooclass> <methodname>b</methodname>
(<emphasis role="arg">const std::vector<int>&</emphasis>)</synopsis>
<para>& & & { } @
</para>';
diff --git a/tp/t/results/languages/multiple.pl
b/tp/t/results/languages/multiple.pl
index b06a9de95d..06a12f9655 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -1311,23 +1311,23 @@ $result_converted{'xml'}->{'multiple'} =
'<documentlanguage xml:lang="fr" spaces
$result_converted{'docbook'}->{'multiple'} = '
-<bookinfo><legalnotice><synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<replaceable>b</replaceable></synopsis>
+<bookinfo><legalnotice><synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<emphasis role="arg">b</emphasis></synopsis>
<blockquote><para>erreur→
</para></blockquote></legalnotice></bookinfo>
<anchor id="Top"/>
-<synopsis><indexterm role="vr"><primary>BBB de fr</primary></indexterm><phrase
role="category"><emphasis role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>fr</classname></ooclass> <property>BBB</property>
<replaceable>CCC</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>BBB de fr</primary></indexterm><phrase
role="category"><emphasis role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>fr</classname></ooclass> <property>BBB</property> <emphasis
role="arg">CCC</emphasis></synopsis>
<blockquote><para>erreur→
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<replaceable>b</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<emphasis role="arg">b</emphasis></synopsis>
<blockquote><para>error→
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>BBB od hr</primary></indexterm><phrase
role="category"><emphasis role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>hr</classname></ooclass> <property>BBB</property>
<replaceable>CCC</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>BBB od hr</primary></indexterm><phrase
role="category"><emphasis role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>hr</classname></ooclass> <property>BBB</property> <emphasis
role="arg">CCC</emphasis></synopsis>
<blockquote><para>greška→
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<replaceable>b</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<emphasis role="arg">b</emphasis></synopsis>
<blockquote><para>greška→
</para></blockquote>
<index role="vr"></index>
diff --git a/tp/t/results/languages/multiple_in_preamble.pl
b/tp/t/results/languages/multiple_in_preamble.pl
index 509d97bd2a..3a2696fbac 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -1329,7 +1329,7 @@ $result_converted{'xml'}->{'multiple_in_preamble'} =
'<documentlanguage xml:lang
$result_converted{'docbook'}->{'multiple_in_preamble'} = '
-<bookinfo><legalnotice><synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<replaceable>b</replaceable></synopsis>
+<bookinfo><legalnotice><synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<emphasis role="arg">b</emphasis></synopsis>
<blockquote><para>erreur→
</para></blockquote></legalnotice></bookinfo>
@@ -1340,11 +1340,11 @@ $result_converted{'docbook'}->{'multiple_in_preamble'}
= '
<chapter label="1" id="chapter" lang="hr">
<title>chap</title>
-<synopsis><indexterm role="vr"><primary>BBB od hr</primary></indexterm><phrase
role="category"><emphasis role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>hr</classname></ooclass> <property>BBB</property>
<replaceable>CCC</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>BBB od hr</primary></indexterm><phrase
role="category"><emphasis role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>hr</classname></ooclass> <property>BBB</property> <emphasis
role="arg">CCC</emphasis></synopsis>
<blockquote><para>greška→
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>FFF von
de</primary></indexterm><phrase role="category"><emphasis role="bold">Instance
Variable</emphasis>:</phrase> <ooclass><classname>de</classname></ooclass>
<property>FFF</property> <replaceable>GGG</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>FFF von
de</primary></indexterm><phrase role="category"><emphasis role="bold">Instance
Variable</emphasis>:</phrase> <ooclass><classname>de</classname></ooclass>
<property>FFF</property> <emphasis role="arg">GGG</emphasis></synopsis>
</chapter>
';
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index 398efff1fd..40f59c1a9b 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -1149,7 +1149,7 @@
$result_converted{'xml'}->{'multiple_in_preamble_before_node'} = '<documentlangu
$result_converted{'docbook'}->{'multiple_in_preamble_before_node'} = '
-<bookinfo><legalnotice><synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<replaceable>b</replaceable></synopsis>
+<bookinfo><legalnotice><synopsis><indexterm role="vr"><primary>a de
copying</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>copying</classname></ooclass> <property>a</property>
<emphasis role="arg">b</emphasis></synopsis>
<blockquote><para>erreur→
</para></blockquote></legalnotice></bookinfo>
@@ -1163,7 +1163,7 @@
$result_converted{'docbook'}->{'multiple_in_preamble_before_node'} = '
<chapter label="1" id="chapter" lang="de">
<title>chap</title>
-<synopsis><indexterm role="vr"><primary>BBB von c</primary></indexterm><phrase
role="category"><emphasis role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>c</classname></ooclass> <property>BBB</property>
<replaceable>CCC</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>BBB von c</primary></indexterm><phrase
role="category"><emphasis role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>c</classname></ooclass> <property>BBB</property> <emphasis
role="arg">CCC</emphasis></synopsis>
<blockquote><para>error→
</para></blockquote></chapter>
';
diff --git a/tp/t/results/misc_commands/empty_center.pl
b/tp/t/results/misc_commands/empty_center.pl
index ee2bc7dcdf..30be51d927 100644
--- a/tp/t/results/misc_commands/empty_center.pl
+++ b/tp/t/results/misc_commands/empty_center.pl
@@ -73,7 +73,7 @@ $result_converted{'plaintext'}->{'empty_center'} = '';
$result_converted{'html_text'}->{'empty_center'} = '';
-$result_converted{'docbook'}->{'empty_center'} = '
+$result_converted{'docbook'}->{'empty_center'} = '<simpara
role="center"></simpara>
';
1;
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl
b/tp/t/results/misc_commands/footnote_in_center.pl
index 070a251649..130c724796 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -357,12 +357,12 @@ shows an important feature of the centered text.
';
-$result_converted{'docbook'}->{'footnote_in_center'} = 'Centered text with a
footnote<footnote><para>This footnote
+$result_converted{'docbook'}->{'footnote_in_center'} = '<simpara
role="center">Centered text with a footnote<footnote><para>This footnote
shows an important feature of the centered text.
</para>
<variablelist><varlistentry><term>item
</term><listitem><screen>line
-</screen></listitem></varlistentry></variablelist></footnote> and text after
the footnote.
+</screen></listitem></varlistentry></variablelist></footnote> and text after
the footnote.</simpara>
';
1;
diff --git a/tp/t/results/misc_commands/ref_in_center.pl
b/tp/t/results/misc_commands/ref_in_center.pl
index 285a57d7a7..e62a01ff38 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -306,10 +306,10 @@ $result_converted{'html_text'}->{'ref_in_center'} = '<h1
class="node" id="Top">T
$result_converted{'docbook'}->{'ref_in_center'} = '<anchor id="Top"/>
-<link linkend="Top">Top</link>
+<simpara role="center"><link linkend="Top">Top</link></simpara>
-<link>title
-</link>
+<simpara role="center"><link>title
+</link></simpara>
<para>very long
</para>';
diff --git a/tp/t/results/preformatted/def_in_example.pl
b/tp/t/results/preformatted/def_in_example.pl
index 58c08a56d5..a9ed427797 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -304,7 +304,7 @@ $result_converted{'html_text'}->{'def_in_example'} = '<div
class="example">
';
-$result_converted{'docbook'}->{'def_in_example'} = '<synopsis><indexterm
role="fn"><primary>name</primary></indexterm><phrase role="category"><emphasis
role="bold">Function</emphasis>:</phrase> <function>name</function>
<replaceable>arg</replaceable></synopsis>
+$result_converted{'docbook'}->{'def_in_example'} = '<synopsis><indexterm
role="fn"><primary>name</primary></indexterm><phrase role="category"><emphasis
role="bold">Function</emphasis>:</phrase> <function>name</function> <emphasis
role="arg">arg</emphasis></synopsis>
<blockquote><screen>in defun
</screen></blockquote>';
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index 426493ad51..09bdd390a5 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -403,21 +403,21 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<informalequation><mathphrase>disp--laymath
f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu
\over \sigma}\right)^2</superscript>
</mathphrase></informalequation>
-<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
-</replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable>
<replaceable>so</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <emphasis role="arg">ar--guments</emphasis>
<emphasis role="arg">more</emphasis> <emphasis role="arg">args</emphasis>
<emphasis role="arg">
+</emphasis> <emphasis role="arg">even</emphasis> <emphasis
role="arg">more</emphasis> <emphasis role="arg">so</emphasis></synopsis>
<blockquote><para>def–fn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
<indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <emphasis role="arg">truc</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<emphasis role="arg">truc</emphasis></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
@@ -427,22 +427,22 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="fn"><primary>bidule
machin</primary></indexterm><phrase role="category"><emphasis
role="bold"></emphasis>:</phrase> <function>bidule machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <replaceable>b</replaceable>
<replaceable>c</replaceable> <replaceable>d</replaceable>
<replaceable>e</replaceable> <replaceable><emphasis role="bold">f
g</emphasis></replaceable> <replaceable>h i</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <replaceable>before</replaceable>
<replaceable>end</replaceable> <replaceable>deffn</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <emphasis role="arg">b</emphasis> <emphasis
role="arg">c</emphasis> <emphasis role="arg">d</emphasis> <emphasis
role="arg">e</emphasis> <emphasis role="arg"><emphasis role="bold">f
g</emphasis></emphasis> <emphasis role="arg">h i</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <emphasis role="arg">before</emphasis> <emphasis
role="arg">end</emphasis> <emphasis role="arg">deffn</emphasis></synopsis>
<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function></synopsis>
-<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <replaceable>with</replaceable>
<replaceable>deffnx</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <emphasis role="arg">with</emphasis> <emphasis
role="arg">deffnx</emphasis></synopsis>
<!-- comment between deffn and deffnx -->
<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffnx</function></synopsis>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
<blockquote><!-- comment -->
<para>text in def item for second def item
</para></blockquote>
@@ -451,7 +451,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over
2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efvr_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<varname>d--efvr_name</varname></synopsis>
<blockquote><para>d–efvr
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function></synopsis>
@@ -475,16 +475,16 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property></synopsis>
<blockquote><para>d–efcv
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efcv with arguments
</para></blockquote>
<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypecv_name</property></synopsis>
<blockquote><para>d–eftypecv
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<emphasis role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efop
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname></synopsis>
@@ -493,19 +493,19 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="tp"><primary>d--eftp_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
<blockquote><para>d–eftp
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efun
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmac
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efspec
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname></synopsis>
<blockquote><para>d–efvar
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <replaceable>arg--var</replaceable>
<replaceable>arg--var1</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <emphasis role="arg">arg--var</emphasis>
<emphasis role="arg">arg--var1</emphasis></synopsis>
<blockquote><para>d–efvar with args
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efopt_name</primary></indexterm><phrase
role="category"><emphasis role="bold">User Option</emphasis>:</phrase>
<varname>d--efopt_name</varname></synopsis>
@@ -523,7 +523,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over
2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypeivar_name</property></synopsis>
<blockquote><para>d–eftypeivar
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmethod
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname>
<type>a--rguments...</type></synopsis>
@@ -545,7 +545,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over
2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue>
<property>d--eftypecv_name2</property></synopsis>
<blockquote><para>d–eftypecv2
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<replaceable>a--rguments2...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<emphasis role="arg">a--rguments2...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments2
</para></blockquote>
<synopsis><indexterm role="fn"><primary>arg2</primary></indexterm><phrase
role="category"><emphasis role="bold">fun2</emphasis>:</phrase>
<function>arg2</function></synopsis>
@@ -651,7 +651,7 @@ more text
<para>f–lushright
more text
</para>
-ce–ntered line
+<simpara role="center">ce–ntered line</simpara>
<para>r–raggedright
more text
@@ -770,14 +770,14 @@ aaa</literallayout></textobject></inlinemediaobject>
</para></listitem></varlistentry></variablelist>
<!-- deffnx after deff lines -->
<synopsis><phrase role="category"><emphasis
role="bold">fun</emphasis>:</phrase></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>and after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">and after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<para>Various deff lines
-</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function>
<replaceable>a</replaceable> <replaceable>deff</replaceable>
<replaceable>item</replaceable></synopsis>
+</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">deff</emphasis> <emphasis
role="arg">item</emphasis></synopsis>
<!-- node is non existent, or missing first arg -->
<para><literal>@ref{node}</literal> <link linkend="node">node</link>
@@ -1214,21 +1214,21 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<informalequation><mathphrase>disp--laymath
f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu
\over \sigma}\right)^2</superscript>
</mathphrase></informalequation>
-<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
-</replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable>
<replaceable>so</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <emphasis role="arg">ar--guments</emphasis>
<emphasis role="arg">more</emphasis> <emphasis role="arg">args</emphasis>
<emphasis role="arg">
+</emphasis> <emphasis role="arg">even</emphasis> <emphasis
role="arg">more</emphasis> <emphasis role="arg">so</emphasis></synopsis>
<blockquote><para>def–fn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
<indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <emphasis role="arg">truc</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<emphasis role="arg">truc</emphasis></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
@@ -1238,22 +1238,22 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="fn"><primary>bidule
machin</primary></indexterm><phrase role="category"><emphasis
role="bold"></emphasis>:</phrase> <function>bidule machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <replaceable>b</replaceable>
<replaceable>c</replaceable> <replaceable>d</replaceable>
<replaceable>e</replaceable> <replaceable><emphasis role="bold">f
g</emphasis></replaceable> <replaceable>h i</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <replaceable>before</replaceable>
<replaceable>end</replaceable> <replaceable>deffn</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <emphasis role="arg">b</emphasis> <emphasis
role="arg">c</emphasis> <emphasis role="arg">d</emphasis> <emphasis
role="arg">e</emphasis> <emphasis role="arg"><emphasis role="bold">f
g</emphasis></emphasis> <emphasis role="arg">h i</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <emphasis role="arg">before</emphasis> <emphasis
role="arg">end</emphasis> <emphasis role="arg">deffn</emphasis></synopsis>
<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function></synopsis>
-<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <replaceable>with</replaceable>
<replaceable>deffnx</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <emphasis role="arg">with</emphasis> <emphasis
role="arg">deffnx</emphasis></synopsis>
<!-- comment between deffn and deffnx -->
<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffnx</function></synopsis>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
<blockquote><!-- comment -->
<para>text in def item for second def item
</para></blockquote>
@@ -1262,7 +1262,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efvr_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<varname>d--efvr_name</varname></synopsis>
<blockquote><para>d–efvr
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function></synopsis>
@@ -1286,16 +1286,16 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property></synopsis>
<blockquote><para>d–efcv
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efcv with arguments
</para></blockquote>
<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypecv_name</property></synopsis>
<blockquote><para>d–eftypecv
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<emphasis role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efop
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname></synopsis>
@@ -1304,19 +1304,19 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="tp"><primary>d--eftp_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
<blockquote><para>d–eftp
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efun
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmac
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efspec
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname></synopsis>
<blockquote><para>d–efvar
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <replaceable>arg--var</replaceable>
<replaceable>arg--var1</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <emphasis role="arg">arg--var</emphasis>
<emphasis role="arg">arg--var1</emphasis></synopsis>
<blockquote><para>d–efvar with args
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efopt_name</primary></indexterm><phrase
role="category"><emphasis role="bold">User Option</emphasis>:</phrase>
<varname>d--efopt_name</varname></synopsis>
@@ -1334,7 +1334,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypeivar_name</property></synopsis>
<blockquote><para>d–eftypeivar
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmethod
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname>
<type>a--rguments...</type></synopsis>
@@ -1356,7 +1356,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue>
<property>d--eftypecv_name2</property></synopsis>
<blockquote><para>d–eftypecv2
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<replaceable>a--rguments2...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<emphasis role="arg">a--rguments2...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments2
</para></blockquote>
<synopsis><indexterm role="fn"><primary>arg2</primary></indexterm><phrase
role="category"><emphasis role="bold">fun2</emphasis>:</phrase>
<function>arg2</function></synopsis>
@@ -1462,7 +1462,7 @@ more text
<para>f–lushright
more text
</para>
-ce–ntered line
+<simpara role="center">ce–ntered line</simpara>
<para>r–raggedright
more text
@@ -1581,14 +1581,14 @@ aaa</literallayout></textobject></inlinemediaobject>
</para></listitem></varlistentry></variablelist>
<!-- deffnx after deff lines -->
<synopsis><phrase role="category"><emphasis
role="bold">fun</emphasis>:</phrase></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>and after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">and after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<para>Various deff lines
-</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function>
<replaceable>a</replaceable> <replaceable>deff</replaceable>
<replaceable>item</replaceable></synopsis>
+</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">deff</emphasis> <emphasis
role="arg">item</emphasis></synopsis>
<!-- node is non existent, or missing first arg -->
<para><literal>@ref{node}</literal> <link linkend="node">node</link>
@@ -2026,21 +2026,21 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<informalequation><mathphrase>disp--laymath
f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu
\over \sigma}\right)^2</superscript>
</mathphrase></informalequation>
-<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
-</replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable>
<replaceable>so</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <emphasis role="arg">ar--guments</emphasis>
<emphasis role="arg">more</emphasis> <emphasis role="arg">args</emphasis>
<emphasis role="arg">
+</emphasis> <emphasis role="arg">even</emphasis> <emphasis
role="arg">more</emphasis> <emphasis role="arg">so</emphasis></synopsis>
<blockquote><para>def–fn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
<indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <emphasis role="arg">truc</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<emphasis role="arg">truc</emphasis></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
@@ -2050,22 +2050,22 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="fn"><primary>bidule
machin</primary></indexterm><phrase role="category"><emphasis
role="bold"></emphasis>:</phrase> <function>bidule machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <replaceable>b</replaceable>
<replaceable>c</replaceable> <replaceable>d</replaceable>
<replaceable>e</replaceable> <replaceable><emphasis role="bold">f
g</emphasis></replaceable> <replaceable>h i</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <replaceable>before</replaceable>
<replaceable>end</replaceable> <replaceable>deffn</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <emphasis role="arg">b</emphasis> <emphasis
role="arg">c</emphasis> <emphasis role="arg">d</emphasis> <emphasis
role="arg">e</emphasis> <emphasis role="arg"><emphasis role="bold">f
g</emphasis></emphasis> <emphasis role="arg">h i</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <emphasis role="arg">before</emphasis> <emphasis
role="arg">end</emphasis> <emphasis role="arg">deffn</emphasis></synopsis>
<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function></synopsis>
-<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <replaceable>with</replaceable>
<replaceable>deffnx</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <emphasis role="arg">with</emphasis> <emphasis
role="arg">deffnx</emphasis></synopsis>
<!-- comment between deffn and deffnx -->
<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffnx</function></synopsis>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
<blockquote><!-- comment -->
<para>text in def item for second def item
</para></blockquote>
@@ -2074,7 +2074,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efvr_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<varname>d--efvr_name</varname></synopsis>
<blockquote><para>d–efvr
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function></synopsis>
@@ -2098,16 +2098,16 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property></synopsis>
<blockquote><para>d–efcv
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efcv with arguments
</para></blockquote>
<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypecv_name</property></synopsis>
<blockquote><para>d–eftypecv
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<emphasis role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efop
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname></synopsis>
@@ -2116,19 +2116,19 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="tp"><primary>d--eftp_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
<blockquote><para>d–eftp
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efun
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmac
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efspec
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname></synopsis>
<blockquote><para>d–efvar
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <replaceable>arg--var</replaceable>
<replaceable>arg--var1</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <emphasis role="arg">arg--var</emphasis>
<emphasis role="arg">arg--var1</emphasis></synopsis>
<blockquote><para>d–efvar with args
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efopt_name</primary></indexterm><phrase
role="category"><emphasis role="bold">User Option</emphasis>:</phrase>
<varname>d--efopt_name</varname></synopsis>
@@ -2146,7 +2146,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypeivar_name</property></synopsis>
<blockquote><para>d–eftypeivar
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmethod
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname>
<type>a--rguments...</type></synopsis>
@@ -2168,7 +2168,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue>
<property>d--eftypecv_name2</property></synopsis>
<blockquote><para>d–eftypecv2
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<replaceable>a--rguments2...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<emphasis role="arg">a--rguments2...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments2
</para></blockquote>
<synopsis><indexterm role="fn"><primary>arg2</primary></indexterm><phrase
role="category"><emphasis role="bold">fun2</emphasis>:</phrase>
<function>arg2</function></synopsis>
@@ -2274,7 +2274,7 @@ more text
<para>f–lushright
more text
</para>
-ce–ntered line
+<simpara role="center">ce–ntered line</simpara>
<para>r–raggedright
more text
@@ -2393,14 +2393,14 @@ aaa</literallayout></textobject></inlinemediaobject>
</para></listitem></varlistentry></variablelist>
<!-- deffnx after deff lines -->
<synopsis><phrase role="category"><emphasis
role="bold">fun</emphasis>:</phrase></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>and after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">and after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<para>Various deff lines
-</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function>
<replaceable>a</replaceable> <replaceable>deff</replaceable>
<replaceable>item</replaceable></synopsis>
+</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">deff</emphasis> <emphasis
role="arg">item</emphasis></synopsis>
<!-- node is non existent, or missing first arg -->
<para><literal>@ref{node}</literal> <link linkend="node">node</link>
@@ -2856,21 +2856,21 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<informalequation><mathphrase>disp--laymath
f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu
\over \sigma}\right)^2</superscript>
</mathphrase></informalequation>
-<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
-</replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable>
<replaceable>so</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <emphasis role="arg">ar--guments</emphasis>
<emphasis role="arg">more</emphasis> <emphasis role="arg">args</emphasis>
<emphasis role="arg">
+</emphasis> <emphasis role="arg">even</emphasis> <emphasis
role="arg">more</emphasis> <emphasis role="arg">so</emphasis></synopsis>
<blockquote><para>def–fn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
<indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <emphasis role="arg">truc</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<emphasis role="arg">truc</emphasis></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
@@ -2880,22 +2880,22 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="fn"><primary>bidule
machin</primary></indexterm><phrase role="category"><emphasis
role="bold"></emphasis>:</phrase> <function>bidule machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <replaceable>b</replaceable>
<replaceable>c</replaceable> <replaceable>d</replaceable>
<replaceable>e</replaceable> <replaceable><emphasis role="bold">f
g</emphasis></replaceable> <replaceable>h i</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <replaceable>before</replaceable>
<replaceable>end</replaceable> <replaceable>deffn</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <emphasis role="arg">b</emphasis> <emphasis
role="arg">c</emphasis> <emphasis role="arg">d</emphasis> <emphasis
role="arg">e</emphasis> <emphasis role="arg"><emphasis role="bold">f
g</emphasis></emphasis> <emphasis role="arg">h i</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <emphasis role="arg">before</emphasis> <emphasis
role="arg">end</emphasis> <emphasis role="arg">deffn</emphasis></synopsis>
<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function></synopsis>
-<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <replaceable>with</replaceable>
<replaceable>deffnx</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <emphasis role="arg">with</emphasis> <emphasis
role="arg">deffnx</emphasis></synopsis>
<!-- comment between deffn and deffnx -->
<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffnx</function></synopsis>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
<blockquote><!-- comment -->
<para>text in def item for second def item
</para></blockquote>
@@ -2904,7 +2904,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efvr_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<varname>d--efvr_name</varname></synopsis>
<blockquote><para>d–efvr
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function></synopsis>
@@ -2928,16 +2928,16 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property></synopsis>
<blockquote><para>d–efcv
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efcv with arguments
</para></blockquote>
<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypecv_name</property></synopsis>
<blockquote><para>d–eftypecv
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<emphasis role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efop
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname></synopsis>
@@ -2946,19 +2946,19 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="tp"><primary>d--eftp_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
<blockquote><para>d–eftp
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efun
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmac
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efspec
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname></synopsis>
<blockquote><para>d–efvar
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <replaceable>arg--var</replaceable>
<replaceable>arg--var1</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <emphasis role="arg">arg--var</emphasis>
<emphasis role="arg">arg--var1</emphasis></synopsis>
<blockquote><para>d–efvar with args
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efopt_name</primary></indexterm><phrase
role="category"><emphasis role="bold">User Option</emphasis>:</phrase>
<varname>d--efopt_name</varname></synopsis>
@@ -2976,7 +2976,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypeivar_name</property></synopsis>
<blockquote><para>d–eftypeivar
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmethod
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname>
<type>a--rguments...</type></synopsis>
@@ -2998,7 +2998,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue>
<property>d--eftypecv_name2</property></synopsis>
<blockquote><para>d–eftypecv2
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<replaceable>a--rguments2...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<emphasis role="arg">a--rguments2...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments2
</para></blockquote>
<synopsis><indexterm role="fn"><primary>arg2</primary></indexterm><phrase
role="category"><emphasis role="bold">fun2</emphasis>:</phrase>
<function>arg2</function></synopsis>
@@ -3104,7 +3104,7 @@ more text
<para>f–lushright
more text
</para>
-ce–ntered line
+<simpara role="center">ce–ntered line</simpara>
<para>r–raggedright
more text
@@ -3223,14 +3223,14 @@ aaa</literallayout></textobject></inlinemediaobject>
</para></listitem></varlistentry></variablelist>
<!-- deffnx after deff lines -->
<synopsis><phrase role="category"><emphasis
role="bold">fun</emphasis>:</phrase></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>and after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">and after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<para>Various deff lines
-</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function>
<replaceable>a</replaceable> <replaceable>deff</replaceable>
<replaceable>item</replaceable></synopsis>
+</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">deff</emphasis> <emphasis
role="arg">item</emphasis></synopsis>
<!-- node is non existent, or missing first arg -->
<para><literal>@ref{node}</literal> <link linkend="node">node</link>
@@ -3667,21 +3667,21 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<informalequation><mathphrase>disp--laymath
f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu
\over \sigma}\right)^2</superscript>
</mathphrase></informalequation>
-<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
-</replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable>
<replaceable>so</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <emphasis role="arg">ar--guments</emphasis>
<emphasis role="arg">more</emphasis> <emphasis role="arg">args</emphasis>
<emphasis role="arg">
+</emphasis> <emphasis role="arg">even</emphasis> <emphasis
role="arg">more</emphasis> <emphasis role="arg">so</emphasis></synopsis>
<blockquote><para>def–fn
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
<indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <emphasis role="arg">truc</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<emphasis role="arg">truc</emphasis></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
@@ -3691,22 +3691,22 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="fn"><primary>bidule
machin</primary></indexterm><phrase role="category"><emphasis
role="bold"></emphasis>:</phrase> <function>bidule machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <replaceable>b</replaceable>
<replaceable>c</replaceable> <replaceable>d</replaceable>
<replaceable>e</replaceable> <replaceable><emphasis role="bold">f
g</emphasis></replaceable> <replaceable>h i</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <replaceable>before</replaceable>
<replaceable>end</replaceable> <replaceable>deffn</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <emphasis role="arg">b</emphasis> <emphasis
role="arg">c</emphasis> <emphasis role="arg">d</emphasis> <emphasis
role="arg">e</emphasis> <emphasis role="arg"><emphasis role="bold">f
g</emphasis></emphasis> <emphasis role="arg">h i</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <emphasis role="arg">before</emphasis> <emphasis
role="arg">end</emphasis> <emphasis role="arg">deffn</emphasis></synopsis>
<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function></synopsis>
-<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <replaceable>with</replaceable>
<replaceable>deffnx</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>deffn</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffn</function> <emphasis role="arg">with</emphasis> <emphasis
role="arg">deffnx</emphasis></synopsis>
<!-- comment between deffn and deffnx -->
<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffnx</function></synopsis>
-<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
<blockquote><!-- comment -->
<para>text in def item for second def item
</para></blockquote>
@@ -3715,7 +3715,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efvr_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<varname>d--efvr_name</varname></synopsis>
<blockquote><para>d–efvr
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–effn
</para></blockquote>
<synopsis><indexterm role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function></synopsis>
@@ -3739,16 +3739,16 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property></synopsis>
<blockquote><para>d–efcv
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efcv with arguments
</para></blockquote>
<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypecv_name</property></synopsis>
<blockquote><para>d–eftypecv
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<emphasis role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efop
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname></synopsis>
@@ -3757,19 +3757,19 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm
role="tp"><primary>d--eftp_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
<blockquote><para>d–eftp
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efun
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmac
</para></blockquote>
-<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efspec
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname></synopsis>
<blockquote><para>d–efvar
</para></blockquote>
-<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <replaceable>arg--var</replaceable>
<replaceable>arg--var1</replaceable></synopsis>
+<synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <emphasis role="arg">arg--var</emphasis>
<emphasis role="arg">arg--var1</emphasis></synopsis>
<blockquote><para>d–efvar with args
</para></blockquote>
<synopsis><indexterm
role="vr"><primary>d--efopt_name</primary></indexterm><phrase
role="category"><emphasis role="bold">User Option</emphasis>:</phrase>
<varname>d--efopt_name</varname></synopsis>
@@ -3787,7 +3787,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypeivar_name</property></synopsis>
<blockquote><para>d–eftypeivar
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d–efmethod
</para></blockquote>
<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname>
<type>a--rguments...</type></synopsis>
@@ -3809,7 +3809,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue>
<property>d--eftypecv_name2</property></synopsis>
<blockquote><para>d–eftypecv2
</para></blockquote>
-<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<replaceable>a--rguments2...</replaceable></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<emphasis role="arg">a--rguments2...</emphasis></synopsis>
<blockquote><para>d–eftypecv with arguments2
</para></blockquote>
<synopsis><indexterm role="fn"><primary>arg2</primary></indexterm><phrase
role="category"><emphasis role="bold">fun2</emphasis>:</phrase>
<function>arg2</function></synopsis>
@@ -3915,7 +3915,7 @@ more text
<para>f–lushright
more text
</para>
-ce–ntered line
+<simpara role="center">ce–ntered line</simpara>
<para>r–raggedright
more text
@@ -4034,14 +4034,14 @@ aaa</literallayout></textobject></inlinemediaobject>
</para></listitem></varlistentry></variablelist>
<!-- deffnx after deff lines -->
<synopsis><phrase role="category"><emphasis
role="bold">fun</emphasis>:</phrase></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>and after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">and after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
<para>Various deff lines
-</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function>
<replaceable>a</replaceable> <replaceable>deff</replaceable>
<replaceable>item</replaceable></synopsis>
+</para><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">deff</emphasis> <emphasis
role="arg">item</emphasis></synopsis>
<!-- node is non existent, or missing first arg -->
<para><literal>@ref{node}</literal> <link linkend="node">node</link>
@@ -4472,20 +4472,20 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</screen><informalequation><mathphrase>disp--laymath
f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu
\over \sigma}\right)^2</superscript>
</mathphrase></informalequation><screen>
-</screen><synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>d--effn_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><screen>d--effn
</screen></blockquote><screen>
-</screen><synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
-</replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable>
<replaceable>so</replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><phrase
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase>
<function>de--ffn_name</function> <emphasis role="arg">ar--guments</emphasis>
<emphasis role="arg">more</emphasis> <emphasis role="arg">args</emphasis>
<emphasis role="arg">
+</emphasis> <emphasis role="arg">even</emphasis> <emphasis
role="arg">more</emphasis> <emphasis role="arg">so</emphasis></synopsis>
<blockquote><screen>def--fn
</screen></blockquote><screen>
-</screen><synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
-<screen><indexterm role="cp"><primary>index entry within
deffn</primary></indexterm></screen><synopsis><indexterm
role="fn"><primary>truc</primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function>truc</function>
<replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
+<screen><indexterm role="cp"><primary>index entry within
deffn</primary></indexterm></screen><synopsis><indexterm
role="fn"><primary>truc</primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function>truc</function> <emphasis
role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap1</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <emphasis role="arg">truc</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<emphasis role="arg">truc</emphasis></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
@@ -4495,22 +4495,22 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
<synopsis><indexterm role="fn"><primary>bidule
machin</primary></indexterm><phrase role="category"><emphasis
role="bold"></emphasis>:</phrase> <function>bidule machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<screen><!-- comment -->
</screen><synopsis><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
-<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <replaceable>b</replaceable>
<replaceable>c</replaceable> <replaceable>d</replaceable>
<replaceable>e</replaceable> <replaceable><emphasis role="bold">f
g</emphasis></replaceable> <replaceable>h i</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <replaceable>before</replaceable>
<replaceable>end</replaceable> <replaceable>deffn</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>a</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>a</function> <emphasis role="arg">b</emphasis> <emphasis
role="arg">c</emphasis> <emphasis role="arg">d</emphasis> <emphasis
role="arg">e</emphasis> <emphasis role="arg"><emphasis role="bold">f
g</emphasis></emphasis> <emphasis role="arg">h i</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>deffnx</function> <emphasis role="arg">before</emphasis> <emphasis
role="arg">end</emphasis> <emphasis role="arg">deffn</emphasis></synopsis>
<screen>
</screen><synopsis><indexterm
role="fn"><primary>deffn</primary></indexterm><phrase role="category"><emphasis
role="bold">empty</emphasis>:</phrase> <function>deffn</function></synopsis>
<screen>
-</screen><synopsis><indexterm
role="fn"><primary>deffn</primary></indexterm><phrase role="category"><emphasis
role="bold">empty</emphasis>:</phrase> <function>deffn</function>
<replaceable>with</replaceable> <replaceable>deffnx</replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary>deffn</primary></indexterm><phrase role="category"><emphasis
role="bold">empty</emphasis>:</phrase> <function>deffn</function> <emphasis
role="arg">with</emphasis> <emphasis role="arg">deffnx</emphasis></synopsis>
<screen><!-- comment between deffn and deffnx -->
</screen><synopsis><indexterm
role="fn"><primary>deffnx</primary></indexterm><phrase
role="category"><emphasis role="bold">empty</emphasis>:</phrase>
<function>deffnx</function></synopsis>
<screen>
-</screen><synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable>
<replaceable>g</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <replaceable></replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase
role="category"><emphasis role="bold">fset</emphasis>:</phrase>
<function><replaceable>i</replaceable></function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase
role="category"><emphasis role="bold">cmde</emphasis>:</phrase>
<function>truc</function> <emphasis role="arg"></emphasis></synopsis>
<blockquote><screen><!-- comment -->
text in def item for second def item
</screen></blockquote><screen>
@@ -4519,7 +4519,7 @@ text in def item for second def item
</screen><synopsis><indexterm
role="vr"><primary>d--efvr_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<varname>d--efvr_name</varname></synopsis>
<blockquote><screen>d--efvr
</screen></blockquote><screen>
-</screen><synopsis><indexterm
role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><screen>d--effn
</screen></blockquote><screen>
</screen><synopsis><indexterm
role="fn"><primary>n--ame</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<function>n--ame</function></synopsis>
@@ -4543,16 +4543,16 @@ text in def item for second def item
</screen><synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property></synopsis>
<blockquote><screen>d--efcv
</screen></blockquote><screen>
-</screen><synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm
role="vr"><primary>d--efcv_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<property>d--efcv_name</property> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><screen>d--efcv with arguments
</screen></blockquote><screen>
</screen><synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypecv_name</property></synopsis>
<blockquote><screen>d--eftypecv
</screen></blockquote><screen>
-</screen><synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm role="vr"><primary>d--eftypecv_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <property>d--eftypecv_name</property>
<emphasis role="arg">a--rguments...</emphasis></synopsis>
<blockquote><screen>d--eftypecv with arguments
</screen></blockquote><screen>
-</screen><synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><screen>d--efop
</screen></blockquote><screen>
</screen><synopsis><indexterm role="fn"><primary>d--efop_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efop_name</methodname></synopsis>
@@ -4561,19 +4561,19 @@ text in def item for second def item
</screen><synopsis><indexterm
role="tp"><primary>d--eftp_name</primary></indexterm><phrase
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase>
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
<blockquote><screen>d--eftp
</screen></blockquote><screen>
-</screen><synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary>d--efun_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Function</emphasis>:</phrase>
<function>d--efun_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><screen>d--efun
</screen></blockquote><screen>
-</screen><synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary>d--efmac_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Macro</emphasis>:</phrase>
<function>d--efmac_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><screen>d--efmac
</screen></blockquote><screen>
-</screen><synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary>d--efspec_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase>
<function>d--efspec_name</function> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><screen>d--efspec
</screen></blockquote><screen>
</screen><synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname></synopsis>
<blockquote><screen>d--efvar
</screen></blockquote><screen>
-</screen><synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <replaceable>arg--var</replaceable>
<replaceable>arg--var1</replaceable></synopsis>
+</screen><synopsis><indexterm
role="vr"><primary>d--efvar_name</primary></indexterm><phrase
role="category"><emphasis role="bold">Variable</emphasis>:</phrase>
<varname>d--efvar_name</varname> <emphasis role="arg">arg--var</emphasis>
<emphasis role="arg">arg--var1</emphasis></synopsis>
<blockquote><screen>d--efvar with args
</screen></blockquote><screen>
</screen><synopsis><indexterm
role="vr"><primary>d--efopt_name</primary></indexterm><phrase
role="category"><emphasis role="bold">User Option</emphasis>:</phrase>
<varname>d--efopt_name</varname></synopsis>
@@ -4591,7 +4591,7 @@ text in def item for second def item
</screen><synopsis><indexterm role="vr"><primary>d--eftypeivar_name of
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Instance Variable</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue>
<property>d--eftypeivar_name</property></synopsis>
<blockquote><screen>d--eftypeivar
</screen></blockquote><screen>
-</screen><synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname>
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm role="fn"><primary>d--efmethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<methodname>d--efmethod_name</methodname> <emphasis
role="arg">a--rguments...</emphasis></synopsis>
<blockquote><screen>d--efmethod
</screen></blockquote><screen>
</screen><synopsis><indexterm role="fn"><primary>d--eftypemethod_name on
c--lass</primary></indexterm><phrase role="category"><emphasis
role="bold">Method</emphasis>:</phrase>
<ooclass><classname>c--lass</classname></ooclass>
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname>
<type>a--rguments...</type></synopsis>
@@ -4613,7 +4613,7 @@ text in def item for second def item
</screen><synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue>
<property>d--eftypecv_name2</property></synopsis>
<blockquote><screen>d--eftypecv2
</screen></blockquote><screen>
-</screen><synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<replaceable>a--rguments2...</replaceable></synopsis>
+</screen><synopsis><indexterm role="vr"><primary>d--eftypecv_name2 of
c--lass2</primary></indexterm><phrase role="category"><emphasis
role="bold">c--ategory2</emphasis>:</phrase>
<ooclass><classname>c--lass2</classname></ooclass>
<returnvalue>t--ype2</returnvalue> <property>d--eftypecv_name2</property>
<emphasis role="arg">a--rguments2...</emphasis></synopsis>
<blockquote><screen>d--eftypecv with arguments2
</screen></blockquote><screen>
</screen><synopsis><indexterm
role="fn"><primary>arg2</primary></indexterm><phrase role="category"><emphasis
role="bold">fun2</emphasis>:</phrase> <function>arg2</function></synopsis>
@@ -4718,7 +4718,7 @@ more text
</screen><screen>f--lushright
more text
</screen><screen>
-</screen>ce--ntered line
+</screen><simpara role="center">ce--ntered line</simpara>
<screen>
</screen><screen>r--raggedright
more text
@@ -4836,14 +4836,14 @@ Invalid use of @':
</screen></listitem></varlistentry></variablelist><screen>
<!-- deffnx after deff lines -->
</screen><synopsis><phrase role="category"><emphasis
role="bold">fun</emphasis>:</phrase></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <replaceable>bidule</replaceable>
<replaceable>chose</replaceable> <replaceable>and</replaceable>
<replaceable>and after</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <replaceable>by</replaceable>
<replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>machin</function> <emphasis role="arg">bidule</emphasis> <emphasis
role="arg">chose</emphasis> <emphasis role="arg">and</emphasis> <emphasis
role="arg">and after</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase
role="category"><emphasis role="bold">truc</emphasis>:</phrase>
<function>followed</function> <emphasis role="arg">by</emphasis> <emphasis
role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<screen><!-- comment -->
Various deff lines
-</screen><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function>
<replaceable>a</replaceable> <replaceable>deff</replaceable>
<replaceable>item</replaceable></synopsis>
+</screen><synopsis><indexterm
role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis
role="bold">truc</emphasis>:</phrase> <function>after</function> <emphasis
role="arg">a</emphasis> <emphasis role="arg">deff</emphasis> <emphasis
role="arg">item</emphasis></synopsis>
<screen>
<!-- node is non existent, or missing first arg -->
<literal>@ref{node}</literal> <link linkend="node">node</link>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/DocBook.pm (%docbook_misc_elements_with_arg_map) (%def_argument_types_docbook, _convert): add exdent role for @exdent, use simpara and center role for @center. Use emphasis role="arg" instead of replaceable for arg def argument type. The idea is that replaceable is not used such that replaceable is only used if @var{} is present which should be more in line with the examples in the Texinfo manual.,
Patrice Dumas <=