summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-18 00:44:01 +0000
committerKarl Berry <karl@freefriends.org>2011-01-18 00:44:01 +0000
commitd0258084f13903296356f63b4b09b55e6d0012b6 (patch)
treed4705a1cfb1946f9044e9cb941688e2d9c0ee4f0
parent8b9caf2ada7ba9a0b6fbdaf7503c2d61091c988b (diff)
cmbright (needed for ages)
git-svn-id: svn://tug.org/texlive/trunk@21107 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/cmbright/LICENSE (renamed from Master/texmf-dist/doc/latex/cmbright/copyrite.txt)4
-rw-r--r--Master/texmf-dist/doc/fonts/cmbright/README (renamed from Master/texmf-dist/doc/latex/cmbright/readme)124
-rw-r--r--Master/texmf-dist/doc/fonts/cmbright/cmbright.txt35
-rw-r--r--Master/texmf-dist/doc/fonts/cmbright/manifest.txt (renamed from Master/texmf-dist/fonts/source/public/cmbright/manifest.txt)4
-rw-r--r--Master/texmf-dist/doc/latex/cmbright/cmbright.pdfbin0 -> 82415 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cmbright/manifest.txt107
-rw-r--r--Master/texmf-dist/source/latex/cmbright/cmbr.fdd311
-rw-r--r--Master/texmf-dist/source/latex/cmbright/cmbright.dtx680
-rw-r--r--Master/texmf-dist/source/latex/cmbright/cmbright.ins48
-rw-r--r--Master/texmf-dist/source/latex/cmbright/oinst.ins36
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/cmbright.sty65
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/omlcmbr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/omlcmbrm.fd14
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/omscmbr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/omscmbrs.fd12
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/ot1cmbr.fd24
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/ot1cmtl.fd10
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/t1cmbr.fd40
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/t1cmtl.fd10
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/ts1cmbr.fd40
-rw-r--r--Master/texmf-dist/tex/latex/cmbright/ts1cmtl.fd10
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds4
23 files changed, 673 insertions, 919 deletions
diff --git a/Master/texmf-dist/doc/latex/cmbright/copyrite.txt b/Master/texmf-dist/doc/fonts/cmbright/LICENSE
index e81f1cc6526..e32f90c627e 100644
--- a/Master/texmf-dist/doc/latex/cmbright/copyrite.txt
+++ b/Master/texmf-dist/doc/fonts/cmbright/LICENSE
@@ -1,6 +1,4 @@
-% copyrite.txt
-%
-% This file is part of the CM bright fonts, version 1.0f
+% This file is part of the CM Bright fonts, version 1.0f
Copyright notice to the CM Bright typefaces
diff --git a/Master/texmf-dist/doc/latex/cmbright/readme b/Master/texmf-dist/doc/fonts/cmbright/README
index 5e7866a8e80..3d8a912137e 100644
--- a/Master/texmf-dist/doc/latex/cmbright/readme
+++ b/Master/texmf-dist/doc/fonts/cmbright/README
@@ -3,109 +3,79 @@
* The COMPUTER MODERN BRIGHT family of fonts *
* *
* fonts: v1.0g 2002-05-25 *
-* cmbright.sty v7.1 2000-06-30 *
-* fd files v7.3 1999-05-12 *
+* macros v8.1 2005-04-13 *
* *
* There will be no more *basic* changes to the fonts. *
-* Extensions and bug fixes, however, may be expected. *
+* Extensions and bug fixes may be expected still. *
* *
************************************************************
Walter Schmidt
- <was@VR-Web.de>
+ w-a-schmidt(at)gmx.net
`Computer Modern Bright' is a family of sans serif fonts for
-TeX and LaTeX, based on Donald Knuth's CM fonts. It
-comprises OT1, T1 and TS1 encoded text fonts of various
+TeX and LaTeX, based on Donald Knuth's `Computer Modern'.
+It comprises OT1, T1 and TS1 encoded text fonts of various
shapes as well as all the fonts necessary for mathematical
-typesetting, incl. the AMS symbols.
+typesetting, including the AMS symbols. CM Bright is
+accompanied by a matching family of monospaced fonts,
+`Computer Modern Typewriter Light'.
-This distribution includes
+This distribution comprises
-* the fonts in the Metafont format in the directory ./mf,
+* the fonts in the Metafont format,
-* the font metrics in the directory ./tfm,
+* the TeX font metrics,
-* the DTX sources of the LaTeX macro package cmbright.sty
- and the related font definition files in the directory
- ./latex.
+* the LaTeX macro package cmbright.sty and the related font
+ definition files
The CM Bright fonts are available in the Type1 format, too.
See <http://www.micropress-inc.com/fonts/brmath/brmain.htm>.
-As to the license conditions for the fonts, see the file
-`copyrite.txt' in the subdirectory ./mf.
+To install, move all files to the corresponding directories
+of your TeX system. In case yor TeX system does not support
+the use of fonts in the obsolete Metafont format, omit the
+directories fonts/source and doc/fonts.
-As to the license conditions for the macro package and the
-.fd files, see the notice in the files cmbright.dtx and
-cmbr.fdd.
+Documentation regarding the use of the fonts can be found in
+the document cmbright.pdf.
+Additional documentation regarding the license of the
+Metafont sources of the CM-Bright fonts can be found in the
+directory texmf/doc/fonts/cmbright.
-Installing the fonts in MF format
-=================================
-Skip this section, if you intend to use the CM Bright fonts
-in Type1 format only!
-
-Copy the files from the subdirectory ./mf of this collection
-to a directory searched by the Metafont program. In a TDS
-compliant file system the suitable place might be:
-
- texmf/fonts/source/public/cmbright
-
-You will need the source files of Knuth's original CM fonts,
-of the original (roman) AMS fonts, and of J. Knappen's EC
-fonts, too, in order to generate the bitmaps.
-
-
-
-Installing the font metrics and the LaTeX interface files
-=========================================================
-Copy the files from the subdirectory ./tfm of this collection
-to a directory where TeX looks for the font metrics. In a
-TDS compliant file system the suitable place might be:
-
- texmf/fonts/tfm/public/cmbright
-
-Copy the files from the directory ./latex of this collection
-to a place where you keep documented LaTeX sources or to a
-temporary directory. Execute the installation script
-cmbright.ins by running it through LaTeX in this directory
-than; this will generate the file cmbright.sty and various
-.fd files.
-
-Move these files to a directory where you keep LaTeX's style
-files; in a TDS compliant files system the suitable place
-is:
-
- texmf/tex/latex/cmbright
-
-The latter step is not required if your "docstrip" program
-has been configured to write directly to the TeX directories
-and the directory tex/latex/cmbright exists in your TDS tree
-before unpacking the files.
-
-
-
-Using the fonts with LaTeX
-==========================
-See the documentation, which is obtained by running the file
-cmbright.dtx through LaTeX.
-
-
-
-Future changes
-==============
-Minor changes and/or bug fixes to the T1/TS1 fonts are still
-to be expected.
-
-All future changes, bug fixes and additions to the
-`official' EC fonts will be adopted, if appropriate.
+License
+=======
+The MF sources of the CM Bright and CM Typewriter Light
+fonts are subject to the LPPL; see the files in the
+directory doc/fonts/cmbright.
+The LaTeX macros to use the CM Bright and CM Typewriter Light
+fonts are separately(!) subject to the LPPL, too; see the
+notice in the file source/latex/cmbrght/cmbright.dtx.
History
=======
+*** 2005-04-13**
+
+ The fonts are now declared as continuously scalable, so
+ that arbitrary sizes are supported.
+ The obsolete hacks regarding the use of \oldstylenums
+ and \textregistered have been abolished.
+ When the package is loaded with the option
+ [slantedGreek], all upright uppercase Greek letters are
+ made available, too
+ Bug fix re. default definition of \Gamma.
+ The package will fix the (La)TeX logos to suit CM-Bright.
+ The package documentation now acts as a font sample,
+ too.
+ Source file cmbright.fdd abolished; all sources are in
+ the .dtx file now.
+ Distribution rearranged \`a la TDS.
+
*** 2002-05-25 ***
Fixed tbsymb.mf and all TFM's of the TC Bright fonts,
diff --git a/Master/texmf-dist/doc/fonts/cmbright/cmbright.txt b/Master/texmf-dist/doc/fonts/cmbright/cmbright.txt
new file mode 100644
index 00000000000..5042ad8a2bf
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cmbright/cmbright.txt
@@ -0,0 +1,35 @@
+************************************************************
+* *
+* The COMPUTER MODERN BRIGHT family of fonts *
+* *
+* There will be no more *basic* changes to the fonts. *
+* Extensions and bug fixes, however, may be expected. *
+* *
+************************************************************
+ Walter Schmidt
+ w-a-schmidt@gmx.net
+
+
+`Computer Modern Bright' is a family of sans serif fonts for
+TeX and LaTeX, based on Donald Knuth's `Computer Modern'.
+It comprises OT1, T1 and TS1 encoded text fonts of various
+shapes as well as all the fonts necessary for mathematical
+typesetting, including the AMS symbols. CM Bright is
+accompanied by a matching family of monospaced fonts,
+`Computer Modern Typewriter Light'.
+
+This distribution includes the fonts in the Metafont format
+in the directory fonts/source/public/cmbright and the font
+metrics in the directory fomnts/tfm/public/cmbright,
+
+The CM Bright and CM typewriter Light fonts are available in
+the Type1 (Postscript) format, too.
+See <http://www.micropress-inc.com/fonts>.
+
+Use of the typefaces with LaTeX is supported through the
+macro package cmbright.sty. Its documentation
+(doc/latex/cmbright/cmbright.pdf) constitutes also a font
+sample.
+
+
+%% finis
diff --git a/Master/texmf-dist/fonts/source/public/cmbright/manifest.txt b/Master/texmf-dist/doc/fonts/cmbright/manifest.txt
index 86e500b67b7..0d435c4c532 100644
--- a/Master/texmf-dist/fonts/source/public/cmbright/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/cmbright/manifest.txt
@@ -1,5 +1,5 @@
-The below file contitute the sources of the
-Computer Modern Bright fonts and mist be disttributed
+The below files contitute the sources of the
+Computer Modern Bright fonts and must be disttributed
as a whole:
3525 Thu May 22 00:00:00 1997 ams10pt.mf
diff --git a/Master/texmf-dist/doc/latex/cmbright/cmbright.pdf b/Master/texmf-dist/doc/latex/cmbright/cmbright.pdf
new file mode 100644
index 00000000000..0539887a44b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cmbright/cmbright.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cmbright/manifest.txt b/Master/texmf-dist/doc/latex/cmbright/manifest.txt
deleted file mode 100644
index d5a895d8cb6..00000000000
--- a/Master/texmf-dist/doc/latex/cmbright/manifest.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-The following files constitute the "CM Bright Fonts"
-and must be distributed as a whole:
-
- 3525 0 0 22-05-97 16:53 cmbright/mf/ams10pt.mf
- 3917 0 0 22-05-97 16:53 cmbright/mf/ams8pt.mf
- 3917 0 0 22-05-97 16:53 cmbright/mf/ams9pt.mf
- 9153 0 0 22-05-97 16:53 cmbright/mf/baccent.mf
- 11886 0 0 22-05-97 16:53 cmbright/mf/bgreeku.mf
- 6263 0 0 22-05-97 16:53 cmbright/mf/bitalms.mf
- 12183 0 0 22-05-97 16:53 cmbright/mf/bpunct.mf
- 3438 0 0 22-05-97 16:53 cmbright/mf/br10pt.mf
- 3491 0 0 22-05-97 16:53 cmbright/mf/br17pt.mf
- 3413 0 0 22-05-97 16:53 cmbright/mf/br8pt.mf
- 3390 0 0 22-05-97 16:53 cmbright/mf/br9pt.mf
- 5107 0 0 22-05-97 16:53 cmbright/mf/brmsa.mf
- 7329 0 0 22-05-97 16:53 cmbright/mf/brmsb.mf
- 3122 0 0 22-05-97 16:53 cmbright/mf/broman.mf
- 40147 0 0 22-05-97 16:53 cmbright/mf/bromanl.mf
- 8146 0 0 22-05-97 16:53 cmbright/mf/bromlig.mf
- 10159 0 0 22-05-97 16:53 cmbright/mf/bromms.mf
- 3561 0 0 26-05-97 18:41 cmbright/mf/brs10pt.mf
- 3594 0 0 26-05-97 18:42 cmbright/mf/brs17pt.mf
- 3538 0 0 26-05-97 18:44 cmbright/mf/brs8pt.mf
- 3514 0 0 26-05-97 18:45 cmbright/mf/brs9pt.mf
- 447 0 0 22-05-97 16:53 cmbright/mf/cmbr10.mf
- 491 0 0 22-05-97 16:53 cmbright/mf/cmbr17.mf
- 485 0 0 22-05-97 16:53 cmbright/mf/cmbr8.mf
- 485 0 0 22-05-97 16:53 cmbright/mf/cmbr9.mf
- 700 0 0 22-05-97 16:53 cmbright/mf/cmbras10.mf
- 695 0 0 22-05-97 16:53 cmbright/mf/cmbras8.mf
- 696 0 0 22-05-97 16:53 cmbright/mf/cmbras9.mf
- 891 0 0 22-05-97 16:53 cmbright/mf/cmbrbs10.mf
- 892 0 0 22-05-97 16:53 cmbright/mf/cmbrbs8.mf
- 892 0 0 22-05-97 16:53 cmbright/mf/cmbrbs9.mf
- 3889 0 0 22-05-97 16:53 cmbright/mf/cmbrbx10.mf
- 3833 0 0 22-05-97 16:53 cmbright/mf/cmbrmb10.mf
- 475 0 0 22-05-97 16:53 cmbright/mf/cmbrmi10.mf
- 513 0 0 22-05-97 16:53 cmbright/mf/cmbrmi8.mf
- 513 0 0 22-05-97 16:53 cmbright/mf/cmbrmi9.mf
- 471 0 0 22-05-97 16:53 cmbright/mf/cmbrsl10.mf
- 515 0 0 22-05-97 16:53 cmbright/mf/cmbrsl17.mf
- 509 0 0 22-05-97 16:53 cmbright/mf/cmbrsl8.mf
- 509 0 0 22-05-97 16:53 cmbright/mf/cmbrsl9.mf
- 4715 0 0 22-05-97 16:53 cmbright/mf/cmbrsy10.mf
- 4695 0 0 22-05-97 16:53 cmbright/mf/cmbrsy8.mf
- 4715 0 0 22-05-97 16:53 cmbright/mf/cmbrsy9.mf
- 3872 0 0 22-05-97 16:53 cmbright/mf/cmsltl10.mf
- 3850 0 0 22-05-97 16:53 cmbright/mf/cmtl10.mf
- 915 0 0 09-02-00 22:26 cmbright/mf/copyrite.txt
- 37672 0 0 26-05-97 20:08 cmbright/mf/ebaccess.mf
- 52473 0 0 30-05-97 09:47 cmbright/mf/ebbase.mf
- 9789 0 0 22-05-97 16:53 cmbright/mf/ebbraces.mf
- 4055 0 0 22-05-97 16:53 cmbright/mf/ebbx10.mf
- 576 0 0 22-05-97 16:53 cmbright/mf/ebmo10.mf
- 623 0 0 22-05-97 16:53 cmbright/mf/ebmo17.mf
- 620 0 0 22-05-97 16:53 cmbright/mf/ebmo8.mf
- 622 0 0 22-05-97 16:53 cmbright/mf/ebmo9.mf
- 562 0 0 22-05-97 16:53 cmbright/mf/ebmr10.mf
- 609 0 0 22-05-97 16:53 cmbright/mf/ebmr17.mf
- 606 0 0 22-05-97 16:53 cmbright/mf/ebmr8.mf
- 608 0 0 22-05-97 16:53 cmbright/mf/ebmr9.mf
- 3064 0 0 22-05-97 16:53 cmbright/mf/ebpseudo.mf
- 11420 0 0 22-05-97 16:53 cmbright/mf/ebpunct.mf
- 51964 0 0 22-05-97 16:53 cmbright/mf/ebrleast.mf
- 9734 0 0 22-05-97 16:53 cmbright/mf/ebrlig.mf
- 10087 0 0 22-05-97 16:53 cmbright/mf/ebrligtb.mf
- 39644 0 0 22-05-97 16:53 cmbright/mf/ebrllett.mf
- 52059 0 0 22-05-97 16:53 cmbright/mf/ebrlwest.mf
- 2101 0 0 26-05-97 12:16 cmbright/mf/ebroman.mf
- 599 0 0 22-05-97 16:53 cmbright/mf/ebso10.mf
- 627 0 0 22-05-97 16:53 cmbright/mf/ebso17.mf
- 620 0 0 22-05-97 16:53 cmbright/mf/ebso8.mf
- 622 0 0 22-05-97 16:53 cmbright/mf/ebso9.mf
- 585 0 0 22-05-97 16:53 cmbright/mf/ebsr10.mf
- 613 0 0 22-05-97 16:53 cmbright/mf/ebsr17.mf
- 606 0 0 22-05-97 16:53 cmbright/mf/ebsr8.mf
- 608 0 0 22-05-97 16:53 cmbright/mf/ebsr9.mf
- 3939 0 0 22-05-97 16:53 cmbright/mf/ebtl10.mf
- 3949 0 0 22-05-97 16:53 cmbright/mf/ebto10.mf
- 3476 0 0 22-05-97 16:53 cmbright/mf/mathsl.mf
- 67170 0 0 22-05-97 16:53 cmbright/mf/msa.mf
- 58281 0 0 22-05-97 16:53 cmbright/mf/msb.mf
- 4079 0 0 22-05-97 16:53 cmbright/mf/tbbx10.mf
- 600 0 0 22-05-97 16:53 cmbright/mf/tbmo10.mf
- 647 0 0 22-05-97 16:53 cmbright/mf/tbmo17.mf
- 644 0 0 22-05-97 16:53 cmbright/mf/tbmo8.mf
- 646 0 0 22-05-97 16:53 cmbright/mf/tbmo9.mf
- 553 0 0 22-05-97 16:53 cmbright/mf/tbmr10.mf
- 603 0 0 22-05-97 16:53 cmbright/mf/tbmr17.mf
- 599 0 0 22-05-97 16:53 cmbright/mf/tbmr8.mf
- 601 0 0 22-05-97 16:53 cmbright/mf/tbmr9.mf
- 2222 0 0 26-05-97 13:28 cmbright/mf/tbpseudo.mf
- 607 0 0 22-05-97 16:53 cmbright/mf/tbso10.mf
- 651 0 0 22-05-97 16:53 cmbright/mf/tbso17.mf
- 644 0 0 22-05-97 16:53 cmbright/mf/tbso8.mf
- 646 0 0 22-05-97 16:53 cmbright/mf/tbso9.mf
- 592 0 0 22-05-97 16:53 cmbright/mf/tbsr10.mf
- 634 0 0 22-05-97 16:53 cmbright/mf/tbsr17.mf
- 630 0 0 22-05-97 16:53 cmbright/mf/tbsr8.mf
- 632 0 0 22-05-97 16:53 cmbright/mf/tbsr9.mf
- 2119 0 0 26-05-97 12:18 cmbright/mf/tbsymb.mf
- 94014 0 0 09-02-00 20:39 cmbright/mf/tbsymbol.mf
- 3959 0 0 09-02-00 19:32 cmbright/mf/tbtl10.mf
- 3972 0 0 09-02-00 19:33 cmbright/mf/tbto10.mf
- 1984 0 0 09-02-00 19:31 cmbright/mf/ttsymb.mf
- 94356 0 0 09-02-00 20:21 cmbright/mf/ttsymbol.mf
-% finis
diff --git a/Master/texmf-dist/source/latex/cmbright/cmbr.fdd b/Master/texmf-dist/source/latex/cmbright/cmbr.fdd
deleted file mode 100644
index 3148dbea08b..00000000000
--- a/Master/texmf-dist/source/latex/cmbright/cmbr.fdd
+++ /dev/null
@@ -1,311 +0,0 @@
-%\CheckSum{70}
-%
-% \iffalse
-%
-% Copyright (c) 1994--1999 Walter Schmidt, Erlangen
-%
-% This program may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.2
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.2 or later is part of all distributions of LaTeX
-% version 1999/12/01 or later.
-%
-% This program consists of the files cmbright.dtx, cmbr.fdd and
-% cmbright.ins.
-%
-% \fi
-%
-% \iffalse
-%
-%<cm>\ProvidesFile{ot1cmbr.fd}
-%<ec>\ProvidesFile{t1cmbr.fd}
-%<ts1cmbr>\ProvidesFile{ts1cmbr.fd}
-%<ot1cmtl>\ProvidesFile{ot1cmtl.fd}
-%<t1cmtl>\ProvidesFile{t1cmtl.fd}
-%<ts1cmtl>\ProvidesFile{ts1cmtl.fd}
-%<omlcmbrm>\ProvidesFile{omlcmbrm.fd}
-%<omscmbrs>\ProvidesFile{omscmbrs.fd}
-%<omlcmbr>\ProvidesFile{omlcmbr.fd}
-%<omscmbr>\ProvidesFile{omscmbr.fd}
-%<*driver>
- \ProvidesFile{cmbr.drv}
-%</driver>
- [1999/05/12 v7.3 (WaS)]
-%
-%<*driver>
-\documentclass[11pt]{ltxdoc}
-\setcounter{StandardModuleDepth}{1}
-\CodelineNumbered
-\GetFileInfo{cmbr.drv}
-\begin{document}
- \DocInput{cmbr.fdd}
-\end{document}
-%</driver>
-%
-% \fi
-%
-% \DeleteShortVerb{\|}
-%
-% \title{The file \texttt{cmbr.fdd}}
-% \date{(\fileversion{} -- \filedate)}
-% \author{Walter Schmidt\thanks{{\ttfamily walter.schmidt@arcormail.de}}}
-% \maketitle
-%
-% \noindent
-% \texttt{cmbr.fdd} is the documented source file of the Computer Modern Bright
-% font definitions for use with \LaTeX.
-%
-% \section{The \textsc{docstrip} modules}
-% {\small
-% \begin{tabular}{ll}
-% driver & documentation driver file\\
-% cm & font definition file \texttt{ot1cmbr.fd}\\
-% ec & font definition file \texttt{t1cmbr.fd}\\
-% ts1cmbr & font definition file \texttt{ts1cmbr.fd}\\
-% omlcmbrm & font definition file {\tt omlcmbrm.fd}\\
-% omscmbrs & font definition file {\tt omscmbrs.fd}\\
-% omlcmbr & font definition file \texttt{omlcmbr.fd}\\
-% omscmbr & font definition file \texttt{omscmbr.fd}\\
-% ot1cmtl & font definition file \texttt{ot1cmtl.fd}\\
-% t1cmtl & font definition file \texttt{t1cmtl.fd}\\
-% ts1cmtl & font definition file \texttt{ts1cmtl.fd}\\
-% \end{tabular}
-% \par}
-%
-% \StopEventually{}
-%
-% \section{CM Bright, OT1 encoding}
-%
-% \begin{macrocode}
-%<*cm>
-\DeclareFontFamily{OT1}{cmbr}{\hyphenchar\font45}
-\DeclareFontShape{OT1}{cmbr}{m}{n}{%
-<5><6><7><8>cmbr8%
-<9>cmbr9%
-<10><10.95><12><14.4>cmbr10%
-<17.28><20.74><24.88><29.86><35.83>cmbr17%
-}{}
-\DeclareFontShape{OT1}{cmbr}{m}{sl}{%
-<5><6><7><8>cmbrsl8%
-<9>cmbrsl9%
-<10><10.95><12><14.4>cmbrsl10%
-<17.28><20.74><24.88><29.86><35.83>cmbrsl17%
-}{}
-\DeclareFontShape{OT1}{cmbr}{m}{it}{%
-<->ssub*cmbr/m/sl%
-}{}
-\DeclareFontShape{OT1}{cmbr}{b}{n}{%
-<->ssub*cmbr/bx/n%
-}{}
-\DeclareFontShape{OT1}{cmbr}{bx}{n}{%
-<-9>sub*cmbr/m/n%
-<9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmbrbx10%
-}{}
-%</cm>
-% \end{macrocode}
-%
-% \section{CM Bright, T1 encoding}
-%
-% \begin{macrocode}
-%<*ec>
-\DeclareFontFamily{T1}{cmbr}{}
-\DeclareFontShape{T1}{cmbr}{m}{n}{%
-<5><6><7><8>ebmr8%
-<9>ebmr9%
-<10><10.95><12><14.4>ebmr10%
-<17.28><20.74><24.88><29.86><35.83>ebmr17%
-}{}
-\DeclareFontShape{T1}{cmbr}{m}{sl}{%
-<5><6><7><8>ebmo8%
-<9>ebmo9%
-<10><10.95><12><14.4>ebmo10%
-<17.28><20.74><24.88><29.86><35.83>ebmo17%
-}{}
-\DeclareFontShape{T1}{cmbr}{m}{it}{%
-<->ssub*cmbr/m/sl%
-}{}
-\DeclareFontShape{T1}{cmbr}{sb}{n}{%
-<5><6><7><8>ebsr8%
-<9>ebsr9%
-<10><10.95><12><14.4>ebsr10%
-<17.28><20.74><24.88><29.86><35.83>ebsr17%
-}{}
-\DeclareFontShape{T1}{cmbr}{sb}{sl}{%
-<5><6><7><8>ebso8%
-<9>ebso9%
-<10><10.95><12><14.4>ebso10%
-<17.28><20.74><24.88><29.86><35.83>ebso17%
-}{}
-\DeclareFontShape{T1}{cmbr}{sb}{it}{%
-<->ssub*cmbr/sb/sl%
-}{}
-\DeclareFontShape{T1}{cmbr}{b}{n}{%
-<->ssub*cmbr/bx/n%
-}{}
-\DeclareFontShape{T1}{cmbr}{bx}{n}{%
-<-9>sub*cmbr/sb/n%
-<9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>ebbx10%
-}{}
-%</ec>
-% \end{macrocode}
-%
-% \section{CM Typewriter Light, OT1 encoding}
-%
-% \begin{macrocode}
-%<*ot1cmtl>
-\DeclareFontFamily{OT1}{cmtl}{\hyphenchar\font\m@ne}
-\DeclareFontShape{OT1}{cmtl}{m}{n}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmtl10%
-}{}
-\DeclareFontShape{OT1}{cmtl}{m}{sl}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmsltl10%
-}{}
-\DeclareFontShape{OT1}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
-%</ot1cmtl>
-% \end{macrocode}
-%
-% \section{CM Typewriter Light, T1 encoding}
-%
-% \begin{macrocode}
-%<*t1cmtl>
-\DeclareFontFamily{T1}{cmtl}{\hyphenchar\font\m@ne}
-\DeclareFontShape{T1}{cmtl}{m}{n}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>ebtl10%
-}{}
-\DeclareFontShape{T1}{cmtl}{m}{sl}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>ebto10%
-}{}
-\DeclareFontShape{T1}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
-%</t1cmtl>
-% \end{macrocode}
-%
-% \section{CM Bright Math Inclined, OML encoding}
-%
-% \begin{macrocode}
-%<*omlcmbrm>
-\DeclareFontFamily{OML}{cmbrm}{\skewchar\font 127}
-\DeclareFontShape{OML}{cmbrm}{m}{it}{%
-<5><6><7><8>cmbrmi8%
-<9>cmbrmi9%
-<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmbrmi10%
-}{}
-\DeclareFontShape{OML}{cmbrm}{b}{it}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmbrmb10%
-}{}
-%</omlcmbrm>
-% \end{macrocode}
-%
-% \section{CM Bright Symbols, OMS encoding}
-%
-% \begin{macrocode}
-%<*omscmbrs>
-\DeclareFontFamily{OMS}{cmbrs}{\skewchar\font 48}
-\DeclareFontShape{OMS}{cmbrs}{m}{n}{%
-<5><6><7><8>cmbrsy8%
-<9>cmbrsy9%
-<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmbrsy10%
-}{}
-%</omscmbrs>
-% \end{macrocode}
-%
-% \section{CM Bright, OML encoding}
-% We need this for some special tex symbols which may be taken from
-% the `math italic' font.
-% \begin{macrocode}
-%<*omlcmbr>
-\DeclareFontFamily{OML}{cmbr}{\skewchar\font 127}
-\DeclareFontShape{OML}{cmbr}{m}{it}{<->ssub*cmbrm/m/it}{}
-\DeclareFontShape{OML}{cmbr}{sb}{it}{<->ssub*cmbrm/b/it}{}
-\DeclareFontShape{OML}{cmbr}{bx}{it}{<->ssub*cmbrm/b/it}{}
-%</omlcmbr>
-% \end{macrocode}
-%
-% \section{CM Bright, OMS encoding}
-% We need this for some special text symbols which may be taken from
-% the mathematical symbol font.
-% \begin{macrocode}
-%<*omscmbr>
-\DeclareFontFamily{OMS}{cmbr}{\skewchar\font 48}
-\DeclareFontShape{OMS}{cmbr}{m}{n}{<->ssub*cmbrs/m/n}{}
-%</omscmbr>
-% \end{macrocode}
-%
-% \section{CM Bright, TS1 encoding}
-%
-% \begin{macrocode}
-%<*ts1cmbr>
-\DeclareFontFamily{TS1}{cmbr}{\hyphenchar\font\m@ne}
-\DeclareFontShape{TS1}{cmbr}{m}{n}{%
-<5><6><7><8>tbmr8%
-<9>tbmr9%
-<10><10.95><12><14.4>tbmr10%
-<17.28><20.74><24.88><29.86><35.83>tbmr17%
-}{}
-\DeclareFontShape{TS1}{cmbr}{m}{sl}{%
-<5><6><7><8>tbmo8%
-<9>tbmo9%
-<10><10.95><12><14.4>tbmo10%
-<17.28><20.74><24.88><29.86><35.83>tbmo17%
-}{}
-\DeclareFontShape{TS1}{cmbr}{m}{it}{%
-<->ssub*cmbr/m/sl}{}
-\DeclareFontShape{TS1}{cmbr}{sb}{n}{%
-<5><6><7><8>tbsr8%
-<9>tbsr9%
-<10><10.95><12><14.4>tbsr10%
-<17.28><20.74><24.88><29.86><35.83>tbsr17%
-}{}
-\DeclareFontShape{TS1}{cmbr}{sb}{sl}{%
-<5><6><7><8>tbso8%
-<9>tbso9%
-<10><10.95><12><14.4>tbso10%
-<17.28><20.74><24.88><29.86><35.83>tbso17%
-}{}
-\DeclareFontShape{TS1}{cmbr}{sb}{it}{<->ssub*cmbr/sb/sl}{}
-\DeclareFontShape{TS1}{cmbr}{b}{n}{<->ssub*cmbr/bx/n}{}
-\DeclareFontShape{TS1}{cmbr}{bx}{n}{%
-<-9>sub*cmbr/sb/n%
-<9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>tbbx10%
-}{}
-%</ts1cmbr>
-% \end{macrocode}
-%
-% \section{CM Typewriter Light, TS1 encoding}
-%
-% \begin{macrocode}
-%<*ts1cmtl>
-\DeclareFontFamily{TS1}{cmtl}{\hyphenchar\font\m@ne}
-\DeclareFontShape{TS1}{cmtl}{m}{n}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>tbtl10%
-}{}
-\DeclareFontShape{TS1}{cmtl}{m}{sl}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>tbto10%
-}{}
-\DeclareFontShape{TS1}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
-%</ts1cmtl>
-% \end{macrocode}
-%
-% The next line goes into all files and in addition prevents {\sc docstrip}
-% from adding the character table to all modules.
-% \begin{macrocode}
-\endinput
-% \end{macrocode}
-% \Finale
-%
-%% \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 \~}
diff --git a/Master/texmf-dist/source/latex/cmbright/cmbright.dtx b/Master/texmf-dist/source/latex/cmbright/cmbright.dtx
index c5b0e1fad88..cbcae6a7366 100644
--- a/Master/texmf-dist/source/latex/cmbright/cmbright.dtx
+++ b/Master/texmf-dist/source/latex/cmbright/cmbright.dtx
@@ -1,37 +1,54 @@
-%\CheckSum{329}
+%\CheckSum{368}
%
% \iffalse
%
% File `cmbright.dtx'.
-% Copyright (c) 1994--2002 Walter Schmidt
+% Copyright (c) 1994--2005 Walter Schmidt
%
-% This program may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.2
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
-% and version 1.2 or later is part of all distributions of LaTeX
-% version 1999/12/01 or later.
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
%
-% This program consists of the files cmbright.dtx, cmbr.fdd and
-% cmbright.ins.
+% This work has the LPPL maintenance status "maintained".
%
+% This Current Maintainer of this work is Walter Schmidt
+%
+% This work consists of the files cmbright.dtx and cmbright.ins
% \fi
%
% \iffalse
%
-\NeedsTeXFormat{LaTeX2e}
-%<cm&!patch> [1995/06/01]
+%<cm>\ProvidesFile{ot1cmbr.fd}
+%<ec>\ProvidesFile{t1cmbr.fd}
+%<ts1cmbr>\ProvidesFile{ts1cmbr.fd}
+%<ot1cmtl>\ProvidesFile{ot1cmtl.fd}
+%<t1cmtl>\ProvidesFile{t1cmtl.fd}
+%<ts1cmtl>\ProvidesFile{ts1cmtl.fd}
+%<omlcmbrm>\ProvidesFile{omlcmbrm.fd}
+%<omscmbrs>\ProvidesFile{omscmbrs.fd}
+%<omlcmbr>\ProvidesFile{omlcmbr.fd}
+%<omscmbr>\ProvidesFile{omscmbr.fd}
+%<package>\ProvidesPackage{cmbright}
%<*driver>
\ProvidesFile{cmbright.drv}
%</driver>
-%<+cm>\ProvidesPackage{cmbright}
- [2002/05/25 v7.1 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
%
%<*driver>
\documentclass[11pt]{ltxdoc}
-\usepackage{mflogo,url}
+\OnlyDescription
\CodelineNumbered
+\usepackage[enlarged-baselineskips]{cmbright}
+\usepackage{exscale}
+\usepackage{manfnt}
+\newcommand{\danger}{\marginpar[\hfill\textdbend]{\textdbend\hfill}}
+\usepackage{mflogo}
+\newcommand\Lopt[1]{\texttt{#1}}
+\let\Lpack\Lopt
\parindent1em
\leftmargini=2em
\leftmarginii=2em
@@ -47,192 +64,179 @@
%
% \GetFileInfo{cmbright.drv}
% \DeleteShortVerb{\|}
-% \MakeShortVerb{\+}
-% \newcommand{\oitem}[1]{\item[\texttt{#1}]}
%
-% \title{The Computer Modern Bright fonts \\
-% and \\
-% the \LaTeX{} package \textsf{cmbright}}
-% \author{Walter Schmidt\thanks{{\ttfamily was@VR-Web.de}}}
+% \title{Using the CM Bright typeface with \LaTeX}
+% \author{Walter Schmidt\thanks{{\ttfamily w-a-schmidt@gmx.net}}}
% \date{(\fileversion{} -- \filedate)}
% \maketitle
-% \tableofcontents
%
% \section{The CM Bright fonts}
-% `Computer Modern Bright' is a family of sans serif fonts,
-% based on Donald Knuth's CM fonts.
-% It includes OT1, T1 and TS1 encoded text fonts of various
+% `Computer Modern Bright' is a sans serif typeface family,
+% based on Donald Knuth's `Computer Modern'.
+% It comprises OT1, T1 and TS1 encoded text fonts of various
% shapes as well as all the fonts necessary for mathematical
-% typesetting, incl.\ the AMS symbols.
+% typesetting, including the AMS symbols.
%
-% CM Bright has been designed as a well legible standalone
-% font. It is `lighter' and less obtrusive than CM Sans Serif, which,
+% CM~Bright has been designed as a well legible standalone
+% font. It is `lighter' and less obtrusive than CM~Sans~Serif, which,
% in contrast, is more appropriate for markup purposes within
-% a CM Roman environment.
+% a CM~Roman environment.
%
-% Together with CM Bright there comes a family of typewriter
+% Together with CM~Bright there comes a family of typewriter
% fonts, named `CM Typwewriter Light', which look better in
-% combination with CM Bright than the ordinary \texttt{cmtt} fonts would do.
-%
-% The CM Bright fonts in \MF{} format are distributed
-% free from the CTAN archives, directory \texttt{fonts/cmbright}.
+% combination with CM~Bright than the ordinary \texttt{cmtt} fonts would do.
%
-% The fonts are also available in Type1 format from
-% MicroPress~Inc, see
-% \path{<http://www.micropress-inc.com/fonts/brmath/brmain.htm>}.
+% The present document is typeset using the CM~Bright and CM~Typewriter Light
+% typefaces.
+% Samples of mathematical formulas are provided in section~\ref{sec:samples}.
%
-% \section{The \LaTeX{} macro package \textsf{cmbright}}
+% \section{The macro package `cmbright'}
%
-% \subsection{Description}
-% The \LaTeX{} macro package \textsf{cmbright}
-% supports typesetting with the font family CM Bright.
+% \subsection{Basics}
+% The macro package \Lpack{cmbright}
+% supports the use of the typeface family CM~Bright with \LaTeX:
% Loading the package
% \begin{verse}
-% +\usepackage{cmbright}+
+% \verb+\usepackage{cmbright}+
% \end{verse}
% effects the following:
% \begin{itemize}
% \item The default sans serif font family for typesetting text and math
-% is changed to \texttt{cmbr}, i.e.\ CM Bright.
+% is changed to \texttt{cmbr} (CM~Bright).
% \item
-% The sans serif font family is made the default one.
-% \item A new mathematical alphabet +\mathbold+ provides bold slanted
-% letters, inluding uppercase and lowercase Greek.
-% \item The packages \textsf{amsfonts} or \textsf{amssymb},
-% when loaded additionally,
-% will use the `CM Bright' versions of the AMS symbol fonts.
-%
-% Notice that you may still have to specify the option +psamsfonts+
-% for these packages, so as to prevent them from using design sizes
-% of the CM Math Extension and Euler Fraktur fonts, which may be
-% unavailable within your TeX system; this works flawlessly with
-% version 7.1 of the \textsf{cmbright} package now.
-% \item The default typewriter font family is changed to \texttt{cmtl},
-% i.e.\ CM Typewriter Light.
-% \item The line spacing (+\baselineskip+) for the font sizes 8--12\,pt
-% is increased to approx. $1.25 \times \mathrm{size}$.
+% The sans serif font family is made the default one for the whole document.
+% \item
+% The packages \Lpack{amsfonts} or \Lpack{amssymb}, when loaded additionally,
+% will use the `CM~Bright' versions of the AMS symbol fonts.
+% \item
+% The default typewriter font family is changed to \texttt{cmtl}
+% (CM Typewriter Light).
% \end{itemize}
%
-% \subsection{Package options}
-% \begin{description}
-% \oitem{standard-baselineskips}
-% This option prevents the package from enlarging the default line spacing.
-% See the below section~\ref{sec:bugs}.
-% \oitem{slantedGreek}
-% When the macro package is loaded using this option,
-% uppercase Greek letters will, by default, be slanted.
-% Regardless of the option the new commands
-% +\upDelta+ and +\upOmega+ will \emph{always} provide an
-% upright \( \Delta \) and \( \Omega \).
-% \end{description}
-%
-% \subsection{Font encoding}
-% The package does \emph{not} change the default output font
-% encoding from OT1. It is, however, recommended to make use of
-% CM Bright through the extended T1 and TS1 encodings,
-% since doing so does not imply any drawback.
+% \subsection{Line spacing}
+% Because of the large x-height of the CM~Bright typeface, it is often necessary to enlarge
+% the line spacing, as compared with the default setting of the standard \LaTeX\ document
+% classes.
+% By default, the package \Lpack{cmbright}
+% increases the line spacing (\verb+\baselineskip+) for the font sizes 8--12\,pt
+% to approx. $1.25 \times \mathrm{size}$.
+% However, this behavior may cause obscure problems.
+% particularly \danger in conjunction with other macro packages or with `moving arguments'.
+% Furhermore, in narrow columns no changes to the default line spacing may be necessary
+% at all.
+%
+% To stop the package from altering the line spacing, it can be loaded with the option
+% \Lopt{standard-baselineskips},
+% You may still influence the line spacing yourself, for instance,
+% by using the command \verb+\linespread{...}+ in the preamble.
+%
+% \subsection{Greek letters in math mode}
+% When the macro package is loaded using the option \Lopt{slantedGreek},
+% uppercase Greek letters in math mode will, by default, be slanted.
+% Regardless of the option, the new commands
+% \cmd{\upGamma}, \cmd{\upDelta} \dots \cmd{\upOmega} provide
+% upright uppercase Greek letters: $\upGamma, \upDelta\dots \upOmega$ still.
+%
+% \subsection{Bold type in math mode}
+% A new mathematical alphabet \cmd{\mathbold} provides bold slanted
+% letters, inluding uppercase and lowercase Greek.
+% Emboldening of complete formulas throgh the command \cmd{\mathversion} is,
+% however, not possible, \danger because because there is no comprehensive set of bold math fonts.
%
% \subsection{Scaling of the `large' math symbols}
-% In order to achieve proper scaling of the `large' math symbols,
-% you may load the packages \textsf{exscale},
-% \textsf{amsfonts} or \textsf{amssymb}
-% additionally; they work in conjunction with \textsf{cmbright},
-% too.
-%
-% \subsection{Known bugs and deficiencies}
-% \label{sec:bugs}
+% In order to achieve proper scaling of the `large' math symbols, it is recommended
+% to load the standard package \Lpack{exscale} in addition to \Lpack{cmbright}.
+% This is redundant, if you are using the package \Lpack{amsmath}, which
+% includes the required functionality, too.
+%
+%
+% \section{NFSS classification of the fonts}
+% Table~\ref{tab:nfss} lists the font series and shapes available in
+% the CM~Bright and CM Typewriter Light families. Notice, that
% \begin{itemize}
-% \item
-% The automatic adaption of the line spacing was provided for the sake
-% of convenience. Meanwhile it turned out that it causes many obscure
-% problem, particularly in conjunction with other macro packages or
-% with `moving arguments'. Furthermore, the need to enlarge the default
-% line spacing depends on the line width.
-% We recommend to disable the feature by loading the package with the
-% option \textsf{standard-baselineskips}.
-% and take care of the appropriate line spacing by use of the
-% +\linespread+ command, if necessary.
-% \item
-% There is no `bold' +\mathversion+ to bolden complete formulae.
-% (See, however, the mathematical alphabet +\mathbold+.)
-% \item
-% The \textsf{textcomp} package, if required, must be input \emph{after}
-% \texttt{cmbright}, otherwise
-% the symbol \textregistered{} (+\textregistered+) is not taken from the
-% text companion font.
-% The same problem might occur,
-% if (e.g.\ with future versions of \LaTeX) the TS1 encoding is included
-% in the \LaTeX{} format. In both cases the symbol is typeset
-% in roman style, instead of sans serif.
-% \item
-% Within the mathematical mode the symbol \textit{\pounds}
-% is treated as a text symbol, so its size and the surrounding space
-% might be wrong under some circumstances.
+% \item the \texttt{bx} series of the text fonts is available with sizes
+% of 9\,pt and above only;
+% \item there is no special CM~Bright font for the `extensible math symbols',
+% so that OMX/cmex is used instead;
% \item
-% The package \textsf{oldlfont}
-% cannot be used in conjunction with \texttt{cmbright}. (There should be
-% no real need for doing so!)
-% \item
-% The package \textsf{newlfont}, if used in conjunction with the
-% CM Bright fonts, must be input before \texttt{cmbright}.
+% the font definitions for the AMS fonts are part of the package \Lpack{cmbright};
+% there are no separate\texttt{.fd} files for them.
% \end{itemize}
%
-%
-% \begin{table}[hbt]
-% \caption{NFSS classification of the Computer Modern Bright fonts}
+% \begin{table}
+% \caption{NFSS classification of the fonts}
% \label{tab:nfss}
% \begin{center}
% \begin{tabular}{|l|l|l|l|}
% \hline
% \textbf{encoding} & \textbf{family} & \textbf{series} & \textbf{shape(s)}\\
% \hline\hline
-% \multicolumn{4}{|c|}{\textit{CM Bright}}\\ \hline
+% \multicolumn{4}{|c|}{\textit{CM~Bright}}\\ \hline
% OT1, T1, TS1 & cmbr & m & n, sl \\ \hline
% T1, TS1 & cmbr & sb & n, sl\\ \hline
% OT1, T1, TS1 & cmbr & bx & n\\ \hline \hline
% \multicolumn{4}{|c|}{\textit{CM Typewriter Light}}\\ \hline
% OT1, T1, TS1 & cmtl & m & n, sl\\ \hline \hline
-% \multicolumn{4}{|c|}{\textit{CM Bright Math}}\\ \hline
+% \multicolumn{4}{|c|}{\textit{CM~Bright Math}}\\ \hline
% OML & cmbrm & m, b & it \\ \hline
% OMS & cmbrs & m & n \\ \hline \hline
-% \multicolumn{4}{|c|}{\textit{CM Bright AMS A, B}}\\ \hline
+% \multicolumn{4}{|c|}{\textit{CM~Bright AMS A, B}}\\ \hline
% U & msa, msb & m &n\\ \hline
% \end{tabular}
% \end{center}
% \end{table}
%
-% \section{NFSS classification of the fonts}
-% Table~\ref{tab:nfss} lists the font series and shapes available in
-% the CM Bright and CM Typewriter Light families. Notice, that
-% \begin{itemize}
-% \item the bx series of the text fonts is supported at sizes
-% of 9\,pt and above only;
-% \item the usual font substitutions are set up so as to map OML and OMS
-% encoded text fonts to the math fonts;
-% \item there is no special CM Bright font for the `extensible math symbols';
-% OMX/cmex should be used instead;
-% \item
-% the font definitions for the AMS fonts are part of the package \texttt{cmbright};
-% there are no separate\texttt{.fd} files.
-% \end{itemize}
+% ^^A \clearpage
+% \section{Sample Formulas}
+% \label{sec:samples}
+% \subsubsection*{From the \MF\ book, p.\,298}
+% [...] If $n > 2$, the identity
+% \[
+% t[u_1,\dots,u_n] = t\bigl[t[u_1,\dots,u_{n_1}], t[u_2,\dots,u_n]\bigr]
+% \]
+% defines $t[u_1,\dots,u_n]$ recursively, and it can be shown that the alternative definition
+% \[
+% t[u_1,\dots,u_n] = t\bigl[t[u_1,u_2],\dots,t[u_{n-1},u_n]\bigr]
+% \]
+% gives the same result. Indeed, we have
+% \[
+% t[u_1,\dots,u_n] = \sum_{k=1}^n{{n-1} \choose {k-1}} (1-t)^{n-k}t^{k-1}u_k\,\mbox{,}
+% \]
+% a Bernstein polynomial of order $n-1$.
+%
+% \subsubsection*{From the \MF\ book, p.\,59}
+% \[
+% \frac{x_1 + 20}{x_2 - 20} + \sqrt{a^2 - \frac{2}{3}\sqrt b}
+% \]
+%
+% \subsubsection*{From the \TeX\ book, exercise 19.13}
+% \[
+% \int_{-\infty}^{+\infty} \mathrm{e}^{-x^2}\,\mathrm{d}x = \sqrt{\pi}
+% \]
%
% \StopEventually{}
%
+% \clearpage
% \section{The package code}
%
+% We require a sufficiently recent \LaTeX.
+% \begin{macrocode}
+%<*package>
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
+% \end{macrocode}
+%
% \subsection{Text font families}
% The sans serif font family is made the default one:
% \begin{macrocode}
-%<*cm>
\renewcommand{\familydefault}{\sfdefault}
% \end{macrocode}
-% CM Bright is to be used as the default sans serif font family:
+% CM~Bright is to be used as the default sans serif font family:
% \begin{macrocode}
\renewcommand{\sfdefault}{cmbr}
% \end{macrocode}
%
% CM Typewriter Light is to be used as the default typewriter font family,
-% because the +cmtt+ fonts look too dark in combination with CM Bright:
+% because the CM~Typewriter fonts look too dark in combination with CM~Bright:
% \begin{macrocode}
\renewcommand{\ttdefault}{cmtl}
% \end{macrocode}
@@ -242,6 +246,7 @@
% \begin{macrocode}
\DeclareSymbolFont {operators} {OT1}{cmbr}{m}{n}
\DeclareSymbolFont {letters} {OML}{cmbrm}{m}{it}
+\SetSymbolFont {letters}{bold} {OML}{cmbrm}{b}{it}
\DeclareSymbolFont {symbols} {OMS}{cmbrs}{m}{n}
% \DeclareSymbolFont {largesymbols} {OMX}{cmex}{m}{n}
%
@@ -253,17 +258,16 @@
\DeclareMathAlphabet{\mathbf} {OT1}{cmbr}{bx}{n}
\DeclareMathAlphabet{\mathtt} {OT1}{cmtl}{m}{n}
% \end{macrocode}
-% Despite its name, +\mathrm+ is not a font with serifs,
+% Despite its name, \cmd{\mathrm} is not a font with serifs,
% but it is, what the user expects it to be:
-% the upright font used e.g.\ for operator names.
+% the upright font used, e.g.,\ for operator names.
%
-% We do not set up a bold +\mathversion+, but we make a bold
-% slanted mathematical alphabet available:
+% We make a bold slanted mathematical alphabet available:
% \begin{macrocode}
\DeclareMathAlphabet{\mathbold}{OML}{cmbrm}{b}{it}
% \end{macrocode}
%
-% The command +\mathbold+ should act on lowercase greek letters, too:
+% The command \cmd{\mathbold} should act on lowercase Greek, too:
% \begin{macrocode}
\DeclareMathSymbol{\alpha}{\mathalpha}{letters}{11}
\DeclareMathSymbol{\beta}{\mathalpha}{letters}{12}
@@ -271,7 +275,6 @@
\DeclareMathSymbol{\delta}{\mathalpha}{letters}{14}
\DeclareMathSymbol{\epsilon}{\mathalpha}{letters}{15}
\DeclareMathSymbol{\zeta}{\mathalpha}{letters}{16}
-\DeclareMathSymbol{\Gamma}{\mathalpha}{letters}{0}
\DeclareMathSymbol{\eta}{\mathalpha}{letters}{17}
\DeclareMathSymbol{\theta}{\mathalpha}{letters}{18}
\DeclareMathSymbol{\iota}{\mathalpha}{letters}{19}
@@ -312,27 +315,40 @@
\DeclareMathSymbol{\Psi}{\mathalpha}{letters}{9}
\DeclareMathSymbol{\Omega}{\mathalpha}{letters}{10}
}
-\let\upOmega\Omega
+% \end{macrocode}
+% Save the default definitions of the upright uc Greek characters
+% under new names:
+% \begin{macrocode}
\let\upDelta\Delta
+\let\upOmega\Omega
+\let\upGamma\Gamma
+\let\upTheta\Theta
+\let\upLambda\Lambda
+\let\upXi\Xi
+\let\upPi\Pi
+\let\upSigma\Sigma
+\let\upUpsilon\Upsilon
+\let\upPhi\Phi
+\let\upPsi\Psi
% \end{macrocode}
%
% \subsection{Leading}
-% The +\baselineskip+ should be larger than with CM Roman. For text sizes,
-% i.e.\ 8--12\,pt, a value of $1.25 \times \mathrm{size}$ is recommended.
-% In order to overwrite the +\baselineskip+ defined in the commands
-% like +\normalsize+, +\small+, etc., we use a trick from Frank Jensen's
-% package \textsf{beton} (v1.3).
-% First we set up a table containing our +\baselineskip+ values:
+% The \verb+\baselineskip+ should be larger than with CM Roman. For text sizes,
+% i.e., 8--12\,pt, a value of $1.25 \times \mathrm{size}$ is recommended.
+% In order to overwrite the \verb+\baselineskip+ defined in the commands
+% like \cmd{\normalsize}, \cmd{\small}, etc., we use a trick from Frank Jensen's
+% package \Lpack{beton} (v1.3).
+% First we set up a table containing our \verb+\baselineskip+ values:
% \begin{macrocode}
\def\bright@baselineskip@table
{<\@viiipt>10<\@ixpt>11.25<\@xpt>12.5<\@xipt>13.7<\@xiipt>15}
% \end{macrocode}
-% All the standard \LaTeX\ size-changing commands (+\small+, +\large+,
-% etc.)\ are defined in terms of the +\@setfontsize+ macro. This
-% macro is called with the following three arguments: +#1+~is the
-% size-changing command; +#2+~is the font size; +#3+~is the
-% +\baselineskip+ value. We modify this macro to check
-% the above +\bright@baselineskip@table+ for an alternative +\baselineskip+
+% All the standard \LaTeX\ size-changing commands
+% are defined in terms of the \cmd{\@setfontsize} macro. This
+% macro is called with the following three arguments: \verb+#1+~is the
+% size-changing command; \verb+#2+~is the font size; \verb+#3+~is the
+% \verb+\baselineskip+ value. We modify this macro to check
+% the above \verb+\bright@baselineskip@table+ for an alternative \verb+\baselineskip+
% value:
% \begin{macrocode}
\def\bright@setfontsize#1#2#3%
@@ -345,149 +361,316 @@
\fi
\old@setfontsize{#1}{#2}\bright@baselineskip@value}
% \end{macrocode}
-% Now we redefine +\@setfontsize+:
+% Finally, we save the default meaning of \cmd{\@setfontsize}\dots
% \begin{macrocode}
\let\old@setfontsize=\@setfontsize
-\let\@setfontsize=\bright@setfontsize
% \end{macrocode}
-% The +\baselineskip+ values specified in the above table should be
+% \dots and declare an option to set up tbe enlarged line space:
+% \begin{macrocode}
+\DeclareOption{enlarged-baselineskips}{%
+ \let\@setfontsize=\bright@setfontsize}
+% \end{macrocode}
+% The \verb+\baselineskip+ values specified in the above table should be
% appropriate for most purposes, i.e., for one-column material in the
% normal article/report/book formats. However, it is sometimes
-% desirable to use a smaller value for +\baselineskip+, e.g.\ in two-column
-% material. We therefore provide an option
-% to turn off the above automatic mechanism for +\baselineskip+ settings:
+% desirable to turn off the above automatic mechanism:
% \begin{macrocode}
\DeclareOption{standard-baselineskips}{%
\let\@setfontsize=\old@setfontsize}
% \end{macrocode}
-% Note that the +\let+-assignment has to be executed after
-% +\old@setfontsize+ has been defined; this is ensured by
-% the fact that options are processed at the end of the package.
%
-% \subsection{Old-style numerals}
-% Old-style numerals are to be taken from CM Bright, too:
-% \begin{macrocode}
-\def\oldstylenums#1{%
- \begingroup
- \spaceskip\fontdimen\tw@\font
- \usefont{OML}{cmbrm}{\f@series}{it}%
- \mathgroup\symletters #1%
- \endgroup
-}
-% \end{macrocode}
-% In the future this may change; old-style numerals could be
-% taken from the text companion font, thus even providing `oldstyle
-% bold extended'~etc.
%
% \subsection{Missing symbols}
-% The OT1 encoded CM Bright fonts do not contain the symbol \pounds.
+% The OT1 encoded CM~Bright fonts do not contain the symbol \pounds.
% We must therefore redefine the
-% commands +\textsterling+ and +\mathsterling+.
-% They will now use the roman text font family:
+% commands \cmd{\textsterling} and \cmd{\mathsterling}, so that they use
+% the roman text font family:
% \begin{macrocode}
\DeclareTextCommand{\textsterling}{OT1}{{%
- \rmfamily
\ifdim \fontdimen\@ne\font >\z@
- \itshape
+ \fontfamily{\rmdefault}\fontshape{it}\selectfont
\else
- \fontshape{ui}\selectfont
+ \fontfamily{\rmdefault}\fontshape{ui}\selectfont
\fi
\char`\$}}
-\def\mathsterling{\textsl{\textsterling}}
% \end{macrocode}
-% Since there is no `caps and small caps' font shape, the definition of
-% \textregistered\ must be changed:
+% The following is not entirely correct, because the size will be wrong
+% in super- or subscripts:
% \begin{macrocode}
-\DeclareTextCommandDefault{\textregistered}{%
- \textcircled{{\rmfamily\scshape r}}}
+\def\mathsterling{\textsl{\textsterling}}
% \end{macrocode}
%
-% \subsection{Defining the AMS symbol fonts}
-% In case the package \textsf{amsfonts} is loaded additionally,
-% the CM Bright versions of the AMS symbol fonts are to be used.
-% The \textsf{amsfonts} package, when loaded with the \texttt[psamsfonts] option,
+% \subsection{Declaring the AMS symbol fonts}
+% In case the package \Lpack{amsfonts} is loaded additionally,
+% the CM~Bright versions of the AMS symbol fonts are to be used.
+% The \Lpack{amsfonts} package, when loaded with the \texttt[psamsfonts] option,
% will issue its own font definition commands, so we have to defer ours
% after loading of the packages, so as not to let them be overwritten.
% \begin{macrocode}
\AtBeginDocument{%
\DeclareFontFamily{U}{msa}{}
\DeclareFontShape{U}{msa}{m}{n}{%
- <5><6><7><8>cmbras8%
- <9>cmbras9%
- <10><10.95><12><14.4><17.28><20.74><24.88>cmbras10%
+ <-9>cmbras8%
+ <9-10>cmbras9%
+ <10->cmbras10%
}{}
\DeclareFontFamily{U}{msb}{}
\DeclareFontShape{U}{msb}{m}{n}{%
- <5><6><7><8>cmbrbs8%
- <9>cmbrbs9%
- <10><10.95><12><14.4><17.28><20.74><24.88>cmbrbs10%
+ <-9>cmbrbs8%
+ <9-10>cmbrbs9%
+ <10->cmbrbs10%
}{}
}
% \end{macrocode}
%
-
-% \subsection{Patches for obsolete \LaTeX{} releases}
-% With a \LaTeX{} release previous to 1995/06/01
-% some macros from the \LaTeX{} kernel and the standard classes
-% must be redefined, because they explicitely select a font with serifs:
+% \subsection{Logos}
+% The definitions of the \TeX\ and \LaTeX\ logos must be adapted to work
+% with the CM Bright fonts:
% \begin{macrocode}
-%<*patch>
-\typeout{* This package `cmbright' contains patches}
-\typeout{* to be used with obsolete versions of LaTeX.}
-\typeout{* However, if your LaTeX is from 1995/06/01 or newer,}
-\typeout{* you MUST redo the installation of the package,}
-\typeout{* in order to generate it again, without the patches!}
-\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
- \vskip \z@ \@plus.2\p@
- {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
- \parindent #2\relax\@afterindenttrue
- \interlinepenalty\@M
- \leavevmode
- \@tempdima #3\relax
- \advance\leftskip \@tempdima \hbox{}\hskip -\leftskip
- {#4}\nobreak\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep
- mu$}\hfill \nobreak
- \hbox to\@pnumwidth{\hfil\reset@font #5}\par}\fi}
-\def\@eqnnum{{\reset@font(\theequation)}}
-\DeclareOption{leqno}{
-\renewcommand\@eqnnum{\hbox to .01\p@{}%
- \rlap{\reset@font%
- \hskip -\displaywidth(\theequation)}}}
-\def\ps@plain{\let\@mkboth\@gobbletwo
- \let\@oddhead\@empty\def\@oddfoot{\reset@font\hfil\thepage
- \hfil}\let\@evenhead\@empty\let\@evenfoot\@oddfoot}
-\pagestyle{plain}
-%</patch>
+\def\TeX{T\kern-.19em\lower.5ex\hbox{E}\kern-.05emX\@}
+\DeclareRobustCommand{\LaTeX}{L\kern-.3em%
+ {\sbox\z@ T%
+ \vbox to\ht\z@{\hbox{\check@mathfonts
+ \fontsize\sf@size\z@
+ \math@fontsfalse\selectfont
+ A}%
+ \vss}%
+ }%
+ \kern-.15em%
+ \TeX}
+\DeclareRobustCommand{\LaTeXe}{\mbox{\m@th
+ \if b\expandafter\@car\f@series\@nil\boldmath\fi
+ \LaTeX\kern.15em2$_{\textstyle\varepsilon}$}}
% \end{macrocode}
%
% \subsection{Processing the options}
% \begin{macrocode}
+\ExecuteOptions{enlarged-baselineskips}
\ProcessOptions\relax
% \end{macrocode}
%
% \subsection{Initialization}
% We ensure that any package loaded after \texttt{cmbright}
-% will find the new value of +\baselineskip+
-% and the new +\normalfont+, which has a larger `em' than CM Roman.
+% will find the (possibly) changed value of the line space, as well as
+% the changed default font.
% \begin{macrocode}
\normalfont\normalsize
+%</package>
+% \end{macrocode}
+%
+% \section{The font definition files}
+%
+% \subsection{CM~Bright, OT1 encoding}
+%
+% \begin{macrocode}
+%<*cm>
+\DeclareFontFamily{OT1}{cmbr}{\hyphenchar\font45}
+\DeclareFontShape{OT1}{cmbr}{m}{n}{%
+<-9>cmbr8%
+<9-10>cmbr9%
+<10-17>cmbr10%
+<17->cmbr17%
+}{}
+\DeclareFontShape{OT1}{cmbr}{m}{sl}{%
+<-9>cmbrsl8%
+<9-10>cmbrsl9%
+<10-17>cmbrsl10%
+<17->cmbrsl17%
+}{}
+\DeclareFontShape{OT1}{cmbr}{m}{it}{%
+<->ssub*cmbr/m/sl%
+}{}
+\DeclareFontShape{OT1}{cmbr}{b}{n}{%
+<->ssub*cmbr/bx/n%
+}{}
+\DeclareFontShape{OT1}{cmbr}{bx}{n}{%
+<-9>sub*cmbr/m/n%
+<9->cmbrbx10%
+}{}
%</cm>
% \end{macrocode}
%
-% \section*{This file \ldots}
-% \ldots{} +cmbright.dtx+ contains the following
-% DocStrip modules:
-% \begin{quote}
-% \begin{tabular}{ll}
-% module: & contents:\\[0.5ex]
-% +cm+ & package +cmbright+\\
-% +driver+ & driver for documentaion \\
-% +patch+ & patches for \LaTeX{} release $<$ June 1995
-% \end{tabular}
-% \end{quote}
-% The module +patch+ should only be selected together with +cm+.
-% \vspace{1ex}
+% \subsection{CM~Bright, T1 encoding}
+%
+% \begin{macrocode}
+%<*ec>
+\DeclareFontFamily{T1}{cmbr}{}
+\DeclareFontShape{T1}{cmbr}{m}{n}{%
+<-9>ebmr8%
+<9-10>ebmr9%
+<10-17>ebmr10%
+<17->ebmr17%
+}{}
+\DeclareFontShape{T1}{cmbr}{m}{sl}{%
+<-9>ebmo8%
+<9-10>ebmo9%
+<10-17>ebmo10%
+<17->ebmo17%
+}{}
+\DeclareFontShape{T1}{cmbr}{m}{it}{%
+<->ssub*cmbr/m/sl%
+}{}
+\DeclareFontShape{T1}{cmbr}{sb}{n}{%
+<-9>ebsr8%
+<9-10>ebsr9%
+<10-17>ebsr10%
+<17->ebsr17%
+}{}
+\DeclareFontShape{T1}{cmbr}{sb}{sl}{%
+<-9>ebso8%
+<9-10>ebso9%
+<10-17>ebso10%
+<17->ebso17%
+}{}
+\DeclareFontShape{T1}{cmbr}{sb}{it}{%
+<->ssub*cmbr/sb/sl%
+}{}
+\DeclareFontShape{T1}{cmbr}{b}{n}{%
+<->ssub*cmbr/bx/n%
+}{}
+\DeclareFontShape{T1}{cmbr}{bx}{n}{%
+<-9>sub*cmbr/sb/n%
+<9->ebbx10%
+}{}
+%</ec>
+% \end{macrocode}
+%
+% \subsection{CM Typewriter Light, OT1 encoding}
%
+% \begin{macrocode}
+%<*ot1cmtl>
+\DeclareFontFamily{OT1}{cmtl}{\hyphenchar\font\m@ne}
+\DeclareFontShape{OT1}{cmtl}{m}{n}{%
+<->cmtl10%
+}{}
+\DeclareFontShape{OT1}{cmtl}{m}{sl}{%
+<->cmsltl10%
+}{}
+\DeclareFontShape{OT1}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
+%</ot1cmtl>
+% \end{macrocode}
+%
+% \subsection{CM Typewriter Light, T1 encoding}
+%
+% \begin{macrocode}
+%<*t1cmtl>
+\DeclareFontFamily{T1}{cmtl}{\hyphenchar\font\m@ne}
+\DeclareFontShape{T1}{cmtl}{m}{n}{%
+<->ebtl10%
+}{}
+\DeclareFontShape{T1}{cmtl}{m}{sl}{%
+<->ebto10%
+}{}
+\DeclareFontShape{T1}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
+%</t1cmtl>
+% \end{macrocode}
+%
+% \subsection{CM~Bright Math Inclined, OML encoding}
+%
+% \begin{macrocode}
+%<*omlcmbrm>
+\DeclareFontFamily{OML}{cmbrm}{\skewchar\font 127}
+\DeclareFontShape{OML}{cmbrm}{m}{it}{%
+<-9>cmbrmi8%
+<9-10>cmbrmi9%
+<10->cmbrmi10%
+}{}
+\DeclareFontShape{OML}{cmbrm}{b}{it}{%
+<->cmbrmb10%
+}{}
+%</omlcmbrm>
+% \end{macrocode}
+%
+% \subsection{CM~Bright Symbols, OMS encoding}
+%
+% \begin{macrocode}
+%<*omscmbrs>
+\DeclareFontFamily{OMS}{cmbrs}{\skewchar\font 48}
+\DeclareFontShape{OMS}{cmbrs}{m}{n}{%
+<-9>cmbrsy8%
+<9-10>cmbrsy9%
+<10->cmbrsy10%
+}{}
+%</omscmbrs>
+% \end{macrocode}
+%
+% \subsection{CM~Bright, OML encoding}
+% We need this for some special tex symbols which may be taken from
+% the `math italic' font.
+% \begin{macrocode}
+%<*omlcmbr>
+\DeclareFontFamily{OML}{cmbr}{\skewchar\font 127}
+\DeclareFontShape{OML}{cmbr}{m}{it}{<->ssub*cmbrm/m/it}{}
+\DeclareFontShape{OML}{cmbr}{sb}{it}{<->ssub*cmbrm/b/it}{}
+\DeclareFontShape{OML}{cmbr}{bx}{it}{<->ssub*cmbrm/b/it}{}
+%</omlcmbr>
+% \end{macrocode}
+%
+% \subsection{CM~Bright, OMS encoding}
+% We need this for some special text symbols which may be taken from
+% the mathematical symbol font.
+% \begin{macrocode}
+%<*omscmbr>
+\DeclareFontFamily{OMS}{cmbr}{\skewchar\font 48}
+\DeclareFontShape{OMS}{cmbr}{m}{n}{<->ssub*cmbrs/m/n}{}
+%</omscmbr>
+% \end{macrocode}
+%
+% \subsection{CM~Bright, TS1 encoding}
+%
+% \begin{macrocode}
+%<*ts1cmbr>
+\DeclareFontFamily{TS1}{cmbr}{\hyphenchar\font\m@ne}
+\DeclareFontShape{TS1}{cmbr}{m}{n}{%
+<-9>tbmr8%
+<9-10>tbmr9%
+<10-17>tbmr10%
+<17->tbmr17%
+}{}
+\DeclareFontShape{TS1}{cmbr}{m}{sl}{%
+<-9>tbmo8%
+<9-10>tbmo9%
+<10-17>tbmo10%
+<17>tbmo17%
+}{}
+\DeclareFontShape{TS1}{cmbr}{m}{it}{%
+<->ssub*cmbr/m/sl}{}
+\DeclareFontShape{TS1}{cmbr}{sb}{n}{%
+<-9>tbsr8%
+<9-10>tbsr9%
+<10-17>tbsr10%
+<17->tbsr17%
+}{}
+\DeclareFontShape{TS1}{cmbr}{sb}{sl}{%
+<-9>tbso8%
+<9-10>tbso9%
+<10-17>tbso10%
+<17->tbso17%
+}{}
+\DeclareFontShape{TS1}{cmbr}{sb}{it}{<->ssub*cmbr/sb/sl}{}
+\DeclareFontShape{TS1}{cmbr}{b}{n}{<->ssub*cmbr/bx/n}{}
+\DeclareFontShape{TS1}{cmbr}{bx}{n}{%
+<-9>sub*cmbr/sb/n%
+<9->tbbx10%
+}{}
+%</ts1cmbr>
+% \end{macrocode}
+%
+% \subsection{CM Typewriter Light, TS1 encoding}
+%
+% \begin{macrocode}
+%<*ts1cmtl>
+\DeclareFontFamily{TS1}{cmtl}{\hyphenchar\font\m@ne}
+\DeclareFontShape{TS1}{cmtl}{m}{n}{%
+<->tbtl10%
+}{}
+\DeclareFontShape{TS1}{cmtl}{m}{sl}{%
+<->tbto10%
+}{}
+\DeclareFontShape{TS1}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
+%</ts1cmtl>
+% \end{macrocode}
+%
% The next line of code prevents DocStrip from adding the
% character table to all modules:
% \begin{macrocode}
@@ -510,4 +693,3 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-
diff --git a/Master/texmf-dist/source/latex/cmbright/cmbright.ins b/Master/texmf-dist/source/latex/cmbright/cmbright.ins
index 340a32c1c67..95b69c9e9e1 100644
--- a/Master/texmf-dist/source/latex/cmbright/cmbright.ins
+++ b/Master/texmf-dist/source/latex/cmbright/cmbright.ins
@@ -1,25 +1,33 @@
-% file cmbright.ins 1998-01-19
-%\NeedsTeXFormat{LaTeX2e}[1996/12/01]
+% file cmbright.ins 2005-04-13
+% Copyright (c) 1994--2005 Walter Schmidt
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Walter Schmidt
+%
+% This work consists of the files cmbright.dtx and cmbright.ins
\input docstrip
-\usedir{tex/latex/cmbright}
-\keepsilent
-\Msg{Generating cmbright.sty ...}
-
-\generate{\file{cmbright.sty}{\from{cmbright.dtx}{cm}}}
-
-\Msg{Generating font definition files ...}
-
-\generate{\file{ot1cmbr.fd} {\from{cmbr.fdd}{cm}}
- \file{t1cmbr.fd} {\from{cmbr.fdd}{ec}}
- \file{ts1cmbr.fd} {\from{cmbr.fdd}{ts1cmbr}}
- \file{omlcmbrm.fd}{\from{cmbr.fdd}{omlcmbrm}}
- \file{omscmbrs.fd}{\from{cmbr.fdd}{omscmbrs}}
- \file{omlcmbr.fd} {\from{cmbr.fdd}{omlcmbr}}
- \file{omscmbr.fd} {\from{cmbr.fdd}{omscmbr}}
- \file{ot1cmtl.fd} {\from{cmbr.fdd}{ot1cmtl}}
- \file{t1cmtl.fd} {\from{cmbr.fdd}{t1cmtl}}
- \file{ts1cmtl.fd} {\from{cmbr.fdd}{ts1cmtl}}
+\askonceonly
+\generate{\file{cmbright.sty}{\from{cmbright.dtx}{package}}
+ \file{ot1cmbr.fd} {\from{cmbright.dtx}{cm}}
+ \file{t1cmbr.fd} {\from{cmbright.dtx}{ec}}
+ \file{ts1cmbr.fd} {\from{cmbright.dtx}{ts1cmbr}}
+ \file{omlcmbrm.fd} {\from{cmbright.dtx}{omlcmbrm}}
+ \file{omscmbrs.fd} {\from{cmbright.dtx}{omscmbrs}}
+ \file{omlcmbr.fd} {\from{cmbright.dtx}{omlcmbr}}
+ \file{omscmbr.fd} {\from{cmbright.dtx}{omscmbr}}
+ \file{ot1cmtl.fd} {\from{cmbright.dtx}{ot1cmtl}}
+ \file{t1cmtl.fd} {\from{cmbright.dtx}{t1cmtl}}
+ \file{ts1cmtl.fd} {\from{cmbright.dtx}{ts1cmtl}}
}
\endbatchfile
diff --git a/Master/texmf-dist/source/latex/cmbright/oinst.ins b/Master/texmf-dist/source/latex/cmbright/oinst.ins
deleted file mode 100644
index 7af087adaee..00000000000
--- a/Master/texmf-dist/source/latex/cmbright/oinst.ins
+++ /dev/null
@@ -1,36 +0,0 @@
-% file oinst.ins 1998-01-19
-\def\batchfile{oinst.ins}
-\input docstrip
-\keepsilent
-
-\generateFile{cmbright.sty}{}{
- \from{cmbright.dtx}{cm}}
-
-
-\Msg{Generating fd files with mixed-case names ...}
-
-\generateFile{OT1cmbr.fd}{}{\from{cmbr.fdd}{cm}}
-\generateFile{T1cmbr.fd}{}{\from{cmbr.fdd}{ec}}
-\generateFile{OMLcmbrm.fd}{}{\from{cmbr.fdd}{omlcmbrm}}
-\generateFile{OMScmbrs.fd}{}{\from{cmbr.fdd}{omscmbrs}}
-\generateFile{OMLcmbr.fd}{}{\from{cmbr.fdd}{omlcmbr}}
-\generateFile{OMScmbr.fd}{}{\from{cmbr.fdd}{omscmbr}}
-\generateFile{OT1cmtl.fd}{}{\from{cmbr.fdd}{ot1cmtl}}
-\generateFile{T1cmtl.fd}{}{\from{cmbr.fdd}{t1cmtl}}
-\generateFile{TS1cmtl.fd}{}{\from{cmbr.fdd}{ts1cmtl}}
-\generateFile{TS1cmbr.fd}{}{\from{cmbr.fdd}{ts1cmbr}}
-
-
-\ifToplevel{
-\Msg{*}
-\Msg{* To finish the installation you have to move all }
-\Msg{* `.fd' and `.sty' files that have been generated }
-\Msg{* into a directory searched by LaTeX.}
-\Msg{*}
-\Msg{* In a TDS file system this should be: }
-\Msg{* \space\space texmf/tex/latex/cmbright }
-\Msg{*}
-}
-
-\endinput
-
diff --git a/Master/texmf-dist/tex/latex/cmbright/cmbright.sty b/Master/texmf-dist/tex/latex/cmbright/cmbright.sty
index 6af19f7b343..2232a866fba 100644
--- a/Master/texmf-dist/tex/latex/cmbright/cmbright.sty
+++ b/Master/texmf-dist/tex/latex/cmbright/cmbright.sty
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbright.dtx (with options: `cm')
+%% cmbright.dtx (with options: `package')
%%
%% IMPORTANT NOTICE:
%%
@@ -20,15 +20,15 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-\NeedsTeXFormat{LaTeX2e}
- [1995/06/01]
\ProvidesPackage{cmbright}
- [2002/05/25 v7.1 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\renewcommand{\familydefault}{\sfdefault}
\renewcommand{\sfdefault}{cmbr}
\renewcommand{\ttdefault}{cmtl}
\DeclareSymbolFont {operators} {OT1}{cmbr}{m}{n}
\DeclareSymbolFont {letters} {OML}{cmbrm}{m}{it}
+\SetSymbolFont {letters}{bold} {OML}{cmbrm}{b}{it}
\DeclareSymbolFont {symbols} {OMS}{cmbrs}{m}{n}
\DeclareMathAlphabet{\mathit} {OT1}{cmbr}{m}{sl}
\DeclareMathAlphabet{\mathbf} {OT1}{cmbr}{bx}{n}
@@ -40,7 +40,6 @@
\DeclareMathSymbol{\delta}{\mathalpha}{letters}{14}
\DeclareMathSymbol{\epsilon}{\mathalpha}{letters}{15}
\DeclareMathSymbol{\zeta}{\mathalpha}{letters}{16}
-\DeclareMathSymbol{\Gamma}{\mathalpha}{letters}{0}
\DeclareMathSymbol{\eta}{\mathalpha}{letters}{17}
\DeclareMathSymbol{\theta}{\mathalpha}{letters}{18}
\DeclareMathSymbol{\iota}{\mathalpha}{letters}{19}
@@ -77,8 +76,17 @@
\DeclareMathSymbol{\Psi}{\mathalpha}{letters}{9}
\DeclareMathSymbol{\Omega}{\mathalpha}{letters}{10}
}
-\let\upOmega\Omega
\let\upDelta\Delta
+\let\upOmega\Omega
+\let\upGamma\Gamma
+\let\upTheta\Theta
+\let\upLambda\Lambda
+\let\upXi\Xi
+\let\upPi\Pi
+\let\upSigma\Sigma
+\let\upUpsilon\Upsilon
+\let\upPhi\Phi
+\let\upPsi\Psi
\def\bright@baselineskip@table
{<\@viiipt>10<\@ixpt>11.25<\@xpt>12.5<\@xipt>13.7<\@xiipt>15}
\def\bright@setfontsize#1#2#3%
@@ -91,42 +99,47 @@
\fi
\old@setfontsize{#1}{#2}\bright@baselineskip@value}
\let\old@setfontsize=\@setfontsize
-\let\@setfontsize=\bright@setfontsize
+\DeclareOption{enlarged-baselineskips}{%
+ \let\@setfontsize=\bright@setfontsize}
\DeclareOption{standard-baselineskips}{%
\let\@setfontsize=\old@setfontsize}
-\def\oldstylenums#1{%
- \begingroup
- \spaceskip\fontdimen\tw@\font
- \usefont{OML}{cmbrm}{\f@series}{it}%
- \mathgroup\symletters #1%
- \endgroup
-}
\DeclareTextCommand{\textsterling}{OT1}{{%
- \rmfamily
\ifdim \fontdimen\@ne\font >\z@
- \itshape
+ \fontfamily{\rmdefault}\fontshape{it}\selectfont
\else
- \fontshape{ui}\selectfont
+ \fontfamily{\rmdefault}\fontshape{ui}\selectfont
\fi
\char`\$}}
\def\mathsterling{\textsl{\textsterling}}
-\DeclareTextCommandDefault{\textregistered}{%
- \textcircled{{\rmfamily\scshape r}}}
\AtBeginDocument{%
\DeclareFontFamily{U}{msa}{}
\DeclareFontShape{U}{msa}{m}{n}{%
- <5><6><7><8>cmbras8%
- <9>cmbras9%
- <10><10.95><12><14.4><17.28><20.74><24.88>cmbras10%
+ <-9>cmbras8%
+ <9-10>cmbras9%
+ <10->cmbras10%
}{}
\DeclareFontFamily{U}{msb}{}
\DeclareFontShape{U}{msb}{m}{n}{%
- <5><6><7><8>cmbrbs8%
- <9>cmbrbs9%
- <10><10.95><12><14.4><17.28><20.74><24.88>cmbrbs10%
+ <-9>cmbrbs8%
+ <9-10>cmbrbs9%
+ <10->cmbrbs10%
}{}
}
-
+\def\TeX{T\kern-.19em\lower.5ex\hbox{E}\kern-.05emX\@}
+\DeclareRobustCommand{\LaTeX}{L\kern-.3em%
+ {\sbox\z@ T%
+ \vbox to\ht\z@{\hbox{\check@mathfonts
+ \fontsize\sf@size\z@
+ \math@fontsfalse\selectfont
+ A}%
+ \vss}%
+ }%
+ \kern-.15em%
+ \TeX}
+\DeclareRobustCommand{\LaTeXe}{\mbox{\m@th
+ \if b\expandafter\@car\f@series\@nil\boldmath\fi
+ \LaTeX\kern.15em2$_{\textstyle\varepsilon}$}}
+\ExecuteOptions{enlarged-baselineskips}
\ProcessOptions\relax
\normalfont\normalsize
\endinput
diff --git a/Master/texmf-dist/tex/latex/cmbright/omlcmbr.fd b/Master/texmf-dist/tex/latex/cmbright/omlcmbr.fd
index 338db03b4e1..f306b6075c8 100644
--- a/Master/texmf-dist/tex/latex/cmbright/omlcmbr.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/omlcmbr.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `omlcmbr')
+%% cmbright.dtx (with options: `omlcmbr')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,14 +14,14 @@
%% with new filenames distinct from omlcmbr.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{omlcmbr.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{OML}{cmbr}{\skewchar\font 127}
\DeclareFontShape{OML}{cmbr}{m}{it}{<->ssub*cmbrm/m/it}{}
\DeclareFontShape{OML}{cmbr}{sb}{it}{<->ssub*cmbrm/b/it}{}
diff --git a/Master/texmf-dist/tex/latex/cmbright/omlcmbrm.fd b/Master/texmf-dist/tex/latex/cmbright/omlcmbrm.fd
index 1591bd4a87c..4ec3c62ed64 100644
--- a/Master/texmf-dist/tex/latex/cmbright/omlcmbrm.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/omlcmbrm.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `omlcmbrm')
+%% cmbright.dtx (with options: `omlcmbrm')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,22 +14,22 @@
%% with new filenames distinct from omlcmbrm.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{omlcmbrm.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{OML}{cmbrm}{\skewchar\font 127}
\DeclareFontShape{OML}{cmbrm}{m}{it}{%
-<5><6><7><8>cmbrmi8%
-<9>cmbrmi9%
-<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmbrmi10%
+<-9>cmbrmi8%
+<9-10>cmbrmi9%
+<10->cmbrmi10%
}{}
\DeclareFontShape{OML}{cmbrm}{b}{it}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmbrmb10%
+<->cmbrmb10%
}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/cmbright/omscmbr.fd b/Master/texmf-dist/tex/latex/cmbright/omscmbr.fd
index 3b7061abeb4..2c0259fa34d 100644
--- a/Master/texmf-dist/tex/latex/cmbright/omscmbr.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/omscmbr.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `omscmbr')
+%% cmbright.dtx (with options: `omscmbr')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,14 +14,14 @@
%% with new filenames distinct from omscmbr.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{omscmbr.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{OMS}{cmbr}{\skewchar\font 48}
\DeclareFontShape{OMS}{cmbr}{m}{n}{<->ssub*cmbrs/m/n}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/cmbright/omscmbrs.fd b/Master/texmf-dist/tex/latex/cmbright/omscmbrs.fd
index 92a9d5d803b..76d1073b42e 100644
--- a/Master/texmf-dist/tex/latex/cmbright/omscmbrs.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/omscmbrs.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `omscmbrs')
+%% cmbright.dtx (with options: `omscmbrs')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,19 +14,19 @@
%% with new filenames distinct from omscmbrs.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{omscmbrs.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{OMS}{cmbrs}{\skewchar\font 48}
\DeclareFontShape{OMS}{cmbrs}{m}{n}{%
-<5><6><7><8>cmbrsy8%
-<9>cmbrsy9%
-<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmbrsy10%
+<-9>cmbrsy8%
+<9-10>cmbrsy9%
+<10->cmbrsy10%
}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/cmbright/ot1cmbr.fd b/Master/texmf-dist/tex/latex/cmbright/ot1cmbr.fd
index c20ac7d54ea..e2cde6359dd 100644
--- a/Master/texmf-dist/tex/latex/cmbright/ot1cmbr.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/ot1cmbr.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `cm')
+%% cmbright.dtx (with options: `cm')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,26 +14,26 @@
%% with new filenames distinct from ot1cmbr.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{ot1cmbr.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{OT1}{cmbr}{\hyphenchar\font45}
\DeclareFontShape{OT1}{cmbr}{m}{n}{%
-<5><6><7><8>cmbr8%
-<9>cmbr9%
-<10><10.95><12><14.4>cmbr10%
-<17.28><20.74><24.88><29.86><35.83>cmbr17%
+<-9>cmbr8%
+<9-10>cmbr9%
+<10-17>cmbr10%
+<17->cmbr17%
}{}
\DeclareFontShape{OT1}{cmbr}{m}{sl}{%
-<5><6><7><8>cmbrsl8%
-<9>cmbrsl9%
-<10><10.95><12><14.4>cmbrsl10%
-<17.28><20.74><24.88><29.86><35.83>cmbrsl17%
+<-9>cmbrsl8%
+<9-10>cmbrsl9%
+<10-17>cmbrsl10%
+<17->cmbrsl17%
}{}
\DeclareFontShape{OT1}{cmbr}{m}{it}{%
<->ssub*cmbr/m/sl%
@@ -43,7 +43,7 @@
}{}
\DeclareFontShape{OT1}{cmbr}{bx}{n}{%
<-9>sub*cmbr/m/n%
-<9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmbrbx10%
+<9->cmbrbx10%
}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/cmbright/ot1cmtl.fd b/Master/texmf-dist/tex/latex/cmbright/ot1cmtl.fd
index 561db8169e7..61a83a0d166 100644
--- a/Master/texmf-dist/tex/latex/cmbright/ot1cmtl.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/ot1cmtl.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `ot1cmtl')
+%% cmbright.dtx (with options: `ot1cmtl')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,20 +14,20 @@
%% with new filenames distinct from ot1cmtl.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{ot1cmtl.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{OT1}{cmtl}{\hyphenchar\font\m@ne}
\DeclareFontShape{OT1}{cmtl}{m}{n}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmtl10%
+<->cmtl10%
}{}
\DeclareFontShape{OT1}{cmtl}{m}{sl}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>cmsltl10%
+<->cmsltl10%
}{}
\DeclareFontShape{OT1}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/cmbright/t1cmbr.fd b/Master/texmf-dist/tex/latex/cmbright/t1cmbr.fd
index 8e60975afea..07396fcb3ab 100644
--- a/Master/texmf-dist/tex/latex/cmbright/t1cmbr.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/t1cmbr.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `ec')
+%% cmbright.dtx (with options: `ec')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,41 +14,41 @@
%% with new filenames distinct from t1cmbr.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{t1cmbr.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{T1}{cmbr}{}
\DeclareFontShape{T1}{cmbr}{m}{n}{%
-<5><6><7><8>ebmr8%
-<9>ebmr9%
-<10><10.95><12><14.4>ebmr10%
-<17.28><20.74><24.88><29.86><35.83>ebmr17%
+<-9>ebmr8%
+<9-10>ebmr9%
+<10-17>ebmr10%
+<17->ebmr17%
}{}
\DeclareFontShape{T1}{cmbr}{m}{sl}{%
-<5><6><7><8>ebmo8%
-<9>ebmo9%
-<10><10.95><12><14.4>ebmo10%
-<17.28><20.74><24.88><29.86><35.83>ebmo17%
+<-9>ebmo8%
+<9-10>ebmo9%
+<10-17>ebmo10%
+<17->ebmo17%
}{}
\DeclareFontShape{T1}{cmbr}{m}{it}{%
<->ssub*cmbr/m/sl%
}{}
\DeclareFontShape{T1}{cmbr}{sb}{n}{%
-<5><6><7><8>ebsr8%
-<9>ebsr9%
-<10><10.95><12><14.4>ebsr10%
-<17.28><20.74><24.88><29.86><35.83>ebsr17%
+<-9>ebsr8%
+<9-10>ebsr9%
+<10-17>ebsr10%
+<17->ebsr17%
}{}
\DeclareFontShape{T1}{cmbr}{sb}{sl}{%
-<5><6><7><8>ebso8%
-<9>ebso9%
-<10><10.95><12><14.4>ebso10%
-<17.28><20.74><24.88><29.86><35.83>ebso17%
+<-9>ebso8%
+<9-10>ebso9%
+<10-17>ebso10%
+<17->ebso17%
}{}
\DeclareFontShape{T1}{cmbr}{sb}{it}{%
<->ssub*cmbr/sb/sl%
@@ -58,7 +58,7 @@
}{}
\DeclareFontShape{T1}{cmbr}{bx}{n}{%
<-9>sub*cmbr/sb/n%
-<9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>ebbx10%
+<9->ebbx10%
}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/cmbright/t1cmtl.fd b/Master/texmf-dist/tex/latex/cmbright/t1cmtl.fd
index c0f3cba0432..d0a9808ab88 100644
--- a/Master/texmf-dist/tex/latex/cmbright/t1cmtl.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/t1cmtl.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `t1cmtl')
+%% cmbright.dtx (with options: `t1cmtl')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,20 +14,20 @@
%% with new filenames distinct from t1cmtl.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{t1cmtl.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{T1}{cmtl}{\hyphenchar\font\m@ne}
\DeclareFontShape{T1}{cmtl}{m}{n}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>ebtl10%
+<->ebtl10%
}{}
\DeclareFontShape{T1}{cmtl}{m}{sl}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>ebto10%
+<->ebto10%
}{}
\DeclareFontShape{T1}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/cmbright/ts1cmbr.fd b/Master/texmf-dist/tex/latex/cmbright/ts1cmbr.fd
index 567645bf158..26c04a8d785 100644
--- a/Master/texmf-dist/tex/latex/cmbright/ts1cmbr.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/ts1cmbr.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `ts1cmbr')
+%% cmbright.dtx (with options: `ts1cmbr')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,46 +14,46 @@
%% with new filenames distinct from ts1cmbr.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{ts1cmbr.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{TS1}{cmbr}{\hyphenchar\font\m@ne}
\DeclareFontShape{TS1}{cmbr}{m}{n}{%
-<5><6><7><8>tbmr8%
-<9>tbmr9%
-<10><10.95><12><14.4>tbmr10%
-<17.28><20.74><24.88><29.86><35.83>tbmr17%
+<-9>tbmr8%
+<9-10>tbmr9%
+<10-17>tbmr10%
+<17->tbmr17%
}{}
\DeclareFontShape{TS1}{cmbr}{m}{sl}{%
-<5><6><7><8>tbmo8%
-<9>tbmo9%
-<10><10.95><12><14.4>tbmo10%
-<17.28><20.74><24.88><29.86><35.83>tbmo17%
+<-9>tbmo8%
+<9-10>tbmo9%
+<10-17>tbmo10%
+<17>tbmo17%
}{}
\DeclareFontShape{TS1}{cmbr}{m}{it}{%
<->ssub*cmbr/m/sl}{}
\DeclareFontShape{TS1}{cmbr}{sb}{n}{%
-<5><6><7><8>tbsr8%
-<9>tbsr9%
-<10><10.95><12><14.4>tbsr10%
-<17.28><20.74><24.88><29.86><35.83>tbsr17%
+<-9>tbsr8%
+<9-10>tbsr9%
+<10-17>tbsr10%
+<17->tbsr17%
}{}
\DeclareFontShape{TS1}{cmbr}{sb}{sl}{%
-<5><6><7><8>tbso8%
-<9>tbso9%
-<10><10.95><12><14.4>tbso10%
-<17.28><20.74><24.88><29.86><35.83>tbso17%
+<-9>tbso8%
+<9-10>tbso9%
+<10-17>tbso10%
+<17->tbso17%
}{}
\DeclareFontShape{TS1}{cmbr}{sb}{it}{<->ssub*cmbr/sb/sl}{}
\DeclareFontShape{TS1}{cmbr}{b}{n}{<->ssub*cmbr/bx/n}{}
\DeclareFontShape{TS1}{cmbr}{bx}{n}{%
<-9>sub*cmbr/sb/n%
-<9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>tbbx10%
+<9->tbbx10%
}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/cmbright/ts1cmtl.fd b/Master/texmf-dist/tex/latex/cmbright/ts1cmtl.fd
index a6b88bde121..3f0010674ed 100644
--- a/Master/texmf-dist/tex/latex/cmbright/ts1cmtl.fd
+++ b/Master/texmf-dist/tex/latex/cmbright/ts1cmtl.fd
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% cmbr.fdd (with options: `ts1cmtl')
+%% cmbright.dtx (with options: `ts1cmtl')
%%
%% IMPORTANT NOTICE:
%%
@@ -14,20 +14,20 @@
%% with new filenames distinct from ts1cmtl.fd.
%%
%% For distribution of the original source see the terms
-%% for copying and modification in the file cmbr.fdd.
+%% for copying and modification in the file cmbright.dtx.
%%
%% This generated file may be distributed as long as the
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{ts1cmtl.fd}
- [1999/05/12 v7.3 (WaS)]
+ [2005/04/13 v8.1 (WaS)]
\DeclareFontFamily{TS1}{cmtl}{\hyphenchar\font\m@ne}
\DeclareFontShape{TS1}{cmtl}{m}{n}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>tbtl10%
+<->tbtl10%
}{}
\DeclareFontShape{TS1}{cmtl}{m}{sl}{%
-<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>tbto10%
+<->tbto10%
}{}
\DeclareFontShape{TS1}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
\endinput
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 108f54dc24b..2aff2cb6c61 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -78,7 +78,7 @@ my @TLP_working = qw(
cite cjhebrew cjk cjkpunct classicthesis
clefval cleveref
clock clrscode cm-super cm-unicode
- cmap cmcyr cmdstring cmdtrack cmll cmpica cmsd cmtiup
+ cmap cmbright cmcyr cmdstring cmdtrack cmll cmpica cmsd cmtiup
codedoc codepage
collref colordoc colorinfo colorsep colortab colortbl colorwav
combelow combine combinedgraphics comfortaa comma commath comment
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index aee0c116567..74104fb2fcd 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -189,7 +189,7 @@ $Master = "$mydir/../..";
'cm-super', "&MAKEflatten",
'cm-unicode', "&MAKEflatten",
'cmastro', "die 'skipping, noinfo license, author unknown'",
- 'cmbright', "&MAKEflatten",
+ 'cmbright', "&MAKEcopy",
'cmcyr', "&MAKEflatten",
'cntdwn', "die 'skipping, author (dps) request",
'comicsans', "die 'skipping, Comic Sans is nonfree'",
@@ -1517,6 +1517,7 @@ $standardsource='\.(c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
'carlisle', '\.ins|ltxtable.tex',
'ccfonts', 'ccfonts.ins',
'chronology', 'chronology.dtx',
+ 'cmbright', 'NULL',
'cprotect', "$package.dtx",
'curve2e', 'curve2e.dtx',
'dotseqn', 'dotseqn.dtx',
@@ -1866,6 +1867,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
'bundledoc' => $standardclean . '|\.pdf$', # regen for a4
'chemscheme' => $standardclean . '|jawltxdoc.sty', # temp file for doc
'chemstyle' => $standardclean . '|jawltxdoc.sty', # temp file for doc
+ 'cmbright' => 'cmbright.pdf',
'cprotect' => $standardclean . '|\.cpt', # temp files for doc
'dateiliste' => $standardclean . '|dateiliste.README*', # already in dist
'elvish' => '\.pk3', # no pk files