aspectratio (30jan12)

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

21 files changed, 578 insertions, 129 deletions

diff --git a/Master/texmf-dist/doc/latex/aspectratio/ar.pdf b/Master/texmf-dist/doc/latex/aspectratio/ar.pdf
index e10fca8a57d..2431cbc43cf 100644
--- a/Master/texmf-dist/doc/latex/aspectratio/ar.pdf
+++ b/Master/texmf-dist/doc/latex/aspectratio/ar.pdf
diff --git a/Master/texmf-dist/doc/latex/aspectratio/ar.tex b/Master/texmf-dist/doc/latex/aspectratio/ar.tex
index d6a4f5d2cca..f0aafd6de6e 100644
--- a/Master/texmf-dist/doc/latex/aspectratio/ar.tex
+++ b/Master/texmf-dist/doc/latex/aspectratio/ar.tex
@@ -5,20 +5,19 @@
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage{amsmath}
-\usepackage{trace}
-% 
+%
 % The following three lines are to be commented out in order to chose
 % the other font options
 \usepackage{lmodern}
 \usepackage{ar}
 \newcommand\aroption{CM }
-% 
+%
 % The following three lines are to be commented out in order to chose
 % the other font options
 %\usepackage{txfonts}
 %\usepackage[TX]{ar}
 %\newcommand\aroption{TX }
-% 
+%
 % The following three lines are to be commented out in order to chose
 % the other font options
 %\usepackage{pxfonts}
@@ -29,16 +28,16 @@
 
 \usepackage[a4paper,textwidth=15cm,textheight=24cm,%
             hcentering,vcentering]{geometry}
-            
+
 \newcommand\cs[1]{\texttt{\char`\\#1}}
-\newcommand\meta[1]{\texttt{\textlangle{\normalfont\textit{#1}}\textlangle}} 
-\newcommand\marg[1]{\texttt{\{\meta{#1}\}}}  
-\newcommand\oarg[1]{\texttt{[\meta{#1}]}} 
-\newcommand\pack[1]{\textbf{\sffamily#1}} 
+\newcommand\meta[1]{\texttt{\textlangle{\normalfont\textit{#1}}\textlangle}}
+\newcommand\marg[1]{\texttt{\{\meta{#1}\}}}
+\newcommand\oarg[1]{\texttt{[\meta{#1}]}}
+\newcommand\pack[1]{\textbf{\sffamily#1}}
 \newcommand\Arg[1]{\texttt{\{#1\}}}
-\newcommand\file[1]{\texttt{#1}}       
-            
-            
+\newcommand\file[1]{\texttt{#1}}
+
+
 \title{\textbf{The design of the ``A-R'' ligature\\
 with Computer Modern, Times, and Palatino\\
 compatible styles: \AR}}
@@ -79,16 +78,17 @@ The package contains several files of different types:
 \begin{itemize}
 \item This \file{ar.tex} and its compiled result \file{ar.pdf}.
 \item The \MF\ source files \file{ar}\meta{size}\file{.mf} in order to produce the bitmapped fonts, in case the user wanted to typeset a document in DVI format and wanted to preview it with a DVI viewer. The \meta{size} ranges from 5 to 12, in the usual sequence as any other math font in the \TeX\ system.
+\item The \MF\ source files for sans serif medium and bold fonts in 10pt size and the only source file for the typewriter monospaced version of the font in 10 pt size.
 \item The metric files \file{*.tfm} for both the bitmapped and vector fonts.
-\item The vector font files for the Computer modes version, \file{ar}\meta{series}\meta{size}\file{.pfb}, and the vector font file for the Times and Palatino variants, \file{amar}\meta{series}\file{i.pfb} and \file{apar}\meta{series}\file{i.pfb}. The meta{series} is either empty or equal `b', for medium and bold series respectively.
+\item The vector font files for the Computer Modern version, \file{ar}\meta{series}\meta{size}\file{.pfb} includiong the single 10pt size  sans serif and typewriter style fonts, and the vector font files for the Times and Palatino variants, \file{amar}\meta{series}\file{i.pfb} and \file{apar}\meta{series}\file{i.pfb}. The meta{series} is either empty or equal to `b', for medium and bold series respectively.
 \item The \file{ar.sty} extension file through which the suitable settings are made and the \AR\ symbol made available to the user.
-\item The \file{*.map} files necessary to configure your system for having the vector typesetting engines access the vector fonts.
+\item The \file{aspectratio.map} file necessary to configure your system for having the vector typesetting engines access the vector fonts.
 \end{itemize}
 
 
 \section{Installing the package and the fonts}
 
-If the whole package is not already installed by your \TeX\ system distribution, we suggest to create an \file{AspectRatio} fold under these branches of your personal (for individual usage) or local (for machine wide usage) \file{TEXMF} tree\footnote{Here we use the UNIX folder separator \texttt{/}; change \texttt{/} with \texttt{\textbackslash} on windows platforms. Moreover we do not specify the full path from the disk root, but we show only the end branches preceded by an ellipsis.}:
+If the whole package is not already installed by your \TeX\ system distribution, we suggest to create an \file{AspectRatio} folder under these branches of your personal (for individual usage) or local (for machine wide usage) \file{TEXMF} tree\footnote{Here we use the UNIX folder separator \texttt{/}; change \texttt{/} with \texttt{\textbackslash} on Windows platforms. Moreover we do not specify the full path from the disk root, but we show only the end branches preceded by an ellipsis.}:
 \begin{itemize}
 \item \file{.../doc/latex/AspectRatio/}: move this file{ar.pdf} file to this folder;
 \item \file{.../source/latex/AspectRatio/}: move the corresponding \file{ar.tex} file to this folder;
@@ -100,17 +100,17 @@ If the whole package is not already installed by your \TeX\ system distribution,
 \end{itemize}
 If your TeX distribution requires it, refresh the file name database according to the procedure described in your system guide.
 
-In order to use the Type~1 fonts, you must follow the interactions that acme with your \TeX\ system distribution; the idea with all distributions is to let the configuration file \file{updmap.cfg} know about the new map files;  you have to execute a \TeX\ system command  in order to regenerate the map file suitable for the pdftex, dvips, and dvipdfm programs; after the operation is completed the \LaTeX\ engine will use the bitmapped fonts in the DVI output file, while the other vector font oriented engines will use the vector fonts in Type~1 format.
+In order to use the Type~1 fonts, you must follow the instructions that came with your \TeX\ system distribution; the idea with all distributions is to let the configuration file \file{updmap.cfg} know about the new map file;  you have to execute a \TeX\ system command  in order to regenerate the map file suitable for the pdftex, dvips, and dvipdfm programs; after the operation is completed the \LaTeX\ engine will use the bitmapped fonts in the DVI output file, while the other vector font oriented engines will use the vector fonts in Type~1 format.
 
 \section{Author guide}
 
 The symbol \AR, as a means for indicating the aspect ratio, is meaningful only in mathematics, so that only the ``italic'' shape makes sense. As an isolated symbol the \AR\ ligature might be used also in text mode outside a math expression.
 
-Keeping in mind that only the ``italic'' shape is available, with the Computer Modern and the Times or Palatino variants, the ligature produced by \cs{AR} is sensitive to the text  series declarations or commands.  In math mode the bold symbol is available only through  the explicit command \cs{ARb}. This asymmetry arises in order to avoid defining yet another math font group with an alphabet for medium math and a variant for bold math. Remember that when typesetting math, the various typesetting engines can handle a maximum of 16 alphabets; it does not happen very often, but while testing this very package with different fonts we eventually exceeded this maxim number and we produced an immediate fatal error. Therefore we decided that for just one glyph it was a totally useless to define a new math group and we went around this problem with a \cs{mathcoice} work-around that allows us to actually typeset in the proper math size within a box to be used in math mode; apparently complicated, but actually very simple. This, on the other side, forbids us to use the regular math font switching commands to adapt the font family to the requested one.
+Keeping in mind that only the ``italic'' shape is available, with the Computer Modern and the Times or Palatino variants, the ligature produced by \cs{AR} is sensitive to the text series declarations or commands.  In math mode the bold symbol is available only through the explicit command \cs{ARb}. This asymmetry arises in order to avoid defining yet another math font group with an alphabet for medium math and a variant for bold math. Remember that when typesetting math, the various typesetting engines can handle a maximum of 16 alphabets; it does not happen very often, but while testing this very package with different fonts we eventually exceeded this maxim number and we produced an immediate fatal error. Therefore we decided that for just one glyph it was totally useless to define a new math group and we went around this problem with a \cs{mathcoice} work-around that allows us to actually typeset in the proper math size within a box to be used in math mode; apparently complicated, but actually very simple. This, on the other side, forbids us to use the regular math font switching commands to adapt the font family to the requested one.
 
 Table~\ref{tab:glyphs} shows the various ways to produce the \AR\ symbol in math and in text mode with the various families available with the Computer Modern compliant \AR\ symbol. With Times and Palatino there is only one family available, the serifed one, and the variant commands resort to the italic shape.
 
-If you geti the source file of this documentation (\file{ar.tex} and comment out certain lines in the preamble, while uncommenting certain other lines (clearly marked in the preamble) you can typeset again this same file with the Times o Palatino fonts and you can verify the outcome of the various commands in the above mentioned table and in the following examples.
+If you get the source file of this documentation (\file{ar.tex} and comment out certain lines in the preamble, while uncommenting certain other lines (clearly marked in the preamble itself) you can typeset again this same file with the Times o Palatino fonts and you can verify the outcome of the various commands in the above mentioned table and in the following examples.
 
 \begin{table}
 \vspace*{-\bigskipamount}
@@ -120,7 +120,7 @@ If you geti the source file of this documentation (\file{ar.tex} and comment out
 \begin{tabular}{lcccc}
 \toprule
 Description 	& Math	&	Math	& Text	&	Text	\\
-				& symbol& command	&symbol	& command	\\	
+				& symbol& command	&symbol	& command	\\
 \midrule
 Medium ligature	& \AR	& \cs{AR}	& \AR	& \cs{AR}	\\
 Bold ligature 	&$\ARb$
@@ -137,17 +137,17 @@ Monospaced ligature		&		&			&\ARtt
 \end{tabular}
 \par}
 \medskip
-{\footnotesize 
-By means of the specified options it is possible to get the corresponding glyphs in Times or Palatino. Remember, though, that both Times and Palatino have only the proportional serifed medium and bold fonts, so there is no possibility of using the sans serif or the monospaced version. Avoid using the Computer modern monospaced version; it is available, but certainly the large ligature does not fit well into the narrow character width of the monospaced fonts.\par}
+{\footnotesize
+By means of the specified options it is possible to get the corresponding glyphs in Times or Palatino. Remember, though, that both Times and Palatino have only the proportional serifed medium and bold fonts, so there is no possibility of using the sans serif or the monospaced version. Avoid using the Computer Modern monospaced version; it is available, but certainly the complex ligature does not fit well into the narrow character width of the monospaced fonts.\par}
 \end{table}
 
 Here we show the various series, shapes, and sizes available with the package; with the CM fonts and their siblings you get the various families produce the proper variations; with the Times and Platino variants you get only the italics medium and bold variations always in serifed italics.
 \begin{center}
 \noindent\begin{tabular}{ll}
-(\aroption Regular)& {\tiny \AR} {\scriptsize \AR} {\footnotesize \AR} {\small \AR} {\normalsize \AR} {\large \AR} {\Large \AR} {\LARGE \AR} {\huge \AR} {\Huge \AR}\\ 
-(\aroption Bold)& {\bfseries{\tiny \AR} {\scriptsize \AR} {\footnotesize \AR} {\small \AR} {\normalsize \AR} {\large \AR} {\Large \AR} {\LARGE \AR} {\huge \AR} {\Huge \AR}}\\ 
-(\aroption Sans serif regular)& {\tiny \ARss} {\scriptsize \ARss} {\footnotesize \ARss} {\small \ARss} {\normalsize \ARss} {\large \ARss} {\Large \ARss} {\LARGE \ARss} {\huge \ARss} {\Huge \ARss}\\ 
-(\aroption Sans serif bold)& {\bfseries{\tiny \ARss} {\scriptsize \ARss} {\footnotesize \ARss} {\small \ARss} {\normalsize \ARss} {\large \ARss} {\Large \ARss} {\LARGE \ARss} {\huge \ARss} {\Huge \ARss}}\\ 
+(\aroption Regular)& {\tiny \AR} {\scriptsize \AR} {\footnotesize \AR} {\small \AR} {\normalsize \AR} {\large \AR} {\Large \AR} {\LARGE \AR} {\huge \AR} {\Huge \AR}\\
+(\aroption Bold)& {\bfseries{\tiny \AR} {\scriptsize \AR} {\footnotesize \AR} {\small \AR} {\normalsize \AR} {\large \AR} {\Large \AR} {\LARGE \AR} {\huge \AR} {\Huge \AR}}\\
+(\aroption Sans serif regular)& {\tiny \ARss} {\scriptsize \ARss} {\footnotesize \ARss} {\small \ARss} {\normalsize \ARss} {\large \ARss} {\Large \ARss} {\LARGE \ARss} {\huge \ARss} {\Huge \ARss}\\
+(\aroption Sans serif bold)& {\bfseries{\tiny \ARss} {\scriptsize \ARss} {\footnotesize \ARss} {\small \ARss} {\normalsize \ARss} {\large \ARss} {\Large \ARss} {\LARGE \ARss} {\huge \ARss} {\Huge \ARss}}\\
 (\aroption Monospaced regular)& {\tiny \ARtt} {\scriptsize \ARtt} {\footnotesize \ARtt} {\small \ARtt} {\normalsize \ARtt} {\large \ARtt} {\Large \ARtt} {\LARGE \ARtt} {\huge \ARtt} {\Huge \ARtt}
 \end{tabular}
 \end{center}
diff --git a/Master/texmf-dist/fonts/map/dvips/aspectratio/aspectratio.map b/Master/texmf-dist/fonts/map/dvips/aspectratio/aspectratio.map
new file mode 100644
index 00000000000..7cc0b6c2d55
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/aspectratio/aspectratio.map
@@ -0,0 +1,22 @@
+## Fonts containing the aspect ratio AR ligature; glyph "A"
+ar5		 <ar5.pfb
+ar6		 <ar6.pfb
+ar7		 <ar7.pfb
+ar8		 <ar8.pfb
+ar9		 <ar9.pfb
+ar10	 <ar10.pfb
+ar12	 <ar12.pfb
+arb5	 <arb5.pfb
+arb6	 <arb6.pfb
+arb7	 <arb7.pfb
+arb8	 <arb8.pfb
+arb9	 <arb9.pfb
+arb10	 <arb10.pfb
+arb12	 <arb12.pfb
+artti10  <artti10.pfb
+arssi10  <arssi10.pfb
+arssbi10 <arssbi10.pfb
+aparri		<aparri.pfb
+aparbi		<aparbi.pfb
+amarri		<amarri.pfb
+amarbi		<amarbi.pfb
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/ar10.mf b/Master/texmf-dist/fonts/source/public/aspectratio/ar10.mf
index 201a8fadd5e..de209b5c6a3 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/ar10.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/ar10.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,4 +139,4 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/ar12.mf b/Master/texmf-dist/fonts/source/public/aspectratio/ar12.mf
index 1a3e7e82fa3..bd94b0b41bb 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/ar12.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/ar12.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,5 +139,5 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/ar6.mf b/Master/texmf-dist/fonts/source/public/aspectratio/ar6.mf
index d79cfe3de13..15c456637a9 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/ar6.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/ar6.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,6 +139,6 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/ar7.mf b/Master/texmf-dist/fonts/source/public/aspectratio/ar7.mf
index 64f449adbbd..e5b61f516a7 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/ar7.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/ar7.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,7 +139,7 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
 
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/ar8.mf b/Master/texmf-dist/fonts/source/public/aspectratio/ar8.mf
index 36a2fc8e3fe..f6e25cec284 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/ar8.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/ar8.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,5 +139,5 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/ar9.mf b/Master/texmf-dist/fonts/source/public/aspectratio/ar9.mf
index f060f004671..4e1ca20bcfe 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/ar9.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/ar9.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,6 +139,6 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/arb10.mf b/Master/texmf-dist/fonts/source/public/aspectratio/arb10.mf
index 0aa5ad2aff5..a6683554159 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/arb10.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/arb10.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,4 +139,4 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/arb12.mf b/Master/texmf-dist/fonts/source/public/aspectratio/arb12.mf
index b28871666a1..edf417b8ccd 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/arb12.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/arb12.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,5 +139,5 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/arb5.mf b/Master/texmf-dist/fonts/source/public/aspectratio/arb5.mf
index 6d11ca86521..ae058246d09 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/arb5.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/arb5.mf
@@ -119,15 +119,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -141,5 +141,5 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/arb6.mf b/Master/texmf-dist/fonts/source/public/aspectratio/arb6.mf
index 929ad7a2732..05de2ee369f 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/arb6.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/arb6.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,6 +139,6 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/arb7.mf b/Master/texmf-dist/fonts/source/public/aspectratio/arb7.mf
index 7cf09eab8ea..f506d5a1ba9 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/arb7.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/arb7.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,7 +139,7 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
 
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/arb8.mf b/Master/texmf-dist/fonts/source/public/aspectratio/arb8.mf
index f3394e02c0f..12e4acbdbd0 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/arb8.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/arb8.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,5 +139,5 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/arb9.mf b/Master/texmf-dist/fonts/source/public/aspectratio/arb9.mf
index b966f060eb0..1fe6765ea61 100644
--- a/Master/texmf-dist/fonts/source/public/aspectratio/arb9.mf
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/arb9.mf
@@ -117,15 +117,15 @@ if hefty: y14r=.4h; else: y14=y7; fi
 penstroke z13e--z14e; % bar line
 if serifs: numeric inner_jut; pickup tiny.nib;
  prime_points_inside(11,12);
- if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: 
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
    inner_jut=cap_jut;
- else: 
-   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; 
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
  fi
  dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
  nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
-fi 
-math_fit(0,.75ic#); 
+fi
+math_fit(0,.75ic#);
 penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
 
 font_slant slant; font_x_height x_height#;
@@ -139,6 +139,6 @@ else: font_normal_space 6u#+2letter_fit#;
 fi
 
 bye.
-     
+
 
 
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/arssbi10.mf b/Master/texmf-dist/fonts/source/public/aspectratio/arssbi10.mf
new file mode 100644
index 00000000000..3e594b01f8e
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/arssbi10.mf
@@ -0,0 +1,142 @@
+% Computer Modern Sanserif Bold Slanted 10 point
+if unknown cmbase: input cmbase fi
+
+font_identifier:="ARSSBI"; font_size 10pt#;
+
+u#:=22/36pt#;      % unit width
+width_adj#:=22/36pt#;    % width adjustment for certain characters
+serif_fit#:=-9/36pt#;    % extra sidebar near lowercase serifs
+cap_serif_fit#:=-11/36pt#;  % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;    % extra space added to all sidebars
+
+body_height#:=270/36pt#;  % height of tallest characters
+asc_height#:=250/36pt#;    % height of lowercase ascenders
+cap_height#:=250/36pt#;    % height of caps
+fig_height#:=250/36pt#;    % height of numerals
+x_height#:=165/36pt#;    % height of lowercase without ascenders
+math_axis#:=90/36pt#;    % axis of symmetry for math symbols
+bar_height#:=90/36pt#;    % height of crossbar in lowercase e
+comma_depth#:=38/36pt#;    % depth of comma below baseline
+desc_depth#:=70/36pt#;    % depth of lowercase descenders
+
+crisp#:=26/36pt#;    % diameter of serif corners
+tiny#:=26/36pt#;    % diameter of rounded corners
+fine#:=9/36pt#;      % diameter of sharply rounded corners
+thin_join#:=9/36pt#;    % width of extrafine details
+hair#:=49/36pt#;    % lowercase hairline breadth
+stem#:=49/36pt#;    % lowercase stem breadth
+curve#:=49/36pt#;    % lowercase curve breadth
+ess#:=43/36pt#;      % breadth in middle of lowercase s
+flare#:=40/36pt#;    % diameter of bulbs or breadth of terminals
+dot_size#:=47/36pt#;    % diameter of dots
+cap_hair#:=49/36pt#;    % uppercase hairline breadth
+cap_stem#:=53/36pt#;    % uppercase stem breadth
+cap_curve#:=53/36pt#;    % uppercase curve breadth
+cap_ess#:=51/36pt#;    % breadth in middle of uppercase s
+rule_thickness#:=30/36pt#;  % thickness of lines in math symbols
+
+dish#:=0pt#;      % amount erased at top or bottom of serifs
+bracket#:=0pt#;      % vertical distance from serif base to tangent
+jut#:=0pt#;      % protrusion of lowercase serifs
+cap_jut#:=0pt#;      % protrusion of uppercase serifs
+beak_jut#:=0pt#;    % horizontal protrusion of beak serifs
+beak#:=1.5/36pt#;    % vertical protrusion of beak serifs
+vair#:=26/36pt#;    % vertical diameter of hairlines
+notch_cut#:=49/36pt#;    % maximum breadth above or below notches
+bar#:=26/36pt#;      % lowercase bar thickness
+slab#:=36/36pt#;    % serif and arm thickness
+cap_bar#:=34/36pt#;    % uppercase bar thickness
+cap_band#:=31/36pt#;    % uppercase thickness above/below lobes
+cap_notch_cut#:=45/36pt#;  % max breadth above/below uppercase notches
+serif_drop#:=2/36pt#;    % vertical drop of sloped serifs
+stem_corr#:=1/36pt#;    % for small refinements of stem breadth
+vair_corr#:=2/36pt#;    % for small refinements of hairline height
+apex_corr#:=18/36pt#;    % extra width at diagonal junctions
+
+o#:=8/36pt#;      % amount of overshoot for curves
+apex_o#:=0pt#;      % amount of overshoot for diagonal junctions
+
+slant:=sind 12/cosd 12;    % tilt ratio $(\Delta x/\Delta y)$
+fudge:=.88;      % factor applied to weights of heavy characters
+math_spread:=.5;    % extra openness of math symbols
+superness:=3/4;      % parameter for superellipses
+superpull:=1/18;    % extra openness inside bowls
+beak_darkness:=0;    % fraction of triangle inside beak serifs
+ligs:=2;      % level of ligatures to be included
+
+square_dots:=true;    % should dots be square?
+hefty:=true;      % should we try hard not to be overweight?
+serifs:=false;      % should serifs and bulbs be attached?
+monospace:=false;    % should all characters have the same width?
+variant_g:=false;    % should an italic-style g be used?
+low_asterisk:=false;    % should the asterisk be centered at the axis?
+math_fitting:=true;    % should math-mode spacing be used?
+
+mode_setup; font_setup;
+
+
+cmchar "The ligature AR";
+beginchar("A",if serifs: 12u#+.5max(2u#,cap_curve#)
+ else:12.5u#-.5width_adj# fi,cap_height#,0);
+italcorr .75cap_height#*slant- if serifs: 1.75 else: .5 fi\\ u#;
+adjust_fit(6u#+cap_serif_fit#,0);
+pickup tiny.nib; pos1(cap_stem',0); pos2(cap_stem',0);
+lft x1l=lft x2l=hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+penpos3(cap_band,90); penpos4(cap_band,90);
+penpos5(cap_curve if hefty:-3stem_corr fi,0);
+penpos6(vair,-90); penpos7(vair,-90);
+z3r=top z1; y4=y3; y5=.5[y4l,y6l]; y6=y7;
+x7=x2; y7l=vround(.5h+.5vair); x4=x6;
+if serifs: x4=.5w-.5u; x5r=hround(w-2.25u);
+else: x4=.5w+.5u; x5r=hround(w-u); fi
+x4l:=x6l:=x4-.125cap_curve;
+fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e;  % lobe
+if serifs: pos6'(vair,-90); pos0(cap_stem,180);
+ pos8(cap_curve,180); pos9(vair,-90); pos10(hair,0);
+ z6'=z6; lft x0r=lft x8r=hround(x5-2/3u-.5cap_curve);
+ y8=1/3[y2,y7]; y0=3/5[y2,y7]; x9=.5[x8l,x10r];
+ bot y9r=-o; rt x10r=hround(w-.05u); y10=1/4[y2,y7];
+ filldraw stroke z6'e{right}..z0e---z8e....z9e{right}..z10e{up};  % tail
+ dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut);  % lower serif
+else: penpos8(cap_stem-2stem_corr,0); penpos9(cap_stem,0);
+ x8=x6+.5u; y8=y6; x9r=hround(w-.5u); y9=0;
+ fill z8l--diag_end(8l,9l,.5,1,9r,8r)--z8r--cycle; fi  % tail
+left_stem=if monospace:fudged.hair else: cap_hair fi if hefty: -3stem_corr fi;
+outer_jut=.8cap_jut; x11l=l+letter_fit+outer_jut+.5u; y11=0;
+x12=x1l-apex_corr-if monospace:2 fi\\u; y12=h;
+alpha=diag_ratio(1,.5left_stem,y12-y11,x12-x11l);
+penpos11(alpha*left_stem,0); penpos12(alpha*left_stem,0);
+fill diag_end(12l,11l,1,1,11r,12r)
+ --diag_end(11r,12r,1,1,12l,11l)--cycle; % diagonal
+y15=h-slab; z15=whatever[z11,z12];
+fill z15--(x1,y15)--(x1,h)--z12--cycle;  % link
+penpos13(whatever,angle(z2-z1)); z13=whatever[z11,z12];
+penpos14(cap_band,90); x14=x7; y13l=y14l; y13r=y14r;
+if hefty: y14r=.4h; else: y14=y7; fi
+penstroke z13e--z14e; % bar line
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(11,12);
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
+   inner_jut=cap_jut;
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
+ fi
+ dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
+ nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
+fi
+math_fit(0,.75ic#);
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
+
+font_slant slant; font_x_height x_height#;
+if monospace: font_normal_space 9u#; % no stretching or shrinking
+ font_quad 18u#;
+ font_extra_space 9u#;
+else: font_normal_space 6u#+2letter_fit#;
+ font_normal_stretch 3u#; font_normal_shrink 2u#;
+ font_quad 18u#+4letter_fit#;
+ font_extra_space 2u#;
+fi
+
+bye.
+
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/arssi10.mf b/Master/texmf-dist/fonts/source/public/aspectratio/arssi10.mf
new file mode 100644
index 00000000000..7a47e765871
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/arssi10.mf
@@ -0,0 +1,142 @@
+% Computer Modern Sanserif 10 point
+if unknown cmbase: input cmbase fi
+
+font_identifier:="ARSSI"; font_size 10pt#;
+
+u#:=20/36pt#;      % unit width
+width_adj#:=15/36pt#;    % width adjustment for certain characters
+serif_fit#:=-7/36pt#;    % extra sidebar near lowercase serifs
+cap_serif_fit#:=-10/36pt#;  % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;    % extra space added to all sidebars
+
+body_height#:=270/36pt#;  % height of tallest characters
+asc_height#:=250/36pt#;    % height of lowercase ascenders
+cap_height#:=250/36pt#;    % height of caps
+fig_height#:=236/36pt#;    % height of numerals
+x_height#:=160/36pt#;    % height of lowercase without ascenders
+math_axis#:=90/36pt#;    % axis of symmetry for math symbols
+bar_height#:=79/36pt#;    % height of crossbar in lowercase e
+comma_depth#:=45/36pt#;    % depth of comma below baseline
+desc_depth#:=70/36pt#;    % depth of lowercase descenders
+
+crisp#:=0pt#;      % diameter of serif corners
+tiny#:=0pt#;      % diameter of rounded corners
+fine#:=0pt#;      % diameter of sharply rounded corners
+thin_join#:=17/36pt#;    % width of extrafine details
+hair#:=28/36pt#;    % lowercase hairline breadth
+stem#:=28/36pt#;    % lowercase stem breadth
+curve#:=28/36pt#;    % lowercase curve breadth
+ess#:=28/36pt#;      % breadth in middle of lowercase s
+flare#:=25/36pt#;    % diameter of bulbs or breadth of terminals
+dot_size#:=30/36pt#;    % diameter of dots
+cap_hair#:=28/36pt#;    % uppercase hairline breadth
+cap_stem#:=32/36pt#;    % uppercase stem breadth
+cap_curve#:=32/36pt#;    % uppercase curve breadth
+cap_ess#:=32/36pt#;    % breadth in middle of uppercase s
+rule_thickness#:=.4pt#;    % thickness of lines in math symbols
+
+dish#:=0pt#;      % amount erased at top or bottom of serifs
+bracket#:=0pt#;      % vertical distance from serif base to tangent
+jut#:=0pt#;      % protrusion of lowercase serifs
+cap_jut#:=0pt#;      % protrusion of uppercase serifs
+beak_jut#:=0pt#;    % horizontal protrusion of beak serifs
+beak#:=.5/36pt#;    % vertical protrusion of beak serifs
+vair#:=22/36pt#;    % vertical diameter of hairlines
+notch_cut#:=18/36pt#;    % maximum breadth above or below notches
+bar#:=21/36pt#;      % lowercase bar thickness
+slab#:=23/36pt#;    % serif and arm thickness
+cap_bar#:=22/36pt#;    % uppercase bar thickness
+cap_band#:=20/36pt#;    % uppercase thickness above/below lobes
+cap_notch_cut#:=25/36pt#;  % max breadth above/below uppercase notches
+serif_drop#:=2/36pt#;    % vertical drop of sloped serifs
+stem_corr#:=1/36pt#;    % for small refinements of stem breadth
+vair_corr#:=1/36pt#;    % for small refinements of hairline height
+apex_corr#:=5/36pt#;    % extra width at diagonal junctions
+
+o#:=8/36pt#;      % amount of overshoot for curves
+apex_o#:=0pt#;      % amount of overshoot for diagonal junctions
+
+slant:=sind 12/cosd 12;    % tilt ratio $(\Delta x/\Delta y)$
+fudge:=.96;      % factor applied to weights of heavy characters
+math_spread:=0;      % extra openness of math symbols
+superness:=1/sqrt 2;    % parameter for superellipses
+superpull:=1/20;    % extra openness inside bowls
+beak_darkness:=0;    % fraction of triangle inside beak serifs
+ligs:=2;      % level of ligatures to be included
+
+square_dots:=true;    % should dots be square?
+hefty:=true;      % should we try hard not to be overweight?
+serifs:=false;      % should serifs and bulbs be attached?
+monospace:=false;    % should all characters have the same width?
+variant_g:=false;    % should an italic-style g be used?
+low_asterisk:=false;    % should the asterisk be centered at the axis?
+math_fitting:=true;    % should math-mode spacing be used?
+
+mode_setup; font_setup;
+
+
+cmchar "The ligature AR";
+beginchar("A",if serifs: 12u#+.5max(2u#,cap_curve#)
+ else:12.5u#-.5width_adj# fi,cap_height#,0);
+italcorr .75cap_height#*slant- if serifs: 1.75 else: .5 fi\\ u#;
+adjust_fit(6u#+cap_serif_fit#,0);
+pickup tiny.nib; pos1(cap_stem',0); pos2(cap_stem',0);
+lft x1l=lft x2l=hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+penpos3(cap_band,90); penpos4(cap_band,90);
+penpos5(cap_curve if hefty:-3stem_corr fi,0);
+penpos6(vair,-90); penpos7(vair,-90);
+z3r=top z1; y4=y3; y5=.5[y4l,y6l]; y6=y7;
+x7=x2; y7l=vround(.5h+.5vair); x4=x6;
+if serifs: x4=.5w-.5u; x5r=hround(w-2.25u);
+else: x4=.5w+.5u; x5r=hround(w-u); fi
+x4l:=x6l:=x4-.125cap_curve;
+fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e;  % lobe
+if serifs: pos6'(vair,-90); pos0(cap_stem,180);
+ pos8(cap_curve,180); pos9(vair,-90); pos10(hair,0);
+ z6'=z6; lft x0r=lft x8r=hround(x5-2/3u-.5cap_curve);
+ y8=1/3[y2,y7]; y0=3/5[y2,y7]; x9=.5[x8l,x10r];
+ bot y9r=-o; rt x10r=hround(w-.05u); y10=1/4[y2,y7];
+ filldraw stroke z6'e{right}..z0e---z8e....z9e{right}..z10e{up};  % tail
+ dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut);  % lower serif
+else: penpos8(cap_stem-2stem_corr,0); penpos9(cap_stem,0);
+ x8=x6+.5u; y8=y6; x9r=hround(w-.5u); y9=0;
+ fill z8l--diag_end(8l,9l,.5,1,9r,8r)--z8r--cycle; fi  % tail
+left_stem=if monospace:fudged.hair else: cap_hair fi if hefty: -3stem_corr fi;
+outer_jut=.8cap_jut; x11l=l+letter_fit+outer_jut+.5u; y11=0;
+x12=x1l-apex_corr-if monospace:2 fi\\u; y12=h;
+alpha=diag_ratio(1,.5left_stem,y12-y11,x12-x11l);
+penpos11(alpha*left_stem,0); penpos12(alpha*left_stem,0);
+fill diag_end(12l,11l,1,1,11r,12r)
+ --diag_end(11r,12r,1,1,12l,11l)--cycle; % diagonal
+y15=h-slab; z15=whatever[z11,z12];
+fill z15--(x1,y15)--(x1,h)--z12--cycle;  % link
+penpos13(whatever,angle(z2-z1)); z13=whatever[z11,z12];
+penpos14(cap_band,90); x14=x7; y13l=y14l; y13r=y14r;
+if hefty: y14r=.4h; else: y14=y7; fi
+penstroke z13e--z14e; % bar line
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(11,12);
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
+   inner_jut=cap_jut;
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
+ fi
+ dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
+ nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
+fi
+math_fit(0,.75ic#);
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
+
+font_slant slant; font_x_height x_height#;
+if monospace: font_normal_space 9u#; % no stretching or shrinking
+ font_quad 18u#;
+ font_extra_space 9u#;
+else: font_normal_space 6u#+2letter_fit#;
+ font_normal_stretch 3u#; font_normal_shrink 2u#;
+ font_quad 18u#+4letter_fit#;
+ font_extra_space 2u#;
+fi
+
+bye.
+
diff --git a/Master/texmf-dist/fonts/source/public/aspectratio/artti10.mf b/Master/texmf-dist/fonts/source/public/aspectratio/artti10.mf
new file mode 100644
index 00000000000..c8eb0394e3c
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/aspectratio/artti10.mf
@@ -0,0 +1,142 @@
+% Computer Modern typewriter 10 point
+if unknown cmbase: input cmbase fi
+
+font_identifier:="ARTTI"; font_size 10pt#;
+
+u#:=21/36pt#;      % unit width
+width_adj#:=0pt#;    % width adjustment for certain characters
+serif_fit#:=0pt#;    % extra sidebar near lowercase serifs
+cap_serif_fit#:=0pt#;    % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;    % extra space added to all sidebars
+
+body_height#:=250/36pt#;  % height of tallest characters
+asc_height#:=220/36pt#;    % height of lowercase ascenders
+cap_height#:=220/36pt#;    % height of caps
+fig_height#:=220/36pt#;    % height of numerals
+x_height#:=155/36pt#;    % height of lowercase without ascenders
+math_axis#:=110/36pt#;    % axis of symmetry for math symbols
+bar_height#:=79/36pt#;    % height of crossbar in lowercase e
+comma_depth#:=50/36pt#;    % depth of comma below baseline
+desc_depth#:=80/36pt#;    % depth of lowercase descenders
+
+crisp#:=22/36pt#;    % diameter of serif corners
+tiny#:=22/36pt#;    % diameter of rounded corners
+fine#:=21/36pt#;    % diameter of sharply rounded corners
+thin_join#:=21/36pt#;    % width of extrafine details
+hair#:=25/36pt#;    % lowercase hairline breadth
+stem#:=25/36pt#;    % lowercase stem breadth
+curve#:=25/36pt#;    % lowercase curve breadth
+ess#:=22/36pt#;      % breadth in middle of lowercase s
+flare#:=32/36pt#;    % diameter of bulbs or breadth of terminals
+dot_size#:=36/36pt#;    % diameter of dots
+cap_hair#:=25/36pt#;    % uppercase hairline breadth
+cap_stem#:=25/36pt#;    % uppercase stem breadth
+cap_curve#:=25/36pt#;    % uppercase curve breadth
+cap_ess#:=25/36pt#;    % breadth in middle of uppercase s
+rule_thickness#:=25/36pt#;  % thickness of lines in math symbols
+
+dish#:=0pt#;      % amount erased at top or bottom of serifs
+bracket#:=0pt#;      % vertical distance from serif base to tangent
+jut#:=34/36pt#;      % protrusion of lowercase serifs
+cap_jut#:=34/36pt#;    % protrusion of uppercase serifs
+beak_jut#:=0pt#;    % horizontal protrusion of beak serifs
+beak#:=34/36pt#;    % vertical protrusion of beak serifs
+vair#:=22/36pt#;    % vertical diameter of hairlines
+notch_cut#:=25/36pt#;    % maximum breadth above or below notches
+bar#:=22/36pt#;      % lowercase bar thickness
+slab#:=22/36pt#;    % serif and arm thickness
+cap_bar#:=22/36pt#;    % uppercase bar thickness
+cap_band#:=22/36pt#;    % uppercase thickness above/below lobes
+cap_notch_cut#:=25/36pt#;  % max breadth above/below uppercase notches
+serif_drop#:=0pt#;    % vertical drop of sloped serifs
+stem_corr#:=0pt#;    % for small refinements of stem breadth
+vair_corr#:=0pt#;    % for small refinements of hairline height
+apex_corr#:=10/36pt#;    % extra width at diagonal junctions
+
+o#:=4/36pt#;      % amount of overshoot for curves
+apex_o#:=3/36pt#;    % amount of overshoot for diagonal junctions
+
+slant:=0.25;      % tilt ratio $(\Delta x/\Delta y)$
+fudge:=0.81;      % factor applied to weights of heavy characters
+math_spread:=-1;    % extra openness of math symbols
+superness:=1/sqrt2;    % parameter for superellipses
+superpull:=0;      % extra openness inside bowls
+beak_darkness:=0;    % fraction of triangle inside beak serifs
+ligs:=0;      % level of ligatures to be included
+
+square_dots:=false;    % should dots be square?
+hefty:=true;      % should we try hard not to be overweight?
+serifs:=true;      % should serifs and bulbs be attached?
+monospace:=true;    % should all characters have the same width?
+variant_g:=false;    % should an italic-style g be used?
+low_asterisk:=true;    % should the asterisk be centered at the axis?
+math_fitting:=true;    % should math-mode spacing be used?
+
+mode_setup; font_setup;
+
+
+cmchar "The ligature AR";
+beginchar("A",if serifs: 12u#+.5max(2u#,cap_curve#)
+ else:12.5u#-.5width_adj# fi,cap_height#,0);
+italcorr .75cap_height#*slant- if serifs: 1.75 else: .5 fi\\ u#;
+adjust_fit(6u#+cap_serif_fit#,0);
+pickup tiny.nib; pos1(cap_stem',0); pos2(cap_stem',0);
+lft x1l=lft x2l=hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+penpos3(cap_band,90); penpos4(cap_band,90);
+penpos5(cap_curve if hefty:-3stem_corr fi,0);
+penpos6(vair,-90); penpos7(vair,-90);
+z3r=top z1; y4=y3; y5=.5[y4l,y6l]; y6=y7;
+x7=x2; y7l=vround(.5h+.5vair); x4=x6;
+if serifs: x4=.5w-.5u; x5r=hround(w-2.25u);
+else: x4=.5w+.5u; x5r=hround(w-u); fi
+x4l:=x6l:=x4-.125cap_curve;
+fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e;  % lobe
+if serifs: pos6'(vair,-90); pos0(cap_stem,180);
+ pos8(cap_curve,180); pos9(vair,-90); pos10(hair,0);
+ z6'=z6; lft x0r=lft x8r=hround(x5-2/3u-.5cap_curve);
+ y8=1/3[y2,y7]; y0=3/5[y2,y7]; x9=.5[x8l,x10r];
+ bot y9r=-o; rt x10r=hround(w-.05u); y10=1/4[y2,y7];
+ filldraw stroke z6'e{right}..z0e---z8e....z9e{right}..z10e{up};  % tail
+ dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut);  % lower serif
+else: penpos8(cap_stem-2stem_corr,0); penpos9(cap_stem,0);
+ x8=x6+.5u; y8=y6; x9r=hround(w-.5u); y9=0;
+ fill z8l--diag_end(8l,9l,.5,1,9r,8r)--z8r--cycle; fi  % tail
+left_stem=if monospace:fudged.hair else: cap_hair fi if hefty: -3stem_corr fi;
+outer_jut=.8cap_jut; x11l=l+letter_fit+outer_jut+.5u; y11=0;
+x12=x1l-apex_corr-if monospace:2 fi\\u; y12=h;
+alpha=diag_ratio(1,.5left_stem,y12-y11,x12-x11l);
+penpos11(alpha*left_stem,0); penpos12(alpha*left_stem,0);
+fill diag_end(12l,11l,1,1,11r,12r)
+ --diag_end(11r,12r,1,1,12l,11l)--cycle; % diagonal
+y15=h-slab; z15=whatever[z11,z12];
+fill z15--(x1,y15)--(x1,h)--z12--cycle;  % link
+penpos13(whatever,angle(z2-z1)); z13=whatever[z11,z12];
+penpos14(cap_band,90); x14=x7; y13l=y14l; y13r=y14r;
+if hefty: y14r=.4h; else: y14=y7; fi
+penstroke z13e--z14e; % bar line
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(11,12);
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut:
+   inner_jut=cap_jut;
+ else:
+   rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut;
+ fi
+ dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
+ nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
+fi
+math_fit(0,.75ic#);
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar;
+
+font_slant slant; font_x_height x_height#;
+if monospace: font_normal_space 9u#; % no stretching or shrinking
+ font_quad 18u#;
+ font_extra_space 9u#;
+else: font_normal_space 6u#+2letter_fit#;
+ font_normal_stretch 3u#; font_normal_shrink 2u#;
+ font_quad 18u#+4letter_fit#;
+ font_extra_space 2u#;
+fi
+
+bye.
+
diff --git a/Master/texmf-dist/tex/latex/aspectratio/ar.sty b/Master/texmf-dist/tex/latex/aspectratio/ar.sty
index 48c81be485e..a761b02b967 100644
--- a/Master/texmf-dist/tex/latex/aspectratio/ar.sty
+++ b/Master/texmf-dist/tex/latex/aspectratio/ar.sty
@@ -1,10 +1,10 @@
 % Copyright 2008-2012 Claudio Beccari
-% Licence LPPL 
+% Licence LPPL
 %
 % This extension is for using the aspect ratio symbol in math mode and in
 % text mode by means of the command \AR.
 %
-% 
+%
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 \ProvidesPackage{ar}[2012/01/23 v.2.0 Aspect Ratio symbol: CM, TX, PX styles]
 \newif\ifCM\newif\ifTM\newif\ifPA
@@ -32,7 +32,7 @@
   \DeclareFontShape{U}{ar}{m}{n}{<->ssub*ar/m/it}{}
   \DeclareFontShape{U}{ar}{bx}{n}{<->ssub*ar/b/it}{}
 
-\DeclareFontFamily{U}{ARss}{}     
+\DeclareFontFamily{U}{ARss}{}
   \DeclareFontShape{U}{ARss}{m}{it}{<-> arssi10}{}%
   \DeclareFontShape{U}{ARss}{m}{n}{<->ssub*ARss/m/it}{}%
   \DeclareFontShape{U}{ARss}{m}{sl}{<->ssub*ARss/m/it}{}%
@@ -42,11 +42,11 @@
   \DeclareFontShape{U}{ARss}{bx}{sl}{<->ssub*ARss/b/it}{}%
   \DeclareFontShape{U}{ARss}{bx}{it}{<->ssub*ARss/b/it}{}%
   \DeclareFontShape{U}{ARss}{bx}{n}{<->ssub*ARss/b/it}{}%
-  
-\DeclareFontFamily{U}{ARtt}{}     
+
+\DeclareFontFamily{U}{ARtt}{}
   \DeclareFontShape{U}{ARtt}{m}{it}{<-> artti10}{}%
   \DeclareFontShape{U}{ARtt}{b}{it}{<->ssub*ARtt/m/it}{}%
-  \DeclareFontShape{U}{ARtt}{bx}{it}{<->ssub*ARtt/m/it}{}%  
+  \DeclareFontShape{U}{ARtt}{bx}{it}{<->ssub*ARtt/m/it}{}%
 \fi
 %
 \ifTM
@@ -54,40 +54,40 @@
 \DeclareFontFamily{U}{ar}{}
   \DeclareFontShape{U}{ar}{m}{it}{<->s*[\mar@scale]amarri}{}%
   \DeclareFontShape{U}{ar}{b}{it}{<->s*[\mar@scale]amarbi}{}%
-  \DeclareFontShape{U}{ar}{bx}{it}{<->ssub*ar/b/it}{}% 
+  \DeclareFontShape{U}{ar}{bx}{it}{<->ssub*ar/b/it}{}%
 \DeclareFontFamily{U}{ARss}{}
-  \DeclareFontShape{U}{ARss}{m}{it}{<->ssub*ar/m/it}{}     
-  \DeclareFontShape{U}{ARss}{b}{it}{<->ssub*ar/b/it}{}     
-  \DeclareFontShape{U}{ARss}{bx}{it}{<->ssub*ar/b/it}{}     
-\DeclareFontFamily{U}{ARtt}{}     
-  \DeclareFontShape{U}{ARtt}{m}{it}{<->ssub*ar/m/it}{}     
-  \DeclareFontShape{U}{ARtt}{b}{it}{<->ssub*ar/b/it}{}     
-  \DeclareFontShape{U}{ARtt}{bx}{it}{<->ssub*ar/b/it}{}     
+  \DeclareFontShape{U}{ARss}{m}{it}{<->ssub*ar/m/it}{}
+  \DeclareFontShape{U}{ARss}{b}{it}{<->ssub*ar/b/it}{}
+  \DeclareFontShape{U}{ARss}{bx}{it}{<->ssub*ar/b/it}{}
+\DeclareFontFamily{U}{ARtt}{}
+  \DeclareFontShape{U}{ARtt}{m}{it}{<->ssub*ar/m/it}{}
+  \DeclareFontShape{U}{ARtt}{b}{it}{<->ssub*ar/b/it}{}
+  \DeclareFontShape{U}{ARtt}{bx}{it}{<->ssub*ar/b/it}{}
 \fi
 %
 \ifPA
 \def\apar@scale{1.00}%         10pt design size; other sizes simply scaled
 \DeclareFontFamily{U}{ar}{}
-  \DeclareFontShape{U}{ar}{m}{it}{<->s*[\apar@scale]aparri}{}% 
+  \DeclareFontShape{U}{ar}{m}{it}{<->s*[\apar@scale]aparri}{}%
   \DeclareFontShape{U}{ar}{b}{it}{<->s*[\apar@scale]aparbi}{}%
-  \DeclareFontShape{U}{ar}{bx}{it}{<->ssub*ar/b/it}{}%                             
+  \DeclareFontShape{U}{ar}{bx}{it}{<->ssub*ar/b/it}{}%
 \DeclareFontFamily{U}{ARss}{}
-  \DeclareFontShape{U}{ARss}{m}{it}{<->ssub*ar/m/it}{}     
-  \DeclareFontShape{U}{ARss}{b}{it}{<->ssub*ar/b/it}{}     
-  \DeclareFontShape{U}{ARss}{bx}{it}{<->ssub*ar/b/it}{}     
-\DeclareFontFamily{U}{ARtt}{}     
-  \DeclareFontShape{U}{ARtt}{m}{it}{<->ssub*ar/m/it}{}     
-  \DeclareFontShape{U}{ARtt}{b}{it}{<->ssub*ar/b/it}{}     
-  \DeclareFontShape{U}{ARtt}{bx}{it}{<->ssub*ar/b/it}{}     
+  \DeclareFontShape{U}{ARss}{m}{it}{<->ssub*ar/m/it}{}
+  \DeclareFontShape{U}{ARss}{b}{it}{<->ssub*ar/b/it}{}
+  \DeclareFontShape{U}{ARss}{bx}{it}{<->ssub*ar/b/it}{}
+\DeclareFontFamily{U}{ARtt}{}
+  \DeclareFontShape{U}{ARtt}{m}{it}{<->ssub*ar/m/it}{}
+  \DeclareFontShape{U}{ARtt}{b}{it}{<->ssub*ar/b/it}{}
+  \DeclareFontShape{U}{ARtt}{bx}{it}{<->ssub*ar/b/it}{}
 \fi
 
-  
+
 \newcommand*\ARm{\mathchoice
 	{\hbox{\fontencoding{U}\fontfamily{ar}\fontsize{\tf@size}{\f@baselineskip}\fontshape{it}\selectfont A}}%
 	{\hbox{\fontencoding{U}\fontfamily{ar}\fontsize{\tf@size}{\f@baselineskip}\fontshape{it}\selectfont A}}%
 	{\hbox{\fontencoding{U}\fontfamily{ar}\fontsize{\sf@size}{\f@baselineskip}\fontshape{it}\selectfont A}}%
 	{\hbox{\fontencoding{U}\fontfamily{ar}\fontsize{\ssf@size}{\f@baselineskip}\fontshape{it}\selectfont A}}}
-	
+
 \newcommand*\ARmb{\mathchoice
 	{\hbox{\fontencoding{U}\fontfamily{ar}\fontseries{b}\fontsize{\tf@size}{\f@baselineskip}\fontshape{it}\selectfont A}}%
 	{\hbox{\fontencoding{U}\fontfamily{ar}\fontseries{b}\fontsize{\tf@size}{\f@baselineskip}\fontshape{it}\selectfont A}}%
@@ -100,7 +100,7 @@
 % Sans serif
 \DeclareRobustCommand{\ARss}{\ifmmode\ARm\else{\fontencoding{U}\fontfamily{ARss}\fontshape{it}\selectfont A}\fi}
 \DeclareRobustCommand{\ARssb}{\ifmmode\ARmb\else{\fontencoding{U}\fontfamily{ARss}\fontshape{it}\fontseries{b}\selectfont A}\fi}
-% Monospaced 
+% Monospaced
 \DeclareRobustCommand{\ARtt}{\ifmmode\ARm\else{\fontencoding{U}\fontfamily{ARtt}\fontshape{it}\selectfont A}\fi}
 
 
diff --git a/Master/tlpkg/tlpsrc/aspectratio.tlpsrc b/Master/tlpkg/tlpsrc/aspectratio.tlpsrc
index e69de29bb2d..9e36cd41981 100644
--- a/Master/tlpkg/tlpsrc/aspectratio.tlpsrc
+++ b/Master/tlpkg/tlpsrc/aspectratio.tlpsrc
@@ -0,0 +1 @@
+execute addMap aspectratio.map