mathalfa (23feb17)

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

4 files changed, 56 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/latex/mathalfa/README b/Master/texmf-dist/doc/latex/mathalfa/README
index 4728f007ef7..8eba89a158d 100644
--- a/Master/texmf-dist/doc/latex/mathalfa/README
+++ b/Master/texmf-dist/doc/latex/mathalfa/README
@@ -9,9 +9,11 @@ It mostly bypasses the usual fd and sty files used to load these
 alphabets in order to allow each to be scaled independently and 
 without silently quantizing the sizes.
 
-This version (1.08) adds two more alphabets---bb=libus sets blackboard bold to the double-struck alphabet from LibertinusT1Math, and cal=stix sets the calligraphic alphabet to the one in six-mathcal.pfb.
+This version (1.09) adds two more calligraphic/script alphabets, both upright---txupr is based on the math calligraphic font from the TX fonts, and boondoxupr is derived from the stix math script fonts, version 1.1.
 
-Copyright 2012--2016 Michael Sharpe
+Version (1.08) adds two more alphabets---bb=libus sets blackboard bold to the double-struck alphabet from LibertinusT1Math, and cal=stix sets the calligraphic alphabet to the one in stix-mathcal.pfb.
+
+Copyright 2012--2017 Michael Sharpe
 msharpe at ucsd dot edu
 
 License: 
diff --git a/Master/texmf-dist/doc/latex/mathalfa/mathalfa.pdf b/Master/texmf-dist/doc/latex/mathalfa/mathalfa.pdf
index 27b289538da..60e5a69cb30 100644
--- a/Master/texmf-dist/doc/latex/mathalfa/mathalfa.pdf
+++ b/Master/texmf-dist/doc/latex/mathalfa/mathalfa.pdf
diff --git a/Master/texmf-dist/doc/latex/mathalfa/mathalfa.tex b/Master/texmf-dist/doc/latex/mathalfa/mathalfa.tex
index f95d603ac71..99739f19dbf 100644
--- a/Master/texmf-dist/doc/latex/mathalfa/mathalfa.tex
+++ b/Master/texmf-dist/doc/latex/mathalfa/mathalfa.tex
@@ -1,4 +1,6 @@
 \documentclass[11pt]{amsart}
+\pdfmapfile{+TXUprCal.map}  
+\pdfmapfile{+BOONDOXUprScr.map}
 \usepackage[margin=1in]{geometry} 
 \usepackage[parfill]{parskip}\usepackage{url}
 \usepackage{graphicx}
@@ -85,10 +87,10 @@ As initially configured, \textsf{mathalfa} makes available the following options
 after loading the {\tt mathalfa} package. (You may find this a useful option if you specified {\tt cal=dutchcal}, as that font is quite light.)
 \item
 Use of \textsf{zapfc} as a value for either \textsf{cal} or \textsf{scr} requires that you install the \textsf{urwchancal} package from\\
- \url{http://ctan.tug.org/tex-archive/fonts/urwchancal}.\\
+ \url{http://mirror.tug.org/fonts/urwchancal}.\\
   (It is distributed as part of \TeX\ Live as of March 2011.)
 \item Use of the \textsf{rsfso} as a value for either \textsf{cal} or \textsf{scr} requires that you install the \textsf{rsfso} package from\\
- \url{http://ctan.tug.org/tex-archive/fonts/rsfso}.\\
+ \url{http://mirror.tug.org/fonts/rsfso}.\\
   (It is distributed as part of \TeX\ Live as of March 2011.)
 \item Use of \textsf{mma} as a value  requires that you download and install the fonts from\\
 \url{http://support.wolfram.com/technotes/latestfonts.en.html}.\\ 
@@ -233,7 +235,7 @@ Here are some samples from the fonts mentioned above:
 
 \sample{{\tt\small mt} (Mathtime Pro 2 fraktur-bold):} {\usefont{U}{mt2mf}{b}{n}\al}
 
-\sample{{\tt\small boondox} (BOONDOX fraktur-bold):} {\usefont{U}{BOONDOX-frak}{b}{n}\al}
+\sample{{\tt\small boondox} (BOONDOX fraktur-bold):} {\usefont{U}{BOONDOX-frak}{b}{n}\al} 
 
 }
 \def\spc{\hspace*{7pt}}
@@ -247,6 +249,10 @@ Here are some samples from the fonts mentioned above:
 
 \sample{{\small\tt\spc mtc} (Mathtime Pro 2 Curly script):} {\usefont{U}{mt2ms}{m}{n}\al}
 
+\sample{{\small\tt\spc txupr} (TXUprCal):} {\usefont{U}{txuprcal}{m}{n}\al}
+
+\sample{{\small\tt\spc boondoxupr} (BOONDOXUprScr):} {\usefont{U}{boondoxuprscr}{m}{n}\al}
+
 \vspace{4pt}\textsc{Restrained:}\\[3pt]
 \sample{{\small\tt \spc cm} (CM calligraphic, cmsy):} {\usefont{OMS}{cmsy}{m}{n}\al}
 
@@ -327,8 +333,6 @@ Here are some samples from the fonts mentioned above:
 
 \sample{{\tt\small\spc pazo} (Mathpazo bb):} {\usefont{U}{fplmbb}{m}{n}\al}
 
-\sample{{\tt\small\spc tx} (tx bb):} {\usefont{U}{tx-ds}{m}{n}\al}
-
 \sample{{\tt\small\spc px} (px bb):} {\usefont{U}{px-ds}{m}{n}\al}
 
 \sample{{\tt\small\spc px} (px bb bold):} {\usefont{U}{px-ds}{b}{n}\al}
diff --git a/Master/texmf-dist/tex/latex/mathalfa/mathalfa.sty b/Master/texmf-dist/tex/latex/mathalfa/mathalfa.sty
index 05a8fa77c93..989d956c8e6 100644
--- a/Master/texmf-dist/tex/latex/mathalfa/mathalfa.sty
+++ b/Master/texmf-dist/tex/latex/mathalfa/mathalfa.sty
@@ -1,14 +1,14 @@
 \NeedsTeXFormat{LaTeX2e}
-\def\mathalfaVersion{1.08}
-\def\mathalfaDate{2016/03/25}
+\def\mathalfaVersion{1.09}
+\def\mathalfaDate{2017/02/23}
 \ProvidesPackage{mathalfa}[\mathalfaDate\space-\space\mathalfaVersion
  mathalfa (License LPPL) Michael Sharpe]
 \RequirePackage{xkeyval}
 % available choices
 \def\bb@lst{ams, lucida, mathpi, mma, mt, mth, pazo, fourier, esstix, boondox, px, tx, txof, libus}
-\def\cal@lst{cm, euler, rsfso, rsfs, lucida, mathpi, mma, mt, mtc, zapfc, esstix, boondox, boondoxo, dutchcal, pxtx, bickham, bickhams, stix}
+\def\cal@lst{cm, euler, rsfso, rsfs, lucida, mathpi, mma, mt, mtc, zapfc, esstix, boondox, boondoxo, dutchcal, pxtx, bickham, bickhams, stix,txupr,boondoxupr}
 \def\frak@lst{euler, lucida, mathpi, mma, mt, esstix, boondox, pxtx}
-\def\scr@lst{rsfs, rsfso, euler, lucida, mathpi, mma, mtc, zapfc, esstix, boondox, boondoxo, dutchcal, pxtx, bickham, bickhams}
+\def\scr@lst{rsfs, rsfso, euler, lucida, mathpi, mma, mtc, zapfc, esstix, boondox, boondoxo, dutchcal, pxtx, bickham, bickhams,txupr,boondoxupr}
 \def\mathalfa@bbnr{-1}\def\mathalfa@calnr{-1}
 \def\mathalfa@fraknr{-1}\def\mathalfa@scrnr{-1}
 \def\minusone{-1}
@@ -61,7 +61,7 @@
 %\ifx\mathalfa@scrnr\minusone\else\let\mathscr\relax\fi
 % Code to set up the math alphabets specified, not necessarily using the fd files
 % Blackboard Bold
-\ifcase\mathalfa@bbnr\relax% item 0 of {ams, lucida, mathpi, mma, mt, mth, pazo, fourier, esstix, boondox, px, tx, txof}
+\ifcase\mathalfa@bbnr\relax% item 0 of {ams, lucida, mathpi, mma, mt, mth, pazo, fourier, esstix, boondox, px, tx, txof,libus}
   \DeclareFontFamily{U}{msb}{}%
   \DeclareFontShape{U}{msb}{m}{n}{<-7>\mathalfa@bbscaled msbm5
     <7-9>\mathalfa@bbscaled msbm7
@@ -170,7 +170,7 @@
   \DeclareMathAlphabet{\mathbb}{U}{libusbb}{m}{n}
 \fi
 % \mathcal
-\ifcase\mathalfa@calnr\relax% item 0 of {cm, euler, rsfso, rsfs, lucida, mathpi, mma, mt, mtc, zapfc, esstix, boondox, boondoxo, dutchcal,pxtx,bickham,stix}
+\ifcase\mathalfa@calnr\relax% item 0 of {cm, euler, rsfso, rsfs, lucida, mathpi, mma, mt, mtc, zapfc, esstix, boondox, boondoxo, dutchcal,pxtx,bickham,stix,txupr,boondoxupr}
   \DeclareFontFamily{U}{cmsy}{\skewchar\font48 }
   \DeclareFontShape{U}{cmsy}{m}{n}{%
       <-5.5>\mathalfa@calscaled cmsy5%
@@ -330,6 +330,24 @@
   \DeclareMathAlphabet{\mathcal}{U}{stixcal}{m}{n}
   \SetMathAlphabet{\mathcal}{bold}{U}{stixcal}{b}{n}
   \DeclareMathAlphabet{\mathbcal} {U}{stixcal}{b}{n}
+\or %txupr
+  \DeclareFontFamily{U}{TXuprcal}{\skewchar \font =45}
+  \DeclareFontShape{U}{TXuprcal}{m}{n}{
+    <-> \mathalfa@calscaled  txUprCal-Regular}{}
+  \DeclareFontShape{U}{TXuprcal}{b}{n}{
+    <-> \mathalfa@calscaled  txUprCal-Bold}{}
+  \DeclareMathAlphabet{\mathcal}{U}{TXuprcal}{m}{n}
+  \SetMathAlphabet{\mathcal}{bold}{U}{TXuprcal}{b}{n}
+  \DeclareMathAlphabet{\mathbcal}{U}{TXuprcal}{b}{n}
+\or %boondoxupr
+  \DeclareFontFamily{U}{boondoxuprcal}{\skewchar \font =45}
+  \DeclareFontShape{U}{boondoxuprcal}{m}{n}{
+    <-> \mathalfa@calscaled  BOONDOXUprScr-Regular}{}
+  \DeclareFontShape{U}{boondoxuprcal}{b}{n}{
+    <-> \mathalfa@calscaled  BOONDOXUprScr-Bold}{}
+  \DeclareMathAlphabet{\mathcal}{U}{boondoxuprcal}{m}{n}
+  \SetMathAlphabet{\mathcal}{bold}{U}{boondoxuprcal}{b}{n}
+  \DeclareMathAlphabet{\mathbcal}{U}{boondoxuprcal}{b}{n}
 \fi
 % \mathfrak
 \ifcase\mathalfa@fraknr\relax% item 0 of {euler, lucida, mathpi, mma, mt, esstix, boondox, pxtx}
@@ -399,7 +417,7 @@
   \DeclareMathAlphabet{\mathbfrak} {U}{txfrak}{b}{n}
 \fi
 % \mathscr
-\ifcase\mathalfa@scrnr\relax% item 0 of {rsfs, rsfso, euler, lucida, mathpi, mma, mtc, zapfc, esstix, boondox, boondoxo, dutchcal}
+\ifcase\mathalfa@scrnr\relax% item 0 of {rsfs, rsfso, euler, lucida, mathpi, mma, mtc, zapfc, esstix, boondox, boondoxo, dutchcal,pxtx, bickham, bickhams,txupr,boondoxupr}
    %rsfs--avoid using mathrsfs so as to avoid rounding of sizes and to get scaling
    \DeclareFontFamily{U}{rsfs}{\skewchar\font127 }
    \DeclareFontShape{U}{rsfs}{m}{n}{%
@@ -517,6 +535,24 @@
   \DeclareMathAlphabet{\mathscr}{U}{bickhamscr}{m}{n}
   \SetMathAlphabet{\mathscr}{bold}{U}{bickhamscr}{b}{n}
   \DeclareMathAlphabet{\mathbscr} {U}{bickhamscr}{b}{n}
+\or %txupr
+  \DeclareFontFamily{U}{txuprscr}{\skewchar \font =45}
+  \DeclareFontShape{U}{txuprscr}{m}{n}{
+    <-> \mathalfa@scrscaled  txUprCal-Regular}{}
+  \DeclareFontShape{U}{txuprscr}{b}{n}{
+    <-> \mathalfa@scrscaled  txUprCal-Bold}{}
+  \DeclareMathAlphabet{\mathscr}{U}{txuprscr}{m}{n}
+  \SetMathAlphabet{\mathscr}{bold}{U}{txuprscr}{b}{n}
+  \DeclareMathAlphabet{\mathbscr}{U}{txuprscr}{b}{n}
+\or %boondoxupr
+  \DeclareFontFamily{U}{Boondoxuprs}{\skewchar \font =45}
+  \DeclareFontShape{U}{Boondoxuprs}{m}{n}{
+    <-> \mathalfa@scrscaled  BOONDOXUprScr-Regular}{}
+  \DeclareFontShape{U}{Boondoxuprs}{b}{n}{
+    <-> \mathalfa@scrscaled  BOONDOXUprScr-Bold}{}
+  \DeclareMathAlphabet{\mathscr}{U}{Boondoxuprs}{m}{n}
+  \SetMathAlphabet{\mathscr}{bold}{U}{Boondoxuprs}{b}{n}
+  \DeclareMathAlphabet{\mathbscr}{U}{Boondoxuprs}{b}{n}
 \fi
 \ifnum\mathalfa@bbnr>-1\relax \def\Bbb{}\let\Bbb\mathbb\fi
 \ifx\mathbcal\@undefined\def\mathbcal{\PackageError{mathalfa}