diff options
15 files changed, 360 insertions, 107 deletions
diff --git a/Master/texmf-dist/doc/fonts/sansmathaccent/sansmathaccent.pdf b/Master/texmf-dist/doc/fonts/sansmathaccent/sansmathaccent.pdf Binary files differindex 69952234a71..6ebd6894cca 100644 --- a/Master/texmf-dist/doc/fonts/sansmathaccent/sansmathaccent.pdf +++ b/Master/texmf-dist/doc/fonts/sansmathaccent/sansmathaccent.pdf diff --git a/Master/texmf-dist/doc/fonts/sansmathaccent/sansmathaccent.tex b/Master/texmf-dist/doc/fonts/sansmathaccent/sansmathaccent.tex index ab89adaac32..4532da1d992 100644 --- a/Master/texmf-dist/doc/fonts/sansmathaccent/sansmathaccent.tex +++ b/Master/texmf-dist/doc/fonts/sansmathaccent/sansmathaccent.tex @@ -6,7 +6,7 @@ % % author: Ariel Barton % -% Copyright Ariel Barton, 2012 +% Copyright Ariel Barton, 2012, 2013 % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -22,13 +22,12 @@ % The complete list of files considered part of this work is % later in this file. % -% Date: 2012/04/24 +% Date: 2013/03/28 \documentclass{amsart} -%\usepackage{pxfonts} -\usepackage{sfmath} -\usepackage{sansmathaccent} +\usepackage{sfmath,sansmathaccent} +\usepackage{bm} \usepackage{hyperref} \def\sectionautorefname{Section} @@ -51,16 +50,19 @@ However, the Computer Modern sans serif fonts do not contain the information TeX needs to position accents correctly. So math accents end up placed badly: $$ \tilde {\badmath{M}} \quad \dot {\badmath{u}} \quad -\hat {\badmath{T}} \quad \bar {\badmath{v}} \quad +\hat{{}\badmath{T}} \quad \bar {\badmath{v}} \quad \mathring {\badmath{A}}$$ -The \textsf{sansmathaccent} package implements Hendrik Vogt's solution as -a \LaTeX\ package: -$$ \tilde M \quad \dot u \quad \hat T \quad \bar v \quad \mathring A$$ +The \textsf{sansmathaccent} package corrects the accent placements: +$$ \tilde M \quad \dot u \quad \hat{T} \quad \bar v \quad \mathring A$$ + +Version 2 is compatible with the \textsf{bm} package: +$$ \bm{\tilde M} \quad \bm{\dot u} \quad \bm{\hat{T}} \quad \bm{\bar v} +\quad \bm{\mathring{A}}$$ \section{Usage} -This package was uploaded to CTAN in April 2012. If you have installed +This package was uploaded to CTAN in March 2013. If you have installed or updated your \TeX\ distribution since then, this package might have been installed on your system. @@ -81,15 +83,14 @@ on how to install a fonts package by hand:\\ \href{http://en.wikibooks.org/wiki/LaTeX/Packages/Installing_Extra_Packages} {\texttt{http://en.wikibooks.org/wiki/LaTeX/Packages/Installing\_Extra\_Packages}} -To correct the accents in a \textsf{beamer} document, -say \verb|\usepackage{sansmathaccent}|: +Some versions of \textsf{beamer} load \textsf{sansmathaccent} automatically. If your version of \textsf{beamer} does not, you can load it yourself: \begin{quote} \verb|\documentclass{beamer}|\\ \verb|\usepackage{sansmathaccent}|\\ \verb|\begin{document}|\\ \verb|\begin{frame}{}|\\ -\verb|$\tilde M$ $\dot u$ $\hat T$|\\ +\verb|$\tilde M$ $\dot u$ $\hat{T}$|\\ \verb|\end{frame}|\\ \verb|\end{document}| \end{quote} @@ -101,10 +102,9 @@ serif math, then use \textsf{sansmathaccent} to correct the accents: \begin{quote} \verb|\documentclass{article}|\\ -\verb|\usepackage{sfmath}|\\ -\verb|\usepackage{sansmathaccent}|\\ +\verb|\usepackage{sfmath,sansmathaccent}|\\ \verb|\begin{document}|\\ -\verb|$\tilde M$ $\dot u$ $\hat T$|\\ +\verb|$\tilde M$ $\dot u$ $\hat{T}$|\\ \verb|\end{document}| \end{quote} @@ -128,16 +128,26 @@ Feedback is appreciated and may be sent to \texttt{origamist@gmail.com}. This work (the \textsf{sansmathaccent} package) consists of the following files: \begin{itemize} -\item \texttt{sansmathaccent.map} -\item \texttt{sansmathaccent.pdf} -\item \texttt{sansmathaccent.sty} -\item \texttt{sansmathaccent.tex} \item \texttt{mathkerncmssi8.tfm} \item \texttt{mathkerncmssi9.tfm} \item \texttt{mathkerncmssi10.tfm} \item \texttt{mathkerncmssi12.tfm} \item \texttt{mathkerncmssi17.tfm} +\item \texttt{mathkerncmssxi8.tfm} +\item \texttt{mathkerncmssxi9.tfm} +\item \texttt{mathkerncmssxi10.tfm} +\item \texttt{mathkerncmssxi12.tfm} +\item \texttt{mathkerncmssxi17.tfm} +\item \texttt{mathkerncmssxi8.vf} +\item \texttt{mathkerncmssxi9.vf} +\item \texttt{mathkerncmssxi10.vf} +\item \texttt{mathkerncmssxi12.vf} +\item \texttt{mathkerncmssxi17.vf} \item \texttt{ot1mathkerncmss.fd} +\item \texttt{sansmathaccent.map} +\item \texttt{sansmathaccent.pdf} +\item \texttt{sansmathaccent.sty} +\item \texttt{sansmathaccent.tex} \end{itemize} This work may be distributed and/or modified under the @@ -164,7 +174,6 @@ The files \item \texttt{mathkerncmssi10.tfm} \item \texttt{mathkerncmssi12.tfm} \item \texttt{mathkerncmssi17.tfm} -\item \texttt{ot1mathkerncmss.fd} \end{itemize} were derived from the files \begin{itemize} @@ -173,23 +182,39 @@ were derived from the files \item \texttt{cmssi10.tfm} \item \texttt{cmssi12.tfm} \item \texttt{cmssi17.tfm} -\item \texttt{ot1cmss.fd} \end{itemize} all of which are part of the \LaTeX\ base distribution and can be found at \href{ctan.org}{\texttt{ctan.org}}. - -The Font Description file \texttt{ot1mathkerncmss.fd} was edited (by -hand) to use the \texttt{mathkerncmssi} fonts rather than the -\texttt{cmssi} fonts. - The edited \TeX\ Font Metric (\texttt{.tfm}) files were generated using the utilities \texttt{tftopl} and \texttt{pltotf} and using Hendrik -Vogt's patch (included in the documentation as \autoref{sec:patch}). +Vogt's patch (included in the documentation in \autoref{sec:patch}). + +The virtual fonts +\begin{itemize} +\item \texttt{mathkerncmssxi8} +\item \texttt{mathkerncmssxi9} +\item \texttt{mathkerncmssxi10} +\item \texttt{mathkerncmssxi12} +\item \texttt{mathkerncmssxi17} +\end{itemize} +(\texttt{tfm} and \texttt{vf} files) and the file \texttt{ot1mathkerncmss.fd} +were generated from the files +\begin{itemize} +\item \texttt{ecso0800.tfm} +\item \texttt{ecso0900.tfm} +\item \texttt{ecso1000.tfm} +\item \texttt{ecso1200.tfm} +\item \texttt{ecso1728.tfm} +\item \texttt{cmssbx10.tfm} +\end{itemize} +all of which are part of the \LaTeX\ base distribution and can be found +at \href{ctan.org}{\texttt{ctan.org}}. The edited files were generated using the \textsf{fontinst} package and the utilities \texttt{tftopl} and \texttt{vptovf}, and some original \textsf{fontinst} files (included in the documentation in \autoref{sec:fontinst}). + \section{Patch file}\label{sec:patch} The following is the patch file used to generate the corrected TFM -files. It is included for reference; you don't need to read this section +files for the medium-width fonts. It is included for reference; you don't need to read this section to use the package. The patch file was written by Hendrik Vogt and used with permission. \begin{quote} @@ -285,8 +310,9 @@ with permission. > (KRN O 177 R 0.1) \end{verbatim} \end{quote} -The above was saved as a file \texttt{sansmathaccent.patch}. Then the -following commands were executed: +The above was saved as a file \texttt{sansmathaccent.patch}. + +Then the following bash script was run: \begin{quote} \begin{verbatim} for i in 8 9 10 12 17 @@ -298,4 +324,173 @@ done \end{quote} This generated the desired TFM files. +\section{Fontinst files}\label{sec:fontinst} + +%\font \test=cmssxi10 {\test test} + +The bold slanted fonts used in this package are virtual fonts. These virtual fonts were generated using the \textsf{fontinst} package and the following two files (again, included only for reference). + +File \texttt{mathkerncmss.mtx}: +\begin{quote} +\begin{verbatim} +\setkern{A}{dieresis}{140} +\setkern{B}{dieresis}{80} +\setkern{C}{dieresis}{120} +\setkern{D}{dieresis}{80} +\setkern{E}{dieresis}{100} +\setkern{F}{dieresis}{100} +\setkern{G}{dieresis}{120} +\setkern{H}{dieresis}{100} +\setkern{I}{dieresis}{100} +\setkern{J}{dieresis}{220} +\setkern{K}{dieresis}{80} +\setkern{L}{dieresis}{50} +\setkern{M}{dieresis}{100} +\setkern{N}{dieresis}{100} +\setkern{O}{dieresis}{100} +\setkern{P}{dieresis}{80} +\setkern{Q}{dieresis}{100} +\setkern{R}{dieresis}{80} +\setkern{S}{dieresis}{80} +\setkern{T}{dieresis}{90} +\setkern{U}{dieresis}{110} +\setkern{V}{dieresis}{70} +\setkern{W}{dieresis}{70} +\setkern{X}{dieresis}{60} +\setkern{Y}{dieresis}{60} +\setkern{Z}{dieresis}{80} +\setkern{a}{dieresis}{80} +\setkern{b}{dieresis}{50} +\setkern{c}{dieresis}{60} +\setkern{d}{dieresis}{120} +\setkern{e}{dieresis}{80} +\setkern{f}{dieresis}{100} +\setkern{g}{dieresis}{10} +\setkern{h}{dieresis}{20} +\setkern{i}{dieresis}{100} +\setkern{j}{dieresis}{100} +\setkern{k}{dieresis}{40} +\setkern{l}{dieresis}{110} +\setkern{m}{dieresis}{80} +\setkern{n}{dieresis}{80} +\setkern{o}{dieresis}{60} +\setkern{p}{dieresis}{80} +\setkern{q}{dieresis}{60} +\setkern{r}{dieresis}{80} +\setkern{s}{dieresis}{60} +\setkern{t}{dieresis}{70} +\setkern{u}{dieresis}{80} +\setkern{v}{dieresis}{40} +\setkern{w}{dieresis}{30} +\setkern{x}{dieresis}{40} +\setkern{y}{dieresis}{40} +\setkern{z}{dieresis}{60} +\end{verbatim} +\end{quote} +File \texttt{installfonts.tex}: + + +\begin{quote} +\begin{verbatim} +\input fontinst.sty + +\installfonts + +\generalpltomtx{ecso0800}{ecso0800}{pl}{t1} +\generalpltomtx{ecso0900}{ecso0900}{pl}{t1} +\generalpltomtx{ecso1000}{ecso1000}{pl}{t1} +\generalpltomtx{ecso1200}{ecso1200}{pl}{t1} +\generalpltomtx{ecso1728}{ecso1728}{pl}{t1} +\generalpltomtx{cmssbx10}{cmssbx10}{pl}{ot1} + +\substitutesilent{bx}{b} +\substitutesilent{sl}{it} + +\installfamily{OT1}{mathkerncmss}{\skewchar\font127 } + +\installfontas{cmss8} {OT1}{mathkerncmss} {m}{n}{<-8.5>} +\installfontas{cmss9} {OT1}{mathkerncmss} {m}{n}{<8.5-9.5>} +\installfontas{cmss10} {OT1}{mathkerncmss} {m}{n}{<9.5-11.5>} +\installfontas{cmss12} {OT1}{mathkerncmss} {m}{n}{<11.5-15.7>} +\installfontas{cmss17} {OT1}{mathkerncmss} {m}{n}{<15.7->} + +\installfontas{mathkerncmssi8} {OT1}{mathkerncmss} {m}{sl}{<-8.5>} +\installfontas{mathkerncmssi9} {OT1}{mathkerncmss} {m}{sl}{<8.5-9.5>} +\installfontas{mathkerncmssi10}{OT1}{mathkerncmss} {m}{sl}{<9.5-11.5>} +\installfontas{mathkerncmssi12}{OT1}{mathkerncmss} {m}{sl}{<11.5-15.7>} +\installfontas{mathkerncmssi17}{OT1}{mathkerncmss} {m}{sl}{<15.7->} + +\installfontas{cmssbx10} {OT1}{mathkerncmss}{bx}{n}{} + +\installfont{mathkerncmssxi8} {ecso0800,cmssbx10,mathkerncmss} + {ot1}{OT1}{mathkerncmss} {bx}{sl}{<-8.5>} +\installfont{mathkerncmssxi9} {ecso0900,cmssbx10,mathkerncmss} + {ot1}{OT1}{mathkerncmss} {bx}{sl}{<8.5-9.5>} +\installfont{mathkerncmssxi10} {ecso1000,cmssbx10,mathkerncmss} + {ot1}{OT1}{mathkerncmss} {bx}{sl}{<9.5-11.5>} +\installfont{mathkerncmssxi12} {ecso1200,cmssbx10,mathkerncmss} + {ot1}{OT1}{mathkerncmss} {bx}{sl}{<11.5-15.7>} +\installfont{mathkerncmssxi17} {ecso1728,cmssbx10,mathkerncmss} + {ot1}{OT1}{mathkerncmss} {bx}{sl}{<15.7->} + +\endinstallfonts\bye +\end{verbatim} +\end{quote} + + +Once these files had been written, the following script was run: + +\begin{quote} +\begin{verbatim} +tftopl cmssbx10 cmssbx10 + +tftopl ecso0800 ecso0800 +tftopl ecso0900 ecso0900 +tftopl ecso1000 ecso1000 +tftopl ecso1200 ecso1200 +tftopl ecso1728 ecso1728 + +tex installfonts.tex + +for file in *.vpl; do vptovf $file; done +\end{verbatim} +\end{quote} + +This generated the TFM files and virtual fonts for the bold version, and also the \LaTeX\ font definition file \texttt{otlmathkerncmss.fd}. + +\end{document} + +\section{Test} + +$\bm{\Gamma}$ + +\begin{tabular}{cccccccc} +$\hat{a}$ & $\bm{\hat{a}}$ & ${\hat{A}} $ & $\bm{\hat{A}}$ & $\dot{a}$ & $\bm{\dot{a}}$ & ${\dot{A}} $ & $\bm{\dot{A}}$\\ +$\hat{b}$ & $\bm{\hat{b}}$ & ${\hat{B}} $ & $\bm{\hat{B}}$ & $\dot{b}$ & $\bm{\dot{b}}$ & ${\dot{B}} $ & $\bm{\dot{B}}$\\ +$\hat{c}$ & $\bm{\hat{c}}$ & ${\hat{C}} $ & $\bm{\hat{C}}$ & $\dot{c}$ & $\bm{\dot{c}}$ & ${\dot{C}} $ & $\bm{\dot{C}}$\\ +$\hat{d}$ & $\bm{\hat{d}}$ & ${\hat{D}} $ & $\bm{\hat{D}}$ & $\dot{d}$ & $\bm{\dot{d}}$ & ${\dot{D}} $ & $\bm{\dot{D}}$\\ +$\hat{e}$ & $\bm{\hat{e}}$ & ${\hat{E}} $ & $\bm{\hat{E}}$ & $\dot{e}$ & $\bm{\dot{e}}$ & ${\dot{E}} $ & $\bm{\dot{E}}$\\ +$\hat{f}$ & $\bm{\hat{f}}$ & ${\hat{F}} $ & $\bm{\hat{F}}$ & $\dot{f}$ & $\bm{\dot{f}}$ & ${\dot{F}} $ & $\bm{\dot{F}}$\\ +$\hat{g}$ & $\bm{\hat{g}}$ & ${\hat{G}} $ & $\bm{\hat{G}}$ & $\dot{g}$ & $\bm{\dot{g}}$ & ${\dot{G}} $ & $\bm{\dot{G}}$\\ +$\hat{h}$ & $\bm{\hat{h}}$ & ${\hat{H}} $ & $\bm{\hat{H}}$ & $\dot{h}$ & $\bm{\dot{h}}$ & ${\dot{H}} $ & $\bm{\dot{H}}$\\ +$\hat{i}$ & $\bm{\hat{i}}$ & ${\hat{I}} $ & $\bm{\hat{I}}$ & $\dot{i}$ & $\bm{\dot{i}}$ & ${\dot{I}} $ & $\bm{\dot{I}}$\\ +$\hat{j}$ & $\bm{\hat{j}}$ & ${\hat{J}} $ & $\bm{\hat{J}}$ & $\dot{j}$ & $\bm{\dot{j}}$ & ${\dot{J}} $ & $\bm{\dot{J}}$\\ +$\hat{k}$ & $\bm{\hat{k}}$ & ${\hat{K}} $ & $\bm{\hat{K}}$ & $\dot{k}$ & $\bm{\dot{k}}$ & ${\dot{K}} $ & $\bm{\dot{K}}$\\ +$\hat{l}$ & $\bm{\hat{l}}$ & ${\hat{L}} $ & $\bm{\hat{L}}$ & $\dot{l}$ & $\bm{\dot{l}}$ & ${\dot{L}} $ & $\bm{\dot{L}}$\\ +$\hat{m}$ & $\bm{\hat{m}}$ & ${\hat{M}} $ & $\bm{\hat{M}}$ & $\dot{m}$ & $\bm{\dot{m}}$ & ${\dot{M}} $ & $\bm{\dot{M}}$\\ +$\hat{n}$ & $\bm{\hat{n}}$ & ${\hat{N}} $ & $\bm{\hat{N}}$ & $\dot{n}$ & $\bm{\dot{n}}$ & ${\dot{N}} $ & $\bm{\dot{N}}$\\ +$\hat{o}$ & $\bm{\hat{o}}$ & ${\hat{O}} $ & $\bm{\hat{O}}$ & $\dot{o}$ & $\bm{\dot{o}}$ & ${\dot{O}} $ & $\bm{\dot{O}}$\\ +$\hat{p}$ & $\bm{\hat{p}}$ & ${\hat{P}} $ & $\bm{\hat{P}}$ & $\dot{p}$ & $\bm{\dot{p}}$ & ${\dot{P}} $ & $\bm{\dot{P}}$\\ +$\hat{q}$ & $\bm{\hat{q}}$ & ${\hat{Q}} $ & $\bm{\hat{Q}}$ & $\dot{q}$ & $\bm{\dot{q}}$ & ${\dot{Q}} $ & $\bm{\dot{Q}}$\\ +$\hat{r}$ & $\bm{\hat{r}}$ & ${\hat{R}} $ & $\bm{\hat{R}}$ & $\dot{r}$ & $\bm{\dot{r}}$ & ${\dot{R}} $ & $\bm{\dot{R}}$\\ +$\hat{s}$ & $\bm{\hat{s}}$ & ${\hat{S}} $ & $\bm{\hat{S}}$ & $\dot{s}$ & $\bm{\dot{s}}$ & ${\dot{S}} $ & $\bm{\dot{S}}$\\ +$\hat{t}$ & $\bm{\hat{t}}$ & ${\hat{T}} $ & $\bm{\hat{T}}$ & $\dot{t}$ & $\bm{\dot{t}}$ & ${\dot{T}} $ & $\bm{\dot{T}}$\\ +$\hat{u}$ & $\bm{\hat{u}}$ & ${\hat{U}} $ & $\bm{\hat{U}}$ & $\dot{u}$ & $\bm{\dot{u}}$ & ${\dot{U}} $ & $\bm{\dot{U}}$\\ +$\hat{v}$ & $\bm{\hat{v}}$ & ${\hat{V}} $ & $\bm{\hat{V}}$ & $\dot{v}$ & $\bm{\dot{v}}$ & ${\dot{V}} $ & $\bm{\dot{V}}$\\ +$\hat{w}$ & $\bm{\hat{w}}$ & ${\hat{W}} $ & $\bm{\hat{W}}$ & $\dot{w}$ & $\bm{\dot{w}}$ & ${\dot{W}} $ & $\bm{\dot{W}}$\\ +$\hat{x}$ & $\bm{\hat{x}}$ & ${\hat{X}} $ & $\bm{\hat{X}}$ & $\dot{x}$ & $\bm{\dot{x}}$ & ${\dot{X}} $ & $\bm{\dot{X}}$\\ +$\hat{y}$ & $\bm{\hat{y}}$ & ${\hat{Y}} $ & $\bm{\hat{Y}}$ & $\dot{y}$ & $\bm{\dot{y}}$ & ${\dot{Y}} $ & $\bm{\dot{Y}}$\\ +$\hat{z}$ & $\bm{\hat{z}}$ & ${\hat{Z}} $ & $\bm{\hat{Z}}$ & $\dot{z}$ & $\bm{\dot{z}}$ & ${\dot{Z}} $ & $\bm{\dot{Z}}$\\ +\end{tabular} + \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi10.tfm b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi10.tfm Binary files differnew file mode 100644 index 00000000000..0ee0cefe790 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi12.tfm b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi12.tfm Binary files differnew file mode 100644 index 00000000000..c72c37364dd --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi12.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi17.tfm b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi17.tfm Binary files differnew file mode 100644 index 00000000000..c008b79a675 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi17.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi8.tfm b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi8.tfm Binary files differnew file mode 100644 index 00000000000..9291722cff0 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi8.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi9.tfm b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi9.tfm Binary files differnew file mode 100644 index 00000000000..a5fe3f872aa --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/sansmathaccent/mathkerncmssxi9.tfm diff --git a/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi10.vf b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi10.vf Binary files differnew file mode 100644 index 00000000000..bd0373f45da --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi10.vf diff --git a/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi12.vf b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi12.vf Binary files differnew file mode 100644 index 00000000000..57964077c0a --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi12.vf diff --git a/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi17.vf b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi17.vf Binary files differnew file mode 100644 index 00000000000..44129754a5a --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi17.vf diff --git a/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi8.vf b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi8.vf Binary files differnew file mode 100644 index 00000000000..f03ff9e9a96 --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi8.vf diff --git a/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi9.vf b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi9.vf Binary files differnew file mode 100644 index 00000000000..c76c6d9c72d --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/sansmathaccent/mathkerncmssxi9.vf diff --git a/Master/texmf-dist/tex/latex/sansmathaccent/ot1mathkerncmss.fd b/Master/texmf-dist/tex/latex/sansmathaccent/ot1mathkerncmss.fd index deb242a3fb7..1726b794f9d 100644 --- a/Master/texmf-dist/tex/latex/sansmathaccent/ot1mathkerncmss.fd +++ b/Master/texmf-dist/tex/latex/sansmathaccent/ot1mathkerncmss.fd @@ -1,64 +1,46 @@ -%% -%% This is file `ot1mathkerncmss.fd', -%% based on the file `ot1cmss.fd' -%% which is part of the LaTeX base distribution. -%% -%% It has been edited by replacing the family name `cmss' by `mathkerncmss' -%% and by replacing some of the fonts `cmssi<size>' by `mathkerncmssi<size>' -%% -%% This file is part of the sansmathaccent package. -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3c -%% 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.3c or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% +%Filename: ot1mathkerncmss.fd +%Created by: tex installfonts +%Created using fontinst v1.933 + +%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY + \ProvidesFile{ot1mathkerncmss.fd} - [2012/04/26] -\DeclareFontFamily{OT1}{mathkerncmss}{\skewchar\font127 } -\DeclareFontShape{OT1}{mathkerncmss}{m}{n} - {% - <5><6><7><8>cmss8% - <9>cmss9% - <10><10.95>cmss10% - <12><14.4>cmss12% - <17.28><20.74><24.88>cmss17% - }{} -% Font undefined, therefore substituted -\DeclareFontShape{OT1}{mathkerncmss}{m}{it} - {<->sub*mathkerncmss/m/sl}{} -\DeclareFontShape{OT1}{mathkerncmss}{m}{sl} - {% - <5><6><7><8>mathkerncmssi8<9>mathkerncmssi9% - <10><10.95>mathkerncmssi10% - <12><14.4>mathkerncmssi12% - <17.28><20.74><24.88>mathkerncmssi17% - }{} -%%%%%%% Font/shape undefined, therefore substituted -\DeclareFontShape{OT1}{mathkerncmss}{m}{sc} - {<->sub*cmr/m/sc}{} -%%%%%%% Font/shape undefined, therefore substituted -\DeclareFontShape{OT1}{mathkerncmss}{m}{ui} - {<->sub*cmr/m/ui}{} -%%%%%%%% semibold condensed series -\DeclareFontShape{OT1}{mathkerncmss}{sbc}{n} - {% - <5><6><7><8><9>cmssdc10% - <10><10.95><12><14.4><17.28><20.74><24.88>cmssdc10% - }{} + [2013/03/27 Fontinst v1.933 font definitions for OT1/mathkerncmss.] + +\DeclareFontFamily{OT1}{mathkerncmss}{\skewchar \font 127 } + +\DeclareFontShape{OT1}{mathkerncmss}{m}{n}{ + <-8.5> cmss8 + <8.5-9.5> cmss9 + <9.5-11.5> cmss10 + <11.5-15.7> cmss12 + <15.7-> cmss17 +}{} + +\DeclareFontShape{OT1}{mathkerncmss}{m}{sl}{ + <-8.5> mathkerncmssi8 + <8.5-9.5> mathkerncmssi9 + <9.5-11.5> mathkerncmssi10 + <11.5-15.7> mathkerncmssi12 + <15.7-> mathkerncmssi17 +}{} + +\DeclareFontShape{OT1}{mathkerncmss}{bx}{n}{ + <-> cmssbx10 +}{} + +\DeclareFontShape{OT1}{mathkerncmss}{bx}{sl}{ + <-8.5> mathkerncmssxi8 + <8.5-9.5> mathkerncmssxi9 + <9.5-11.5> mathkerncmssxi10 + <11.5-15.7> mathkerncmssxi12 + <15.7-> mathkerncmssxi17 +}{} + +\DeclareFontShape{OT1}{mathkerncmss}{m}{it}{<->ssub * mathkerncmss/m/sl}{} +\DeclareFontShape{OT1}{mathkerncmss}{b}{n}{<->ssub * mathkerncmss/bx/n}{} +\DeclareFontShape{OT1}{mathkerncmss}{b}{sl}{<->ssub * mathkerncmss/bx/sl}{} +\DeclareFontShape{OT1}{mathkerncmss}{bx}{it}{<->ssub * mathkerncmss/bx/sl}{} +\DeclareFontShape{OT1}{mathkerncmss}{b}{it}{<->ssub * mathkerncmss/bx/it}{} -%%%%%%%%% bold extended series -\DeclareFontShape{OT1}{mathkerncmss}{bx}{n} - {% - <5><6><7><8><9>cmssbx10% - <10><10.95><12><14.4><17.28><20.74><24.88>cmssbx10% - }{} -%%%%%%% Font/shape undefined, therefore substituted -\DeclareFontShape{OT1}{mathkerncmss}{bx}{ui} - {<->sub*cmr/bx/ui}{} \endinput -%% -%% End of file `ot1mathkerncmss.fd'. diff --git a/Master/texmf-dist/tex/latex/sansmathaccent/sansmathaccent.sty b/Master/texmf-dist/tex/latex/sansmathaccent/sansmathaccent.sty index c0e8ff60909..f7f06374fbe 100644 --- a/Master/texmf-dist/tex/latex/sansmathaccent/sansmathaccent.sty +++ b/Master/texmf-dist/tex/latex/sansmathaccent/sansmathaccent.sty @@ -1,10 +1,10 @@ -% sansmathaccent.sty +% sansmathaccent.sty, version 2 % % Fixes a problem with accent placement in beamer and sfmath % % author: Ariel Barton % -% Copyright Ariel Barton, 2012 +% Copyright Ariel Barton, 2012, 2013 % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -20,31 +20,88 @@ % The complete list of files considered part of this work is in % the file `sansmathaccent.pdf' and its source code `sansmathaccent.tex'. % -\ProvidesPackage{sansmathaccent}[2012/04/26] +\ProvidesPackage{sansmathaccent}[2013/03/28] -\def\sansmathaccent@warning{sansmathaccent is not a standalone package; it should be used with beamer or sfmath.} +\def\sansmathaccent@warning{sansmathaccent is not a standalone package; it should be used with beamer or sfmath} + +\@ifpackageloaded{bm}{\PackageWarning{sansmathaccent}{Please load bm after loading sansmathaccent}} + +\providecommand\beamer@font@check{ + % Code borrowed from beamerbasefont + % to see if we are using any font packages + \def\beamer@cmr{cmr} + \edef\beamer@fmdef{\mathfamilydefault} + % supress for standard cm + \ifx\beamer@fmdef\beamer@cmr\beamer@suppressreplacementstrue\fi + % supress for mathtime serif and math minion serif + \@ifpackageloaded{arevmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{hvmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{kpfonts}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{lucidabr}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{lucimatx}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mathpmnt}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mathpple}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mathtime}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mtpro}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mtpro2}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} +} % Check to see if we are a Beamer document \@ifpackageloaded{beamerbasefont}{% \def\sansmathaccent@warning{} + + % Ensure proper placement of accents with bm + % but don't waste a mathgroup unless we will in fact use + % bm and pureletters + \IfFileExists{filehook.sty}{ + \RequirePackage{filehook} + \AtBeginOfFile{bm.sty}{ + \beamer@font@check \ifbeamer@suppressreplacements\else + \DeclareSymbolFont{pureletters}{OT1}{mathkerncmss}{m}{sl} + \SetSymbolFont{pureletters}{bold}{OT1}{mathkerncmss}{bx}{sl} + \fi + } + }{ + \DeclareSymbolFont{pureletters}{OT1}{mathkerncmss}{m}{sl} + \SetSymbolFont{pureletters}{bold}{OT1}{mathkerncmss}{bx}{sl} + \PackageWarning{sansmathaccent}{Could not find 'filehooks' package: one mathgroup may be wasted} + } + \AtBeginDocument{ - \def\sansmathaccent@cmss{cmss} - \ifx\beamer@fmdef\sansmathaccent@cmss % Check to see if we are using cmss for math - \DeclareSymbolFont{pureletters}{OT1}{mathkerncmss}{m}{sl} + \ifbeamer@suppressreplacements\else + % Check to see if we are using cmss for math + \def\sansmathaccent@cmss{cmss} + \ifx\beamer@fmdef\sansmathaccent@cmss + % Use properly kerned alphabets + \DeclareSymbolFont{pureletters}{OT1}{mathkerncmss}{m}{sl}% + \ifx\mv@bold\@undefined\else % Compatibility with the bm package + \SetSymbolFont{pureletters}{bold}{OT1}{mathkerncmss}{bx}{sl} + \fi + \else + % If we are using sans serif, but not cmss, for math, + % make sure bm doesn't accidentally end up using bold cmss + \ifx \symboldpureletters \undefined \else + \DeclareSymbolFont{boldpureletters}{\encodingdefault} {\mathfamilydefault}{bx}{it} + \fi + \fi \fi } }{} % Check to see if we are a sfmath document +% This is less fancy, because sfmath doesn't delay with AtBeginDocument \@ifpackageloaded{sfmath}{% \def\sansmathaccent@warning{} \edef\tmp@sfdefault{\math@sfdefault} \def\tmp@compare{cmss} \ifx\tmp@sfdefault\tmp@compare % Check to see if we are using cmss for math - \DeclareSymbolFont{SFMath}{OT1}{mathkerncmss}{m}{sl} - \SetSymbolFont{SFMath}{normal}{OT1}{mathkerncmss}{m}{sl} + \DeclareSymbolFont{SFMath}{OT1}{mathkerncmss}{m}{sl} + \SetSymbolFont{SFMath}{normal}{OT1}{mathkerncmss}{m}{sl} + \SetSymbolFont{SFMath}{bold}{OT1}{mathkerncmss}{bx}{sl} \fi }{} -\ifx \sansmathaccent@warning\empty \else \typeout{\sansmathaccent@warning} \fi
\ No newline at end of file +\ifx \sansmathaccent@warning\empty \else + \PackageWarning{sansmathaccent}{\sansmathaccent@warning} +\fi
\ No newline at end of file diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index c33277281e1..3a310c3e390 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -868,6 +868,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'sae', "die 'skipping, nosell license'", 'saferef', "die 'skipping, nonfree license'", 'sagetex', "die 'skipping, omitted at author request (25 Jan 2010 19:50:16)'", + 'sansmathaccent', "&MAKEflatten", 'schedule', "die 'skipping, noinfo license, too old to matter'", 'schulschriften', "&MAKEflatten", 'scientifixpaper', "die 'skipping, noinfo license'", @@ -4903,15 +4904,33 @@ sub POSTcontext { print "still POST$package - user-level executables\n"; # similar to biber, executables go in both the Master bin dir and the - # Build linked_scripts dir. - my @exec = qw(context mtxrun); - + # Build linked_scripts dir. The executables are cherry-picked from + # two different directories. + my $w32_bindir = "$TOPDEST/bin/win32"; + &xmkdir ($w32_bindir); + # + &xchdir ("$DEST/scripts/$package/stubs/unix"); + my @exec = (); + for my $exec (qw(context luatools texexec texmfstart)) { + &SYSTEM ("$CP ../mswin/$exec.exe $w32_bindir/"); + push (@exec, $exec); + } + #for my $exec (qw(ctxtools pstopdf)) { + # + #} + # + # mtxrun on Windows needs more than just the .exe. + &xchdir ("../mswin"); + &SYSTEM ("$CP mtxrun.exe mtxrun.dll mtxrun.lua $w32_bindir/"); + print "still POST$package - man pages\n"; - &xchdir ("$DEST/doc/$package/scripts/mkiv"); + &xchdir ("$DEST/doc/$package/scripts"); my $mandest = "$TOPDEST/texmf/doc/man/man1"; &xmkdir ($mandest); for my $exec (@exec) { - &SYSTEM ("$CP $exec.man $mandest/$exec.1"); + # man pages might be under mkii or mkiv, just check both. + my $mansrc = (-r "mkii/$exec.man" ? "mkii/$exec.man" : "mkiv/$exec.man"); + &SYSTEM ("$CP $mansrc $mandest/$exec.1"); } &tl_man_to_pdf (); } |