[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Convert/DocBook.pm t/re...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Convert/DocBook.pm t/re... |
|
Date: |
Sun, 18 Sep 2011 17:58:20 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/18 17:58:19
Modified files:
tp : TODO
tp/Texinfo/Convert: DocBook.pm
tp/t/results/coverage: block_commands.pl cartouche.pl
cartouche_in_example.pl
cartouche_in_quotation.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
insertcopying.pl item_container.pl
multitable.pl nested_block_commands.pl
preformatted.pl
punctuation_in_line_commands.pl
quotation_author.pl
symbol_after_command.pl table.pl
table_command_comment.pl
verbatiminclude.pl
Log message:
Many improvements to docbook output.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.169&r2=1.170
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche_in_example.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/comment_on_group_line.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_commands.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_formats.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushleft_flushright.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushright_example_nested.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.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/nested_block_commands.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/quotation_author.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_command.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/verbatiminclude.pl?cvsroot=texinfo&r1=1.12&r2=1.13
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- TODO 14 Sep 2011 22:59:13 -0000 1.169
+++ TODO 18 Sep 2011 17:58:17 -0000 1.170
@@ -34,12 +34,6 @@
Is it right or not?
-Mail Karl about Xref Command Expansion
-
- Quotation mark commands are likewise replaced by their Unicode values
-(*note Inserting Quotation Marks::).
-
-
remove _*directions('This' and replace with new API. Done?
There should be an error message (report by Tom Tromey) in
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Texinfo/Convert/DocBook.pm 17 Sep 2011 22:31:55 -0000 1.8
+++ Texinfo/Convert/DocBook.pm 18 Sep 2011 17:58:17 -0000 1.9
@@ -228,15 +228,15 @@
'type' => ['returnvalue'],
'class' => ['ooclass', 'classname'],
'arg' => ['replaceable'],
- 'argtype' => ['type'],
+ 'typearg' => ['type'],
);
my %ignored_types;
-foreach my $type (#'empty_line_after_command',
+foreach my $type ('empty_line_after_command',
'preamble',
'empty_spaces_after_command',
- #'spaces_at_end',
+ 'spaces_at_end',
'empty_spaces_before_argument', 'empty_spaces_before_paragraph',
'empty_spaces_after_close_brace',
'empty_space_at_end_def_bracketed',
@@ -264,6 +264,7 @@
);
my %docbook_preformatted_formats = (
+# command
'example' => 'screen',
'smallexample' => 'screen',
'display' => 'literallayout',
@@ -271,7 +272,10 @@
'lisp' => 'programlisting',
'smalllisp' => 'programlisting',
'format' => 'abstract',
- 'smallformat' => 'screen'
+ 'smallformat' => 'screen',
+# type
+ 'menu_comment' => 'literallayout',
+ 'menu_description' => 'literallayout',
);
sub _defaults($)
@@ -550,7 +554,13 @@
my $table_command = $root->{'parent'}->{'parent'}->{'parent'};
my $format_item_command;
my $arg_tree;
- my $tree = $root->{'args'}->[0];
+ my $content_tree;
+ #my $content_tree = $root->{'args'}->[0];
+ if ($root->{'extra'} and $root->{'extra'}->{'misc_content'}) {
+ $content_tree = $root->{'extra'}->{'misc_content'};
+ } else {
+ $content_tree = [];
+ }
if ($table_command->{'extra'}
and $table_command->{'extra'}->{'command_as_argument'}) {
my $command_as_argument
@@ -558,18 +568,18 @@
if ($command_as_argument->{'type'} ne 'definfoenclose_command') {
$arg_tree = {'cmdname' => $command_as_argument->{'cmdname'},
'args' => [{'type' => 'brace_command_arg',
- 'contents' => [$tree]}]
+ 'contents' => $content_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]}]
+ 'contents' => $content_tree}]
};
}
} else {
- $arg_tree = $tree;
+ $arg_tree = $root->{'args'}->[0];
}
$result .= "<term>";
# Is it automaticcally entered in docbook? No.
@@ -583,6 +593,8 @@
$self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
$result .= $self->_convert($arg_tree);
$self->{'document_context'}->[-1]->{'code'}-- if ($in_code);
+ chomp ($result);
+ $result .= "\n";
$result .= "</term>";
} else {
unless (($root->{'cmdname'} eq 'item'
@@ -631,8 +643,25 @@
}
} elsif ($Texinfo::Common::root_commands{$root->{'cmdname'}}) {
my $attribute;
+ my $label = '';
+ if (defined($root->{'number'})
+ and ($self->get_conf('NUMBER_SECTIONS')
+ or !defined($self->get_conf('NUMBER_SECTIONS')))) {
+ # Looking at docbook2html output, Appendix is appended in the
+ # section title, so only the letter is used.
+ #if ($root->{'cmdname'} eq 'appendix' and $root->{'level'} == 1) {
+ # $label = Texinfo::Convert::Text::convert($self->gdt(
+ # 'Appendix {number}', {'number' =>
+ # {'text' => $root->{'number'}}}),
+ # {'converter' => $self});
+ #} else {
+ # $label = $root->{'number'};
+ #}
+ $label = $root->{'number'};
+ }
+ $attribute = " label=\"$label\"";
if ($root->{'extra'} and $root->{'extra'}->{'associated_node'}) {
- $attribute = "
id=\"$root->{'extra'}->{'associated_node'}->{'extra'}->{'normalized'}\"";
+ $attribute .= "
id=\"$root->{'extra'}->{'associated_node'}->{'extra'}->{'normalized'}\"";
}
$command = $self->_docbook_section_element($root);
$result .= "<$command${attribute}>\n";
@@ -640,12 +669,18 @@
my ($arg, $end_line)
= $self->_convert_argument_and_end_line($root->{'args'}->[0]);
$result .= "<title>$arg</title>$end_line";
+ chomp ($result);
+ $result .= "\n";
}
} elsif ($Texinfo::Common::sectioning_commands{$root->{'cmdname'}}) {
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";
+ $result .=
+ "<bridgehead
renderas=\"$docbook_sections{$root->{'cmdname'}}\">$arg</bridgehead>$end_line";
+ chomp ($result);
+ $result .= "\n";
+ return $result;
}
return '';
} else {
@@ -654,10 +689,13 @@
my ($arg, $end_line)
= $self->_convert_argument_and_end_line($root->{'args'}->[0]);
if ($command eq '') {
- return "$arg$end_line";
+ $result .= "$arg$end_line";
} else {
- return "<$command${attribute}>$arg</$command>$end_line";
+ $result .= "<$command${attribute}>$arg</$command>$end_line";
}
+ chomp ($result);
+ $result .= "\n";
+ return $result;
}
return '';
}
@@ -670,7 +708,6 @@
return '';
}
} else {
- #return "<$command></$command>\n";
return '';
}
} elsif ($type eq 'special') {
@@ -819,7 +856,7 @@
'book' => $book_contents }));
} elsif ($root->{'cmdname'} eq 'pxref') {
return $self->_convert(
- $self->gdt('(see section address@hidden'@asis{}\' in
@cite{{book}})',
+ $self->gdt('see section address@hidden'@asis{}\' in
@cite{{book}}',
{ 'section_name' => {'contents' => $section_name_contents},
'book' => $book_contents }));
}
@@ -844,7 +881,7 @@
'text' => $argument}}));
} elsif ($root->{'cmdname'} eq 'pxref') {
return $self->_convert(
- $self->gdt('(see {title_ref})', {'title_ref' =>
+ $self->gdt('see {title_ref}', {'title_ref' =>
{'type' => '_converted',
'text' => $argument}}));
}
@@ -859,23 +896,25 @@
{'contents' => $root->{'extra'}->{'brace_command_contents'}->[0]},
{'code' => 1});
my $element;
- if ($self->_is_inline($root)) {
- $element = 'inlinemediaobject';
+ my $is_inline = $self->_is_inline($root);
+ if ($is_inline) {
+ $result .= "<inlinemediaobject>";
} else {
- $element = 'mediaobject';
+ $result .= "<informalfigure><mediaobject>";
}
- $result .= "<$element>";
my @files;
foreach my $extension (@docbook_image_extensions) {
- if ($self->Texinfo::Common::locate_include_file
($basefile.$extension)) {
- push @files, ["$basefile.$extension", $extension];
+ if ($self->Texinfo::Common::locate_include_file
("$basefile.$extension")) {
+ push @files, ["$basefile.$extension", uc($extension)];
}
}
if (!scalar(@files)) {
- push @files, ["$basefile.jpg", 'jpg'];
+ push @files, ["$basefile.jpg", 'JPG'];
}
foreach my $file (@files) {
- $result .= "<imageobject><imagedata fileref=\"$file->[0]\"
format=\"$file->[1]\"></imagedata></imageobject>";
+ $result .= "<imageobject><imagedata fileref=\""
+ .$self->xml_protect_text($file->[0])
+ ."\" format=\"$file->[1]\"></imagedata></imageobject>";
}
my $image_text
= $self->Texinfo::Convert::Plaintext::_image_text($root,
$basefile);
@@ -884,7 +923,11 @@
.$self->xml_protect_text($image_text)
.'</literallayout></textobject>';
}
- $result .= "</$element>";
+ if ($is_inline) {
+ $result .= "</inlinemediaobject>";
+ } else {
+ $result .= "</mediaobject></informalfigure>";
+ }
}
} elsif ($root->{'cmdname'} eq 'email') {
if ($root->{'extra'} and $root->{'extra'}->{'brace_command_contents'})
{
@@ -1017,6 +1060,7 @@
push @elements, 'variablelist';
} elsif ($root->{'cmdname'} eq 'itemize') {
push @elements, 'itemizedlist';
+ #push @attributes, " mark=\"\"";
} elsif ($root->{'cmdname'} eq 'multitable') {
push @elements, "informaltable";
push @attributes, '';
@@ -1093,6 +1137,8 @@
# once al the raw internal text has been formatted
$self->{'document_context'}->[-1]->{'raw'} = 1;
}
+ } elsif ($Texinfo::Common::menu_commands{$root->{'cmdname'}}) {
+ return '';
}
foreach my $element (@elements) {
my $attribute = shift @attributes;
@@ -1104,6 +1150,10 @@
}
}
if ($root->{'type'}) {
+ if (exists($docbook_preformatted_formats{$root->{'type'}})) {
+ push @{$self->{'document_context'}->[-1]->{'preformatted_stack'}},
+ $docbook_preformatted_formats{$root->{'type'}};
+ }
if (defined($type_elements{$root->{'type'}})) {
$result .= "<$type_elements{$root->{'type'}}>";
} elsif ($root->{'type'} eq 'preformatted') {
@@ -1131,6 +1181,10 @@
} elsif ($type eq 'name') {
$result .=
"<$defcommand_name_type{$main_command}>$content</$defcommand_name_type{$main_command}>";
} else {
+ if (!defined($def_argument_types_docbook{$type})) {
+ print STDERR "BUG: no def_argument_types_docbook for $type\n";
+ next;
+ }
foreach my $element (reverse (
@{$def_argument_types_docbook{$type}})) {
$content = "<$element>$content</$element>";
@@ -1185,7 +1239,7 @@
chomp ($result);
chomp ($result);
} else {
- $result .= "\n";
+ #$result .= "\n";
if (exists($docbook_preformatted_formats{$root->{'cmdname'}})) {
my $format = pop
@{$self->{'document_context'}->[-1]->{'preformatted_stack'}};
die "BUG $format ne $docbook_preformatted_formats{$root->{'cmdname'}}"
@@ -1195,6 +1249,10 @@
if ($context_block_commands{$root->{'cmdname'}}) {
pop @{$self->{'document_context'}};
}
+ } elsif ($root->{'type'} and
exists($docbook_preformatted_formats{$root->{'type'}})) {
+ my $format = pop
@{$self->{'document_context'}->[-1]->{'preformatted_stack'}};
+ die "BUG $format ne $docbook_preformatted_formats{$root->{'type'}}"
+ if ($format ne $docbook_preformatted_formats{$root->{'type'}});
# The command is closed either when the corresponding tree element
# is done, and the command is not associated to an element, or when
# the element is closed.
Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- t/results/coverage/block_commands.pl 12 Sep 2011 23:39:15 -0000
1.43
+++ t/results/coverage/block_commands.pl 18 Sep 2011 17:58:17 -0000
1.44
@@ -579,19 +579,15 @@
$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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/coverage/cartouche.pl 12 Sep 2011 23:39:15 -0000 1.14
+++ t/results/coverage/cartouche.pl 18 Sep 2011 17:58:17 -0000 1.15
@@ -118,9 +118,7 @@
</para></cartouche>';
-$result_converted{'docbook'}->{'cartouche'} = '
-<para>in cartouche.
-</para>
-';
+$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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/cartouche_in_example.pl 12 Sep 2011 23:39:15 -0000
1.5
+++ t/results/coverage/cartouche_in_example.pl 18 Sep 2011 17:58:17 -0000
1.6
@@ -243,13 +243,9 @@
';
-$result_converted{'docbook'}->{'cartouche_in_example'} = '
-<screen>In example
-</screen>
-<screen>In cartouche in example
-</screen>
-<screen>end example
-</screen>
-';
+$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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/coverage/cartouche_in_quotation.pl 12 Sep 2011 23:39:15
-0000 1.10
+++ t/results/coverage/cartouche_in_quotation.pl 18 Sep 2011 17:58:18
-0000 1.11
@@ -243,13 +243,9 @@
';
-$result_converted{'docbook'}->{'cartouche_in_quotation'} = '<blockquote>
-<para>In quotation
-</para>
-<para>In cartouche in quotation
-</para>
-<para>end quotation
-</para></blockquote>
-';
+$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/comment_on_cartouche_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/coverage/comment_on_cartouche_line.pl 17 Sep 2011 21:23:59
-0000 1.9
+++ t/results/coverage/comment_on_cartouche_line.pl 18 Sep 2011 17:58:18
-0000 1.10
@@ -150,7 +150,6 @@
$result_converted{'docbook'}->{'comment_on_cartouche_line'} = '<para>in
cartouche.
-</para>
-';
+</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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/coverage/comment_on_group_line.pl 17 Sep 2011 21:23:59 -0000
1.9
+++ t/results/coverage/comment_on_group_line.pl 18 Sep 2011 17:58:18 -0000
1.10
@@ -148,7 +148,6 @@
$result_converted{'docbook'}->{'comment_on_group_line'} = '<para>in group.
-</para>
-';
+</para>';
1;
Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- t/results/coverage/def.pl 17 Sep 2011 21:23:59 -0000 1.53
+++ t/results/coverage/def.pl 18 Sep 2011 17:58:18 -0000 1.54
@@ -2544,12 +2544,10 @@
<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>
@@ -2566,7 +2564,6 @@
<!-- 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>
-';
+</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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/coverage/exdent_and_commands.pl 12 Sep 2011 23:39:15 -0000
1.14
+++ t/results/coverage/exdent_and_commands.pl 18 Sep 2011 17:58:18 -0000
1.15
@@ -578,21 +578,19 @@
';
-$result_converted{'docbook'}->{'exdent_and_commands'} = '<blockquote>
-<para>quotation1
-</para><simpara>in exdented protected eol  </simpara><para>following
+$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 protected eol  </simpara>
+<screen>following
</screen><simpara>in exdented a @*
and following</simpara>
<screen>after exdented
-</screen>
-';
+</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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/coverage/exdent_and_formats.pl 12 Sep 2011 23:39:16 -0000
1.17
+++ t/results/coverage/exdent_and_formats.pl 18 Sep 2011 17:58:18 -0000
1.18
@@ -2474,87 +2474,59 @@
';
-$result_converted{'docbook'}->{'exdent_and_formats'} = '
-<screen> Example Hoho. &tex; .
+$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
+<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
+<blockquote><para>quotation1
quotation2
</para></blockquote>
-
-<blockquote>
-<para>quotation para 1
+<blockquote><para>quotation para 1
</para>
<para>quotation para 2
</para></blockquote>
-
-
<screen>Example Hoho.
-</screen>
-<screen>Nested Other line
+</screen><screen>Nested Other line
</screen><simpara>exdented nested other line</simpara>
-
-
-<blockquote>
-<simpara>exdented quotation line and dash — in quotation</simpara>
+<blockquote><simpara>exdented quotation line and dash — in
quotation</simpara>
</blockquote>
-
-<blockquote>
-<para>Not exdented followed by exdented
+<blockquote><para>Not exdented followed by exdented
</para><simpara>exdented quotation line</simpara>
</blockquote>
-
-<blockquote>
-<simpara>exdented quotation line</simpara>
+<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>
+<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>
+<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><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>
+<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>
-';
+</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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/flushleft_flushright.pl 12 Sep 2011 23:39:16 -0000
1.13
+++ t/results/coverage/flushleft_flushright.pl 18 Sep 2011 17:58:18 -0000
1.14
@@ -348,21 +348,17 @@
$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>
-';
+</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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/flushleft_flushright_in_quotation.pl 12 Sep 2011
23:39:16 -0000 1.13
+++ t/results/coverage/flushleft_flushright_in_quotation.pl 18 Sep 2011
17:58:18 -0000 1.14
@@ -336,15 +336,9 @@
$result_converted{'docbook'}->{'flushleft_flushright_in_quotation'} = '
-<blockquote>
-
-<para>f l
+<blockquote><para>f l
</para>
-
-
<para>f r
-</para>
-</blockquote>
-';
+</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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/coverage/flushright_example_nested.pl 12 Sep 2011 23:39:16
-0000 1.10
+++ t/results/coverage/flushright_example_nested.pl 18 Sep 2011 17:58:18
-0000 1.11
@@ -393,17 +393,9 @@
';
-$result_converted{'docbook'}->{'flushright_example_nested'} = '
-
-<screen>in --- flushright
+$result_converted{'docbook'}->{'flushright_example_nested'} = '<screen>in
--- flushright
</screen>
-
-
-
-
<screen>in --- example
-</screen>
-
-';
+</screen>';
1;
Index: t/results/coverage/insertcopying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/insertcopying.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/coverage/insertcopying.pl 12 Sep 2011 23:39:16 -0000 1.14
+++ t/results/coverage/insertcopying.pl 18 Sep 2011 17:58:18 -0000 1.15
@@ -287,23 +287,16 @@
';
-$result_converted{'docbook'}->{'insertcopying'} = '<bookinfo><legalnotice>
-<para>License.
+$result_converted{'docbook'}->{'insertcopying'} =
'<bookinfo><legalnotice><para>License.
</para>
-<blockquote>
-<para>You are not allowed.
-</para></blockquote>
-</legalnotice></bookinfo>
-
+<blockquote><para>You are not allowed.
+</para></blockquote></legalnotice></bookinfo>
<para>License:
</para>
-
<para>License.
</para>
-<blockquote>
-<para>You are not allowed.
+<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.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- t/results/coverage/item_container.pl 13 Sep 2011 23:09:48 -0000
1.44
+++ t/results/coverage/item_container.pl 18 Sep 2011 17:58:18 -0000
1.45
@@ -511,14 +511,9 @@
$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
+<itemizedlist><listitem><para>• b–ullet
</para></listitem></itemizedlist>
-';
+<itemizedlist><listitem><para>• no itemize argument
+</para></listitem></itemizedlist>';
1;
Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- t/results/coverage/multitable.pl 17 Sep 2011 21:23:59 -0000 1.48
+++ t/results/coverage/multitable.pl 18 Sep 2011 17:58:18 -0000 1.49
@@ -848,9 +848,7 @@
<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>
-';
+</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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/coverage/nested_block_commands.pl 12 Sep 2011 23:39:16 -0000
1.26
+++ t/results/coverage/nested_block_commands.pl 18 Sep 2011 17:58:18 -0000
1.27
@@ -2572,98 +2572,50 @@
';
-$result_converted{'docbook'}->{'nested_block_commands'} = '
-<para>In group
-</para><blockquote>
-<para>in quotation
+$result_converted{'docbook'}->{'nested_block_commands'} = '<para>In group
+</para><blockquote><para>in quotation
</para></blockquote>
-
-
-
-<blockquote>
-<para>in quotation
+<blockquote><para>in quotation
</para></blockquote>
-
-
-
<para>In group
-</para><blockquote>
-<para>in quotation
-</para></blockquote>
-<para>after quotation
+</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 quotation
</para></blockquote>
-
-
-
<para>In group sp b a
</para>
-<blockquote>
-<para>in quotation
+<blockquote><para>in quotation
</para></blockquote>
-
-
-
<para>In group sp a
</para>
-<blockquote>
-<para>in quotation
+<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
+<blockquote><para>in quotation sp a
</para>
</blockquote>
-
-
-
-<blockquote>
-<para>in quotation
+<blockquote><para>in quotation
</para></blockquote>
-
<para>After quotation sp b
</para>
-
-
-<blockquote>
-<para>in quotation
-</para></blockquote>
-<para>After quotation sp a
+<blockquote><para>in quotation
+</para></blockquote><para>After quotation sp a
</para>
-
-
-<blockquote>
-<para>in quotation
+<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.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- t/results/coverage/preformatted.pl 12 Sep 2011 23:39:17 -0000 1.50
+++ t/results/coverage/preformatted.pl 18 Sep 2011 17:58:19 -0000 1.51
@@ -492,18 +492,13 @@
$result_converted{'docbook'}->{'preformatted'} = '
-
<screen>e--xample some
text
</screen>
-
-
-<variablelist><varlistentry><term><literal>item in table in format
-</literal></term><listitem><abstract>
+<variablelist><varlistentry><term><literal>item in table in format</literal>
+</term><listitem><abstract>
in table in format
-</abstract></listitem></varlistentry></variablelist>
-
-';
+</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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/coverage/punctuation_in_line_commands.pl 12 Sep 2011 23:39:17
-0000 1.22
+++ t/results/coverage/punctuation_in_line_commands.pl 18 Sep 2011 17:58:19
-0000 1.23
@@ -1542,27 +1542,23 @@
$result_converted{'docbook'}->{'punctuation_in_line_commands'} = '
-<chapter id="node_0021-After-punc">
+<chapter label="" 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>
Index: t/results/coverage/quotation_author.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/quotation_author.pl 12 Sep 2011 23:39:17 -0000
1.13
+++ t/results/coverage/quotation_author.pl 18 Sep 2011 17:58:19 -0000
1.14
@@ -296,11 +296,9 @@
$result_converted{'docbook'}->{'quotation_author'} =
'<blockquote><attribution>First Author</attribution>
<attribution>Sẽcond author</attribution>
-
<para>quotation
quotation continues.
</para>
-</blockquote>
-';
+</blockquote>';
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/symbol_after_command.pl 12 Sep 2011 23:39:17 -0000
1.12
+++ t/results/coverage/symbol_after_command.pl 18 Sep 2011 17:58:19 -0000
1.13
@@ -681,7 +681,6 @@
</term></varlistentry><varlistentry><term>” quotes
</term></varlistentry><varlistentry><term>: colon
</term></varlistentry></variablelist>
-
<para>@. {, @@ ?, !: @{ @” @:
</para>';
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- t/results/coverage/table.pl 17 Sep 2011 21:23:59 -0000 1.51
+++ t/results/coverage/table.pl 18 Sep 2011 17:58:19 -0000 1.52
@@ -845,16 +845,14 @@
</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 -->
+<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>
-';
+<term>‘<literal>itemx vtable</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.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/coverage/table_command_comment.pl 17 Sep 2011 21:23:59 -0000
1.36
+++ t/results/coverage/table_command_comment.pl 18 Sep 2011 17:58:19 -0000
1.37
@@ -202,8 +202,7 @@
</tableterm></tableentry></table>';
-$result_converted{'docbook'}->{'table_command_comment'} =
'<variablelist><varlistentry><term><literal>item
-</literal></term></varlistentry></variablelist>
-';
+$result_converted{'docbook'}->{'table_command_comment'} =
'<variablelist><varlistentry><term><literal>item</literal>
+</term></varlistentry></variablelist>';
1;
Index: t/results/coverage/verbatiminclude.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/verbatiminclude.pl 12 Sep 2011 23:39:17 -0000
1.12
+++ t/results/coverage/verbatiminclude.pl 18 Sep 2011 17:58:19 -0000
1.13
@@ -89,7 +89,6 @@
$result_converted{'docbook'}->{'verbatiminclude'} = '
<screen>This is the @emph{included} file (include-value2.txi) <> ---.
-</screen>
-';
+</screen>';
1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Convert/DocBook.pm t/re...,
Patrice Dumas <=