sync, missed some findhyph

git-svn-id: svn://tug.org/texlive/trunk@28254 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 105 insertions, 45 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/findhyph/findhyph b/Build/source/texk/texlive/linked_scripts/findhyph/findhyph
index 66fa67d999a..e66f55a8db2 100755
--- a/Build/source/texk/texlive/linked_scripts/findhyph/findhyph
+++ b/Build/source/texk/texlive/linked_scripts/findhyph/findhyph
@@ -6,7 +6,7 @@ $opt_l = 'kKsSvVzZoOuUiIA';             # defaults for Slovak and Czech
 $opt_c = $opt_f = $opt_h = $opt_v = 0;
 getopts('cfphvl:');
 
-$version_msg = "findhyph version 3.0\n";
+$version_msg = "findhyph version 3.1\n";
 $help_msg = "\nUsage: findhyph [options] <yourtexfile.log>\n" .
             "\n" .
             "Options: -c           display hyphenated words in context\n" .
@@ -163,16 +163,22 @@ sub do_hyph {
   for $i (1..$max_break-1) {
     if (defined $USED[$i]) {
       if ($search_hyphens) {              # hyphenated words
-        if ($act_text =~ /(\S+\@$i\@\S+)/) {        # only hyphenated words match
-          $out_text = $1;
+        if ($act_text =~ /(\S+)(\@$i\@)(\S+)/) {        # only hyphenated words match
+          $out_pre = $1;
+          $out_post = $3;
+          if (substr($out_pre,-1) ne "-") {        # hyphenated ligatures
+            $out_pre_A = substr($out_pre,0,rindex($out_pre,"-"));
+            $out_pre_B = substr($out_pre,rindex($out_pre,"-")+1);
+            $out_pre = $out_pre_A;
+            $out_post = $out_pre_B.$out_post;
+          }
           if ($opt_c) {
-            $context_before = $context_after = "";
-            if ($act_text =~ /(\S+)\s+\S+\@$i\@/) {$context_before = $1;}
-            if ($act_text =~ /\@$i\@\S+\s+(\S+)/) {$context_after = $1;}
-            $out_text = "$context_before $out_text $context_after";
+            if ($act_text =~ /(\S+)\s+\S+\@$i\@/) {$out_pre = "$1 $out_pre";}
+            if ($act_text =~ /\@$i\@\S+\s+(\S+)/) {$out_post = "$out_post $1";}
           }
-          $out_text =~ s/-//g;
-          $out_text =~ s/\@$i\@/-/g;
+          $out_pre =~ s/-//g;
+          $out_post =~ s/-//g;
+          $out_text = "$out_pre-$out_post";
           $out_text =~ s/\@\d+\@//g;                 # very narrow columns
           print O1 "$out_text\n";
           $write_hyph_page = 1;
@@ -183,10 +189,8 @@ sub do_hyph {
           $out_text = $1;
           if ($out_text =~ /^[$opt_l]$/) {
             if ($opt_c) {
-              $context_before = $context_after = "";
-              if($act_text =~ /(\S+) \S \@$i\@/) {$context_before = $1;}
-              if($act_text =~ /\@$i\@ ?(\S+)/) {$context_after = $1;}
-              $out_text = "$context_before $out_text $context_after";
+              if($act_text =~ /(\S+) \S \@$i\@/) {$out_text = "$1 $out_text";}
+              if($act_text =~ /\@$i\@ ?(\S+)/) {$out_text = "$out_text $1";}
               $out_text =~ s/-//g;
               $out_text =~ s/\@\d+\@//g;                 # very narrow columns
             }
@@ -348,6 +352,16 @@ for identifying the issue)
 
 =back
 
+=head4 3.1 (2012-11-03)
+
+=over 4
+
+=item *
+
+fixed displaying of hyphenated ligatures (bug reported by Karel Horak)
+
+=back
+
 =head1 LICENSE
 
 This program is free software; you can redistribute it and/or modify
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index e97648435a4..557b8316dd1 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 27748 2012-09-20 10:36:14Z preining $
+# $Id: tlmgr.pl 28216 2012-11-09 12:34:08Z preining $
 #
 # Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 27748 $';
-my $datrev = '$Date: 2012-09-20 12:36:14 +0200 (Thu, 20 Sep 2012) $';
+my $svnrev = '$Revision: 28216 $';
+my $datrev = '$Date: 2012-11-09 13:34:08 +0100 (Fri, 09 Nov 2012) $';
 my $tlmgrrevision;
 my $prg;
 if ($svnrev =~ m/: ([0-9]+) /) {
@@ -1921,7 +1921,6 @@ sub write_w32_updater {
   my $opt_doc = $localtlpdb->option("install_docfiles");
   my $root = $localtlpdb->root;
   my $temp = "$root/temp";
-  my $repo = $remotetlpdb->root . "/$Archive";
   TeXLive::TLUtils::mkdirhier($temp);
   tlwarn("Backup option not implemented for infrastructure update.\n") if ($opts{"backup"});
   if ($media eq 'local_uncompressed') {
@@ -1931,7 +1930,17 @@ sub write_w32_updater {
   }
   my (@upd_tar, @upd_tlpobj, @upd_info, @rst_tar, @rst_tlpobj, @rst_info);
   foreach my $pkg (@w32_updated) {
-    my $mediatlp = $remotetlpdb->get_package($pkg);
+    my $repo;
+    my $mediatlp;
+    if ($media eq "virtual") {
+      my $maxtlpdb;
+      (undef, undef, $mediatlp, $maxtlpdb) = 
+        $remotetlpdb->virtual_candidate($pkg);
+      $repo = $maxtlpdb->root . "/$Archive";
+    } else {
+      $mediatlp = $remotetlpdb->get_package($pkg);
+      $repo = $remotetlpdb->root . "/$Archive";
+    }
     my $localtlp = $localtlpdb->get_package($pkg);
     my $oldrev = $localtlp->revision;
     my $newrev = $mediatlp->revision;
diff --git a/Master/texmf-dist/doc/support/findhyph/findhyph.bat b/Master/texmf-dist/doc/support/findhyph/findhyph.bat
index 46ed04cbccc..92c077d672e 100755
--- a/Master/texmf-dist/doc/support/findhyph/findhyph.bat
+++ b/Master/texmf-dist/doc/support/findhyph/findhyph.bat
@@ -19,7 +19,7 @@ $opt_l = 'kKsSvVzZoOuUiIA';             # defaults for Slovak and Czech
 $opt_c = $opt_f = $opt_h = $opt_v = 0;
 getopts('cfphvl:');
 
-$version_msg = "findhyph version 3.0\n";
+$version_msg = "findhyph version 3.1\n";
 $help_msg = "\nUsage: findhyph [options] <yourtexfile.log>\n" .
             "\n" .
             "Options: -c           display hyphenated words in context\n" .
@@ -176,16 +176,22 @@ sub do_hyph {
   for $i (1..$max_break-1) {
     if (defined $USED[$i]) {
       if ($search_hyphens) {              # hyphenated words
-        if ($act_text =~ /(\S+\@$i\@\S+)/) {        # only hyphenated words match
-          $out_text = $1;
+        if ($act_text =~ /(\S+)(\@$i\@)(\S+)/) {        # only hyphenated words match
+          $out_pre = $1;
+          $out_post = $3;
+          if (substr($out_pre,-1) ne "-") {        # hyphenated ligatures
+            $out_pre_A = substr($out_pre,0,rindex($out_pre,"-"));
+            $out_pre_B = substr($out_pre,rindex($out_pre,"-")+1);
+            $out_pre = $out_pre_A;
+            $out_post = $out_pre_B.$out_post;
+          }
           if ($opt_c) {
-            $context_before = $context_after = "";
-            if ($act_text =~ /(\S+)\s+\S+\@$i\@/) {$context_before = $1;}
-            if ($act_text =~ /\@$i\@\S+\s+(\S+)/) {$context_after = $1;}
-            $out_text = "$context_before $out_text $context_after";
+            if ($act_text =~ /(\S+)\s+\S+\@$i\@/) {$out_pre = "$1 $out_pre";}
+            if ($act_text =~ /\@$i\@\S+\s+(\S+)/) {$out_post = "$out_post $1";}
           }
-          $out_text =~ s/-//g;
-          $out_text =~ s/\@$i\@/-/g;
+          $out_pre =~ s/-//g;
+          $out_post =~ s/-//g;
+          $out_text = "$out_pre-$out_post";
           $out_text =~ s/\@\d+\@//g;                 # very narrow columns
           print O1 "$out_text\n";
           $write_hyph_page = 1;
@@ -196,10 +202,8 @@ sub do_hyph {
           $out_text = $1;
           if ($out_text =~ /^[$opt_l]$/) {
             if ($opt_c) {
-              $context_before = $context_after = "";
-              if($act_text =~ /(\S+) \S \@$i\@/) {$context_before = $1;}
-              if($act_text =~ /\@$i\@ ?(\S+)/) {$context_after = $1;}
-              $out_text = "$context_before $out_text $context_after";
+              if($act_text =~ /(\S+) \S \@$i\@/) {$out_text = "$1 $out_text";}
+              if($act_text =~ /\@$i\@ ?(\S+)/) {$out_text = "$out_text $1";}
               $out_text =~ s/-//g;
               $out_text =~ s/\@\d+\@//g;                 # very narrow columns
             }
@@ -361,6 +365,16 @@ for identifying the issue)
 
 =back
 
+=head4 3.1 (2012-11-03)
+
+=over 4
+
+=item *
+
+fixed displaying of hyphenated ligatures (bug reported by Karel Horak)
+
+=back
+
 =head1 LICENSE
 
 This program is free software; you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/support/findhyph/findhyph.txt b/Master/texmf-dist/doc/support/findhyph/findhyph.txt
index ed089eed89e..5c55c059a8f 100644
--- a/Master/texmf-dist/doc/support/findhyph/findhyph.txt
+++ b/Master/texmf-dist/doc/support/findhyph/findhyph.txt
@@ -82,6 +82,10 @@ HISTORY
     *   "\looseness" setting is now taken into account (thanks to Karel
         Horak for identifying the issue)
 
+   3.1 (2012-11-03)
+    *   fixed displaying of hyphenated ligatures (bug reported by Karel
+        Horak)
+
 LICENSE
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the
diff --git a/Master/texmf-dist/scripts/findhyph/findhyph b/Master/texmf-dist/scripts/findhyph/findhyph
index 66fa67d999a..e66f55a8db2 100755
--- a/Master/texmf-dist/scripts/findhyph/findhyph
+++ b/Master/texmf-dist/scripts/findhyph/findhyph
@@ -6,7 +6,7 @@ $opt_l = 'kKsSvVzZoOuUiIA';             # defaults for Slovak and Czech
 $opt_c = $opt_f = $opt_h = $opt_v = 0;
 getopts('cfphvl:');
 
-$version_msg = "findhyph version 3.0\n";
+$version_msg = "findhyph version 3.1\n";
 $help_msg = "\nUsage: findhyph [options] <yourtexfile.log>\n" .
             "\n" .
             "Options: -c           display hyphenated words in context\n" .
@@ -163,16 +163,22 @@ sub do_hyph {
   for $i (1..$max_break-1) {
     if (defined $USED[$i]) {
       if ($search_hyphens) {              # hyphenated words
-        if ($act_text =~ /(\S+\@$i\@\S+)/) {        # only hyphenated words match
-          $out_text = $1;
+        if ($act_text =~ /(\S+)(\@$i\@)(\S+)/) {        # only hyphenated words match
+          $out_pre = $1;
+          $out_post = $3;
+          if (substr($out_pre,-1) ne "-") {        # hyphenated ligatures
+            $out_pre_A = substr($out_pre,0,rindex($out_pre,"-"));
+            $out_pre_B = substr($out_pre,rindex($out_pre,"-")+1);
+            $out_pre = $out_pre_A;
+            $out_post = $out_pre_B.$out_post;
+          }
           if ($opt_c) {
-            $context_before = $context_after = "";
-            if ($act_text =~ /(\S+)\s+\S+\@$i\@/) {$context_before = $1;}
-            if ($act_text =~ /\@$i\@\S+\s+(\S+)/) {$context_after = $1;}
-            $out_text = "$context_before $out_text $context_after";
+            if ($act_text =~ /(\S+)\s+\S+\@$i\@/) {$out_pre = "$1 $out_pre";}
+            if ($act_text =~ /\@$i\@\S+\s+(\S+)/) {$out_post = "$out_post $1";}
           }
-          $out_text =~ s/-//g;
-          $out_text =~ s/\@$i\@/-/g;
+          $out_pre =~ s/-//g;
+          $out_post =~ s/-//g;
+          $out_text = "$out_pre-$out_post";
           $out_text =~ s/\@\d+\@//g;                 # very narrow columns
           print O1 "$out_text\n";
           $write_hyph_page = 1;
@@ -183,10 +189,8 @@ sub do_hyph {
           $out_text = $1;
           if ($out_text =~ /^[$opt_l]$/) {
             if ($opt_c) {
-              $context_before = $context_after = "";
-              if($act_text =~ /(\S+) \S \@$i\@/) {$context_before = $1;}
-              if($act_text =~ /\@$i\@ ?(\S+)/) {$context_after = $1;}
-              $out_text = "$context_before $out_text $context_after";
+              if($act_text =~ /(\S+) \S \@$i\@/) {$out_text = "$1 $out_text";}
+              if($act_text =~ /\@$i\@ ?(\S+)/) {$out_text = "$out_text $1";}
               $out_text =~ s/-//g;
               $out_text =~ s/\@\d+\@//g;                 # very narrow columns
             }
@@ -348,6 +352,16 @@ for identifying the issue)
 
 =back
 
+=head4 3.1 (2012-11-03)
+
+=over 4
+
+=item *
+
+fixed displaying of hyphenated ligatures (bug reported by Karel Horak)
+
+=back
+
 =head1 LICENSE
 
 This program is free software; you can redistribute it and/or modify
diff --git a/Master/texmf/doc/man/man1/findhyph.1 b/Master/texmf/doc/man/man1/findhyph.1
index a32ec0df968..583209ffcbe 100644
--- a/Master/texmf/doc/man/man1/findhyph.1
+++ b/Master/texmf/doc/man/man1/findhyph.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FINDHYPH 1"
-.TH FINDHYPH 1 "2012-02-01" "perl v5.10.1" ""
+.TH FINDHYPH 1 "2012-11-03" "perl v5.10.1" ""
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -225,6 +225,11 @@ fixed a bug when total paragraph demerits are negative
 .IP "\(bu" 4
 \&\f(CW\*(C`\elooseness\*(C'\fR setting is now taken into account (thanks to Karel Horak
 for identifying the issue)
+.PP
+3.1 (2012\-11\-03)
+.IX Subsection "3.1 (2012-11-03)"
+.IP "\(bu" 4
+fixed displaying of hyphenated ligatures (bug reported by Karel Horak)
 .SH "LICENSE"
 .IX Header "LICENSE"
 This program is free software; you can redistribute it and/or modify
diff --git a/Master/texmf/doc/man/man1/findhyph.man1.pdf b/Master/texmf/doc/man/man1/findhyph.man1.pdf
index 565770f4879..b53acaa421b 100644
--- a/Master/texmf/doc/man/man1/findhyph.man1.pdf
+++ b/Master/texmf/doc/man/man1/findhyph.man1.pdf