Import of YANICK/XML-XPathScript-1.54 from CPAN.

gitpan-cpan-distribution: XML-XPathScript
gitpan-cpan-version:      1.54
gitpan-cpan-path:         YANICK/XML-XPathScript-1.54.tar.gz
gitpan-cpan-author:       YANICK
gitpan-cpan-maturity:     released

Author: Yanick Champoux

Changes

@@ -1,5 +1,13 @@
 Revision history for Perl module XML::XPathScript
 
+1.54 July 26, 2008
+    - Fix bugs in stylesheet DocBook2LaTex
+    - Fix bug in X::X::Processor::B where there is no whitespace
+        between the tagname and the first attribute.
+    - Change Readonly call in X::X::Processor to try to please Perl 5.6 and
+      earlier.
+    - Getting rid of internal class StdoutSnatcher.
+
 1.53 Dec 18, 2007
     - If no XML parser is present during installation, add XML::LibXML
         to the dependencies (thanks to David for the bug report)

META.yml

@@ -1,6 +1,6 @@
 ---
 name: XML-XPathScript
-version: 1.53
+version: 1.54
 author:
   - 'Yanick Champoux <yanick@cpan.org>'
   - 'Dominique Quatravaux <domq@cpan.org> '
@@ -25,32 +25,30 @@ build_requires:
 provides:
   XML::XPathScript:
     file: lib/XML/XPathScript.pm
-    version: 1.53
+    version: 1.54
   XML::XPathScript::Processor:
     file: lib/XML/XPathScript/Processor.pm
-    version: 1.53
+    version: 1.54
   XML::XPathScript::Processor::B:
     file: lib/XML/XPathScript/Processor/B.pm
-    version: 1.53
+    version: 1.54
   XML::XPathScript::Processor::LibXML:
     file: lib/XML/XPathScript/Processor/LibXML.pm
-    version: 1.53
+    version: 1.54
   XML::XPathScript::Processor::XPath:
     file: lib/XML/XPathScript/Processor/XPath.pm
-    version: 1.53
-  XML::XPathScript::StdoutSnatcher:
-    file: lib/XML/XPathScript.pm
+    version: 1.54
   XML::XPathScript::Stylesheet::DocBook2LaTeX:
     file: lib/XML/XPathScript/Stylesheet/DocBook2LaTeX.pm
-    version: 1.53
+    version: 1.54
   XML::XPathScript::Template:
     file: lib/XML/XPathScript/Template.pm
-    version: 1.53
+    version: 1.54
   XML::XPathScript::Template::Content:
     file: lib/XML/XPathScript/Processor.pm
   XML::XPathScript::Template::Tag:
     file: lib/XML/XPathScript/Template/Tag.pm
-    version: 1.53
+    version: 1.54
 generated_by: Module::Build version 0.280801
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.2.html

SIGNATURE

@@ -15,26 +15,26 @@ not run its Makefile.PL or Build.PL.
 Hash: SHA1
 
 SHA1 2554a1c42ac19f0bfc7b5c391676f3343a2ad232 Build.PL
-SHA1 47a46a449cf77844a3f743be42cf84638f185071 Changes
+SHA1 6289a7b63e6cddf0139fd9d74705adf0d07464fa Changes
 SHA1 05a5f3528ef8a73c665e5e73cfe088a22841d60f MANIFEST
-SHA1 a65624f3fca72342c09e93f2ab1c129e2d8ca524 META.yml
+SHA1 c12cf66c790482c504d042650f963b8effc940d3 META.yml
 SHA1 1794aad4c7569a63f2638e58789ee2f1ad3a86a8 Makefile.PL
 SHA1 0b05cc0bbf188500b5260ae83f500e5af82735ca README
 SHA1 585dbee14359e90630096c4c39d944c3ed5fd0df dist/rewrite-default-xml-parser
 SHA1 b8f13d00c750860ca69a0f2be632fdb0cf1b3256 examples/docbook2latex.xps
 SHA1 49de2221717af40dfd852e18c46650097290aa1f examples/sample-docbook.xml
-SHA1 b43bb4925898cef7d35be8ba6a3650afce90acac lib/XML/XPathScript.pm
-SHA1 d96184b54fe2bb56809c9fb37ec8b75287ead850 lib/XML/XPathScript/Processor.pm
-SHA1 1d075f69703ddcc3e5259faba0188174620f1473 lib/XML/XPathScript/Processor/B.pm
-SHA1 dd7458db336c56db2bc69b2ab0c8acebfda92611 lib/XML/XPathScript/Processor/LibXML.pm
-SHA1 e5147416e4c022a9d5fb8ae55be536a45a2ef90f lib/XML/XPathScript/Processor/XPath.pm
+SHA1 477417aa6f19e280f0a99cfebe898709b43f58fc lib/XML/XPathScript.pm
+SHA1 425d3d5866d0f5214672883c58efc52f8f0188ac lib/XML/XPathScript/Processor.pm
+SHA1 2c6197b637d04230d08c55db4b5cf19804ff558c lib/XML/XPathScript/Processor/B.pm
+SHA1 873b0493b0ad13eecdfa8eaac69f139a23d75e0c lib/XML/XPathScript/Processor/LibXML.pm
+SHA1 433d1eb212012aeb6450a4137f08bbf89c958e77 lib/XML/XPathScript/Processor/XPath.pm
 SHA1 4f2bd67d33fd417629c6cff2a0d3053035c45e03 lib/XML/XPathScript/Stylesheet.pod
-SHA1 5516c9b56da12b33d0c60134f564a84e30779518 lib/XML/XPathScript/Stylesheet/DocBook2LaTeX.pm
-SHA1 c61b07ac8d1e4d791c19f879e13ace684784b762 lib/XML/XPathScript/Template.pm
-SHA1 9aba6566eb13651c8ba5d1c5927754e8a6674007 lib/XML/XPathScript/Template/Tag.pm
+SHA1 f667a41fd6c92916e6205fadbadb7d22b9c86bd2 lib/XML/XPathScript/Stylesheet/DocBook2LaTeX.pm
+SHA1 9bba29e14e803933b09efb3eadca5eefbdf2bd8c lib/XML/XPathScript/Template.pm
+SHA1 19ba4614630c35a3059dffa8e18876ba6d0d6afa lib/XML/XPathScript/Template/Tag.pm
 SHA1 44a91906b1c3ba4b2bddec121e96c77c97f30081 lib_axkit/Apache/AxKit/Language/YPathScript.pm
 SHA1 553248592b413f49ea7f739d1da52f2fc2219b53 lib_tomkit/Apache2/TomKit/Processor/XPathScript.pm
-SHA1 a73bfb7ff30574b701eba6e321083f6e0690ffe2 script/xpathscript
+SHA1 0475c452e5a471b610041abd6b24b177748e7186 script/xpathscript
 SHA1 0fabf086f09dd536eab3e44118e71ed456a53eb1 t/00build.t
 SHA1 9d8a3166da409cfa69237aaf8228e17f6e75cf9a t/01basic.t
 SHA1 66b1a741ea182ba1ff9fcdc6527ee3fdbbec10ef t/02interpolate.t
@@ -100,9 +100,9 @@ SHA1 e739fa89f56b123580d539d5e2d400c6abd108d5 t/testdocs/tag_attributes.expected
 SHA1 db53da51ad4ff13761a69ee9b0e12315f7623fc5 t/testdocs/tag_attributes.xml
 SHA1 d36ad2b5860e4ca564b845e0e7bb5d5134624d6e t/testdocs/tag_attributes.xps
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHaIDf34Hwf+GwC4wRAkS+AJ9mG5ukejenOpKQWN48BfOhKslYawCcDRNN
-ZqDyr/N2bbwZvO8zrT0SUYM=
-=xccT
+iD8DBQFIi4tn34Hwf+GwC4wRApKMAJ45/53zHAFfm4qNgae6xY3cnYYlrACg8fAn
+eArdMMSPcsD2SEX0daapB/Q=
+=lCA1
 -----END PGP SIGNATURE-----

lib/XML/XPathScript.pm

@@ -239,7 +239,7 @@ use File::Basename;
 use XML::XPathScript::Processor;
 use XML::XPathScript::Template;
 
-our $VERSION = '1.53';
+our $VERSION = '1.54';
 
 $XML_parser = 'XML::LibXML';
 
@@ -649,7 +649,7 @@ sub process {
 		# Perl 5.6.1 dislikes closed but tied descriptors (causes SEGVage)
    		*STDOUT = *ORIGINAL_STDOUT if $^V lt v5.7.0; 
 
-	   	tie *STDOUT, 'XML::XPathScript::StdoutSnatcher';
+	   	tie *STDOUT, __PACKAGE__;
         $self->compile unless $self->{compiledstylesheet};
 	   	my $retval = $self->{compiledstylesheet}->( $self, @extravars );
 	   	untie *STDOUT;
@@ -1186,12 +1186,6 @@ sub document {
     return $results;
 }
 
-1;
-
-# small package to catch print statements within
-# the stylesheets
-package XML::XPathScript::StdoutSnatcher;
-
 sub TIEHANDLE { my $self = ''; bless \$self, $_[0] }
 sub PRINT {
 	my $self = shift;
@@ -1201,7 +1195,7 @@ sub BINMODE {
     return XML::XPathScript::current()->binmode( @_ );
 }
 
-'end of XML::XPathScript::StdoutSnatcher' ;
+1;
 
 __END__
 

lib/XML/XPathScript/Processor.pm

@@ -9,7 +9,7 @@ use base qw/ Exporter /;
 use XML::XPathScript::Template;
 use Readonly;
 
-our $VERSION = '1.53';
+our $VERSION = '1.54';
 
 our @EXPORT = qw/ 
         $DO_SELF_AS_CHILD 
@@ -68,10 +68,10 @@ use constant DO_NOT_PROCESS   =>  0;
 
 our( $DO_SELF_AS_CHILD, $DO_SELF_AND_KIDS,
      $DO_SELF_ONLY,     $DO_NOT_PROCESS    );
-Readonly $DO_SELF_AS_CHILD =>  2;
-Readonly $DO_SELF_AND_KIDS =>  1;
-Readonly $DO_SELF_ONLY     => -1;
-Readonly $DO_NOT_PROCESS   =>  0;
+Readonly::Scalar $DO_SELF_AS_CHILD =>  2;
+Readonly::Scalar $DO_SELF_AND_KIDS =>  1;
+Readonly::Scalar $DO_SELF_ONLY     => -1;
+Readonly::Scalar $DO_NOT_PROCESS   =>  0;
 
 
 sub new {

lib/XML/XPathScript/Processor/B.pm

@@ -5,7 +5,7 @@ package XML::XPathScript::Processor::B;
 
 use base qw/ XML::XPathScript::Processor /;
 
-our $VERSION = '1.53';
+our $VERSION = '1.54';
 
 # No namespaces here
 sub get_namespace { }
@@ -41,7 +41,7 @@ sub get_attributes {
     return;
 }
 
-sub get_attribute { "$_[1][0]='$_[1][1]' " }
+sub get_attribute { " $_[1][0]='$_[1][1]' " }
 
 # it's all element nodes
 sub is_element_node  { 1 }

lib/XML/XPathScript/Processor/LibXML.pm

@@ -5,7 +5,7 @@ use warnings;
 
 use base qw/ XML::XPathScript::Processor /;
 
-our $VERSION = '1.53';
+our $VERSION = '1.54';
 
 sub get_namespace {
         my $ns = $_[1]->getNamespaces();

lib/XML/XPathScript/Processor/XPath.pm

@@ -5,7 +5,7 @@ package XML::XPathScript::Processor::XPath;
 
 use base qw/ XML::XPathScript::Processor /;
 
-our $VERSION = '1.53';
+our $VERSION = '1.54';
 
 sub get_namespace { 
         my $prefix = $_[1]->getPrefix or return;

lib/XML/XPathScript/Stylesheet/DocBook2LaTeX.pm

@@ -6,7 +6,7 @@ use strict;
 use XML::XPathScript::Processor;
 use Carp;
 
-our $VERSION = '1.53';
+our $VERSION = '1.54';
 
 our $processor;
 
@@ -280,7 +280,7 @@ sub tc_quote {
 	my ($self,$t)=@_;
 
 	my $lang=langofnode($self);
-	my ($nested)=findnodes("ancestor::quote",$self);
+	my ($nested)= $self->findnodes("ancestor::quote");
 
 	if ($lang && $lang =~ m/^fr/i) {
 		if ($nested) {
@@ -303,7 +303,8 @@ sub tc_quote {
 }
 
 sub langofnode {
-    return findvalue('(ancestor::*/@lang)[position()=last()]',$_[0]);
+    my $self = shift;
+    return $self->findvalue('(ancestor::*/@lang)[position()=last()]');
 }
 
 sub tc_varlisentry {
@@ -799,7 +800,7 @@ $template->{'orderedlist'}->{testcode}=sub {
 	# also have "continuation=Continues" set, and then another list
 	# that doesn't have it.
 
-	my $cont=findvalue('@continuation',$self);
+	my $cont= $self->findvalue('@continuation');
 	if ($cont && ($cont =~ m/continues/i)) {
 		my $num=0;
 
@@ -821,13 +822,13 @@ $template->{'orderedlist'}->{testcode}=sub {
 $template->{'ulink'}->{testcode}=sub {
 	my ($self, $t)=@_;
 
-	my $url="\\texttt{".utf8totex(findvalue('@url',$self), 
+	my $url="\\texttt{".utf8totex( $self->findvalue('@url'), 
 								  {
 								   ord(" ")=>"\\ ",
 								   ord('@')=>'@',
 								  })."}";
 
-	if (findnodes("node()", $self)) {
+	if ( $self->findnodes("node()") ) {
 		$t->{post}=render_footnote($self, $url);
 		$t->{pre}="";
 		return 1;
@@ -939,7 +940,7 @@ sub footnotes_allowed {
 	my ($self)=@_;
 #warn "footnotes_allowed",get_xpath_of_node($self);
 
-	my ($parent)=findnodes("..", $self);
+	my ($parent)= $self->findnodes('..');
 	if (!defined $parent) {
 #warn "footnotes_allowed hit root";
 		return 1
@@ -954,7 +955,7 @@ sub footnotes_allowed {
 $is_footnote_blocker=sub {
 	my ($self)=@_;
 
-	my $nodename=findvalue("name()", $self);
+	my $nodename= $self->findvalue('name()');
 	return undef if (! $nodename); # Root node
 	return grep {$_ eq $nodename} @footnote_blockers;
 };

lib/XML/XPathScript/Template.pm

@@ -13,7 +13,7 @@ use Scalar::Util qw/ refaddr /;
 use overload '&{}'  => \&_overload_func,
              q{""}  => \&_overload_quote;
 
-our $VERSION = '1.53';
+our $VERSION = '1.54';
 
 sub new {
    my( $class ) = @_;