[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html/examples info.init
From: |
Patrice Dumas |
Subject: |
[Texi2html-cvs] texi2html/examples info.init |
Date: |
Thu, 16 Apr 2009 08:28:08 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/04/16 08:28:08
Modified files:
examples : info.init
Log message:
Better def* formatting
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.26&r2=1.27
Patches:
Index: info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- info.init 13 Apr 2009 22:54:12 -0000 1.26
+++ info.init 16 Apr 2009 08:28:07 -0000 1.27
@@ -184,7 +184,7 @@
}
my %info_default_indented_commands;
-foreach my $command (keys (%{$complex_format_map}),
@info_default_normal_formats, 'quotation', keys(%def_map))
+foreach my $command (keys (%{$complex_format_map}),
@info_default_normal_formats, 'quotation', 'deff_item')
{
$info_default_indented_commands{$command} = 1;
}
@@ -479,8 +479,7 @@
while(1)
{
my ($current_next, $index_next, $close_next) =
info_default_iterator_next($current, $index, $close);
- #return ($current, $index, $close) if (!defined($close_next) or
$close_next);
- return ($current, $index, $close) if ($close_next);
+ return ($current, $index, $close) if ($close_next or
(!defined($current_next)));
my $content = $current_next->{'content'}->[$index_next];
if (defined($content->{'begin'}))
{
@@ -1741,6 +1740,7 @@
#print STDERR "info_default_normal_text $text $in_preformatted $in_code \n";
$text = uc($text) if (in_cmd($style_stack, 'sc'));
+ $text = uc($text) if (in_cmd($style_stack, 'var'));
# $text = &$protect_text($text) unless($in_raw_text);
if (! $in_code and !$in_preformatted)
{
@@ -2598,7 +2598,7 @@
my $text = shift;
my $only_inter_item_commands = shift;
- return $text;
+ return info_default_close_command(undef, 'deff_item');
}
sub info_default_def_line($$$$$$$$$$$$$$$$)
@@ -2625,25 +2625,26 @@
my $type_name = '';
$type_name .= $name if ($name ne '');
- my $result = " -- $category_prepared: $type_name $arguments";
+ my $result = " -- $category_prepared: ${type_name}$arguments";
$result =~ s/\s*$//;
$result .= "\n";
my $state = $Texi2HTML::THISDOC{'state'};
- if ($command =~ /x$/)
- {
- return info_default_store_text($state,$result,$command);
- }
- else
- {
- info_default_open_command($state, $command, {'begin'=>$result});
- }
+# if ($command =~ /x$/)
+# {
+ info_default_store_text($state,$result,$command);
+# }
+# else
+# {
+# return info_default_open_command($state, $command, {'begin'=>$result});
+# }
+ return info_default_open_command($state, 'deff_item');
}
sub info_default_def($$)
{
my $text = shift;
my $command = shift;
- info_default_close_command(undef, $command);
+ return info_default_close_command(undef, $command);
}
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/03
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/12
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/13
- [Texi2html-cvs] texi2html/examples info.init,
Patrice Dumas <=
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/16
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/19
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/23
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/23
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/23
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/25
- [Texi2html-cvs] texi2html/examples info.init, Patrice Dumas, 2009/04/26