[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Convert/Converter.pm Te...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Convert/Converter.pm Te... |
|
Date: |
Mon, 12 Sep 2011 23:39:17 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/12 23:39:17
Modified files:
tp : TODO
tp/Texinfo/Convert: Converter.pm DocBook.pm
tp/t : 02coverage.t test_utils.pl
tp/t/results/coverage: accent_and_dash.pl
at_after_accent_command.pl
block_commands.pl cartouche.pl
cartouche_in_example.pl
cartouche_in_quotation.pl center.pl
commands.pl comment_on_cartouche_line.pl
comment_on_group_line.pl def.pl
exdent_and_commands.pl
exdent_and_formats.pl
flushleft_flushright.pl
flushleft_flushright_in_quotation.pl
flushright_example_nested.pl
hyphenation.pl insertcopying.pl
item_container.pl
lettered_accent_and_spaces.pl math.pl
multitable.pl nested_block_commands.pl
preformatted.pl
punctuation_in_line_commands.pl
quotation_author.pl
setfilename_in_paragraph.pl
symbol_after_command.pl table.pl
table_command_comment.pl test_tie.pl
test_today.pl verbatiminclude.pl
Log message:
Finish the docbook backend.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/02coverage.t?cvsroot=texinfo&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/accent_and_dash.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/at_after_accent_command.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche_in_example.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/center.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/comment_on_group_line.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_commands.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_formats.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushleft_flushright.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushright_example_nested.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/hyphenation.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/insertcopying.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/math.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/nested_block_commands.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/quotation_author.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/setfilename_in_paragraph.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_command.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/test_tie.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/test_today.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/verbatiminclude.pl?cvsroot=texinfo&r1=1.11&r2=1.12
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- TODO 10 Sep 2011 11:17:26 -0000 1.166
+++ TODO 12 Sep 2011 23:39:14 -0000 1.167
@@ -85,6 +85,49 @@
html tests which should be right:
sectioning setfilename_on_top_and_after_node
+* docbook: in function no style.
+ replaceable is for @var or function argument. Only characters.
+ Maybe replaced with parameter?
+
+ Instead of synopsis may use specialized synopsis, funcsynopsis/funcprototype
+ for deftype*, funcdef for defffn, ooclass for object oriented.
+ deffn:
+ <funcsynopsis><funcprototype><funcdef
role=...><function>d--effn_name</function></funcdef><paramdef><parameter>args</parameter></paramdef></funcprototype></funcsynopsis>
+ defvr, deftypevr: varname, and type and not returnvalue
+ deftypefn:
+ <funcsynopsis><funcprototype><funcdef role=...>type
<function>d--eftypefn_name</function></funcdef><paramdef>a type<parameter>in
var..</parameter></paramdef></funcprototype></funcsynopsis>
+ deftp: structname/structfield. Both contains a replaceable. Problem with
+ structfield is that there should be one by field.
+ defcv: classname + property, and category in synopsis
+ deftypecv: classname + type + property, and category in synopsis
+ fieldsynopsis?
+ defop:
<classsynopsis><classsynopsisinfo>category</classsynopsisinfo><ooclass><classname>class<><><methodsynopsis><methodname><replaceable><></methodname><methodparam><parameter>...<><><>
+ deftypeop: same with type in methodparam.
+
+ also informalfigure in @float
+
+ also use informaltable or table, for multitable?
+
+ What is before the first sectioning command is put in <bookinfo><abstract>.
+
+ what about @titlefont in docbook?
+
+ maybe use simpara instead of para. Indeed, simpara is for paragraph without
+ block elent within, and it should be that way in generated output.
+
+ put <title> in <articleinfo>?
+
+ what to do for guilsinglleft, guilsinglright? Currently < > since
+ there is no ‹ nor ›
+
+* to solve above issue (first issue), the definition arg formatted with
+ simple_format should alo be passed down
+
+* in docbook, when there is only one section <article> should be better
+ than book. Maybe the best way to do that would be passing the
+ information that there is only one section to the functions formatting
+ the page header and page footer.
+
Test tree leading to non empty preamble_before_setfilename. Currently there
are none in the test suite, maybe require a real file as input.
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- Texinfo/Convert/Converter.pm 11 Sep 2011 17:32:49 -0000 1.37
+++ Texinfo/Convert/Converter.pm 12 Sep 2011 23:39:14 -0000 1.38
@@ -554,22 +554,41 @@
my %not_inline_commands = (%Texinfo::Common::root_commands,
%Texinfo::Common::block_commands, %Texinfo::Common::context_brace_command);
-sub _is_inline($$)
+sub _inline_or_block($$)
{
my $self = shift;
my $current = shift;
- while ($current->{'parent'}) {
- $current = $current->{'parent'};
if ($current->{'type'} and $inline_types{$current->{'type'}}) {
return 1;
} elsif ($current->{'cmdname'}
and $not_inline_commands{$current->{'cmdname'}}) {
return 0;
+ } else {
+ return undef;
}
+}
+
+sub _is_inline($$)
+{
+ my $self = shift;
+ my $current = shift;
+ while ($current->{'parent'}) {
+ $current = $current->{'parent'};
+ my $inline_or_block = $self->_inline_or_block($current);
+ return ($inline_or_block) if (defined($inline_or_block));
}
return 0;
}
+sub _in_inline($$)
+{
+ my $self = shift;
+ my $current = shift;
+ my $inline_or_block = $self->_inline_or_block($current);
+ return ($inline_or_block) if (defined($inline_or_block));
+ return $self->_is_inline($current);
+}
+
our %default_args_code_style = (
'email' => ['code'],
'anchor' => ['code'],
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Texinfo/Convert/DocBook.pm 11 Sep 2011 19:05:09 -0000 1.3
+++ Texinfo/Convert/DocBook.pm 12 Sep 2011 23:39:14 -0000 1.4
@@ -17,8 +17,6 @@
#
# Original author: Patrice Dumas <address@hidden>
-# TODO block commands
-
package Texinfo::Convert::DocBook;
use 5.00405;
@@ -61,6 +59,7 @@
my $rdquo = '&#'.hex('201D').';';
my $rsquo = '&#'.hex('2019').';';
my $lsquo = '&#'.hex('2018').';';
+my $nbsp = '&#'.hex('00A0').';';
my %defaults = (
#'ENABLE_ENCODING' => 0,
@@ -88,6 +87,10 @@
my %docbook_specific_formatting = (
'TeX' => '&tex;',
'LaTeX' => '&latex;',
+ "\t" => $nbsp,
+ "\n" => $nbsp,
+ " " => $nbsp,
+# FIXME and '*'?
);
my %docbook_commands_formatting
= %{$Texinfo::Convert::Converter::default_xml_commands_formatting{'normal'}};
@@ -97,6 +100,7 @@
= '&#'.hex($Texinfo::Convert::Unicode::unicode_map{$command}).';'
if ($Texinfo::Convert::Unicode::unicode_map{$command} ne '');
}
+$docbook_commands_formatting{'tie'} = $nbsp;
foreach my $command (keys(%docbook_specific_formatting)) {
$docbook_commands_formatting{$command}
@@ -107,6 +111,13 @@
'samp' => 1,
);
+my @inline_elements = ('emphasis', 'abbrev', 'acronym', 'link',
+ 'inlinemediaobject', 'firstterm', 'footnote', 'replaceable', 'wordasword');
+my %inline_elements;
+foreach my $inline_element (@inline_elements) {
+ $inline_elements{$inline_element} = 1;
+};
+
my %style_attribute_commands;
%style_attribute_commands = (
'b' => 'emphasis role="bold"',
@@ -119,13 +130,15 @@
'file' => 'filename',
'headitemfont' => 'emphasis role="bold"', # not really that, in fact it
is
# in <th> rather than <td>
+ # FIXME wordasword is likely to be wrong. Maybe emph for i and literal
+ # for indicateurl.
'i' => 'wordasword',
'indicateurl' => 'wordasword',
- 'sansserif' => 'span class="sansserif"',
+ 'sansserif' => '',
'kbd' => 'userinput',
'key' => 'keycap',
'option' => 'option',
- 'r' => 'span class="roman"',
+ 'r' => 'lineannotation',
'samp' => 'literal',
'strong' => 'emphasis role="bold"',
't' => 'literal',
@@ -173,6 +186,8 @@
my %docbook_misc_elements_with_arg_map = (
'settitle' => 'title',
+ 'exdent' => 'simpara',
+ 'center' => '',
);
my %docbook_misc_commands = %Texinfo::Common::misc_commands;
@@ -198,16 +213,24 @@
my %defcommand_name_type = (
'deffn' => 'function',
- 'defvr' => 'variable',
+ 'defvr' => 'varname',
'deftypefn' => 'function',
- 'deftypeop' => 'operation',
- 'deftypevr' => 'variable',
- 'defcv' => 'classvar',
- 'deftypecv' => 'classvar',
- 'defop' => 'operation',
- 'deftp' => 'datatype',
+ 'deftypeop' => 'methodname',
+ 'deftypevr' => 'varname',
+ 'defcv' => 'property',
+ 'deftypecv' => 'property',
+ 'defop' => 'methodname',
+ 'deftp' => 'structname',
);
+my %def_argument_types_docbook = (
+ 'type' => ['returnvalue'],
+ 'class' => ['ooclass', 'classname'],
+ 'arg' => ['replaceable'],
+ 'argtype' => ['type'],
+);
+
+
my %ignored_types;
foreach my $type (#'empty_line_after_command',
'preamble',
@@ -236,6 +259,7 @@
my %context_block_commands = (
'float' => 1,
+ 'docbook' => 1,
);
my %docbook_preformatted_formats = (
@@ -424,6 +448,7 @@
my $root = shift;
if ($root->{'extra'} and $root->{'extra'}->{'index_entry'}) {
my $index_entry = $root->{'extra'}->{'index_entry'};
+ # FIXME DocBook 5 role->type
my $result = "<indexterm role=\"$index_entry->{'index_name'}\"><primary>";
push @{$self->{'document_context'}}, {};
$self->{'document_context'}->[-1]->{'code'}++
@@ -491,8 +516,9 @@
return '' if ($root->{'type'} and $ignored_types{$root->{'type'}});
my $result = '';
if (defined($root->{'text'})) {
- return $root->{'text'} if (defined($root->{'type'})
- and $root->{'type'} eq '_converted');
+ return $root->{'text'} if ((defined($root->{'type'})
+ and $root->{'type'} eq '_converted')
+ or $self->{'document_context'}->[-1]->{'raw'});
$result = $self->xml_protect_text($root->{'text'});
if (! defined($root->{'type'}) or $root->{'type'} ne 'raw') {
if (!$self->{'document_context'}->[-1]->{'code'}) {
@@ -518,6 +544,8 @@
$command = $root->{'cmdname'};
}
return $docbook_commands_formatting{$command};
+ } elsif ($root->{'cmdname'} eq 'today') {
+ return $self->_convert(Texinfo::Common::expand_today($self));
} elsif ($Texinfo::Common::accent_commands{$root->{'cmdname'}}) {
return $self->xml_accents($root, undef, \&docbook_accent);#,
$self->in_upper_case());
# } elsif ($root->{'cmdname'} eq 'item' and
@@ -528,6 +556,16 @@
and ($root->{'parent'}->{'cmdname'} eq 'itemize'
or $root->{'parent'}->{'cmdname'} eq 'enumerate')) {
$result .= "<listitem>";
+ if ($root->{'parent'}->{'cmdname'} eq 'itemize'
+ and $root->{'parent'}->{'extra'}
+ and $root->{'parent'}->{'extra'}->{'block_command_line_contents'}
+ and
$root->{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]) {
+ # $result .= $self->_convert({'contents'
+ # =>
$root->{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]})
+ # ." ";
+ $self->{'pending_prepend'} = $self->_convert({'contents'
+ => $root->{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]})
." ";
+ }
push @close_elements, 'listitem';
} elsif (($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx')
and $root->{'parent'}->{'type'}
@@ -535,17 +573,29 @@
my $table_command = $root->{'parent'}->{'parent'}->{'parent'};
my $format_item_command;
my $arg_tree;
+ my $tree = $root->{'args'}->[0];
if ($table_command->{'extra'}
and $table_command->{'extra'}->{'command_as_argument'}) {
- $format_item_command
- = $table_command->{'extra'}->{'command_as_argument'}->{'cmdname'};
- $arg_tree = { 'cmdname' => $format_item_command,
- 'contents' => $root->{'args'}->[0]->{'contents'}};
+ my $command_as_argument
+ = $table_command->{'extra'}->{'command_as_argument'};
+ if ($command_as_argument->{'type'} ne 'definfoenclose_command') {
+ $arg_tree = {'cmdname' => $command_as_argument->{'cmdname'},
+ 'args' => [{'type' => 'brace_command_arg',
+ 'contents' => [$tree]}]
+ };
+ } else {
+ $arg_tree = {'cmdname' => $command_as_argument->{'cmdname'},
+ 'type' => $command_as_argument->{'type'},
+ 'extra' => $command_as_argument->{'extra'},
+ 'args' => [{'type' => 'brace_command_arg',
+ 'contents' => [$tree]}]
+ };
+ }
} else {
- $arg_tree = $root->{'args'}->[0];
+ $arg_tree = $tree;
}
$result .= "<term>";
- # Is it automaticcally entered in docbook?
+ # Is it automaticcally entered in docbook? No.
#$result .= $self->_index_entry($root);
# FIXME
my $in_code;
@@ -556,8 +606,7 @@
$self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
$result .= $self->_convert($arg_tree);
$self->{'document_context'}->[-1]->{'code'}-- if ($in_code);
- chomp ($result);
- $result .= "</term>\n";
+ $result .= "</term>";
} else {
unless (($root->{'cmdname'} eq 'item'
or $root->{'cmdname'} eq 'headitem'
@@ -584,27 +633,20 @@
my $command;
if (exists ($docbook_misc_elements_with_arg_map{$root->{'cmdname'}})) {
$command = $docbook_misc_elements_with_arg_map{$root->{'cmdname'}};
- } else {
- $command = $root->{'cmdname'};
}
my $type = $docbook_misc_commands{$root->{'cmdname'}};
if ($type eq 'text') {
- return '' if ($root->{'cmdname'} eq 'end');
- my $attribute = '';
- if ($misc_command_line_attributes{$root->{'cmdname'}}) {
- if ($root->{'extra'} and defined($root->{'extra'}->{'text_arg'})) {
- $attribute = "
$misc_command_line_attributes{$root->{'cmdname'}}=\""
- . $self->xml_protect_text($root->{'extra'}->{'text_arg'})
."\"";
- }
+ if ($root->{'cmdname'} eq 'verbatiminclude') {
+ my $verbatim_include_verbatim
+ = Texinfo::Common::expand_verbatiminclude($self, $root);
+ if (defined($verbatim_include_verbatim)) {
+ $result .= $self->_convert($verbatim_include_verbatim);
+ } else {
+ return '';
}
- my $arg = $self->_convert($root->{'args'}->[0]);
- my $end_line;
- if (chomp ($arg)) {
- $end_line = "\n";
} else {
- $end_line = "";
+ return '';
}
- return "<$command${attribute}>$arg</$command>$end_line";
} elsif ($type eq 'line') {
if ($root->{'cmdname'} eq 'node') {
if (!$root->{'extra'} or !$root->{'extra'}->{'associated_section'}) {
@@ -613,7 +655,7 @@
} elsif ($Texinfo::Common::root_commands{$root->{'cmdname'}}) {
my $attribute;
if ($root->{'extra'} and $root->{'extra'}->{'associated_node'}) {
- $attribute = "
id=\"$root->{'extra'}->{'associated_node'}->{'normalized'}\"";
+ $attribute = "
id=\"$root->{'extra'}->{'associated_node'}->{'extra'}->{'normalized'}\"";
}
$command = $self->_docbook_section_element($root);
$result .= "<$command${attribute}>\n";
@@ -626,50 +668,56 @@
if ($root->{'args'} and $root->{'args'}->[0]) {
my ($arg, $end_line)
= $self->_convert_argument_and_end_line($root->{'args'}->[0]);
- return "<bridgehead
renderas=\"$docbook_sections{$root->{'cmdname'}}>$arg</bridgehead>$end_line";
+ return "<bridgehead
renderas=\"$docbook_sections{$root->{'cmdname'}}\">$arg</bridgehead>$end_line";
}
return '';
} else {
my $attribute = '';
+ if (defined($command)) {
my ($arg, $end_line)
= $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+ if ($command eq '') {
+ return "$arg$end_line";
+ } else {
return "<$command${attribute}>$arg</$command>$end_line";
}
+ }
+ return '';
+ }
} elsif ($type eq 'skipline' or $type eq 'noarg') {
- return "<$command></$command>\n";
+ if ($root->{'cmdname'} eq 'insertcopying') {
+ if ($self->{'extra'} and $self->{'extra'}->{'copying'}) {
+ return $self->_convert({'contents'
+ => $self->{'extra'}->{'copying'}->{'contents'}});
+ } else {
+ return '';
+ }
+ } else {
+ #return "<$command></$command>\n";
+ return '';
+ }
} elsif ($type eq 'special') {
+ return '';
} elsif ($type eq 'lineraw') {
if ($root->{'cmdname'} eq 'c' or $root->{'cmdname'} eq 'comment') {
return $self->xml_default_comment($root->{'args'}->[0]->{'text'})
} else {
- my $value = '';
- if ($root->{'args'} and $root->{'args'}->[0]
- and defined($root->{'args'}->[0]->{'text'})) {
- $value = $self->xml_protect_text($root->{'args'}->[0]->{'text'});
- }
- return "<${command}>$value</${command}>\n";
+ return "";
}
} else {
print STDERR "BUG: unknown misc_command style $type" if ($type !~
/^\d$/);
- my $args_attributes;
- if ($misc_command_numbered_arguments_attributes{$root->{'cmdname'}}) {
- $args_attributes =
$misc_command_numbered_arguments_attributes{$root->{'cmdname'}};
- } else {
- $args_attributes = ['value'];
- }
- my $attribute = '';
- my $arg_index = 0;
+ if ($root->{'cmdname'} eq 'printindex') {
if (defined($root->{'extra'})
and defined($root->{'extra'}->{'misc_args'})) {
- foreach my $arg_attribute (@{$args_attributes}) {
- if (defined ($root->{'extra'}->{'misc_args'}->[$arg_index])) {
- $attribute .= " $arg_attribute=\""
-
.$self->xml_protect_text($root->{'extra'}->{'misc_args'}->[$arg_index])."\"";
- }
- $arg_index++;
+ # FIXME DocBook 5
+ #return "<index
type=\"$root->{'extra'}->{'misc_args'}->[0]\"></index>\n";
+ return "<index
role=\"$root->{'extra'}->{'misc_args'}->[0]\"></index>\n";
+ } else {
+ return "<index></index>\n";
}
+ } else {
+ return '';
}
- return "<$command${attribute}></$command>\n";
}
} elsif ($root->{'type'}
and $root->{'type'} eq 'definfoenclose_command') {
@@ -696,8 +744,12 @@
$self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
my ($style, $attribute_text) =
_parse_attribute($formatting->{'attribute'});
my $result = $self->_convert($root->{'args'}->[0]);
- if ($style ne '') {
+ if ($style ne '' and (!$self->{'document_context'}->[-1]->{'inline'}
+ or $inline_elements{$style})) {
$result = "<$style${attribute_text}>$result</$style>";
+ if ($root->{'cmdname'} eq 'math') {
+ $result = "<inlineequation>$result</inlineequation>";
+ }
}
if (defined($formatting->{'quote'})) {
$result = $self->get_conf('OPEN_QUOTE_SYMBOL') . $result
@@ -707,9 +759,7 @@
if ($Texinfo::Common::context_brace_commands{$root->{'cmdname'}}) {
pop @{$self->{'document_context'}};
}
- if ($root->{'cmdname'} eq 'math') {
- $result = "<inlineequation>$result</inlineequation>";
- } elsif ($root->{'cmdname'} eq 'w') {
+ if ($root->{'cmdname'} eq 'w') {
$result .= '<!-- /@w -->';
}
return $result;
@@ -845,7 +895,7 @@
push @files, ["$basefile.jpg", 'jpg'];
}
foreach my $file (@files) {
- $result .= "<imageobject><imagedata fileref=\"$file->[0]\"
format=\"$file->[1]\"</imagedata></imageobject>";
+ $result .= "<imageobject><imagedata fileref=\"$file->[0]\"
format=\"$file->[1]\"></imagedata></imageobject>";
}
my $image_text
= $self->Texinfo::Convert::Plaintext::_image_text($root,
$basefile);
@@ -876,6 +926,7 @@
return "<ulink url=\"mailto:$email_text\";>"
.$self->_convert({'contents' => $name}).'</ulink>';
} elsif ($email) {
+ # FIXME in_inline
return "<email>$email_text</email>";
} elsif ($name) {
return $self->_convert({'contents' => $name});
@@ -911,6 +962,8 @@
$replacement = $url_text;
}
return "<ulink url=\"$url_text\">$replacement</ulink>";
+ # DocBook 5
+ # return "<link xl:href=\"$url_text\">$replacement</link>";
}
} elsif ($root->{'cmdname'} eq 'abbr' or $root->{'cmdname'} eq
'acronym') {
my $argument;
@@ -955,13 +1008,14 @@
if ($context_block_commands{$root->{'cmdname'}}) {
push @{$self->{'document_context'}}, {};
}
- my $attribute = '';
- my $element;
+ my @attributes;
+ my $appended = '';
+ my @elements;
if (exists($docbook_preformatted_formats{$root->{'cmdname'}})) {
push @{$self->{'document_context'}->[-1]->{'preformatted_stack'}},
$docbook_preformatted_formats{$root->{'cmdname'}};
} elsif ($root->{'cmdname'} eq 'enumerate') {
- $element = 'orderedlist';
+ push @elements, 'orderedlist';
my $numeration;
if ($root->{'extra'}
and $root->{'extra'}->{'enumerate_specification'}) {
@@ -975,46 +1029,95 @@
} else {
$numeration = 'arabic';
}
- $attribute = " numeration=\"$numeration\"";
+ push @attributes, " numeration=\"$numeration\"";
} elsif ($Texinfo::Common::item_line_commands{$root->{'cmdname'}}) {
- $element = 'variablelist';
+ push @elements, 'variablelist';
} elsif ($root->{'cmdname'} eq 'itemize') {
- $element = 'itemizedlist';
+ push @elements, 'itemizedlist';
} elsif ($root->{'cmdname'} eq 'multitable') {
- $element = "informaltable";
+ push @elements, "informaltable";
+ push @attributes, '';
+ my $columns_count;
+ if ($root->{'extra'} and defined($root->{'extra'}->{'max_columns'})) {
+ $columns_count = $root->{'extra'}->{'max_columns'};
+ } else {
+ $columns_count = 0;
+ }
+ push @elements, 'tgroup';
+ push @attributes, " cols=\"$columns_count\"";
if ($root->{'extra'}) {
+ my @fractions;
+ my $multiply;
if ($root->{'extra'}->{'prototypes'}) {
- $result .= "<columnprototypes>";
+ $multiply = 1;
foreach my $prototype (@{$root->{'extra'}->{'prototypes'}}) {
- $result .= "<columnprototype>".$self->_convert($prototype)
- ."</columnprototype>";
+ my $prototype_text
+ = Texinfo::Convert::Text::convert($prototype,
+ {'converter' => $self});
+ push @fractions,
+ Texinfo::Convert::Unicode::string_width($prototype_text);
}
- $result .= "</columnprototypes>";
} elsif ($root->{'extra'}->{'columnfractions'}) {
- $result .= "<columnfractions>";
- foreach my $fraction (@{$root->{'extra'}->{'columnfractions'}}) {
- $result .= "<columnfraction
value=\"$fraction\"></columnfraction>";
+ @fractions = @{$root->{'extra'}->{'columnfractions'}};
+ $multiply = 100;
}
- $result .= "</columnfractions>";
+ foreach my $fraction (@fractions) {
+ $appended .= '<colspec colwidth="'.($fraction*$multiply)
+ .'*"></colspec>';
}
}
} elsif ($root->{'cmdname'} eq 'float') {
if ($root->{'extra'} and defined($root->{'extra'}->{'normalized'})) {
- $result .= "<anchor id=\"$root->{'extra'}->{'normalized'}\">\n";
+ $result .= "<anchor id=\"$root->{'extra'}->{'normalized'}\"/>\n";
}
} elsif ($root->{'cmdname'} eq 'verbatim') {
- $element = 'screen';
- } elsif ($root->{'cmdname'} eq 'quotation') {
- # docbook_special_quotations
- $element = 'blockquote';
+ push @elements, 'screen';
+ } elsif ($root->{'cmdname'} eq 'quotation'
+ or $root->{'cmdname'} eq 'smallquotation') {
+ my $element;
+ if ($root->{'extra'}) {
+ if ($root->{'extra'}->{'authors'}) {
+ foreach my $author (@{$root->{'extra'}->{'authors'}}) {
+ if ($author->{'extra'} and $author->{'extra'}->{'misc_content'})
{
+ $appended .= '<attribution>'.$self->_convert(
+ {'contents' => $author->{'extra'}->{'misc_content'}})
+ ."</attribution>\n";
+ }
+ }
+ }
+ if ($root->{'extra'}->{'block_command_line_contents'}
+ and
defined($root->{'extra'}->{'block_command_line_contents'}->[0])) {
+ my $quotation_arg_text = Texinfo::Convert::Text::convert(
+ {'contents' =>
$root->{'extra'}->{'block_command_line_contents'}->[0]});
+ if ($docbook_special_quotations{lc($quotation_arg_text)}) {
+ $element = lc($quotation_arg_text);
+ } else {
+ $self->{'pending_prepend'}
+ = $self->_convert($self->gdt('@b{{quotation_arg}:} ',
+ {'quotation_arg' =>
+ $root->{'extra'}->{'block_command_line_contents'}->[0]}));
+ }
}
- if (defined($element)) {
- $result .= "<$element${attribute}>";
- push @close_elements, $element;
- if ($root->{'cmdname'} eq 'multitable') {
- push @close_elements, 'tgroup';
}
+ $element = 'blockquote' if (!defined($element));
+ push @elements, $element;
+ } elsif ($root->{'cmdname'} eq 'copying') {
+ push @elements, ('bookinfo', 'legalnotice');
+ } elsif ($Texinfo::Common::block_commands{$root->{'cmdname'}} eq 'raw') {
+ return '' if (!$self->{'expanded_formats_hash'}->{$root->{'cmdname'}});
+ if ($root->{'cmdname'} eq 'docbook') {
+ # the context ids here only for the command, so this is forgotten
+ # once al the raw internal text has been formatted
+ $self->{'document_context'}->[-1]->{'raw'} = 1;
+ }
+ }
+ foreach my $element (@elements) {
+ my $attribute = shift @attributes;
+ $attribute = '' if (!defined($attribute));
+ $result .= "<$element${attribute}>";
+ unshift @close_elements, $element;
}
+ $result .= $appended if (defined($appended));
}
}
if ($root->{'type'}) {
@@ -1023,54 +1126,38 @@
} elsif ($root->{'type'} eq 'preformatted') {
$result .=
"<$self->{'document_context'}->[-1]->{'preformatted_stack'}->[-1]>";
} elsif ($root->{'type'} eq 'def_line') {
- if ($root->{'cmdname'}) {
- $result .= "<$root->{'cmdname'}>";
- }
- $result .= "<definitionterm>";
- $result .= $self->_index_entry($root);
+ $result .= "<synopsis>";
+ push @{$self->{'document_context'}}, {};
$self->{'document_context'}->[-1]->{'code'}++;
+ $self->{'document_context'}->[-1]->{'inline'}++;
+ $result .= $self->_index_entry($root);
if ($root->{'extra'} and $root->{'extra'}->{'def_args'}) {
my $main_command;
- my $alias;
if ($Texinfo::Common::def_aliases{$root->{'extra'}->{'def_command'}}) {
$main_command =
$Texinfo::Common::def_aliases{$root->{'extra'}->{'def_command'}};
- $alias = 1;
} else {
$main_command = $root->{'extra'}->{'def_command'};
- $alias = 0;
}
foreach my $arg (@{$root->{'extra'}->{'def_args'}}) {
my $type = $arg->[0];
my $content = $self->_convert($arg->[1]);
- if ($type eq 'spaces') {
+ if ($type eq 'spaces' or $type eq 'delimiter') {
$result .= $content;
- } else {
- my $attribute;
- if ($type eq 'category' and $alias) {
- $attribute = " automatic=\"on\"";
- } else {
- $attribute = "";
+ } elsif ($type eq 'category') {
+ $result .= "<emphasis type=\"bold\">$content</emphasis>:";
+ } elsif ($type eq 'name') {
+ $result .=
"<$defcommand_name_type{$main_command}>$content</$defcommand_name_type{$main_command}>";
+ } else {
+ foreach my $element (reverse (
+ @{$def_argument_types_docbook{$type}})) {
+ $content = "<$element>$content</$element>";
}
- my $element;
- if ($type eq 'name') {
- $element = $defcommand_name_type{$main_command};
- } elsif ($type eq 'arg') {
- $element = 'param';
- } elsif ($type eq 'argtype') {
- $element = 'paramtype';
- } else {
- $element = $type;
- }
- $result .= "<def$element${attribute}>$content</def$element>";
+ $result .= $content;
}
}
}
- $self->{'document_context'}->[-1]->{'code'}--;
- $result .= "</definitionterm>";
- if ($root->{'cmdname'}) {
- $result .= "</$root->{'cmdname'}>";
- }
- chomp ($result);
+ pop @{$self->{'document_context'}};
+ $result .= "</synopsis>";
$result .= "\n";
}
}
@@ -1084,6 +1171,10 @@
if (ref($root->{'contents'}) ne 'ARRAY') {
cluck "contents not an array($root->{'contents'}).";
}
+ if (defined($self->{'pending_prepend'}) and $self->_in_inline($root)) {
+ $result .= $self->{'pending_prepend'};
+ delete $self->{'pending_prepend'};
+ }
foreach my $content (@{$root->{'contents'}}) {
$result .= $self->_convert($content);
}
Index: t/02coverage.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/02coverage.t,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- t/02coverage.t 11 Sep 2011 02:18:23 -0000 1.60
+++ t/02coverage.t 12 Sep 2011 23:39:14 -0000 1.61
@@ -692,7 +692,7 @@
push @{$test->[2]->{'test_formats'}}, 'plaintext';
push @{$test->[2]->{'test_formats'}}, 'html_text';
push @{$test->[2]->{'test_formats'}}, 'xml';
- #push @{$test->[2]->{'test_formats'}}, 'docbook';
+ push @{$test->[2]->{'test_formats'}}, 'docbook';
}
our ($arg_test_case, $arg_generate, $arg_debug);
Index: t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- t/test_utils.pl 11 Sep 2011 02:18:23 -0000 1.97
+++ t/test_utils.pl 12 Sep 2011 23:39:14 -0000 1.98
@@ -57,6 +57,16 @@
'debugcount' => 'txt',
'html_text' => 'html',
'xml' => 'xml',
+ 'docbook' => 'dbk',
+);
+
+my %outfile_preamble = (
+ 'docbook' => ['<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; [
+ <!ENTITY tex "TeX">
+ <!ENTITY latex "LaTeX">
+]>
+'. "<book lang=\"en\">\n", "</book>\n"],
);
our $arg_generate;
@@ -485,7 +495,13 @@
if (!open (OUTFILE, ">$outfile")) {
warn "Open $outfile: $!\n";
} else {
+ if ($outfile_preamble{$format}) {
+ print OUTFILE $outfile_preamble{$format}->[0];
+ }
print OUTFILE $converted{$format};
+ if ($outfile_preamble{$format}) {
+ print OUTFILE $outfile_preamble{$format}->[1];
+ }
close (OUTFILE) or warn "Close $outfile: $!\n";
}
if ($converted_errors{$format}) {
Index: t/results/coverage/accent_and_dash.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage/accent_and_dash.pl 6 Sep 2011 20:20:45 -0000
1.7
+++ t/results/coverage/accent_and_dash.pl 12 Sep 2011 23:39:15 -0000
1.8
@@ -61,4 +61,7 @@
$result_converted{'xml'}->{'accent_and_dash'} = '<para><accent
type="circ">a&textndash;</accent></para>';
+
+$result_converted{'docbook'}->{'accent_and_dash'} = '<para>a–^</para>';
+
1;
Index: t/results/coverage/at_after_accent_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/at_after_accent_command.pl 6 Sep 2011 20:20:45
-0000 1.4
+++ t/results/coverage/at_after_accent_command.pl 12 Sep 2011 23:39:15
-0000 1.5
@@ -95,4 +95,8 @@
$result_converted{'xml'}->{'at_after_accent_command'} = '<para><accent
type="ring"></accent>&arobase;. <accent type="circ"></accent>&arobase;.
</para>';
+
+$result_converted{'docbook'}->{'at_after_accent_command'} =
'<para>address@hidden address@hidden
+</para>';
+
1;
Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- t/results/coverage/block_commands.pl 6 Sep 2011 23:04:03 -0000
1.42
+++ t/results/coverage/block_commands.pl 12 Sep 2011 23:39:15 -0000
1.43
@@ -577,4 +577,21 @@
</float>
';
+
+$result_converted{'docbook'}->{'block_commands'} = '
+
+<para>in group
+</para>
+
+<warning><para>in quotation
+</para></warning>
+
+<anchor id="b-float"/>
+<para>In float
+</para>
+
+
+
+';
+
1;
Index: t/results/coverage/cartouche.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/cartouche.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/cartouche.pl 10 Sep 2011 11:17:27 -0000 1.13
+++ t/results/coverage/cartouche.pl 12 Sep 2011 23:39:15 -0000 1.14
@@ -117,4 +117,10 @@
<para>in cartouche.
</para></cartouche>';
+
+$result_converted{'docbook'}->{'cartouche'} = '
+<para>in cartouche.
+</para>
+';
+
1;
Index: t/results/coverage/cartouche_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/cartouche_in_example.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/cartouche_in_example.pl 7 Sep 2011 23:17:45 -0000
1.4
+++ t/results/coverage/cartouche_in_example.pl 12 Sep 2011 23:39:15 -0000
1.5
@@ -242,4 +242,14 @@
</pre></example>
';
+
+$result_converted{'docbook'}->{'cartouche_in_example'} = '
+<screen>In example
+</screen>
+<screen>In cartouche in example
+</screen>
+<screen>end example
+</screen>
+';
+
1;
Index: t/results/coverage/cartouche_in_quotation.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/coverage/cartouche_in_quotation.pl 6 Sep 2011 20:20:45
-0000 1.9
+++ t/results/coverage/cartouche_in_quotation.pl 12 Sep 2011 23:39:15
-0000 1.10
@@ -242,4 +242,14 @@
</para></quotation>
';
+
+$result_converted{'docbook'}->{'cartouche_in_quotation'} = '<blockquote>
+<para>In quotation
+</para>
+<para>In cartouche in quotation
+</para>
+<para>end quotation
+</para></blockquote>
+';
+
1;
Index: t/results/coverage/center.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/center.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/coverage/center.pl 6 Sep 2011 20:20:45 -0000 1.11
+++ t/results/coverage/center.pl 12 Sep 2011 23:39:15 -0000 1.12
@@ -126,4 +126,10 @@
';
+
+$result_converted{'docbook'}->{'center'} = '
+in center <literal>in code</literal>
+
+';
+
1;
Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/results/coverage/commands.pl 6 Sep 2011 20:20:46 -0000 1.46
+++ t/results/coverage/commands.pl 12 Sep 2011 23:39:15 -0000 1.47
@@ -577,4 +577,15 @@
<majorheading>majorheading <b>in b</b></majorheading>
';
+
+$result_converted{'docbook'}->{'commands'} = '<para>@ &tex;  ë
î ã å
+File → Open.
+<ulink url="mailto:a";>b</ulink> <literal>code --- -- \'\' ``</literal>
+— – ” “. small caps.
+</para>
+<indexterm role="cp"><primary>index entry “in text”
&latex;</primary></indexterm>
+
+<bridgehead renderas="other">majorheading <emphasis role="bold">in
b</emphasis></bridgehead>
+';
+
1;
Index: t/results/coverage/comment_on_cartouche_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage/comment_on_cartouche_line.pl 7 Sep 2011 22:41:21
-0000 1.7
+++ t/results/coverage/comment_on_cartouche_line.pl 12 Sep 2011 23:39:15
-0000 1.8
@@ -148,4 +148,9 @@
</para></cartouche>
';
+
+$result_converted{'docbook'}->{'comment_on_cartouche_line'} = '<para>in
cartouche.
+</para>
+';
+
1;
Index: t/results/coverage/comment_on_group_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/comment_on_group_line.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage/comment_on_group_line.pl 7 Sep 2011 22:41:22 -0000
1.7
+++ t/results/coverage/comment_on_group_line.pl 12 Sep 2011 23:39:15 -0000
1.8
@@ -146,4 +146,9 @@
</para></group>
';
+
+$result_converted{'docbook'}->{'comment_on_group_line'} = '<para>in group.
+</para>
+';
+
1;
Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- t/results/coverage/def.pl 6 Sep 2011 20:20:46 -0000 1.51
+++ t/results/coverage/def.pl 12 Sep 2011 23:39:15 -0000 1.52
@@ -2539,4 +2539,34 @@
</para></definitionitem></deffn>
';
+
+$result_converted{'docbook'}->{'def'} = '
+<synopsis><indexterm
role="fn"><primary>d--effn_name</primary></indexterm><emphasis
type="bold">c--ategory</emphasis>: <function>d--effn_name</function>
<replaceable>a--rguments...</replaceable></synopsis>
+<blockquote><para>d–effn
+</para></blockquote>
+
+<synopsis><indexterm
role="fn"><primary>de--ffn_name</primary></indexterm><emphasis
type="bold">cate--gory</emphasis>: <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>
+<blockquote><para>def–fn
+</para></blockquote>
+
+<synopsis><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><emphasis
type="bold">fset</emphasis>: <function><replaceable>i</replaceable></function>
<replaceable>a</replaceable> <replaceable>g</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><emphasis
type="bold">cmde</emphasis>: <function>truc</function>
<replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log
trap</primary></indexterm><emphasis type="bold">Command</emphasis>:
<function>log trap</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log
trap1</primary></indexterm><emphasis type="bold">Command</emphasis>:
<function>log trap1</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log
trap2</primary></indexterm><emphasis type="bold">Command</emphasis>:
<function>log trap2</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><emphasis type="bold">cmde</emphasis>:
<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><emphasis type="bold">cmde2</emphasis>:
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><emphasis
type="bold"></emphasis>: <function>machin</function></synopsis>
+<synopsis><indexterm role="fn"><primary>bidule
machin</primary></indexterm><emphasis type="bold"></emphasis>: <function>bidule
machin</function></synopsis>
+<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><emphasis
type="bold">truc</emphasis>: <function>machin</function></synopsis>
+<synopsis><indexterm
role="fn"><primary>followed</primary></indexterm><emphasis
type="bold">truc</emphasis>: <function>followed</function>
<replaceable>by</replaceable> <replaceable>a</replaceable>
<replaceable>comment</replaceable></synopsis>
+<!-- comment -->
+<synopsis><indexterm role="fn"><primary>after</primary></indexterm><emphasis
type="bold">truc</emphasis>: <function>after</function>
<replaceable>a</replaceable> <replaceable>deff</replaceable>
<replaceable>item</replaceable></synopsis>
+<!-- comment -->
+<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><emphasis
type="bold">truc</emphasis>: <function>deffnx</function>
<replaceable>before</replaceable> <replaceable>end</replaceable>
<replaceable>deffn</replaceable></synopsis>
+<blockquote><para>Various deff lines
+</para></blockquote>
+';
+
1;
Index: t/results/coverage/exdent_and_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/exdent_and_commands.pl 7 Sep 2011 23:17:45 -0000
1.13
+++ t/results/coverage/exdent_and_commands.pl 12 Sep 2011 23:39:15 -0000
1.14
@@ -577,4 +577,22 @@
</pre></example>
';
+
+$result_converted{'docbook'}->{'exdent_and_commands'} = '<blockquote>
+<para>quotation1
+</para><simpara>in exdented protected eol  </simpara><para>following
+</para><simpara>in exdented a @*
+ and following</simpara>
+<para>after exdented
+</para></blockquote>
+
+
+<screen>example
+</screen><simpara>in exdented protected eol  </simpara><screen>following
+</screen><simpara>in exdented a @*
+ and following</simpara>
+<screen>after exdented
+</screen>
+';
+
1;
Index: t/results/coverage/exdent_and_formats.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/coverage/exdent_and_formats.pl 7 Sep 2011 23:17:45 -0000
1.16
+++ t/results/coverage/exdent_and_formats.pl 12 Sep 2011 23:39:16 -0000
1.17
@@ -2473,4 +2473,88 @@
</quotation>
';
+
+$result_converted{'docbook'}->{'exdent_and_formats'} = '
+<screen> Example Hoho. &tex; .
+ @.
+
+</screen><simpara>Other line</simpara>
+<screen>not exdented
+</screen>
+
+
+
+<simpara>exdented and dash --- in example</simpara>
+<screen>Not exdented
+</screen><simpara>exdented</simpara>
+<screen>Not exdented
+</screen>
+
+<para>Para1.
+</para>
+<blockquote>
+<para>qsddsqkdsqkkmljsqjsqodmmdsqdsmqj dqs sdq sqd sdq dsq sdq sqd sqd sdq sdq
+qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq sdqsd q
+</para></blockquote>
+
+<para>Para2.
+</para>
+<para>Para3.
+</para>
+<para>Last para.
+</para>
+<blockquote>
+<para>quotation1
+quotation2
+</para></blockquote>
+
+<blockquote>
+<para>quotation para 1
+</para>
+<para>quotation para 2
+</para></blockquote>
+
+
+<screen>Example Hoho.
+</screen>
+<screen>Nested Other line
+</screen><simpara>exdented nested other line</simpara>
+
+
+
+<blockquote>
+<simpara>exdented quotation line and dash — in quotation</simpara>
+</blockquote>
+
+<blockquote>
+<para>Not exdented followed by exdented
+</para><simpara>exdented quotation line</simpara>
+</blockquote>
+
+<blockquote>
+<simpara>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>
+
+<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>
+
+<blockquote>
+<para>quotation line oidfjslsd aez a aze azaz aeae za eaz az zelef aaa
+</para><simpara>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>
+';
+
1;
Index: t/results/coverage/flushleft_flushright.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/flushleft_flushright.pl 6 Sep 2011 20:20:46 -0000
1.12
+++ t/results/coverage/flushleft_flushright.pl 12 Sep 2011 23:39:16 -0000
1.13
@@ -346,4 +346,23 @@
</para></flushright>
';
+
+$result_converted{'docbook'}->{'flushleft_flushright'} = '
+
+<para>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
+ldskf dsflj
+ lklsdlv l lll. Bbb.
+</para>
+<para>lhds
+</para>
+
+
+<para>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
+ldskf dsflj
+ lklsdlv l lll. Bbb.
+</para>
+<para>lhds
+</para>
+';
+
1;
Index: t/results/coverage/flushleft_flushright_in_quotation.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/flushleft_flushright_in_quotation.pl 6 Sep 2011
20:20:46 -0000 1.12
+++ t/results/coverage/flushleft_flushright_in_quotation.pl 12 Sep 2011
23:39:16 -0000 1.13
@@ -334,4 +334,17 @@
</quotation>
';
+
+$result_converted{'docbook'}->{'flushleft_flushright_in_quotation'} = '
+<blockquote>
+
+<para>f l
+</para>
+
+
+<para>f r
+</para>
+</blockquote>
+';
+
1;
Index: t/results/coverage/flushright_example_nested.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/flushright_example_nested.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/coverage/flushright_example_nested.pl 7 Sep 2011 23:17:45
-0000 1.9
+++ t/results/coverage/flushright_example_nested.pl 12 Sep 2011 23:39:16
-0000 1.10
@@ -392,4 +392,18 @@
</flushright>
';
+
+$result_converted{'docbook'}->{'flushright_example_nested'} = '
+
+<screen>in --- flushright
+</screen>
+
+
+
+
+<screen>in --- example
+</screen>
+
+';
+
1;
Index: t/results/coverage/hyphenation.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/hyphenation.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/coverage/hyphenation.pl 6 Sep 2011 20:20:46 -0000 1.10
+++ t/results/coverage/hyphenation.pl 12 Sep 2011 23:39:16 -0000 1.11
@@ -79,4 +79,9 @@
<hyphenation>some-where </hyphenation>
';
+
+$result_converted{'docbook'}->{'hyphenation'} = '
+
+';
+
1;
Index: t/results/coverage/insertcopying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/insertcopying.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/insertcopying.pl 10 Sep 2011 13:16:19 -0000 1.13
+++ t/results/coverage/insertcopying.pl 12 Sep 2011 23:39:16 -0000 1.14
@@ -286,4 +286,24 @@
<insertcopying></insertcopying>
';
+
+$result_converted{'docbook'}->{'insertcopying'} = '<bookinfo><legalnotice>
+<para>License.
+</para>
+<blockquote>
+<para>You are not allowed.
+</para></blockquote>
+</legalnotice></bookinfo>
+
+<para>License:
+</para>
+
+<para>License.
+</para>
+<blockquote>
+<para>You are not allowed.
+</para></blockquote>
+
+';
+
1;
Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- t/results/coverage/item_container.pl 11 Sep 2011 19:05:09 -0000
1.42
+++ t/results/coverage/item_container.pl 12 Sep 2011 23:39:16 -0000
1.43
@@ -507,4 +507,18 @@
</para></item></itemize>
';
+
+$result_converted{'docbook'}->{'item_container'} = '
+<itemizedlist><listitem><para>+ i–tem +
+</para></listitem></itemizedlist>
+
+<itemizedlist><listitem>
+<para>• b–ullet
+</para></listitem></itemizedlist>
+
+<itemizedlist>
+<listitem><para>• no itemize argument
+</para></listitem></itemizedlist>
+';
+
1;
Index: t/results/coverage/lettered_accent_and_spaces.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/coverage/lettered_accent_and_spaces.pl 6 Sep 2011 20:20:47
-0000 1.10
+++ t/results/coverage/lettered_accent_and_spaces.pl 12 Sep 2011 23:39:16
-0000 1.11
@@ -62,4 +62,8 @@
$result_converted{'xml'}->{'lettered_accent_and_spaces'} = '<para><accent
type="ring">a</accent>
</para>';
+
+$result_converted{'docbook'}->{'lettered_accent_and_spaces'} = '<para>å
+</para>';
+
1;
Index: t/results/coverage/math.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/math.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/coverage/math.pl 6 Sep 2011 20:20:47 -0000 1.27
+++ t/results/coverage/math.pl 12 Sep 2011 23:39:16 -0000 1.28
@@ -442,4 +442,19 @@
</para>
';
+
+$result_converted{'docbook'}->{'math'} = '<para>Simple math
+<inlineequation><mathphrase>--{x^i}\\over{\\tan
y}</mathphrase></inlineequation>
+</para>
+<para>Math with @-command
+<inlineequation><mathphrase><literal>math code</literal> a <
b</mathphrase></inlineequation>
+</para>
+<para>Complex
+<inlineequation><mathphrase>\\underline{<literal>math \\hbox{ code
}</literal>} \\i \\sum_{i}{\\underline{f}}</mathphrase></inlineequation>
+</para>
+<para>@\\ outside of math
+\\
+</para>
+';
+
1;
Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/results/coverage/multitable.pl 6 Sep 2011 23:04:04 -0000 1.46
+++ t/results/coverage/multitable.pl 12 Sep 2011 23:39:16 -0000 1.47
@@ -839,4 +839,18 @@
</para></entry></row></tbody></multitable>
';
+
+$result_converted{'docbook'}->{'multitable'} = '
+<informaltable><tgroup cols="2"><colspec colwidth="60*"></colspec><colspec
colwidth="40*"></colspec><thead><row><entry><para>mu–ltitable headitem
</para></entry><entry><para>another tab
+</para></entry></row></thead><tbody><row><entry><para>mu–ltitable item
</para></entry><entry><para>multitable tab
+<!-- comment in multitable -->
+</para></entry></row><row><entry><para>mu–ltitable item 2
</para></entry><entry><para>multitable tab 2
+<indexterm role="cp"><primary>index entry within
multitable</primary></indexterm>
+</para></entry></row><row><entry><para>lone mu–ltitable item
+</para></entry></row></tbody></tgroup></informaltable>
+
+<informaltable><tgroup cols="2"><colspec colwidth="4*"></colspec><colspec
colwidth="6*"></colspec><tbody><row><entry><para>truc
</para></entry><entry><para>bidule
+</para></entry></row></tbody></tgroup></informaltable>
+';
+
1;
Index: t/results/coverage/nested_block_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/nested_block_commands.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/coverage/nested_block_commands.pl 6 Sep 2011 20:20:47 -0000
1.25
+++ t/results/coverage/nested_block_commands.pl 12 Sep 2011 23:39:16 -0000
1.26
@@ -2571,4 +2571,99 @@
</group>
';
+
+$result_converted{'docbook'}->{'nested_block_commands'} = '
+<para>In group
+</para><blockquote>
+<para>in quotation
+</para></blockquote>
+
+
+
+<blockquote>
+<para>in quotation
+</para></blockquote>
+
+
+
+<para>In group
+</para><blockquote>
+<para>in quotation
+</para></blockquote>
+<para>after quotation
+</para>
+
+
+
+<para>In group sp b
+</para><blockquote>
+<para>in quotation
+</para></blockquote>
+
+
+
+
+<para>In group sp b a
+</para>
+<blockquote>
+<para>in quotation
+</para></blockquote>
+
+
+
+<para>In group sp a
+</para>
+<blockquote>
+<para>in quotation
+</para></blockquote>
+
+
+
+<blockquote>
+
+<para>in quotation sp b
+</para></blockquote>
+
+
+
+<blockquote>
+
+<para>in quotation sp b a
+</para>
+</blockquote>
+
+
+
+<blockquote>
+<para>in quotation sp a
+</para>
+</blockquote>
+
+
+
+<blockquote>
+<para>in quotation
+</para></blockquote>
+
+<para>After quotation sp b
+</para>
+
+
+<blockquote>
+<para>in quotation
+</para></blockquote>
+<para>After quotation sp a
+</para>
+
+
+
+<blockquote>
+<para>in quotation
+</para></blockquote>
+
+<para>After quotation sp b a
+</para>
+
+';
+
1;
Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- t/results/coverage/preformatted.pl 11 Sep 2011 19:05:09 -0000 1.49
+++ t/results/coverage/preformatted.pl 12 Sep 2011 23:39:17 -0000 1.50
@@ -490,4 +490,20 @@
</format>
';
+
+$result_converted{'docbook'}->{'preformatted'} = '
+
+<screen>e--xample some
+
+ text
+</screen>
+
+
+<variablelist><varlistentry><term><literal>item in table in format
+</literal></term><listitem><abstract>
+in table in format
+</abstract></listitem></varlistentry></variablelist>
+
+';
+
1;
Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/coverage/punctuation_in_line_commands.pl 11 Sep 2011 19:05:09
-0000 1.21
+++ t/results/coverage/punctuation_in_line_commands.pl 12 Sep 2011 23:39:17
-0000 1.22
@@ -1540,4 +1540,41 @@
</top>
';
+
+$result_converted{'docbook'}->{'punctuation_in_line_commands'} = '
+<chapter id="node_0021-After-punc">
+<title>top! After punc</title>
+
+<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>
+</blockquote>
+
+<anchor id="float-label_0021-After-punc"/>
+<para>In float
+</para>
+
+
+<anchor id="label-with-caption"/>
+<para>In float with caption.
+</para>
+
+
+
+<indexterm role="cp"><primary>index! After punc</primary></indexterm>
+
+<bridgehead renderas="sect1">heading! After punc</bridgehead>
+
+titlefont! After punc
+
+center! After punc
+
+<index role="cp"></index>
+
+
+</chapter>
+';
+
1;
Index: t/results/coverage/quotation_author.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/quotation_author.pl 6 Sep 2011 20:20:47 -0000
1.12
+++ t/results/coverage/quotation_author.pl 12 Sep 2011 23:39:17 -0000
1.13
@@ -292,4 +292,15 @@
</quotation>
';
+
+$result_converted{'docbook'}->{'quotation_author'} =
'<blockquote><attribution>First Author</attribution>
+<attribution>Sẽcond author</attribution>
+
+
+<para>quotation
+quotation continues.
+</para>
+</blockquote>
+';
+
1;
Index: t/results/coverage/setfilename_in_paragraph.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/setfilename_in_paragraph.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/setfilename_in_paragraph.pl 6 Sep 2011 20:20:47
-0000 1.4
+++ t/results/coverage/setfilename_in_paragraph.pl 12 Sep 2011 23:39:17
-0000 1.5
@@ -92,4 +92,8 @@
</para><setfilename file="filename.info">filename.info</setfilename>
';
+
+$result_converted{'docbook'}->{'setfilename_in_paragraph'} = '<para>Some text
+</para>';
+
1;
Index: t/results/coverage/symbol_after_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/coverage/symbol_after_command.pl 11 Sep 2011 19:05:09 -0000
1.11
+++ t/results/coverage/symbol_after_command.pl 12 Sep 2011 23:39:17 -0000
1.12
@@ -672,4 +672,17 @@
<para>&arobase;. }, &arobase;&arobase; &eosquest;, &eosexcl;:
&arobase;} &arobase;&textrdquo; &arobase;:
</para>';
+
+$result_converted{'docbook'}->{'symbol_after_command'} =
'<variablelist><varlistentry><term>. dot
+</term></varlistentry><varlistentry><term>, comma
+</term></varlistentry><varlistentry><term>@ @
+</term></varlistentry><varlistentry><term>{ {
+</term></varlistentry><varlistentry><term>! exclam
+</term></varlistentry><varlistentry><term>” quotes
+</term></varlistentry><varlistentry><term>: colon
+</term></varlistentry></variablelist>
+
+<para>@. {, @@ ?, !: @{ @” @:
+</para>';
+
1;
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- t/results/coverage/table.pl 11 Sep 2011 19:05:09 -0000 1.48
+++ t/results/coverage/table.pl 12 Sep 2011 23:39:17 -0000 1.49
@@ -838,4 +838,23 @@
</tableitem></tableentry></vtable>
';
+
+$result_converted{'docbook'}->{'table'} = '
+<variablelist><varlistentry><term>table item
+</term><term>table itemx
+</term><listitem>
+<para>In table
+</para></listitem></varlistentry></variablelist>
+
+<variablelist><!-- after vtable -->
+<indexterm role="cp"><primary>index entry</primary></indexterm>
+
+<varlistentry><term>‘<literal>vtable item
+</literal>’</term><!-- after item -->
+<indexterm role="ky"><primary>key</primary></indexterm>
+<term>‘<literal>itemx vtable <!-- comment in itemx line -->
+</literal>’</term><listitem>
+</listitem></varlistentry></variablelist>
+';
+
1;
Index: t/results/coverage/table_command_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- t/results/coverage/table_command_comment.pl 11 Sep 2011 19:05:09 -0000
1.34
+++ t/results/coverage/table_command_comment.pl 12 Sep 2011 23:39:17 -0000
1.35
@@ -201,4 +201,9 @@
<tableentry><tableterm><item><itemformat
command="code">item</itemformat></item>
</tableterm></tableentry></table>';
+
+$result_converted{'docbook'}->{'table_command_comment'} =
'<variablelist><varlistentry><term><literal>item
+</literal></term></varlistentry></variablelist>
+';
+
1;
Index: t/results/coverage/test_tie.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/test_tie.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage/test_tie.pl 6 Sep 2011 20:20:47 -0000 1.7
+++ t/results/coverage/test_tie.pl 12 Sep 2011 23:39:17 -0000 1.8
@@ -65,4 +65,8 @@
$result_converted{'xml'}->{'test_tie'} =
'<para>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA BBBBBBBBBBB
</para>';
+
+$result_converted{'docbook'}->{'test_tie'} =
'<para>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA BBBBBBBBBBB
+</para>';
+
1;
Index: t/results/coverage/test_today.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/test_today.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage/test_today.pl 6 Sep 2011 20:20:48 -0000 1.7
+++ t/results/coverage/test_today.pl 12 Sep 2011 23:39:17 -0000 1.8
@@ -55,4 +55,7 @@
$result_converted{'xml'}->{'test_today'} = '<para><today/>.</para>';
+
+$result_converted{'docbook'}->{'test_today'} = '<para>a sunny day.</para>';
+
1;
Index: t/results/coverage/verbatiminclude.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/coverage/verbatiminclude.pl 6 Sep 2011 20:20:48 -0000
1.11
+++ t/results/coverage/verbatiminclude.pl 12 Sep 2011 23:39:17 -0000
1.12
@@ -86,4 +86,10 @@
<verbatiminclude file="incl-incl.txi">incl-incl.txi</verbatiminclude>
';
+
+$result_converted{'docbook'}->{'verbatiminclude'} = '
+<screen>This is the @emph{included} file (include-value2.txi) <> ---.
+</screen>
+';
+
1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Convert/Converter.pm Te...,
Patrice Dumas <=