[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/HTML.pm init/book.pm...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/HTML.pm init/book.pm... |
|
Date: |
Sun, 16 Oct 2011 22:37:10 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/10/16 22:37:10
Modified files:
tp/Texinfo/Convert: HTML.pm
tp/init : book.pm html32.pm tex4ht.pm
tp/t : 10menu.t
tp/t/init : ignore_and_comments_output.init
redefine_need.init
tp/t/results/menu: sc_in_menu.pl
Added files:
tp/init : mini_ker_t2h.init
Log message:
New formatting function, for 'element_footer'.
If a type is in pre_class_types, it starts a composition_context, and is
taken into account to determine if in preformatted.
Add function to register commands and types formatting functions.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.186&r2=1.187
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/book.pm?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/html32.pm?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/tex4ht.pm?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/mini_ker_t2h.init?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/10menu.t?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/init/ignore_and_comments_output.init?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/init/redefine_need.init?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/sc_in_menu.pl?cvsroot=texinfo&r1=1.1&r2=1.2
Patches:
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- Texinfo/Convert/HTML.pm 16 Oct 2011 18:43:18 -0000 1.186
+++ Texinfo/Convert/HTML.pm 16 Oct 2011 22:37:09 -0000 1.187
@@ -95,6 +95,8 @@
%menu_commands, %align_commands);
$composition_context_commands{'float'} = 1;
+my %pre_class_types;
+
# FIXME allow customization?
my %upper_case_commands = ( 'sc' => 1 );
@@ -110,6 +112,7 @@
my $self = shift;
my $context =
$self->{'document_context'}->[-1]->{'composition_context'}->[-1];
if ($preformatted_commands{$context}
+ or $pre_class_types{$context}
or ($menu_commands{$context} and $self->_in_preformatted_in_menu())) {
return $context;
} else {
@@ -983,7 +986,6 @@
$preformatted_commands_context{'verbatim'} = 1;
my %pre_class_commands;
-my %pre_class_types;
foreach my $preformatted_command (keys(%preformatted_commands_context)) {
$pre_class_commands{$preformatted_command} = $preformatted_command;
}
@@ -4052,7 +4054,19 @@
}
}
$result .= $content unless ($special_element);
+ $result .= &{$self->{'format_element_footer'}}($self, $type,
+ $element, $content);
+ return $result;
+}
+
+sub _default_element_footer($$$$)
+{
+ my $self = shift;
+ my $type = shift;
+ my $element = shift;
+ my $content = shift;
+ my $result = '';
my $is_top = $self->_element_is_top($element);
my $next_is_top = ($element->{'element_next'}
and $self->_element_is_top($element->{'element_next'}));
@@ -4177,6 +4191,7 @@
'navigation_header' => \&_default_navigation_header,
'navigation_header_panel' => \&_default_navigation_header_panel,
'element_header' => \&_default_element_header,
+ 'element_footer' => \&_default_element_footer,
'button' => \&_default_button_formatting,
'button_icon_img' => \&_default_button_icon_img,
'external_href' => \&_default_external_href,
@@ -4217,9 +4232,9 @@
}
foreach my $type (keys(%default_types_conversion)) {
- if (exists($Texinfo::Config::types_conversion{$type})) {
+ if (exists($Texinfo::Config::texinfo_types_conversion{$type})) {
$self->{'types_conversion'}->{$type}
- = $Texinfo::Config::types_conversion{$type};
+ = $Texinfo::Config::texinfo_types_conversion{$type};
} else {
$self->{'types_conversion'}->{$type}
= $default_types_conversion{$type};
@@ -4239,9 +4254,9 @@
# FIXME put value in a category in Texinfo::Common?
foreach my $command (keys(%misc_commands), keys(%brace_commands),
keys (%block_commands), keys(%no_brace_commands), 'value') {
- if (exists($Texinfo::Config::commands_conversion{$command})) {
+ if (exists($Texinfo::Config::texinfo_commands_conversion{$command})) {
$self->{'commands_conversion'}->{$command}
- = $Texinfo::Config::commands_conversion{$command};
+ = $Texinfo::Config::texinfo_commands_conversion{$command};
} else {
if (!$self->get_conf('SHOW_MENU')
and ($command eq 'menu' or $command eq 'detailmenu')) {
@@ -4315,7 +4330,7 @@
foreach my $command (keys %{$self->{'commands_conversion'}}) {
if (exists($Texinfo::Config::commands_args{$command})) {
$self->{'commands_args'}->{$command}
- = $Texinfo::Config::commands_conversion{$command};
+ = $Texinfo::Config::commands_args{$command};
} elsif (exists($default_commands_args{$command})) {
$self->{'commands_args'}->{$command} = $default_commands_args{$command};
}
@@ -6081,7 +6096,8 @@
{
package Texinfo::Config;
-use vars qw(%texinfo_default_stage_handlers %texinfo_formatting_references);
+use vars qw(%texinfo_default_stage_handlers %texinfo_formatting_references
+ %texinfo_commands_conversion %texinfo_types_conversion);
sub texinfo_register_handler($$;$)
{
@@ -6100,15 +6116,30 @@
sub texinfo_register_formatting_function($$)
{
- my $type = shift;
+ my $thing = shift;
my $handler = shift;
- if (!$default_formatting_references{$type}) {
- carp ("Unknown formatting type $type\n");
+ if (!$default_formatting_references{$thing}) {
+ carp ("Unknown formatting type $thing\n");
return 0;
}
- $texinfo_formatting_references{$type} = $handler;
+ $texinfo_formatting_references{$thing} = $handler;
}
+sub texinfo_register_command_formatting($$)
+{
+ my $command = shift;
+ my $reference = shift;
+ $texinfo_commands_conversion{$command} = $reference;
+}
+
+sub texinfo_register_type_formatting($$)
+{
+ my $command = shift;
+ my $reference = shift;
+ $texinfo_types_conversion{$command} = $reference;
+}
+
+
}
sub output($$)
@@ -6822,6 +6853,8 @@
} elsif ($pre_class_types{$root->{'type'}}) {
push @{$self->{'document_context'}->[-1]->{'preformatted_classes'}},
$pre_class_types{$root->{'type'}};
+ push @{$self->{'document_context'}->[-1]->{'composition_context'}},
+ $root->{'type'};
}
if ($self->{'code_types'}->{$root->{'type'}}) {
$self->{'document_context'}->[-1]->{'code'}++;
@@ -6858,6 +6891,7 @@
delete $self->{'current_filename'};
} elsif ($pre_class_types{$root->{'type'}}) {
pop @{$self->{'document_context'}->[-1]->{'preformatted_classes'}};
+ pop @{$self->{'document_context'}->[-1]->{'composition_context'}};
}
print STDERR "DO type ($root->{'type'}) => `$result'\n"
if ($self->get_conf('DEBUG'));
Index: init/book.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/book.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- init/book.pm 15 Oct 2011 12:01:43 -0000 1.4
+++ init/book.pm 16 Oct 2011 22:37:09 -0000 1.5
@@ -10,7 +10,7 @@
use strict;
-use vars qw(%commands_conversion $element_file_name);
+use vars qw($element_file_name);
set_from_init_file('contents', 1);
set_from_init_file('INLINE_CONTENTS', 1);
@@ -241,7 +241,8 @@
}
foreach my $command (keys(%Texinfo::Common::sectioning_commands), 'node') {
- $commands_conversion{$command} = \&book_convert_heading_command;
+ texinfo_register_command_formatting($command,
+ \&book_convert_heading_command);
}
sub book_element_file_name($$$)
Index: init/html32.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/html32.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- init/html32.pm 10 Oct 2011 21:08:45 -0000 1.2
+++ init/html32.pm 16 Oct 2011 22:37:09 -0000 1.3
@@ -25,8 +25,7 @@
use strict;
use Texinfo::Convert::Converter qw(xml_protect_text);
-use vars qw(%commands_formatting %style_commands_formatting
- %commands_conversion %types_conversion);
+use vars qw(%commands_formatting %style_commands_formatting);
set_from_init_file('COMPLEX_FORMAT_IN_TABLE', 1);
@@ -124,7 +123,7 @@
}
return $text;
}
-$types_conversion{'text'} = \&html32_convert_text;
+texinfo_register_type_formatting('text', \&html32_convert_text);
sub html32_convert_explained_command($$$$)
@@ -156,8 +155,8 @@
}
foreach my $explained_command (keys(%Texinfo::Common::explained_commands)) {
- $commands_conversion{$explained_command}
- = \&html32_convert_explained_command;
+ texinfo_register_command_formatting($explained_command,
+ \&html32_convert_explained_command);
}
# row in multitable. no thead in html 3.2
@@ -174,7 +173,7 @@
return '';
}
}
-$types_conversion{'row'} = \&html32_convert_row_type;
+texinfo_register_type_formatting('row', \&html32_convert_row_type);
sub html32_convert_tab_command ($$$$)
{
@@ -199,7 +198,8 @@
return "<td>" . $content . '</td>';
}
}
-$commands_conversion{'tab'} = \&html32_convert_tab_command;
+texinfo_register_command_formatting('tab',
+ \&html32_convert_tab_command);
sub html32_convert_item_command($$$$)
{
@@ -217,7 +217,9 @@
return &{$self->default_commands_conversion($cmdname)}($self, $cmdname,
$command, $content);
}
}
-$commands_conversion{'item'} = \&html32_convert_item_command;
-$commands_conversion{'headitem'} = \&html32_convert_item_command;
+texinfo_register_command_formatting('item',
+ \&html32_convert_item_command);
+texinfo_register_command_formatting('headitem',
+ \&html32_convert_item_command);
1;
Index: init/tex4ht.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/tex4ht.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- init/tex4ht.pm 12 Oct 2011 07:33:13 -0000 1.2
+++ init/tex4ht.pm 16 Oct 2011 22:37:10 -0000 1.3
@@ -44,10 +44,8 @@
texinfo_register_handler('init', \&tex4ht_convert);
texinfo_register_handler('finish', \&tex4ht_finish);
-use vars qw(%commands_conversion);
-
-$commands_conversion{'math'} = \&tex4ht_do_tex;
-$commands_conversion{'tex'} = \&tex4ht_do_tex;
+texinfo_register_command_formatting('math', \&tex4ht_do_tex);
+texinfo_register_command_formatting('tex', \&tex4ht_do_tex);
{
use Cwd;
Index: t/10menu.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/10menu.t,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/10menu.t 16 Oct 2011 08:50:36 -0000 1.24
+++ t/10menu.t 16 Oct 2011 22:37:10 -0000 1.25
@@ -231,8 +231,12 @@
@menu
* @sc{value}:@sc{node}. @sc{descrip tion}
address@hidden comment}
+
@example
* @sc{menu-example value}:(dir)@sc{menu-example node}. @sc{menu-example
descrip tion}
+
address@hidden comment}
@end example
@end menu
@@ -241,6 +245,8 @@
@example
@menu
* @sc{example value}:(dir)@sc{example node}. @sc{example descrip tion}
+
address@hidden comment}
@end menu
@end example
Index: t/init/ignore_and_comments_output.init
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/init/ignore_and_comments_output.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/init/ignore_and_comments_output.init 7 Oct 2011 23:53:23 -0000
1.1
+++ t/init/ignore_and_comments_output.init 16 Oct 2011 22:37:10 -0000
1.2
@@ -15,8 +15,8 @@
}
}
-$commands_conversion{'comment'} = \&convert_comment_command;
-$commands_conversion{'c'} = \&convert_comment_command;
+texinfo_register_command_formatting('c', \&convert_comment_command);
+texinfo_register_command_formatting('comment', \&convert_comment_command);
sub convert_ignore_command($$$$)
{
@@ -29,4 +29,4 @@
return $self->xml_comment(" ".$content."\n");
}
-$commands_conversion{'ignore'} = \&convert_ignore_command;
+texinfo_register_command_formatting('ignore', \&convert_ignore_command);
Index: t/init/redefine_need.init
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/init/redefine_need.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/init/redefine_need.init 9 Oct 2011 00:49:38 -0000 1.2
+++ t/init/redefine_need.init 16 Oct 2011 22:37:10 -0000 1.3
@@ -1,6 +1,6 @@
use strict;
-$Texinfo::Config::commands_conversion{'need'} = \&my_need_formatting;
+texinfo_register_command_formatting('need', \&my_need_formatting);
sub my_need_formatting($$$)
{
Index: t/results/menu/sc_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/menu/sc_in_menu.pl 16 Oct 2011 08:50:36 -0000 1.1
+++ t/results/menu/sc_in_menu.pl 16 Oct 2011 22:37:10 -0000 1.2
@@ -194,6 +194,39 @@
'text' => '
',
'type' => 'after_description_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'menu comment'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sc',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
'parent' => {},
@@ -234,7 +267,7 @@
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 10,
'macro' => ''
},
'parent' => {}
@@ -287,6 +320,39 @@
'parent' => {},
'text' => '
'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'menu-example comment'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sc',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
}
],
'parent' => {},
@@ -327,7 +393,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 13,
'macro' => ''
},
'parent' => {}
@@ -338,7 +404,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 9,
'macro' => ''
},
'parent' => {}
@@ -382,7 +448,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 14,
'macro' => ''
},
'parent' => {}
@@ -453,7 +519,7 @@
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 16,
'macro' => ''
},
'parent' => {}
@@ -527,7 +593,7 @@
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 20,
'macro' => ''
},
'parent' => {}
@@ -631,6 +697,51 @@
'type' => 'menu_entry'
},
{
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'after_description_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'example comment'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sc',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_comment'
+ },
+ {
'args' => [
{
'contents' => [
@@ -665,7 +776,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 23,
'macro' => ''
},
'parent' => {}
@@ -676,7 +787,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 15,
+ 'line_nr' => 19,
'macro' => ''
},
'parent' => {}
@@ -716,7 +827,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 24,
'macro' => ''
},
'parent' => {}
@@ -727,7 +838,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 18,
'macro' => ''
},
'parent' => {}
@@ -792,6 +903,11 @@
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1];
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1];
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1];
@@ -810,6 +926,11 @@
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'line_nr'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'};
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[7]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[8];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[8]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[9]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1];
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
@@ -872,14 +993,21 @@
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1];
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
@@ -902,8 +1030,12 @@
@menu
* @sc{value}:@sc{node}. @sc{descrip tion}
address@hidden comment}
+
@example
* @sc{menu-example value}:(dir)@sc{menu-example node}. @sc{menu-example
descrip tion}
+
address@hidden comment}
@end example
@end menu
@@ -912,6 +1044,8 @@
@example
@menu
* @sc{example value}:(dir)@sc{example node}. @sc{example descrip tion}
+
address@hidden comment}
@end menu
@end example
@@ -922,11 +1056,17 @@
* VALUE:NODE. DESCRIP TION
+MENU COMMENT
+
* MENU-EXAMPLE VALUE:(dir)MENU-EXAMPLE NODE. MENU-EXAMPLE DESCRIP TION
+MENU-EXAMPLE COMMENT
+
* EXAMPLE VALUE:(dir)EXAMPLE NODE. EXAMPLE DESCRIP TION
+EXAMPLE COMMENT
+
';
$result_sectioning{'sc_in_menu'} = {};
@@ -1040,12 +1180,18 @@
* VALUE:NODE. DESCRIP TION
+MENU COMMENT
+
* MENU-EXAMPLE VALUE:(dir)MENU-EXAMPLE NODE. MENU-EXAMPLE DESCRIP TION
+ MENU-EXAMPLE COMMENT
+
* Menu:
* EXAMPLE VALUE:(dir)EXAMPLE NODE. EXAMPLE DESCRIP TION
+ EXAMPLE COMMENT
+
';
@@ -1104,8 +1250,12 @@
<tr><td align="left" valign="top">• <a href="#NODE"
accesskey="1"><small>VALUE</small></a>:</td><td> </td><td
align="left" valign="top"> <small>DESCRIP TION</small>
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+MENU COMMENT
+
</pre><div class="example">
<pre class="example">* MENU-EXAMPLE VALUE:(dir)MENU-EXAMPLE NODE.
MENU-EXAMPLE DESCRIP TION
+
+MENU-EXAMPLE COMMENT
</pre></div>
</th></tr></table>
@@ -1120,6 +1270,8 @@
<div class="example">
<table class="menu" border="0" cellspacing="0"><tr><td>
<pre class="menu-preformatted">• EXAMPLE VALUE:<a
href="dir.html#EXAMPLE-NODE" accesskey="1">(dir)EXAMPLE NODE</a>. EXAMPLE
DESCRIP TION
+</pre><pre class="menu-comment">
+EXAMPLE COMMENT
</pre></td></tr></table>
</div>
Index: init/mini_ker_t2h.init
===================================================================
RCS file: init/mini_ker_t2h.init
diff -N init/mini_ker_t2h.init
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ init/mini_ker_t2h.init 16 Oct 2011 22:37:10 -0000 1.1
@@ -0,0 +1,33 @@
+set_from_init_file('shortcontents', 1);
+
+sub mini_ker_element_type($$$$)
+{
+ my $self = shift;
+ my $cmdname = shift;
+ my $command = shift;
+ my $content = shift;
+
+ if ($self->_element_is_top($command)) {
+ my $result = '';
+ $result .= &{$self->{'format_navigation_header'}}($self,
+ $self->get_conf('MISC_BUTTONS'), $cmdname, $command)
+ if ($self->get_conf('SPLIT') or $self->get_conf('HEADERS'));
+ $result .= &{$self->{'format_titlepage'}}($self);
+ my $overview = &{$self->{'format_contents'}}($self, 'shortcontents',
undef);
+ if ($overview) {
+ $result .= '<h2> ' .$self->convert_tree($self->gdt('Overview:'))
+ . "</h2>\n" . "<blockquote>\n";
+ $result .= $overview;;
+ $result .= "</blockquote>\n";
+ }
+ $result .= &{$self->default_formatting_function('element_footer')}($self,
+ $cmdname, $command, $content);
+ return $result;
+ } else {
+ return &{$self->default_types_conversion($cmdname)}($self,
+ $cmdname, $command, $content);
+ }
+}
+
+texinfo_register_type_formatting('element', \&mini_ker_element_type);
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/HTML.pm init/book.pm...,
Patrice Dumas <=