[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/Pod-Simple-Texinfo lib/Pod/Simple/Texin...
From: |
Patrice Dumas |
Subject: |
texinfo/Pod-Simple-Texinfo lib/Pod/Simple/Texin... |
Date: |
Sun, 04 Mar 2012 23:23:45 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/03/04 23:23:45
Modified files:
Pod-Simple-Texinfo/lib/Pod/Simple: Texinfo.pm
Pod-Simple-Texinfo/t: Pod-Simple-Texinfo.t
Log message:
Handle better @*ref in sectioning commands now that it is supported in
Texinfo::Structuring.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t?cvsroot=texinfo&r1=1.11&r2=1.12
Patches:
Index: lib/Pod/Simple/Texinfo.pm
===================================================================
RCS file:
/sources/texinfo/texinfo/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- lib/Pod/Simple/Texinfo.pm 26 Feb 2012 01:37:48 -0000 1.14
+++ lib/Pod/Simple/Texinfo.pm 4 Mar 2012 23:23:44 -0000 1.15
@@ -265,14 +265,16 @@
return $name;
}
-sub _protect_comma($) {
+sub _protect_comma($)
+{
my $texinfo = shift;
my $tree = parse_texi_line(undef, $texinfo);
$tree = protect_comma_in_tree($tree);
return Texinfo::Convert::Texinfo::convert($tree);
}
-sub _protect_hashchar($) {
+sub _protect_hashchar($)
+{
my $texinfo = shift;
# protect # first in line
if ($texinfo =~ /#/) {
@@ -283,6 +285,15 @@
return $texinfo;
}
}
+
+sub _reference_to_text_in_texi($)
+{
+ my $texinfo = shift;
+ my $tree = parse_texi_text(undef, $texinfo);
+ Texinfo::Structuring::reference_to_text_in_tree(undef, $tree);
+ return Texinfo::Convert::Texinfo::convert($tree);
+}
+
sub _section_manual_to_node_name($$$)
{
my $self = shift;
@@ -341,7 +352,8 @@
= $self->_section_manual_to_node_name($self->texinfo_short_title,
$texinfo_node_name,
$self->texinfo_sectioning_base_level);
- return $texinfo_node_name;
+ # also change refs to text
+ return _reference_to_text_in_texi($texinfo_node_name);
}
sub _prepare_anchor($$)
@@ -603,7 +615,7 @@
}
my $anchor = '';
- my $node_name = _prepare_anchor ($self, _node_name($self,$result));
+ my $node_name = _prepare_anchor($self, _node_name($self, $result));
if ($node_name =~ /\S/) {
if ($tagname eq 'item-text' or !$self->texinfo_section_nodes) {
$anchor = "address@hidden";
Index: t/Pod-Simple-Texinfo.t
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/Pod-Simple-Texinfo.t 3 Mar 2012 15:15:38 -0000 1.11
+++ t/Pod-Simple-Texinfo.t 4 Mar 2012 23:23:45 -0000 1.12
@@ -106,6 +106,7 @@
=item L</somewhere>
', '@table @asis
@item @ref{somewhere}
address@hidden
@end table
@@ -131,6 +132,7 @@
run_test('=head1 L</somewhere>
', '@chapter @ref{somewhere}
address@hidden
', 'ref in section');
@@ -142,10 +144,10 @@
', '@table @asis
@item a @ref{, pod2text,, pod2text}
address@hidden }
address@hidden pod2text}
@item a @ref{, pod2latex,, pod2latex}
address@hidden 1}
address@hidden pod2latex}
@end table
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/Pod-Simple-Texinfo lib/Pod/Simple/Texin...,
Patrice Dumas <=