second part of bbm split: add bbm-macros new tlpsrc package,

add it to collections-fontsextra and scheme-tetex where bbm also is present
remove old bbm/fonts files


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

16 files changed, 553 insertions, 224 deletions

diff --git a/Master/texmf-dist/doc/latex/bbm-macros/bbm b/Master/texmf-dist/doc/latex/bbm-macros/bbm
new file mode 120000
index 00000000000..4193def5042
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bbm-macros/bbm
@@ -0,0 +1 @@
+../../../../fonts/cm/bbm
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/bbm-macros/readme.bbm b/Master/texmf-dist/doc/latex/bbm-macros/readme.bbm
new file mode 100644
index 00000000000..108bc3f8e25
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bbm-macros/readme.bbm
@@ -0,0 +1,31 @@
+This package provides some font definitions for using set symbols like
+for complex or real numbers. You can find the MF source in the directory
+called 'fonts'.
+
+  The fonts are located in fonts/cm/bbm and were designed by 
+  Gilles F. ROBERT in March 1993.
+
+Install the package by
+
+ latex bbm.ins
+
+Produce your documentation by
+
+ latex bbm.dtx
+
+For compatibility with the former version latex.ins create a file `bbm.drv'
+which can be used for typesetting the documentation too.
+
+For generating the doc you need the .tfm files of the bbm fonts.
+
+Copyright 1994-1999 Torsten Hilbrich <Torsten.Hilbrich@gmx.net>
+
+ This package can redistributed and/or modified under the terms of the
+ LaTeX Project Public License Distributed from CTAN archives in
+ directory macros/latex/base/lppl.txt; either version 1 of the
+ License, or (at your option) any later version.
+
+Please send any bugs, problems, and proposals to me.
+	
+	email: Torsten.Hilbrich@gmx.net
+
diff --git a/Master/texmf-dist/source/latex/bbm-macros/bbm.drv b/Master/texmf-dist/source/latex/bbm-macros/bbm.drv
new file mode 100644
index 00000000000..10e4a613c00
--- /dev/null
+++ b/Master/texmf-dist/source/latex/bbm-macros/bbm.drv
@@ -0,0 +1,39 @@
+%%
+%% This is file `bbm.drv',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bbm.dtx  (with options: `driver')
+%% 
+%% Copyright (C) 1994,1997 by Torsten Hilbrich
+%% 
+%% This file is part of the BBM package, a support for using the bbm* fonts.
+\def\fileversion{1.2}
+\def\filedate{1999/03/15}
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\documentclass{ltxdoc}
+\setlength{\parskip}{1ex plus 0,5ex minus 0,2ex}
+\setlength{\parindent}{0pt}
+\usepackage{bbm}
+\begin{document}
+ \DocInput{bbm.dtx}
+\end{document}
+
+\endinput
+%%
+%% End of file `bbm.drv'.
diff --git a/Master/texmf-dist/source/latex/bbm-macros/bbm.dtx b/Master/texmf-dist/source/latex/bbm-macros/bbm.dtx
new file mode 100644
index 00000000000..a6a077d9cb5
--- /dev/null
+++ b/Master/texmf-dist/source/latex/bbm-macros/bbm.dtx
@@ -0,0 +1,273 @@
+%\iffalse
+%
+% A readme file and the file bbm.ins should be part of this package.
+%
+% Run bbm.ins through latex2e for generating the needed file and
+% use bbm.drv to get a user documentation
+%
+% This package can redistributed and/or modified under the terms of the
+% LaTeX Project Public License Distributed from CTAN archives in
+% directory macros/latex/base/lppl.txt; either version 1 of the License,
+% or (at your option) any later version.
+%
+% Copyright 1994-1999 Torsten Hilbrich <Torsten.Hilbrich@gmx.net>
+% \fi
+\def\fileversion{1.2}
+\def\filedate{1999/03/15}
+% \CheckSum{56}
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%
+% \Finale
+%
+%\iffalse
+%
+% This package provides font information and math alphabets declaration
+% for the bbm fonts
+%
+%\fi
+%
+% \changes{1.0}{1994/10/14}{First version}
+% \changes{1.01}{1994/12/22}{Now uses doc for documentation}
+% \changes{1.02}{1995/06/20}{Corrected some typos and mistakes}
+% \changes{1.1}{1997/07/24}{Changed to new font naming scheme, ubbm.fd instead of Ubbm.fd}
+% \changes{1.2}{1999/03/13}{Added copyright and license information}
+%
+% \title{A package for using the \texttt{bbm} fonts in math environment}
+% \author{Torsten Hilbrich\thanks{Torsten.Hilbrich@gmx.net}}
+% \date{Printed \today}
+% \maketitle
+% \section{Introduction}
+%
+% Did you ever write mathematical text and needed a character specifying the
+% set of natural numbers? One opportunity is to use the \texttt{bbold} font
+% of AMS. But this is rather an outlined than a double-striked font.
+%
+% I found some fonts, called \texttt{bbm} which are available in roman,
+% sans serif and typewrite type and look like those you would write on
+% paper, double-striked left side and normal right side.
+%
+% \section{How to use these fonts?}
+%
+% You simple have to input the package \texttt{bbm} by typing the following:
+% \begin{verbatim}
+% \usepackage{bbm}
+% \end{verbatim}
+%
+% \DescribeMacro{\mathbbm}
+% The fonts can now be used in math environment by typing
+% \verb|$\mathbbm{N}$| for getting the symbol for natural numbers:
+% $\mathbbm{N}$. This is the same methode like for getting a calligraphic
+% $\mathcal{N}$ where you use \verb|$\mathcal{N}$|.
+%
+% The characters can be used as index or superscript as well. Let's
+% see: $M_\mathbbm{i}$ was created with the following sequence.
+% \begin{verbatim}
+% $M_\mathbbm{i}$
+% \end{verbatim}
+%
+% Do you prefer a sans serif font for sets, or even a typewrite style? No
+% problem, the commands
+% \DescribeMacro{\mathbbmss}
+% \verb|\mathbbmss|
+% and
+% \DescribeMacro{\mathbbmtt}
+% \verb|\mathbbmtt| do the same
+% like \verb|\mathbbm| except of using the specified font.
+%
+% Examples:
+% \par\nopagebreak
+% \begin{tabular}{ll}
+% \verb|\mathbbm{N}| & $\mathbbm{N}$\\
+% \verb|\mathbbmss{N}| & $\mathbbmss{N}$\\
+% \verb|\mathbbmtt{N}| & $\mathbbmtt{N}$\\
+% \end{tabular}
+%
+% Some often used sets can be described with the following letters:
+% $\mathbbm{N}$, $\mathbbm{R}$, $\mathbbm{Z}$,
+% $\mathbbm{R}$, $\mathbbm{Q}$, and $\mathbbm{C}$.
+%
+% \subsection{What about bold symbols?}
+%
+% By typing \verb|\mathbold| or \verb|\mathversion{bold}| you switch to the
+% bold variant of some
+% math symbols. The selection of math version must be done
+% \emph{outside} the math environment. Two of the fonts described above are
+% available in
+% bold extended series too, the roman and sans serif family.
+% If you specify \verb|\mathbold| before using the symbols,\mathversion{bold}
+% you can use bold letters. Let's see the examples again, now in bold version:
+% \par\nopagebreak
+% \begin{tabular}{ll}
+% \verb|\mathbbm{N}| & $\mathbbm{N}$\\
+% \verb|\mathbbmss{N}| & $\mathbbmss{N}$\\
+% \verb|\mathbbmtt{N}| & $\mathbbmtt{N}$\\
+% \end{tabular}
+% \section{Where to get the fonts?}
+%
+% The fonts can be found at CTAN\footnote{e.g. \texttt{ftp.dante.de}},
+% the directory is \texttt{/tex-archive/fonts/cm/bbm}. The BBM directory
+% on CTAN contains a link to this location.
+% \mathversion{normal}
+% \StopEventually{\PrintChanges}
+% \section{Implementation}
+%
+% Here the driver file for the documentation.
+%    \begin{macrocode}
+%<*driver>
+\documentclass{ltxdoc}
+\setlength{\parskip}{1ex plus 0,5ex minus 0,2ex}
+\setlength{\parindent}{0pt}
+\usepackage{bbm}
+\begin{document}
+ \DocInput{bbm.dtx}
+\end{document}
+%</driver>
+%    \end{macrocode}
+% \subsection{The style file}
+% I simply declare some new math alphabets. If you want to now more about
+% the font selection used by \LaTeXe{} you should read \texttt{fntguide.tex}
+% which is part of the distribution.
+%
+% Some identification stuff
+%    \begin{macrocode}
+%<*package>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{bbm}[\filedate\space V\space\fileversion
+                      \space provides fonts for set symbols - TH]
+%    \end{macrocode}
+% First I declare \verb|\mathbbm| as new math alphabet:
+%    \begin{macrocode}
+\DeclareMathAlphabet{\mathbbm}{U}{bbm}{m}{n}
+%    \end{macrocode}
+% and set the bold version of this font:
+%    \begin{macrocode}
+\SetMathAlphabet\mathbbm{bold}{U}{bbm}{bx}{n}
+%    \end{macrocode}
+% I decided to use the encoding \texttt{U} because the fonts aint
+% complete. The contain lower and upper letters, the digits 1 and 2,
+% brackets and parentheses.
+%
+% The same definition is repeated for \texttt{bbmss}
+%    \begin{macrocode}
+\DeclareMathAlphabet{\mathbbmss}{U}{bbmss}{m}{n}
+\SetMathAlphabet\mathbbmss{bold}{U}{bbmss}{bx}{n}
+%    \end{macrocode}
+%
+% The typewrite font has no bold version those it's declared by
+%    \begin{macrocode}
+\DeclareMathAlphabet{\mathbbmtt}{U}{bbmtt}{m}{n}
+%</package>
+%    \end{macrocode}
+% \subsection{The font definition files}
+%
+% \LaTeXe{} knows now new math alphabets called \texttt{bbm}, \texttt{bbmss}
+% and \texttt{bbmtt}. But it don't know, which files contains the information
+% of the fonts. Font definition files (the files with extension
+% \texttt{.fd}) are needed to inform \LaTeXe{} about the new fonts.
+% The whole mechanism
+% of these files can be found in \texttt{fntguide.tex} in section 4.
+%    \begin{macrocode}
+%<*bbm>
+\ProvidesFile{ubbm.fd}[\filedate\space V\space\fileversion
+                      \space Font definition for bbm font - TH]
+\DeclareFontFamily{U}{bbm}{}
+\DeclareFontShape{U}{bbm}{m}{n}
+   {  <5> <6> <7> <8> <9> <10> <12> gen * bbm
+      <10.95> bbm10%
+      <14.4>  bbm12%
+      <17.28><20.74><24.88> bbm17}{}
+\DeclareFontShape{U}{bbm}{m}{sl}
+   {  <5> <6> <7> bbmsl8%
+      <8> <9> <10> <12> gen * bbmsl
+      <10.95> bbmsl10%
+      <14.4> <17.28> <20.74> <24.88> bbmsl12}{}
+%    \end{macrocode}
+% As an example I will explain the following part.
+%    \begin{macrocode}
+\DeclareFontShape{U}{bbm}{bx}{n}
+   {  <5> <6> <7> <8> <9> <10> <12> gen * bbmbx
+      <10.95> bbmbx10%
+      <14.4> <17.28> <20.74> <24.88> bbmbx12}{}
+%    \end{macrocode}
+% The first line means: the sizes 5, 6, 7, 8, 9, 10, 12 point can
+% be directly generated because these fonts are available. The next
+% line replaces the 10.95pt by the 10pt sized font scaled to 10.95pt
+% size.
+% All fonts greater than 12pt are scaled to the proper size using the 12pt
+% font.
+%    \begin{macrocode}
+\DeclareFontShape{U}{bbm}{bx}{sl}
+   {  <5> <6> <7> <8> <9> <10> <10.95> <12> <14.4> <17.28>%
+      <20.74> <24.88> bbmbxsl10}{}
+\DeclareFontShape{U}{bbm}{b}{n}
+   {  <5> <6> <7> <8> <9> <10> <10.95> <12> <14.4> <17.28>%
+      <20.74> <24.88> bbmb10}{}
+%</bbm>
+%    \end{macrocode}
+% The definitions are quite long, I know. Let's pick out the definition
+% \begin{verbatim}
+% \DeclareFontShape{U}{bbm}{bx}{n}
+% \end{verbatim}
+% The first line means: in the sizes 5, 6, 7, 8, 9, 10, 12 point you can
+% directly generate the fonts because this sizes are available. The next
+% line replaces the 10.95pt by the 10pt sized font scaled to the needed
+% size. 14.4pt sized font can be generated using 12pt size at magstep 1.
+% All sizes greater than 14.4pt are scaled using the 17pt font.
+%
+% Here are the other definitions:
+%    \begin{macrocode}
+%<*bbmss>
+\ProvidesFile{ubbmss.fd}[\filedate\space V\space\fileversion
+                         \space Font definition for bbmss font - TH]
+\DeclareFontFamily{U}{bbmss}{}
+\DeclareFontShape{U}{bbmss}{m}{n}
+   {  <5> <6> <7> bbmss8%
+      <8> <9> <10> <12> gen * bbmss
+      <10.95> bbmss10%
+      <14.4> bbmss12%
+      <17.28> <20.74> <24.88> bbmss17}{}
+\DeclareFontShape{U}{bbmss}{m}{it}
+   {  <5> <6> <7> bbmssi8%
+      <8> <9> <10> <12> gen * bbmssi
+      <10.95> bbmssi10%
+      <14.4> bbmssi12%
+      <17.28> <20.74> <24.88> bbmssi17}{}
+\DeclareFontShape{U}{bbmss}{bx}{n}
+   {  <5> <6> <7> <8> <9> <10> <10.95> <12> <14.4> <17.28>%
+      <20.74> <24.88> bbmssbx10}{}
+%</bbmss>
+%    \end{macrocode}
+%
+% The typewrite font is even purer since it contains only the medium series
+% normal shape characters.
+%    \begin{macrocode}
+%<*bbmtt>
+\ProvidesFile{ubbmtt.fd}[\filedate\space V\space\fileversion
+                         \space Font definition for bbmss font - TH]
+\DeclareFontFamily{U}{bbmtt}{}
+\DeclareFontShape{U}{bbmtt}{m}{n}
+   {  <5> <6> <7> bbmtt8%
+      <8> <9> <10> <12> gen * bbmtt
+      <10.95> bbmtt10%
+      <14.4> <17.28> <20.74> <24.88> bbmtt12}{}
+%</bbmtt>
+%    \end{macrocode}
+%
+% \Finale
+%
+
+\endinput
diff --git a/Master/texmf-dist/source/latex/bbm-macros/bbm.ins b/Master/texmf-dist/source/latex/bbm-macros/bbm.ins
new file mode 100644
index 00000000000..7f45b922086
--- /dev/null
+++ b/Master/texmf-dist/source/latex/bbm-macros/bbm.ins
@@ -0,0 +1,20 @@
+\def\batchfile{bbm.ins}
+\input docstrip.tex
+
+\preamble
+
+Copyright (C) 1994,1997 by Torsten Hilbrich
+
+This file is part of the BBM package, a support for using the bbm* fonts.
+\endpreamble
+
+% Don't display progress
+\keepsilent
+
+\generateFile{bbm.sty}{t}{\from{bbm.dtx}{package}}
+\generateFile{ubbm.fd}{t}{\from{bbm.dtx}{bbm}}
+\generateFile{ubbmss.fd}{t}{\from{bbm.dtx}{bbmss}}
+\generateFile{ubbmtt.fd}{t}{\from{bbm.dtx}{bbmtt}}
+\generateFile{bbm.drv}{t}{\from{bbm.dtx}{driver}}
+
+\endinput
diff --git a/Master/texmf-dist/source/latex/bbm/fonts/bbm.readme b/Master/texmf-dist/source/latex/bbm/fonts/bbm.readme
deleted file mode 100644
index 7b5e7f5af83..00000000000
--- a/Master/texmf-dist/source/latex/bbm/fonts/bbm.readme
+++ /dev/null
@@ -1,52 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-A mathematician often needs special symbols to designate sets such as the
-integers, the reals etc..
-
-For the time being, the only fonts providing these special symbols have been:
- - the AMS fonts msbm (older version msym), which are intended for use with
-Times and aren't truly what a mathematician expects (the stress is on both
-stems instead of being on only the left one).
- - Alan Jeffrey's bbold fonts, which are sans-serif ones, with (almost) no
-possibility of design variations for, say, a bold variant.
-That was all, and in particular nothing for use with Computer Modern.
-
-I was already working at that time on the project of changing the codes of
-romanu.mf, romanl.mf and other files to add a 'Blackboard' variant to
-Computer Modern.
-
-                YOU HAVE IT ALL THERE !!!
-
-The whole package contains five 'main' files:
- - blbbase.mf (the 'base') contains the supplementary definitions needed
-for double stems etc..
- - blbord.mf (the 'driver') is fairly simple and only makes the necessary
-calls.
- - blbordu.mf (based on romanu.mf): programs for uppercase letters.
- - blbordl.mf (based on romanl.mf): programs for lowercase letters.
- - blbordsp.mf (based on romand.mf and punct.mf): programs for the digits~1
-and~2 and for parentheses and brackets.
-
-There is also a whole lot of parameter files that are (almost) the same as
-those provided by DEK.
-
-For most of them, the only differences are
-- change 'cmbase' for 'blbbase' on line~2
-- change 'generate roman' for 'generate blbord' on last line
-- add two extra parameters (interspace# and cap_interspace#).
-
-A LaTeX(2e) package written by Torsten Hilbrich for using these fonts is also 
-available nearby, exactly in ctan/macros/latex/contrib/supported/bbm/
-
-I sincerely hope you'll enjoy using these fonts; if you get into problems
-while using them, I should be reachable at
-
- _ _       Gilles F. ROBERT
-|          Unit\'e de Math\'ematiques Pures et Appliqu\'ees
-|  _ _ _   \'Ecole Normale Sup\'erieure
-|   |   |  46, All\'ee d'Italie
-|_ _|_ _|  69364 Lyon Cedex (FRANCE)
-    |  \
-    |   \  e-mail : gfrobert@umpa.ens-lyon.fr
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/latex/bbm/fonts/gfbatch.batch b/Master/texmf-dist/source/latex/bbm/fonts/gfbatch.batch
deleted file mode 100644
index 642e4bdec67..00000000000
--- a/Master/texmf-dist/source/latex/bbm/fonts/gfbatch.batch
+++ /dev/null
@@ -1,55 +0,0 @@
-# This is a shell script that produces all PK files from GF files
-# produced by mfbatch.batch, assuming that 'localfont' is a 300dpi laser.
-# Gilles F. ROBERT (29-03-93)
-gftopk bbm10.300gf
-gftopk bbm12.300gf
-gftopk bbm17.300gf
-gftopk bbm9.300gf
-gftopk bbm8.300gf
-gftopk bbm7.300gf
-gftopk bbm6.300gf
-gftopk bbm5.300gf
-#
-gftopk bbmsl10.300gf
-gftopk bbmsl12.300gf
-gftopk bbmsl9.300gf
-gftopk bbmsl8.300gf
-#
-gftopk bbmbx10.300gf
-gftopk bbmbx12.300gf
-gftopk bbmbx9.300gf
-gftopk bbmbx8.300gf
-gftopk bbmbx7.300gf
-gftopk bbmbx6.300gf
-gftopk bbmbx5.300gf
-gftopk bbmbxsl10.300gf
-#
-gftopk bbmss10.300gf
-gftopk bbmss12.300gf
-gftopk bbmss17.300gf
-gftopk bbmss9.300gf
-gftopk bbmss8.300gf
-gftopk bbmssq8.300gf
-#
-gftopk bbmssi10.300gf
-gftopk bbmssi12.300gf
-gftopk bbmssi17.300gf
-gftopk bbmssi9.300gf
-gftopk bbmssi8.300gf
-gftopk bbmssqi8.300gf
-#
-gftopk bbmssbx10.300gf
-gftopk bbmssdc10.300gf
-#
-gftopk bbmtt10.300gf
-gftopk bbmtt12.300gf
-gftopk bbmtt9.300gf
-gftopk bbmtt8.300gf
-gftopk bbmsltt10.300gf
-gftopk bbmvtt10.300gf
-#
-gftopk bbmb10.300gf
-gftopk bbmdunh10.300gf
-gftopk bbmfib8.300gf
-gftopk bbminch.300gf
-
diff --git a/Master/texmf-dist/source/latex/bbm/fonts/mfbatch.batch b/Master/texmf-dist/source/latex/bbm/fonts/mfbatch.batch
deleted file mode 100644
index 6989d63bee0..00000000000
--- a/Master/texmf-dist/source/latex/bbm/fonts/mfbatch.batch
+++ /dev/null
@@ -1,51 +0,0 @@
-mf "\mode=localfont; scrollmode; input bbm10"
-mf "\mode=localfont; scrollmode; input bbm12"
-mf "\mode=localfont; scrollmode; input bbm17"
-mf "\mode=localfont; scrollmode; input bbm9"
-mf "\mode=localfont; scrollmode; input bbm8"
-mf "\mode=localfont; scrollmode; input bbm7"
-mf "\mode=localfont; scrollmode; input bbm6"
-mf "\mode=localfont; scrollmode; input bbm5"
-#
-mf "\mode=localfont; scrollmode; input bbmsl10"
-mf "\mode=localfont; scrollmode; input bbmsl12"
-mf "\mode=localfont; scrollmode; input bbmsl9"
-mf "\mode=localfont; scrollmode; input bbmsl8"
-#
-mf "\mode=localfont; scrollmode; input bbmbx10"
-mf "\mode=localfont; scrollmode; input bbmbx12"
-mf "\mode=localfont; scrollmode; input bbmbx9"
-mf "\mode=localfont; scrollmode; input bbmbx8"
-mf "\mode=localfont; scrollmode; input bbmbx7"
-mf "\mode=localfont; scrollmode; input bbmbx6"
-mf "\mode=localfont; scrollmode; input bbmbx5"
-mf "\mode=localfont; scrollmode; input bbmbxsl10"
-#
-mf "\mode=localfont; scrollmode; input bbmss10"
-mf "\mode=localfont; scrollmode; input bbmss12"
-mf "\mode=localfont; scrollmode; input bbmss17"
-mf "\mode=localfont; scrollmode; input bbmss9"
-mf "\mode=localfont; scrollmode; input bbmss8"
-mf "\mode=localfont; scrollmode; input bbmssq8"
-#
-mf "\mode=localfont; scrollmode; input bbmssi10"
-mf "\mode=localfont; scrollmode; input bbmssi12"
-mf "\mode=localfont; scrollmode; input bbmssi17"
-mf "\mode=localfont; scrollmode; input bbmssi9"
-mf "\mode=localfont; scrollmode; input bbmssi8"
-mf "\mode=localfont; scrollmode; input bbmssqi8"
-#
-mf "\mode=localfont; scrollmode; input bbmssbx10"
-mf "\mode=localfont; scrollmode; input bbmssdc10"
-#
-mf "\mode=localfont; scrollmode; input bbmtt10"
-mf "\mode=localfont; scrollmode; input bbmtt12"
-mf "\mode=localfont; scrollmode; input bbmtt9"
-mf "\mode=localfont; scrollmode; input bbmtt8"
-mf "\mode=localfont; scrollmode; input bbmsltt10"
-mf "\mode=localfont; scrollmode; input bbmvtt10"
-#
-mf "\mode=localfont; scrollmode; input bbmb10"
-mf "\mode=localfont; scrollmode; input bbmdunh10"
-mf "\mode=localfont; scrollmode; input bbmfib8"
-mf "\mode=localfont; scrollmode; input bbminch"
diff --git a/Master/texmf-dist/source/latex/bbm/fonts/test.tex b/Master/texmf-dist/source/latex/bbm/fonts/test.tex
deleted file mode 100644
index a17cdff65aa..00000000000
--- a/Master/texmf-dist/source/latex/bbm/fonts/test.tex
+++ /dev/null
@@ -1,66 +0,0 @@
-\let\noinit!\input testfont
-\def\fontname{bbm17 }\startfont\table
-\def\fontname{bbm12 }\startfont\table
-\eject
-\def\fontname{bbm10 }\startfont\table
-\def\fontname{bbm9 }\startfont\table
-\eject
-\def\fontname{bbm8 }\startfont\table
-\def\fontname{bbm7 }\startfont\table
-\eject
-\def\fontname{bbm6 }\startfont\table
-\def\fontname{bbm5 }\startfont\table
-\eject
-\def\fontname{bbmsl12 }\startfont\table
-\def\fontname{bbmsl10 }\startfont\table
-\eject
-\def\fontname{bbmsl9 }\startfont\table
-\def\fontname{bbmsl8 }\startfont\table
-\eject
-\def\fontname{bbmbx12 }\startfont\table
-\def\fontname{bbmbx10 }\startfont\table
-\eject
-\def\fontname{bbmbx9 }\startfont\table
-\def\fontname{bbmbx8 }\startfont\table
-\eject
-\def\fontname{bbmbx7 }\startfont\table
-\def\fontname{bbmbx6 }\startfont\table
-\eject
-\def\fontname{bbmbx5 }\startfont\table
-\def\fontname{bbmbxsl10 }\startfont\table
-\eject
-\def\fontname{bbmss17 }\startfont\table
-\def\fontname{bbmss12 }\startfont\table
-\eject
-\def\fontname{bbmss10 }\startfont\table
-\def\fontname{bbmss9 }\startfont\table
-\eject
-\def\fontname{bbmss8 }\startfont\table
-\def\fontname{bbmssq8 }\startfont\table
-\eject
-\def\fontname{bbmssi17 }\startfont\table
-\def\fontname{bbmssi12 }\startfont\table
-\eject
-\def\fontname{bbmssi10 }\startfont\table
-\def\fontname{bbmssi9 }\startfont\table
-\eject
-\def\fontname{bbmssi8 }\startfont\table
-\def\fontname{bbmssqi8 }\startfont\table
-\eject
-\def\fontname{bbmssbx10 }\startfont\table
-\def\fontname{bbmssdc10 }\startfont\table
-\eject
-\def\fontname{bbmtt12 }\startfont\table
-\def\fontname{bbmtt10 }\startfont\table
-\eject
-\def\fontname{bbmtt9 }\startfont\table
-\def\fontname{bbmtt8 }\startfont\table
-\eject
-\def\fontname{bbmsltt10 }\startfont\table
-\def\fontname{bbmvtt10 }\startfont\table
-\eject
-\def\fontname{bbmb10 }\startfont\table
-\def\fontname{bbmfib8 }\startfont\table
-\eject
-\def\fontname{bbmdunh10 }\startfont\table
-\bye
diff --git a/Master/texmf-dist/tex/latex/bbm-macros/bbm.sty b/Master/texmf-dist/tex/latex/bbm-macros/bbm.sty
new file mode 100644
index 00000000000..b366a477f93
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bbm-macros/bbm.sty
@@ -0,0 +1,40 @@
+%%
+%% This is file `bbm.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bbm.dtx  (with options: `package')
+%% 
+%% Copyright (C) 1994,1997 by Torsten Hilbrich
+%% 
+%% This file is part of the BBM package, a support for using the bbm* fonts.
+\def\fileversion{1.2}
+\def\filedate{1999/03/15}
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{bbm}[\filedate\space V\space\fileversion
+                      \space provides fonts for set symbols - TH]
+\DeclareMathAlphabet{\mathbbm}{U}{bbm}{m}{n}
+\SetMathAlphabet\mathbbm{bold}{U}{bbm}{bx}{n}
+\DeclareMathAlphabet{\mathbbmss}{U}{bbmss}{m}{n}
+\SetMathAlphabet\mathbbmss{bold}{U}{bbmss}{bx}{n}
+\DeclareMathAlphabet{\mathbbmtt}{U}{bbmtt}{m}{n}
+
+\endinput
+%%
+%% End of file `bbm.sty'.
diff --git a/Master/texmf-dist/tex/latex/bbm-macros/ubbm.fd b/Master/texmf-dist/tex/latex/bbm-macros/ubbm.fd
new file mode 100644
index 00000000000..88d6c3667b4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bbm-macros/ubbm.fd
@@ -0,0 +1,55 @@
+%%
+%% This is file `ubbm.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bbm.dtx  (with options: `bbm')
+%% 
+%% Copyright (C) 1994,1997 by Torsten Hilbrich
+%% 
+%% This file is part of the BBM package, a support for using the bbm* fonts.
+\def\fileversion{1.2}
+\def\filedate{1999/03/15}
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\ProvidesFile{ubbm.fd}[\filedate\space V\space\fileversion
+                      \space Font definition for bbm font - TH]
+\DeclareFontFamily{U}{bbm}{}
+\DeclareFontShape{U}{bbm}{m}{n}
+   {  <5> <6> <7> <8> <9> <10> <12> gen * bbm
+      <10.95> bbm10%
+      <14.4>  bbm12%
+      <17.28><20.74><24.88> bbm17}{}
+\DeclareFontShape{U}{bbm}{m}{sl}
+   {  <5> <6> <7> bbmsl8%
+      <8> <9> <10> <12> gen * bbmsl
+      <10.95> bbmsl10%
+      <14.4> <17.28> <20.74> <24.88> bbmsl12}{}
+\DeclareFontShape{U}{bbm}{bx}{n}
+   {  <5> <6> <7> <8> <9> <10> <12> gen * bbmbx
+      <10.95> bbmbx10%
+      <14.4> <17.28> <20.74> <24.88> bbmbx12}{}
+\DeclareFontShape{U}{bbm}{bx}{sl}
+   {  <5> <6> <7> <8> <9> <10> <10.95> <12> <14.4> <17.28>%
+      <20.74> <24.88> bbmbxsl10}{}
+\DeclareFontShape{U}{bbm}{b}{n}
+   {  <5> <6> <7> <8> <9> <10> <10.95> <12> <14.4> <17.28>%
+      <20.74> <24.88> bbmb10}{}
+
+\endinput
+%%
+%% End of file `ubbm.fd'.
diff --git a/Master/texmf-dist/tex/latex/bbm-macros/ubbmss.fd b/Master/texmf-dist/tex/latex/bbm-macros/ubbmss.fd
new file mode 100644
index 00000000000..7d14500b6f1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bbm-macros/ubbmss.fd
@@ -0,0 +1,50 @@
+%%
+%% This is file `ubbmss.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bbm.dtx  (with options: `bbmss')
+%% 
+%% Copyright (C) 1994,1997 by Torsten Hilbrich
+%% 
+%% This file is part of the BBM package, a support for using the bbm* fonts.
+\def\fileversion{1.2}
+\def\filedate{1999/03/15}
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\ProvidesFile{ubbmss.fd}[\filedate\space V\space\fileversion
+                         \space Font definition for bbmss font - TH]
+\DeclareFontFamily{U}{bbmss}{}
+\DeclareFontShape{U}{bbmss}{m}{n}
+   {  <5> <6> <7> bbmss8%
+      <8> <9> <10> <12> gen * bbmss
+      <10.95> bbmss10%
+      <14.4> bbmss12%
+      <17.28> <20.74> <24.88> bbmss17}{}
+\DeclareFontShape{U}{bbmss}{m}{it}
+   {  <5> <6> <7> bbmssi8%
+      <8> <9> <10> <12> gen * bbmssi
+      <10.95> bbmssi10%
+      <14.4> bbmssi12%
+      <17.28> <20.74> <24.88> bbmssi17}{}
+\DeclareFontShape{U}{bbmss}{bx}{n}
+   {  <5> <6> <7> <8> <9> <10> <10.95> <12> <14.4> <17.28>%
+      <20.74> <24.88> bbmssbx10}{}
+
+\endinput
+%%
+%% End of file `ubbmss.fd'.
diff --git a/Master/texmf-dist/tex/latex/bbm-macros/ubbmtt.fd b/Master/texmf-dist/tex/latex/bbm-macros/ubbmtt.fd
new file mode 100644
index 00000000000..80a5bbabe6a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bbm-macros/ubbmtt.fd
@@ -0,0 +1,40 @@
+%%
+%% This is file `ubbmtt.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bbm.dtx  (with options: `bbmtt')
+%% 
+%% Copyright (C) 1994,1997 by Torsten Hilbrich
+%% 
+%% This file is part of the BBM package, a support for using the bbm* fonts.
+\def\fileversion{1.2}
+\def\filedate{1999/03/15}
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\ProvidesFile{ubbmtt.fd}[\filedate\space V\space\fileversion
+                         \space Font definition for bbmss font - TH]
+\DeclareFontFamily{U}{bbmtt}{}
+\DeclareFontShape{U}{bbmtt}{m}{n}
+   {  <5> <6> <7> bbmtt8%
+      <8> <9> <10> <12> gen * bbmtt
+      <10.95> bbmtt10%
+      <14.4> <17.28> <20.74> <24.88> bbmtt12}{}
+
+\endinput
+%%
+%% End of file `ubbmtt.fd'.
diff --git a/Master/tlpkg/tlpsrc/bbm-macros.tlpsrc b/Master/tlpkg/tlpsrc/bbm-macros.tlpsrc
new file mode 100644
index 00000000000..806e7f5c324
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/bbm-macros.tlpsrc
@@ -0,0 +1,2 @@
+name bbm-macros
+category Package
diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
index 966603a790a..f18f61f162c 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
@@ -22,6 +22,7 @@ depend Package/barcodes
 depend Package/bayer
 depend Package/bbding
 depend Package/bbm
+depend Package/bbm-macros
 depend Package/bbold
 depend Package/belleek
 depend Package/bera
diff --git a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
index 9f6f7f6d4b3..1149e533282 100644
--- a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
@@ -15,6 +15,7 @@ depend Documentation/tamethebeast
 depend Documentation/tds
 depend Documentation/tex-refs
 depend Package/bbm
+depend Package/bbm-macros
 depend Package/bbold
 depend Package/cmbright
 depend Package/cweb