@@ -1,10 +1,29 @@
 Revision history for Perl suite Locale::Maketext
 
+2013-04-13
+    * No changes. Switch to version 1.25 for release to CPAN.
+	
+2013-04-13
+    * Update to 1.25_01 from upstream blead for release testing
+	
+2013-11-08
+    * Fix for case when lexicon translations contain substitionand literals with eval-non-safe characters.
+	RT #120457
+
+2013-08-21
+    * Swap out base for parent (bowtie) For: RT #119403
+
+2013-05-21 
+    * typo fixes for Locale::Maketext
+
+2013-01-04
+    * POD fixes uncovered by the new Pod::Checker, not yet in core.
+
 2012-12-04
     * Fix misparsing of maketext strings.
 
 2012-11-22
-    * Fix hash order dependcy bug in tests
+    * Fix hash order dependency bug in tests
 
 2012-01-14
     * Minor POD documentation update to sync with upstream blead.

@@ -51,5 +51,5 @@
       },
       "x_MailingList" : "http://lists.perl.org/list/perl5-porters.html"
    },
-   "version" : "1.23"
+   "version" : "1.25"
 }

@@ -26,4 +26,4 @@ resources:
   license: http://dev.perl.org/licenses/
   repository: http://perl5.git.perl.org/perl.git/tree/HEAD:/dist/Locale-Maketext
   x_MailingList: http://lists.perl.org/list/perl5-porters.html
-version: 1.23
+version: 1.25

@@ -715,7 +715,7 @@ right tool for the job.
 However, other accidents of history have made Perl a well-accepted
 language for design of server-side programs (generally in CGI form)
 for Web site interfaces.  Localization of static pages in Web sites is
-trivial, feasable either with simple language-negotiation features in
+trivial, feasible either with simple language-negotiation features in
 servers like Apache, or with some kind of server-side inclusions of
 language-appropriate text into layout templates.  However, I think
 that the localization of Perl-based search systems (or other kinds of

@@ -27,7 +27,7 @@ BEGIN {
 }
 
 
-$VERSION = '1.23';
+$VERSION = '1.25';
 @ISA = ();
 
 $MATCH_SUPERS = 1;
@@ -194,7 +194,7 @@ sub maketext {
     my($handle, $phrase) = splice(@_,0,2);
     Carp::confess('No handle/phrase') unless (defined($handle) && defined($phrase));
 
-    # backup $@ in case it it's still being used in the calling code.
+    # backup $@ in case it's still being used in the calling code.
     # If no failures, we'll re-set it back to what it was later.
     my $at = $@;
 
@@ -344,7 +344,7 @@ sub _langtag_munging {
     my($base_class, @languages) = @_;
 
     # We have all these DEBUG statements because otherwise it's hard as hell
-    # to diagnose ifwhen something goes wrong.
+    # to diagnose if/when something goes wrong.
 
     DEBUG and warn 'Lgs1: ', map("<$_>", @languages), "\n";
 
@@ -570,6 +570,7 @@ sub _compile {
                             $c[-1] = ''; # reuse this slot
                         }
                         else {
+                            $c[-1] =~ s/\\\\/\\/g;
                             push @code, ' $c[' . $#c . "],\n";
                             push @c, ''; # new chunk
                         }

@@ -443,10 +443,6 @@ B<Remember: Don't be afraid to read the Maketext source if there's
 any point on which this documentation is unclear.>  This documentation
 is vastly longer than the module source itself.
 
-=over
-
-=back
-
 =head1 LANGUAGE CLASS HIERARCHIES
 
 These are Locale::Maketext's assumptions about the class
@@ -699,7 +695,7 @@ it's basically turned into:
       ")!\n",
   }
   # to be called by $lh->maketext(KEY, params...)
-   
+
 In other words, text outside bracket groups is turned into string
 literals.  Text in brackets is rather more complex, and currently follows
 these rules:
@@ -999,10 +995,10 @@ The "fail" attribute can be accessed with the C<fail_with> method:
 
   # Set to a method name:
   $lh->fail_with( 'failure_method' );
-  
+
   # Set to nothing (i.e., so failure throws a plain exception)
   $lh->fail_with( undef );
-  
+
   # Get the current value
   $handler = $lh->fail_with();
 
@@ -1115,10 +1111,10 @@ consisting minimally of:
   package Projname::L10N;
   use base qw(Locale::Maketext);
   ...any methods you might want all your languages to share...
-  
+
   # And, assuming you want the base class to be an _AUTO lexicon,
   # as is discussed a few sections up:
-  
+
   1;
 
 =item *

@@ -3,12 +3,12 @@ use warnings;
 
 {
     package TEST;
-    use base 'Locale::Maketext';
+    use parent qw(Locale::Maketext);
 }
 
 {
     package TEST::en;
-    use base 'TEST';
+    use parent -norequire, qw(TEST);
     our %Lexicon = (
         _AUTO => 1,
     );