consistency

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

5 files changed, 176 insertions, 146 deletions

diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index f52588f1f53..e868c455e2c 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -5,7 +5,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 24439 $';
+my $svnrev = '$Revision: 25027 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -259,39 +259,41 @@ C</.*-(.*$)/> as a last resort and hope it provides something useful.
 =cut
 
 sub platform_name {
-      my ($guessed_platform) = @_;
-
-      $guessed_platform =~ s/^x86_64-(.*-k?)freebsd/amd64-$1freebsd/;
-      my $CPU; # CPU type as reported by config.guess.
-      my $OS;  # O/S type as reported by config.guess.
-      ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
-      $CPU =~ s/^alpha(.*)/alpha/;   # alphaev56 or whatever
-      $CPU =~ s/powerpc64/powerpc/;  # we don't distinguish ppc64
-      $CPU =~ s/mips64el/mipsel/;    # we don't distinguish mips64 and 32 el
-
-      my @OSs = qw(aix cygwin darwin freebsd hpux irix
-                   kfreebsd linux netbsd openbsd solaris);
-      for my $os (@OSs) {
-        # Match word boundary at the beginning of the os name so that
-        #   freebsd and kfreebsd are distinguished.
-        # Do not match word boundary at the end of the os so that
-        #   solaris2 is matched.
-        $OS = $os if $guessed_platform =~ /\b$os/;
-      }
-      if ($OS eq "darwin") {
-        # We never want to guess x86_64-darwin even if config.guess
-        # does, because Leopard can be 64-bit but our x86_64-darwin
-        # binaries will only run on Snow Leopard.
-        $CPU = "universal";
-      } elsif ($CPU =~ /^i.86$/) {
-        $CPU = "i386";  # 586, 686, whatever
-      }
+  my ($guessed_platform) = @_;
+
+  $guessed_platform =~ s/^x86_64-(.*-k?)freebsd/amd64-$1freebsd/;
+  my $CPU; # CPU type as reported by config.guess.
+  my $OS;  # O/S type as reported by config.guess.
+  ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
+  $CPU =~ s/^alpha(.*)/alpha/;   # alphaev56 or whatever
+  $CPU =~ s/armv7l/armel/;       # arm
+  $CPU =~ s/powerpc64/powerpc/;  # we don't distinguish ppc64
+  $CPU =~ s/mips64el/mipsel/;    # we don't distinguish mips64 and 32 el
+
+  my @OSs = qw(aix cygwin darwin freebsd hpux irix
+               kfreebsd linux netbsd openbsd solaris);
+  for my $os (@OSs) {
+    # Match word boundary at the beginning of the os name so that
+    #   freebsd and kfreebsd are distinguished.
+    # Do not match word boundary at the end of the os so that
+    #   solaris2 is matched.
+    $OS = $os if $guessed_platform =~ /\b$os/;
+  }
+  
+  if ($OS eq "darwin") {
+    # We never want to guess x86_64-darwin even if config.guess
+    # does, because Leopard can be 64-bit but our x86_64-darwin
+    # binaries will only run on Snow Leopard.
+    $CPU = "universal";
+  } elsif ($CPU =~ /^i.86$/) {
+    $CPU = "i386";  # 586, 686, whatever
+  }
 
-      unless (defined $OS) {
-        ($OS = $guessed_platform) =~ s/.*-(.*)/$1/;
-      }
+  if (! defined $OS) {
+    ($OS = $guessed_platform) =~ s/.*-(.*)/$1/;
+  }
 
-      return "$CPU-$OS";
+  return "$CPU-$OS";
 }
 
 =item C<platform_desc($platform)>
@@ -309,11 +311,12 @@ sub platform_desc {
     'alphaev5-osf'     => 'DEC Alphaev5 OSF',
     'amd64-freebsd'    => 'x86_64 with FreeBSD',
     'amd64-kfreebsd'   => 'x86_64 with GNU/FreeBSD',
+    'armel-linux'      => 'ARM with GNU/Linux',
     'hppa-hpux'        => 'HP-UX',
     'i386-cygwin'      => 'Intel x86 with Cygwin',
     'i386-darwin'      => 'Intel x86 with MacOSX/Darwin',
     'i386-freebsd'     => 'Intel x86 with FreeBSD',
-    'i386-kfreebsd'    => 'Intel x86 with GNU/FreeBSD',
+    'i386-kfreebsd'    => 'Intel x86 with GNU/kFreeBSD',
     'i386-openbsd'     => 'Intel x86 with OpenBSD',
     'i386-netbsd'      => 'Intel x86 with NetBSD',
     'i386-linux'       => 'Intel x86 with GNU/Linux',
@@ -1947,7 +1950,7 @@ sub remove_link_dir_dir {
     }
     # trry to remove the destination directory, it might be empty and
     # we might have write permissions, ignore errors
-    `rmdir "$to" 2>/dev/null`;
+    # `rmdir "$to" 2>/dev/null`;
     return $ret;
   } else {
     tlwarn ("destination $to not writable, no removal of links done!\n");
@@ -1987,7 +1990,7 @@ sub add_remove_symlinks {
         $errors++ unless remove_link_dir_dir($mandir, "$sys_man/$m");
       }
     }
-    `rmdir "$sys_man" 2>/dev/null` if ($mode eq "remove");
+    # `rmdir "$sys_man" 2>/dev/null` if ($mode eq "remove");
   } else {
     tlwarn("destination of man symlink $sys_man not writable, "
       . "cannot $mode symlinks.\n");
diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm
index f52588f1f53..e868c455e2c 100644
--- a/Build/source/utils/biber/TeXLive/TLUtils.pm
+++ b/Build/source/utils/biber/TeXLive/TLUtils.pm
@@ -5,7 +5,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 24439 $';
+my $svnrev = '$Revision: 25027 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -259,39 +259,41 @@ C</.*-(.*$)/> as a last resort and hope it provides something useful.
 =cut
 
 sub platform_name {
-      my ($guessed_platform) = @_;
-
-      $guessed_platform =~ s/^x86_64-(.*-k?)freebsd/amd64-$1freebsd/;
-      my $CPU; # CPU type as reported by config.guess.
-      my $OS;  # O/S type as reported by config.guess.
-      ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
-      $CPU =~ s/^alpha(.*)/alpha/;   # alphaev56 or whatever
-      $CPU =~ s/powerpc64/powerpc/;  # we don't distinguish ppc64
-      $CPU =~ s/mips64el/mipsel/;    # we don't distinguish mips64 and 32 el
-
-      my @OSs = qw(aix cygwin darwin freebsd hpux irix
-                   kfreebsd linux netbsd openbsd solaris);
-      for my $os (@OSs) {
-        # Match word boundary at the beginning of the os name so that
-        #   freebsd and kfreebsd are distinguished.
-        # Do not match word boundary at the end of the os so that
-        #   solaris2 is matched.
-        $OS = $os if $guessed_platform =~ /\b$os/;
-      }
-      if ($OS eq "darwin") {
-        # We never want to guess x86_64-darwin even if config.guess
-        # does, because Leopard can be 64-bit but our x86_64-darwin
-        # binaries will only run on Snow Leopard.
-        $CPU = "universal";
-      } elsif ($CPU =~ /^i.86$/) {
-        $CPU = "i386";  # 586, 686, whatever
-      }
+  my ($guessed_platform) = @_;
+
+  $guessed_platform =~ s/^x86_64-(.*-k?)freebsd/amd64-$1freebsd/;
+  my $CPU; # CPU type as reported by config.guess.
+  my $OS;  # O/S type as reported by config.guess.
+  ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
+  $CPU =~ s/^alpha(.*)/alpha/;   # alphaev56 or whatever
+  $CPU =~ s/armv7l/armel/;       # arm
+  $CPU =~ s/powerpc64/powerpc/;  # we don't distinguish ppc64
+  $CPU =~ s/mips64el/mipsel/;    # we don't distinguish mips64 and 32 el
+
+  my @OSs = qw(aix cygwin darwin freebsd hpux irix
+               kfreebsd linux netbsd openbsd solaris);
+  for my $os (@OSs) {
+    # Match word boundary at the beginning of the os name so that
+    #   freebsd and kfreebsd are distinguished.
+    # Do not match word boundary at the end of the os so that
+    #   solaris2 is matched.
+    $OS = $os if $guessed_platform =~ /\b$os/;
+  }
+  
+  if ($OS eq "darwin") {
+    # We never want to guess x86_64-darwin even if config.guess
+    # does, because Leopard can be 64-bit but our x86_64-darwin
+    # binaries will only run on Snow Leopard.
+    $CPU = "universal";
+  } elsif ($CPU =~ /^i.86$/) {
+    $CPU = "i386";  # 586, 686, whatever
+  }
 
-      unless (defined $OS) {
-        ($OS = $guessed_platform) =~ s/.*-(.*)/$1/;
-      }
+  if (! defined $OS) {
+    ($OS = $guessed_platform) =~ s/.*-(.*)/$1/;
+  }
 
-      return "$CPU-$OS";
+  return "$CPU-$OS";
 }
 
 =item C<platform_desc($platform)>
@@ -309,11 +311,12 @@ sub platform_desc {
     'alphaev5-osf'     => 'DEC Alphaev5 OSF',
     'amd64-freebsd'    => 'x86_64 with FreeBSD',
     'amd64-kfreebsd'   => 'x86_64 with GNU/FreeBSD',
+    'armel-linux'      => 'ARM with GNU/Linux',
     'hppa-hpux'        => 'HP-UX',
     'i386-cygwin'      => 'Intel x86 with Cygwin',
     'i386-darwin'      => 'Intel x86 with MacOSX/Darwin',
     'i386-freebsd'     => 'Intel x86 with FreeBSD',
-    'i386-kfreebsd'    => 'Intel x86 with GNU/FreeBSD',
+    'i386-kfreebsd'    => 'Intel x86 with GNU/kFreeBSD',
     'i386-openbsd'     => 'Intel x86 with OpenBSD',
     'i386-netbsd'      => 'Intel x86 with NetBSD',
     'i386-linux'       => 'Intel x86 with GNU/Linux',
@@ -1947,7 +1950,7 @@ sub remove_link_dir_dir {
     }
     # trry to remove the destination directory, it might be empty and
     # we might have write permissions, ignore errors
-    `rmdir "$to" 2>/dev/null`;
+    # `rmdir "$to" 2>/dev/null`;
     return $ret;
   } else {
     tlwarn ("destination $to not writable, no removal of links done!\n");
@@ -1987,7 +1990,7 @@ sub add_remove_symlinks {
         $errors++ unless remove_link_dir_dir($mandir, "$sys_man/$m");
       }
     }
-    `rmdir "$sys_man" 2>/dev/null` if ($mode eq "remove");
+    # `rmdir "$sys_man" 2>/dev/null` if ($mode eq "remove");
   } else {
     tlwarn("destination of man symlink $sys_man not writable, "
       . "cannot $mode symlinks.\n");
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index d8311178d48..2abda0f3daf 100644
--- a/Master/texmf-dist/tex/texinfo/texinfo.tex
+++ b/Master/texmf-dist/tex/texinfo/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2011-11-09.15}
+\def\texinfoversion{2012-01-03.09}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -230,6 +230,13 @@
   \errorcontextlines16
 }%
 
+% @errormsg{MSG}.  Do the index-like expansions on MSG, but if things
+% aren't perfect, it's not the end of the world, being an error message,
+% after all.
+% 
+\def\errormsg{\begingroup \indexnofonts \doerrormsg}
+\def\doerrormsg#1{\errmessage{#1}}
+
 % add check for \lastpenalty to plain's definitions.  If the last thing
 % we did was a \nobreak, we don't want to insert more space.
 %
@@ -1090,50 +1097,24 @@ where each line of input produces a line of output.}
 % for display in the outlines, and in other places.  Thus, we have to
 % double any backslashes.  Otherwise, a name like "\node" will be
 % interpreted as a newline (\n), followed by o, d, e.  Not good.
-% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
-% (and related messages, the final outcome is that it is up to the TeX
-% user to double the backslashes and otherwise make the string valid, so
-% that's what we do).
-
-% double active backslashes.
-%
-{\catcode`\@=0 \catcode`\\=\active
- @gdef@activebackslashdouble{%
-   @catcode`@\=@active
-   @let\=@doublebackslash}
-}
-
-% To handle parens, we must adopt a different approach, since parens are
-% not active characters.  hyperref.dtx (which has the same problem as
-% us) handles it with this amazing macro to replace tokens, with minor
-% changes for Texinfo.  It is included here under the GPL by permission
-% from the author, Heiko Oberdiek.
-%
-% #1 is the tokens to replace.
-% #2 is the replacement.
-% #3 is the control sequence with the string.
-%
-\def\HyPsdSubst#1#2#3{%
-  \def\HyPsdReplace##1#1##2\END{%
-    ##1%
-    \ifx\\##2\\%
-    \else
-      #2%
-      \HyReturnAfterFi{%
-        \HyPsdReplace##2\END
-      }%
-    \fi
-  }%
-  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
-}
-\long\def\HyReturnAfterFi#1\fi{\fi#1}
-
-% #1 is a control sequence in which to do the replacements.
-\def\backslashparens#1{%
-  \xdef#1{#1}% redefine it as its expansion; the definition is simply
-             % \lastnode when called from \setref -> \pdfmkdest.
-  \HyPsdSubst{(}{\realbackslash(}{#1}%
-  \HyPsdSubst{)}{\realbackslash)}{#1}%
+% 
+% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and
+% related messages.  The final outcome is that it is up to the TeX user
+% to double the backslashes and otherwise make the string valid, so
+% that's what we do.  pdftex 1.30.0 (ca.2005) introduced a primitive to
+% do this reliably, so we use it.
+
+% #1 is a control sequence in which to do the replacements,
+% which we \xdef.
+\def\txiescapepdf#1{%
+  \ifx\pdfescapestring\relax
+    % No primitive available; should we give a warning or log?
+    % Many times it won't matter.
+  \else
+    % The expandable \pdfescapestring primitive escapes parentheses,
+    % backslashes, and other special chars.
+    \xdef#1{\pdfescapestring{#1}}%
+  \fi
 }
 
 \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
@@ -1247,10 +1228,9 @@ output) for that.)}
     % such as \, aren't expanded when present in a section title.
     \indexnofonts
     \turnoffactive
-    \activebackslashdouble
     \makevalueexpandable
     \def\pdfdestname{#1}%
-    \backslashparens\pdfdestname
+    \txiescapepdf\pdfdestname
     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
   }}
   %
@@ -1282,28 +1262,22 @@ output) for that.)}
     % page number.  We could generate a destination for the section
     % text in the case where a section has no node, but it doesn't
     % seem worth the trouble, since most documents are normally structured.
-    \def\pdfoutlinedest{#3}%
+    \edef\pdfoutlinedest{#3}%
     \ifx\pdfoutlinedest\empty
       \def\pdfoutlinedest{#4}%
     \else
-      % Doubled backslashes in the name.
-      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
-       \backslashparens\pdfoutlinedest}%
+      \txiescapepdf\pdfoutlinedest
     \fi
     %
-    % Also double the backslashes in the display string.
-    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
-     \backslashparens\pdfoutlinetext}%
+    % Also escape PDF chars in the display string.
+    \edef\pdfoutlinetext{#1}%
+    \txiescapepdf\pdfoutlinetext
     %
     \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
   }
   %
   \def\pdfmakeoutlines{%
     \begingroup
-      % Thanh's hack / proper braces in bookmarks
-      \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
-      \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
-      %
       % Read toc silently, to get counts of subentries for \pdfoutline.
       \def\partentry##1##2##3##4{}% ignore parts in the outlines
       \def\numchapentry##1##2##3##4{%
@@ -1359,15 +1333,26 @@ output) for that.)}
       % Latin 2 (0xea) gets translated to a | character.  Info from
       % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
       %
-      % xx to do this right, we have to translate 8-bit characters to
-      % their "best" equivalent, based on the @documentencoding.  Right
-      % now, I guess we'll just let the pdf reader have its way.
+      % TODO this right, we have to translate 8-bit characters to
+      % their "best" equivalent, based on the @documentencoding.  Too
+      % much work for too little return.  Just use the ASCII equivalents
+      % we use for the index sort strings.
+      % 
       \indexnofonts
       \setupdatafile
+      % We can have normal brace characters in the PDF outlines, unlike
+      % Texinfo index files.  So set that up.
+      \def\{{\lbracecharliteral}%
+      \def\}{\rbracecharliteral}%
       \catcode`\\=\active \otherbackslash
       \input \tocreadfilename
     \endgroup
   }
+  {\catcode`[=1 \catcode`]=2
+   \catcode`{=\other \catcode`}=\other
+   \gdef\lbracecharliteral[{]%
+   \gdef\rbracecharliteral[}]%
+  ]
   %
   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
     \ifx\PP\D\let\nextsp\relax
@@ -2851,20 +2836,48 @@ end
   }
 }
 
+% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
+% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
+% except specified as a normal braced arg, so no newlines to worry about.
+% 
+\def\outfmtnametex{tex}
+%
+\def\inlinefmt#1{\doinlinefmt #1,\finish}
+\def\doinlinefmt#1,#2,\finish{%
+  \def\inlinefmtname{#1}%
+  \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
+}
+% For raw, must switch into @tex before parsing the argument, to avoid
+% setting catcodes prematurely.  Doing it this way means that, for
+% example, @inlineraw{html, foo{bar} gets a parse error instead of being
+% ignored.  But this isn't important because if people want a literal
+% *right* brace they would have to use a command anyway, so they may as
+% well use a command to get a left brace too.  We could re-use the
+% delimiter character idea from \verb, but it seems like overkill.
+% 
+\def\inlineraw{\tex \doinlineraw}
+\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
+\def\doinlinerawtwo#1,#2,\finish{%
+  \def\inlinerawname{#1}%
+  \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
+  \endgroup % close group opened by \tex.
+}
+
 
 \message{glyphs,}
 % and logos.
 
-% @@ prints an @.
+% @@ prints an @, as does @atchar{}.
 \def\@{\char64 }
+\let\atchar=\@
 
-% Used to generate quoted braces.  Unless we're in typewriter, use
-% \ecfont because the CM text fonts do not have braces, and we don't
-% want to switch into math.
+% @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
+% Unless we're in typewriter, use \ecfont because the CM text fonts do
+% not have braces, and we don't want to switch into math.
 \def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
 \def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
-\let\{=\mylbrace
-\let\}=\myrbrace
+\let\{=\mylbrace \let\lbracechar=\{
+\let\}=\myrbrace \let\rbracechar=\}
 \begingroup
   % Definitions to produce \{ and \} commands for indices,
   % and @{ and @} for the aux/toc files.
@@ -4486,6 +4499,7 @@ end
   %
   % Commands that take arguments.
   \definedummyword\acronym
+  \definedummyword\anchor
   \definedummyword\cite
   \definedummyword\code
   \definedummyword\command
@@ -7825,9 +7839,8 @@ end
      % etc. don't get their TeX definitions.
      \getfilename{#4}%
      %
-     % See comments at \activebackslashdouble.
-     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
-      \backslashparens\pdfxrefdest}%
+     \edef\pdfxrefdest{#1}%
+     \txiescapepdf\pdfxrefdest
      %
      \leavevmode
      \startlink attr{/Border [0 0 0]}%
@@ -9796,14 +9809,24 @@ directory should work if nowhere else does.}
 
 % In texinfo, backslash is an active character; it prints the backslash
 % in fixed width font.
-\catcode`\\=\active
-@def@normalbackslash{{@tt@backslashcurfont}}
+\catcode`\\=\active  % @ for escape char from now on.
+
+% The story here is that in math mode, the \char of \backslashcurfont
+% ends up printing the roman \ from the math symbol font (because \char
+% in math mode uses the \mathcode, and plain.tex sets
+% \mathcode`\\="026E).  It seems better for @backslashchar{} to always
+% print a typewriter backslash, hence we use an explicit \mathchar,
+% which is the decimal equivalent of "715c (class 7, e.g., use \fam;
+% ignored family value; char position "5C).  We can't use " for the
+% usual hex value because it has already been made active.
+@def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
+@let@backslashchar = @normalbackslash % @backslashchar{} is for user documents.
+
 % On startup, @fixbackslash assigns:
 %  @let \ = @normalbackslash
-
 % \rawbackslash defines an active \ to do \backslashcurfont.
 % \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
+% catcode other.  We switch back and forth between these.
 @gdef@rawbackslash{@let\=@backslashcurfont}
 @gdef@otherbackslash{@let\=@realbackslash}
 
@@ -9859,10 +9882,13 @@ directory should work if nowhere else does.}
 @def@normalslash{/}
 
 % These look ok in all fonts, so just make them not special.
+% @hashchar{} gets its own user-level command, because of #line.
 @catcode`@& = @other @def@normalamp{&}
 @catcode`@# = @other @def@normalhash{#}
 @catcode`@% = @other @def@normalpercent{%}
 
+@let @hashchar = @normalhash
+
 @c Finally, make ` and ' active, so that txicodequoteundirected and
 @c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}.  If we
 @c don't make ` and ' active, @code will not get them as active chars.
diff --git a/Master/tlpkg/tlpsrc/background.tlpsrc b/Master/tlpkg/tlpsrc/background.tlpsrc
index 3d1f5887f71..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/background.tlpsrc
+++ b/Master/tlpkg/tlpsrc/background.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/stex/example/background
diff --git a/Master/tlpkg/tlpsrc/paper.tlpsrc b/Master/tlpkg/tlpsrc/paper.tlpsrc
index 0c6ecd9961e..8310c487646 100644
--- a/Master/tlpkg/tlpsrc/paper.tlpsrc
+++ b/Master/tlpkg/tlpsrc/paper.tlpsrc
@@ -1,2 +1 @@
 docpattern +!d texmf-dist/doc/latex/aiaa/pre2004/demos/paper
-docpattern +!d texmf-dist/doc/latex/stex/example/paper