cfr-lm (Mar4) - plus adaptions for ctan2tds

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

6 files changed, 141 insertions, 70 deletions

diff --git a/Master/texmf-dist/doc/fonts/cfr-lm/README b/Master/texmf-dist/doc/fonts/cfr-lm/README
index a69db5b436a..14e9c64e78a 100644
--- a/Master/texmf-dist/doc/fonts/cfr-lm/README
+++ b/Master/texmf-dist/doc/fonts/cfr-lm/README
@@ -1,5 +1,5 @@
 manifest.txt
-Copyright 2010 Clea F. Rees
+Copyright 2014 Clea F. Rees
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@ postscript type 1 version of the fonts.
 
 The encoding t1-clm.etx is derived from the file t1.etx supplied with
 fontinst. A copy of fontinst including an unmodified copy of t1.etx is 
-available from http://tug.ctan.org/tex-archive/fonts/utilities/fontinst.
+available from http://mirror.ctan.org/fonts/utilities/fontinst.
 
 Warning - Experimental
 ----------------------
@@ -61,6 +61,10 @@ characters, especially those which do not occur in English or Welsh
 text as these are the only languages I typeset more than a word or two
 of once in a blue moon.
 
+Moreover, version 1.4 adds experimental support for microtype. While this 
+should work fine since it basically uses the settings for Latin Modern and
+Computer Modern Roman, I'm far from confident about this.
+
 Documentation
 -------------
 
@@ -69,5 +73,5 @@ and usage.
 
 
 Clea F. Rees
-cfrees <at> imapmail <dot> org
-2010/05/30
+ReesC21 <at> cardiff <dot> ac <dot> uk
+2014/03/01
diff --git a/Master/texmf-dist/doc/fonts/cfr-lm/cfr-lm.pdf b/Master/texmf-dist/doc/fonts/cfr-lm/cfr-lm.pdf
index 2e7280c92a5..3edb04fa134 100644
--- a/Master/texmf-dist/doc/fonts/cfr-lm/cfr-lm.pdf
+++ b/Master/texmf-dist/doc/fonts/cfr-lm/cfr-lm.pdf
diff --git a/Master/texmf-dist/doc/fonts/cfr-lm/cfr-lm.tex b/Master/texmf-dist/doc/fonts/cfr-lm/cfr-lm.tex
index 0f12386e7fc..0ea7c8d9f7b 100644
--- a/Master/texmf-dist/doc/fonts/cfr-lm/cfr-lm.tex
+++ b/Master/texmf-dist/doc/fonts/cfr-lm/cfr-lm.tex
@@ -1,7 +1,7 @@
 % !TEX TS-program = pdflatex
 % !TEX encoding = UTF-8 Unicode
 %% cfr-lm.tex
-%% Copyright 2010 Clea F. Rees
+%% Copyright 2014 Clea F. Rees
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -12,14 +12,17 @@
 % version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status `maintained'.
-% 
+%
 % The Current Maintainer of this work is Clea F. Rees.
 %
 % This work consists of all files listed in manifest.txt.
 \listfiles
-\documentclass[11pt,british]{article}
-\usepackage{babel}	
-\usepackage[utf8x]{inputenc}
+\documentclass[11pt,british,a4paper]{article}
+\usepackage{babel}
+\usepackage[utf8]{inputenc}
+\usepackage{csquotes}
+   \MakeAutoQuote{‘}{’}
+   \MakeAutoQuote*{“}{”}
 \usepackage[T1]{fontenc}
 \usepackage{textcomp,cfr-lm}
 \usepackage{fancyhdr,lastpage,fancyref}
@@ -29,12 +32,12 @@
 \usepackage{url}
 	\urlstyle{sf}
 \usepackage{microtype}
-\usepackage[a4paper,headheight=14pt]{geometry}	% use 14pt for 11pt text, 15pt for 12pt text
+\usepackage[headheight=14pt]{geometry}	% use 14pt for 11pt text, 15pt for 12pt text
 
 \title{cfr-lm}
-\author{Clea F.\ Rees\footnote{cfrees <at> imapmail <dot> org}}
-\def\dyddiad{30th May, 2010}
-\def\fyversion{Version 1.3}
+\author{Clea F.\ Rees\footnote{reesc21 <at> cardiff <dot> ac <dot> uk}}
+\def\dyddiad{St.\ David's Day, 2014}
+\def\fyversion{Version 1.4}
 \date{\fyversion\ --- \dyddiad}
 \pagestyle{fancy}
 	\fancyhf[lh]{\itshape \fyversion}
@@ -43,7 +46,7 @@
 	\fancyhf[lf]{}
 	\fancyhf[rf]{}
 	\fancyhf[cf]{\itshape --- \thepage~\ofname~\pageref{LastPage} ---}
-	
+
 
 \begin{document}
 \maketitle\thispagestyle{empty}
@@ -51,7 +54,7 @@
 	/Creator		(TeX)
 	/Producer		(pdfTeX)
 	/Author			(Clea F.\ Rees)
-	/Title				(cfr-lm)
+	/Title			(cfr-lm)
 	/Subject		(TeX)
 	/Keywords		(TeX,LaTeX,font,fonts,tex,latex,LatinModern,Latin Modern,latinmodern,cfr-lm,lm,LM,osf,OSF,figure,figures,digit,digits,proportional,tabular,lining,oldstyle,Latin,Modern,Clea,Rees)}
 \pdfcatalog{%
@@ -61,12 +64,12 @@
 %	\pagestyle{empty}	% if you want this, you probably want to comment out \maketitle as well...?
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{0.5em}
-	
+
 \newcommand*{\lpack}[1]{\textsf{#1}}
 \newcommand*{\fgroup}[1]{\textsf{#1}}
 
 \begin{abstract}
-	\hspace*{-\parindent}\lpack{cfr-lm} is an \emph{experimental} package offering enhanced support for the Latin Modern fonts in \TeX/\LaTeX. A number of features of the Latin Modern fonts are not easily accessible via the default \TeX/\LaTeX\ support provided in the official distribution. This package aims to provide \TeX/\LaTeX\ support for a number of these features including various styles of digits, upright italic and oblique small-caps shapes, and alternative weights and widths. It also supports the variable width typewriter, ``dunhill'' and ``quotation'' fonts. Version 1.3 supports version 2.004 of the Latin Modern fonts.
+	\hspace*{-\parindent}\lpack{cfr-lm} is an \emph{experimental} package offering enhanced support for the Latin Modern fonts in \TeX/\LaTeX. A number of features of the Latin Modern fonts are not easily accessible via the default \TeX/\LaTeX\ support provided in the official distribution. This package aims to provide \TeX/\LaTeX\ support for a number of these features including various styles of digits, upright italic and oblique small-caps shapes, and alternative weights and widths. It also supports the variable width typewriter, ‘dunhill’ and ‘quotation’ fonts. Version 1.3 supports version 2.004 of the Latin Modern fonts. Version 1.4 adds experimental support for (but does not require) \lpack{microtype}.
 \end{abstract}
 
 \tableofcontents
@@ -80,7 +83,9 @@ This document explains how to use the \emph{experimental} \lpack{cfr-lm} package
 
 \lpack{cfr-lm} consists of all files listed in \lpack{manifest.txt}\ and these files are released under the \LaTeX\ Project Public Licence as explained in the included licensing notices.
 
-Version 1.3 of the package has benefited greatly from feedback provided by Enrico Gregorio, who essentially rewrote the style file using keyval to show me how I ought to be setting the various options up, and Lars Hellström who demonstrated considerable patience in answering my many questions about using fontinst and some peculiarities of the Latin Modern fonts. I hope the changes in the production of the virtual fonts will improve accent placement in ``faked'' glyphs (i.e.\ in the case of characters not included in the \textsc{ec}/\textsc{t1} font encoding which \TeX\ therefore creates by combining glyphs which are included). The changes involve ignoring all font dimensions given in the \textsc{afm} files and taking them from the relevant \textsc{tfm} files supplied with Latin Modern instead. The exception to this is the value of \verb|acccapheight| which is set to zero in the \textsc{tfm}s. The current virtual font setup uses \lpack{fontinst}'s default value in this case.
+Version 1.3 of the package benefited greatly from feedback provided by Enrico Gregorio, who essentially rewrote the style file using keyval to show me how I ought to be setting the various options up, and Lars Hellström who demonstrated considerable patience in answering my many questions about using fontinst and some peculiarities of the Latin Modern fonts. I hope the changes in the production of the virtual fonts will improve accent placement in ‘faked’ glyphs (i.e.\ in the case of characters not included in the \textsc{ec}/\textsc{t1} font encoding which \TeX\ therefore creates by combining glyphs which are included). The changes involve ignoring all font dimensions given in the \textsc{afm} files and taking them from the relevant \textsc{tfm} files supplied with Latin Modern instead. The exception to this is the value of \verb|acccapheight| which is set to zero in the \textsc{tfm}s. The current virtual font setup uses \lpack{fontinst}'s default value in this case.
+
+If you load \lpack{microtype}, version 1.4 \emph{should} automatically figure out the family-specific settings to use. This is done using aliases which tell \lpack{microtype} to treat the virtual fonts provided by this package in the same way it treats Latin Modern and Computer Modern Roman. See \fref{sec:mt} for details. This \emph{seems} to work for me but please let me know if it does not work for you. In the worst case, the output should be no worse with version 1.4 of this package than it was with version 1.3. That is, at worst \lpack{microtype} should just use generic settings as it did before.
 
 These improvements notwithstanding, please note that, unlike the fonts themselves and the official support provided by \lpack{lm}, including \path{lmodern.sty}, this alternative support package is \emph{experimental}. Although I do not expect the package to raid your fridge or make off with your best computer, it certainly contains bugs and may not work as advertised. If you let me know of problems, I will solve them if I can. If you can correct the problems and send me the fixes, that would be even better.
 
@@ -105,14 +110,16 @@ though you can always comment out the relevant lines if you don't have these pac
 
 In addition to the requirements of \path{clm-test.tex}, the documentation requires:
 \begin{itemize}
+	\item \lpack{array}
+	\item \lpack{booktabs}
+	\item \lpack{csquotes}
 	\item \lpack{fancyhdr}
-	\item \lpack{lastpage}
 	\item \lpack{fancyref}
-	\item \lpack{array}
+	\item \lpack{lastpage}
 	\item \lpack{longtable}
-	\item \lpack{verbatim}
-	\item \lpack{booktabs}
+	\item \lpack{multirow}
 	\item \lpack{url}
+	\item \lpack{verbatim}
 \end{itemize}
 
 \section{Limitations}
@@ -207,9 +214,9 @@ The following font families are provided for use in the \textsc{ec}/\textsc{t1}
 											&	\fgroup{clm2j}							&	proportional, oldstyle			&	\lpack{cfr-lm} \verb|rm| default\tabularnewline\midrule
 		\multirow{4}{.2\textwidth}{Latin Modern Sans}%
 											&	\fgroup{clms}							&	tabular, lining						&	similar to \lpack{lm} \verb|sf| default\tabularnewline\cmidrule{3-4}
-											&	\fgroup{clm2s}							&	proportional, lining				&	\tabularnewline\cmidrule{3-4}	
+											&	\fgroup{clm2s}							&	proportional, lining				&	\tabularnewline\cmidrule{3-4}
 											&	\fgroup{clmjs}							&	tabular, oldstyle					&	\tabularnewline\cmidrule{3-4}
-											&	\fgroup{clm2js}						&	proportional, oldstyle			&	\lpack{cfr-lm} \verb|sf| default\tabularnewline\pagebreak%\midrule
+											&	\fgroup{clm2js}						&	proportional, oldstyle			&	\lpack{cfr-lm} \verb|sf| default\tabularnewline\midrule
 		\multirow{2}{.2\textwidth}{Latin Modern Mono\footnote{The duplication in \TeX\ name here is to avoid \TeX\ complaining if commands to use proportional digits are issued while one of these fonts is active and to ensure that it is possible to switch smoothly to these fonts if another font with proportional digits is active.}}%
 											&	\fgroup{clmt}, \fgroup{clm2t}				&	tabular, lining						&	similar to \lpack{lm} \verb|tt| default\tabularnewline\cmidrule{3-4}
 											&	\fgroup{clmjt},	\fgroup{clm2jt}			&	tabular, oldstyle					&	\tabularnewline\midrule
@@ -223,12 +230,13 @@ The following font families are provided for use in the \textsc{ec}/\textsc{t1}
 											&	\fgroup{clm2qs}						&	proportional, lining				&	\tabularnewline\cmidrule{3-4}
 											&	\fgroup{clmjqs}							&	tabular, oldstyle					&	\tabularnewline\cmidrule{3-4}
 											&	\fgroup{clm2jqs}						&	proportional, oldstyle			&	\tabularnewline\midrule
-		\multirow{4}{.2\textwidth}{Latin Modern Roman Dunhill}%\multirow{nrows}[bigstruts]{width}[fixup]{text}; or * for {width}	
+		\multirow{4}{.2\textwidth}{Latin Modern Roman Dunhill}%\multirow{nrows}[bigstruts]{width}[fixup]{text}; or * for {width}
 											&	\fgroup{clmd}							&	tabular, lining						&	\tabularnewline\cmidrule{3-4}
 											&	\fgroup{clm2d}							&	proportional, lining				&	\tabularnewline\cmidrule{3-4}
 											&	\fgroup{clmdj}							&	tabular, oldstyle					&	\tabularnewline\cmidrule{3-4}
 											&	\fgroup{clm2dj}						&	proportional, oldstyle			&	\tabularnewline
 \end{longtable}
+\clearpage
 
 \subsection{Shapes, weights and widths}
 
@@ -241,7 +249,7 @@ The following font families are provided for use in the \textsc{ec}/\textsc{t1}
 																	&						&	demi					&	upright, oblique\tabularnewline\midrule
 		\fgroup{clms}, \fgroup{clm2s}, \fgroup{clmjs}, \fgroup{clm2js}				&	standard	&	normal				&	upright, oblique\tabularnewline\cmidrule{3-4}
 																	&						&	bold					&	upright, oblique\tabularnewline\cmidrule{2-4}
-																	&	condensed	&	demi					&	upright, oblique\tabularnewline\pagebreak%\midrule
+																	&	condensed	&	demi					&	upright, oblique\tabularnewline\midrule
 		\fgroup{clmt}, \fgroup{clm2t}, \fgroup{clmjt}, \fgroup{clm2jt}				&	standard	&	normal				&	upright, oblique,\\italic, small-caps,\\oblique small-caps\tabularnewline\cmidrule{3-4}
 																	&						&	bold					&	upright, oblique\tabularnewline\cmidrule{3-4}
 																	&						&	light					&	upright, oblique\tabularnewline\cmidrule{2-4}
@@ -252,7 +260,7 @@ The following font families are provided for use in the \textsc{ec}/\textsc{t1}
 		\fgroup{clmqs}, \fgroup{clm2qs}, \fgroup{clmjqs}, \fgroup{clm2jqs}	&						&	normal				&	upright, oblique\tabularnewline\cmidrule{3-4}
 																	&						&	bold					&	upright, oblique\tabularnewline\midrule
 		\fgroup{clmd}, \fgroup{clm2d}, \fgroup{clmdj}, \fgroup{clm2dj}			&	standard	&	normal				&	upright, oblique\tabularnewline\cmidrule{3-4}
-																	&						&	bold					&	upright, oblique\tabularnewline																		
+																	&						&	bold					&	upright, oblique\tabularnewline
 	\end{longtable}
 
 Where applicable, oblique small-caps are substituted for italic small-caps; italic or oblique for upright italic; oblique for italic; and upright for small-caps. This means that some of the commands described in \fref{sec:commands} will fail silently to avoid undue clutter in the log file.
@@ -260,8 +268,8 @@ Where applicable, oblique small-caps are substituted for italic small-caps; ital
 \section{The \LaTeX\ package}\label{sec:support}
 
 To load this package, write \verb|\usepackage{cfr-lm}| in your document preamble. By default, the package will define \fgroup{clm2j}, \fgroup{clm2js} and \fgroup{clm2jv} as the default roman/serif, sans and typewriter fonts but you can control the choice by passing options to the package.
-	
-The package recognises four keys. Three of these keys take various options which take the value true or false. These control the default style of figures to be used for each of roman/serif, sans and typewriter text, and whether variable or monowidth typewriter will be used by default. The fourth key itself takes a true or false value but has no effect unless \verb|\qtfont| is already defined\footnote{This key is designed to control use of LM Sans Quotation in conjunction with prior redefinitions of appropriate environments. Since this is not the sort of redefining a font package should be doing, the option will have absolutely no effect unless you do some prior work to make use of it. In any case, the font can still be accessed directly using the commands explained in \fref{sec:commands}.}. 
+
+The package recognises four keys. Three of these keys take various options which take the value true or false. These control the default style of figures to be used for each of roman/serif, sans and typewriter text, and whether variable or monowidth typewriter will be used by default. The fourth key itself takes a true or false value but has no effect unless \verb|\qtfont| is already defined\footnote{This key is designed to control use of LM Sans Quotation in conjunction with prior redefinitions of appropriate environments. Since this is not the sort of redefining a font package should be doing, the option will have absolutely no effect unless you do some prior work to make use of it. In any case, the font can still be accessed directly using the commands explained in \fref{sec:commands}.}.
 	\begin{longtable}{l>{\raggedright}p{.25\textwidth}>{\raggedright}ll}
 		\toprule
 		\textbf{key}	&	\textbf{affects}	&	\textbf{option}	&	 \textbf{possible values}\tabularnewline\midrule\endhead
@@ -289,7 +297,7 @@ The default value in all cases is \verb|true| if an option is given without a va
 				sf={oldstyle,proportional},%
 				tt={oldstyle=false,proportional=true,monowidth}%
 				]{cfr-lm}
-				
+
 			\usepackage[%
 				rm={oldstyle=false, proportional=true},%
 				sf={lining=false,tabular=false},%
@@ -307,19 +315,19 @@ Loading the package without options is equivalent to:
 		]{cfr-lm}
 \end{verbatim}
 That is, by default, oldstyle, proportional figures for roman, sans and typewriter text and variable width typewriter will be selected.
-	
+
 \section{Additional font selection commands}\label{sec:commands}
 
 \lpack{cfr=lm}\ loads \lpack{nfssext-cfr}\ which is an extension of the package \lpack{nfssext}\ supplied by Philipp Lehman as part of The Font Installation Guide. The file extends the font selection commands to facilitate access to various font features. Both the original and the extension are designed for use with a wide range of fonts. For this reason, only a subset of the additional commands are relevant to any particular font support package. Those relevant to \lpack{cfr-lm}\ are described below.
-	
+
 I consider my additions to \lpack{nfssext-cfr}\ to be \emph{highly experimental}. If things don't work as advertised, apart from letting me know about the problem, you may be able to access the features you need by issuing a \verb|\normalfont| and then selecting features from there. This command will return you to the default document text font --- typically the relevant serif in regular weight, standard width and upright shape with the style of figures determined by the package and options loaded.
 
 \subsection{nfssext-cfr}
 
 These commands are available when \lpack{cfr-lm}\ is loaded. If for some reason you wish to make them available at any other time, use \verb|\usepackage{nfssext-cfr}| in your document preamble.
 
-Note that only combinations supported by the fonts will appear as expected because the commands will only have an effect if the active font offers the relevant variant. For example, trying to switch to a condensed width will have no effect if any of the LM Roman fonts is active. This means that only a subset of combinations are possible. In other cases,	one of two things should happen. First, a `silent' substitution may be made. For example, if you request proportional figures while using monowidth typewriter, tabular figures will be silently substituted. Second, console messages may warn you that the combination you tried to use isn't available.  If you request titling while using monowidth 	typewriter, a console message will warn you it was unavailable.  The file \path{clm-test.tex} gives an idea of what's possible and also serves as an example illustrating some of the commands provided by \lpack{cfr-lm} and other ways of accessing the fonts..
-	
+Note that only combinations supported by the fonts will appear as expected because the commands will only have an effect if the active font offers the relevant variant. For example, trying to switch to a condensed width will have no effect if any of the LM Roman fonts is active. This means that only a subset of combinations are possible. In other cases,	one of two things should happen. First, a ‘silent’ substitution may be made. For example, if you request proportional figures while using monowidth typewriter, tabular figures will be silently substituted. Second, console messages may warn you that the combination you tried to use isn't available.  If you request titling while using monowidth 	typewriter, a console message will warn you it was unavailable.  The file \path{clm-test.tex} gives an idea of what's possible and also serves as an example illustrating some of the commands provided by \lpack{cfr-lm} and other ways of accessing the fonts..
+
 \subsubsection{Widths}
 
 	\begin{longtable}{lll}
@@ -344,8 +352,6 @@ The problem with using the commands provided by \lpack{nfssext-cfr} is that they
 
 Similar considerations in the case of light condensed monowidth typewriter mean that the \emph{order} in which commands are issued is critical. In this case, a light-weight standard-width font is available, but no normal-weight condensed font is provided. Consequently, \verb|\texttm{\textlg{\textcd{a successful switch}}}| will produce \texttm{\textlg{\textcd{a successful switch}}} while \verb|\texttm{\textcd{\textlg{an unsuccessful switch}}}| will result in \texttm{\textcd{\textlg{an unsuccessful switch}}} and a warning in the log. In this case, the latter command is equivalent to \verb|\texttm{\textlg{}}| because \verb|\textcd{}| can only succeed \emph{after} \verb|\textlg{}|.
 
-\vfill\pagebreak
-
 \subsubsection{Weights}
 
 	\begin{longtable}{lll}
@@ -355,7 +361,7 @@ Similar considerations in the case of light condensed monowidth typewriter mean
 		light							&	\verb|\lgweight|				&	\verb|\textlg{}|\\
 		semi-bold					&	\verb|\sbweight|				&	\verb|\textsb{}|\\
 	\end{longtable}
-		
+
 	\begin{verbatim}
 		\textsb{Semi-bold and \textsl{semi-bold oblique} serif}\\
 		\texttt{\textlg{Light typewriter}}
@@ -374,9 +380,9 @@ Similar considerations in the case of light condensed monowidth typewriter mean
 		\bottomrule\endfoot
 		oblique small-caps\footnote{Actually the command switches to \emph{italic} small-caps but since LM does not offer this, oblique small-caps are substituted}%
 											&	\verb|\sishape|					&	\verb|\textsi{}|\\
-		upright italic			&	\verb|\uishape|					&	\verb|\textui{}|\\		
+		upright italic			&	\verb|\uishape|					&	\verb|\textui{}|\\
 	\end{longtable}
-		
+
 \begin{verbatim}
 	\textsi{I always avoid a kangaroo.}\\
 	\textui{Nobody is despised who can manage a crocodile.}
@@ -396,8 +402,8 @@ produces only:
 	\textsf{\textsi{The bits about kangaroos and crocodiles were from Lewis Carroll.}}\\
 	\textbf{\textui{Sylvia snorkeled snappily.}}
 \end{center}
-where upright sans and bold italic are substituted for italic small-caps sans and bold upright italic since neither is available. Note that the first substitution produces a warning in the log while the second is done ``silently''.
-		
+where upright sans and bold italic are substituted for italic small-caps sans and bold upright italic since neither is available. Note that the first substitution produces a warning in the log while the second is done ‘silently’.
+
 \subsubsection{Figures}
 
 Commands are provided to change either one or both aspects of digits' style:
@@ -408,13 +414,13 @@ Commands are provided to change either one or both aspects of digits' style:
 		lining										&	\verb|\lstyle|						&	\verb|\textl{}|\\
 		oldstyle									&	\verb|\ostyle|						&	\verb|\texto{}|\\
 		proportional							&	\verb|\pstyle|						&	\verb|\textp{}|\\
-		tabular									&	\verb|\tstyle|						&	\verb|\textt{}|\\		
-		proportional, lining				&	\verb|\plstyle|						&	\verb|\textpl{}|\\				
-		proportional, oldstyle			&	\verb|\postyle|					&	\verb|\textpo{}|\\				
-		tabular, lining						&	\verb|\tlstyle|						&	\verb|\texttl{}|\\				
-		tabular, oldstyle					&	\verb|\tostyle|					&	\verb|\textto{}|				
+		tabular									&	\verb|\tstyle|						&	\verb|\textt{}|\\
+		proportional, lining				&	\verb|\plstyle|						&	\verb|\textpl{}|\\
+		proportional, oldstyle			&	\verb|\postyle|					&	\verb|\textpo{}|\\
+		tabular, lining						&	\verb|\tlstyle|						&	\verb|\texttl{}|\\
+		tabular, oldstyle					&	\verb|\tostyle|					&	\verb|\textto{}|
 	\end{longtable}
-	
+
 In this document, proportional, oldstyle figures are used by default for roman/serif, sans and typewriter:
 		\begin{center}
 			0123456789\\
@@ -433,7 +439,7 @@ produces:
 			\textsf{\textl{0123456789}}\\
 			\texttt{\textl{0123456789}}
 		\end{center}
-First, note that it is necessary to reissue \verb|\textl{}| after switching to sans or typewriter text. This is because both switching to sans or typewriter and switching to another figure style involves a switch of font family\footnote{Compare a switch in width or weight which does not typically involve a change of active font family.}. 
+First, note that it is necessary to reissue \verb|\textl{}| after switching to sans or typewriter text. This is because both switching to sans or typewriter and switching to another figure style involves a switch of font family\footnote{Compare a switch in width or weight which does not typically involve a change of active font family.}.
 
 Second, note that the output shows \emph{proportional} lining figures because the command \verb|\textl{}| only changes \emph{one} aspect of the style. Because proportional figures were already active, the command switched to proportional, lining figures. Tabular, lining digits may be accessed in several ways:
 \begin{verbatim}
@@ -456,7 +462,7 @@ In addition to the package options to specify either LM Mono or LM Mono Prop as
 		\textbf{typewriter font}	&	\textbf{style command}	&	\textbf{text command}\\\midrule\endhead
 		\bottomrule\endfoot
 		variable typewriter				&	\verb|\tvstyle|					&	\verb|\texttv{}|\\
-		monowidth typewriter		&	\verb|\tmstyle|					&	\verb|\texttm{}|				
+		monowidth typewriter		&	\verb|\tmstyle|					&	\verb|\texttm{}|
 	\end{longtable}
 
 Variable width is default in this document so
@@ -477,11 +483,11 @@ This font may be accessed as follows:
 		\toprule
 		\textbf{font}			&	\textbf{style command}	&	\textbf{text command}\\\midrule\endhead
 		\bottomrule\endfoot
-		sans quotation			&	\verb|\qtstyle|					&	\verb|\textqt{}|				
+		sans quotation			&	\verb|\qtstyle|					&	\verb|\textqt{}|
 	\end{longtable}
 
 For example, \verb|\textqt{some text in the font}| will produce \textqt{some text in the font}.
-	
+
 \subsubsection{Latin Modern Roman Dunhill}
 
 This font may be accessed as follows:
@@ -491,7 +497,7 @@ This font may be accessed as follows:
 		\bottomrule\endfoot
 		titling							&	\verb|\tistyle|						&	\verb|\textti{}|\\
 	\end{longtable}
-		
+
 To ensure the command succeeds independently of the currently active font, you may wish to issue \verb|\normalfont| first. For example:
 		\begin{verbatim}
 			\normalfont\textti{Kinky Querulous Rhinos X-Ray Exultant Risque Zebras}\\
@@ -501,11 +507,17 @@ To ensure the command succeeds independently of the currently active font, you m
 		\begin{center}
 		 	\normalfont\textti{Kinky Querulous Rhinos X-Ray Exultant Risque Zebras}\\
 			\textti{\textsl{Kinky Querulous Rhinos X-Ray Exultant Risque Zebras}}
-		\end{center}	
-	
+		\end{center}
+
 \subsection{zeroslash}
-	
+
 \lpack{cfr-lm}\ provides one additional command. \verb|\zeroslash| will produce the \zeroslash\ character from the current font.
-	
-\end{document}  
+
+\section{Microtype}\label{sec:mt}
+
+Version 1.4 adds support for family-specific microtypographical features supported by \lpack{microtype}. This code will do nothing if you do not load \lpack{microtype}. If you do use these features, all regular roman and sans families, together with the sans quotation font, will use the settings for Computer Modern Roman. The fallback generic settings will continue to be applied to the typewriter and ‘dunhill’ families.
+
+The code responsible for this is in a block at the end of \lpack{cfr-lm.sty} so it should be easy to find and remove should it cause any trouble. (But do let me know in this case so that I can correct any issues for everybody.)
+
+\end{document}
 
diff --git a/Master/texmf-dist/doc/fonts/cfr-lm/manifest.txt b/Master/texmf-dist/doc/fonts/cfr-lm/manifest.txt
index 3710f026012..144ec64fc40 100644
--- a/Master/texmf-dist/doc/fonts/cfr-lm/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/cfr-lm/manifest.txt
@@ -1,5 +1,5 @@
 manifest.txt
-Copyright 2010 Clea F. Rees
+Copyright 2014 Clea F. Rees
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -27,7 +27,7 @@ postscript type 1 version of the fonts.
 The encoding t1-clm.etx is derived from the file t1.etx supplied with
 fontinst. A copy of fontinst including an unmodified copy of t1.etx is 
 available from
-http://tug.ctan.org/tex-archive/fonts/utilities/fontinst.
+http://mirror.ctan.org/fonts/utilities/fontinst.
 
 manifest.txt
 README
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/cfr-lm.sty b/Master/texmf-dist/tex/latex/cfr-lm/cfr-lm.sty
index 9aaca29ae44..e8659960073 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/cfr-lm.sty
+++ b/Master/texmf-dist/tex/latex/cfr-lm/cfr-lm.sty
@@ -1,4 +1,4 @@
-%% Copyright 2010 Clea F. Rees
+%% Copyright 2014 Clea F. Rees
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -9,19 +9,27 @@
 % version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status `maintained'.
-% 
+%
 % The Current Maintainer of this work is Clea F. Rees.
 %
 % This work consists of all files listed in manifest.txt.
 %
-% Parts of this file are based on lmodern.sty which is included with 
+% Parts of this file are based on lmodern.sty which is included with
 % the Latin Modern fonts released by GUST and available from
 % http://www.gust.org.pl/projects/e-foundry/latin-modern.
-% 
+%
 % Improvements to this file in v1.2 (unpublished) and v1.3 owe almost
 % everything to Enrico Gregorio.
+%
+% v1.4 adds family-specific support for microtype. This draws also on the
+% documentation for the microtype package and MinionPro.sty. MinionPro.sty 
+% is available as part of the minionpro package and can be obtain from
+% http://mirror.ctan.org/fonts/minionpro. MinionPro.sty is in the public
+% domain. The documentation for microtype is available in English and German
+% from http://ctan.org/pkg/microtype. It is part of the microtype package which
+% is itself licensed under the LPPL.
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cfr-lm}[2010/05/20 v1.3 cfr-lm for use with LatinModern v2.004]
+\ProvidesPackage{cfr-lm}[2014/03/01 v1.4 cfr-lm for use with LatinModern v2.004]
 \RequirePackage{xkeyval}
 \RequirePackage[T1]{fontenc}
 \RequirePackage{textcomp}
@@ -55,7 +63,7 @@
 		\def\cfrlm@rmpt{2}%
 	\fi}
 
-%:boolkeys for sans osf/lf	
+%:boolkeys for sans osf/lf
 \define@boolkey[cfrlm]{sf}{oldstyle}[true]{%
 	\ifcfrlm@sf@oldstyle
 		\def\cfrlm@sfol{j}%
@@ -110,7 +118,7 @@
 	\else
 		\def\cfrlm@ttpt{2}%
 	\fi}
-	
+
 %:boolkeys for typewriter mono/variable width
 \define@boolkey[cfrlm]{tt}{monowidth}[true]{%
 	\ifcfrlm@tt@monowidth
@@ -129,10 +137,10 @@
 \define@key{cfr-lm.sty}{rm}{%
 	\setkeys[cfrlm]{rm}{#1}}
 
-%:options for sans	
+%:options for sans
 \define@key{cfr-lm.sty}{sf}{%
 	\setkeys[cfrlm]{sf}{#1}}
-	
+
 %:options for typewriter
 \define@key{cfr-lm.sty}{tt}{%
 	\setkeys[cfrlm]{tt}{#1}}
@@ -143,6 +151,7 @@
 
 %:defaults to ensure everything is defined to something
 \ExecuteOptionsX{rm={oldstyle,proportional},sf={oldstyle,proportional},tt={oldstyle,proportional,variable},qt=false}
+%\ExecuteOptionsX{rm={lining,tabular},sf={oldstyle,proportional},tt={oldstyle,proportional,variable},qt=false}
 
 %:options override defaults
 \ProcessOptionsX
@@ -191,7 +200,7 @@
 \SetMathAlphabet{\mathit}{bold}  {OT1}{lmr}{bx}{it}
 \SetMathAlphabet{\mathtt}{bold}  {OT1}{lmtt}{m}{n}
 
-\def\mathsterling{\mathit{\mathchar"70BF}} 
+\def\mathsterling{\mathit{\mathchar"70BF}}
 
 %:new in v1.1
 \DeclareRobustCommand{\dotdigitenc}{%
@@ -200,4 +209,34 @@
 \DeclareTextFontCommand{\textdde}{\dotdigitenc}
 \newcommand*{\zeroslash}{\textdde{\char 250}}
 
+%:Partly from microtype docs; partly from MinionPro package
+%
+% We need to set up aliases for the font families created by cfr-lm so that
+% microtype recognises them as similar to Computer Modern Roman.
+%
+% T1 families in cfr-lm: clm clm2 clm2d clm2dj clm2j clm2jqs clm2js clm2jt 
+% clm2jv clm2qs clm2s clm2t clm2v clmd clmdj clmj clmjqs clmjs clmjt clmjv 
+% clmqs clms clmt clmv
+%
+% See variants set in nfssext-cfr
+%
+% Ref: http://tex.stackexchange.com/a/75440/39222
+\newcommand{\cfr@ffs}{% alias to cmr
+  clm,clm2,clm2j,clmj,% roman
+  clms,clm2js,clm2s,clmjs,% sans
+  clmqs,clm2jqs,clm2qs,clmjqs%
+%  clm2d,clm2dj,clmd,clmdj,% leave unaliased?
+%  clm2jv,clmjv,clm2v,clmv,% leave unaliased?
+%  clmt,clm2t,clmjt,clm2jt% leave unaliased?
+  }
+\gdef\cfrlm@MicroType@Aliases{%
+  \@for	\xx:=\cfr@ffs \do {%
+	  \DeclareMicrotypeAlias{\xx}{cmr}}%
+  }
+\def\cfrlm@MT@Hook{\cfrlm@MicroType@Aliases}
+\@ifpackageloaded{microtype}{%
+  \cfrlm@MT@Hook}{%
+  \@ifundefined{Microtype@Hook}{%
+  	\let\Microtype@Hook\cfrlm@MT@Hook}{% MinionPro has \global before this
+	\g@addto@macro\Microtype@Hook{\cfrlm@MT@Hook}}}
 \endinput
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index e0ab7663ae2..93af0dcecf0 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -210,7 +210,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'cdcover',	"die 'skipping, use cd-cover'",
  'cellular',	"die 'skipping, noinfo license, author deceased'",
  'cellwise',	"die 'skipping, noinfo license'",
- 'cfr-lm',	"&MAKEcopy",
  'changebar',	"&MAKEchangebar",
  'chapterbib',	"die 'skipping, update cite instead'",
  'check-parens',"die 'skipping, C++'",
@@ -1139,6 +1138,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'biber'		=> '&POSTbiber',
  'biblatex'		=> '&POSTbiblatex',
  'bibtex'		=> '&POSTbibtex',
+ 'cfr-lm'		=> '&POSTcfr_lm',
  'chemmacros'		=> '&POSTchemmacros',
  'context'		=> '&POSTcontext',
  'context-games'	=> '&POSTcontext_games',
@@ -1670,6 +1670,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'burmese',			'fonts',
  'cbfonts',		'fonts',
  'cc-pl',		'fonts',
+ 'cfr-lm',              'fonts',
  'chicago-annote',	'bibtex',
  'chemarrow',		'fonts',
  'chronosys',		'generic',
@@ -5179,6 +5180,21 @@ sub POSTmptopdf {
 }
 
 
+
+sub POSTcfr_lm {
+  print "POST$package - move directories around\n";  
+  &rename_with_mkdir ("vf", "$DEST/fonts/vf/public/$package");
+  &rename_with_mkdir ("tfm", "$DEST/fonts/tfm/public/$package");
+  &rename_with_mkdir ("enc", "$DEST/fonts/enc/dvips/$package");
+  &rename_with_mkdir ("map", "$DEST/fonts/map/dvips/$package");
+  &SYSTEM("$MV source/* $DEST/source/fonts/$package");
+  # somehome th source/fonts package is already created???
+  #&rename_with_mkdir ("source", "$DEST/source/fonts/$package");
+  &rename_with_mkdir ("tex", "$DEST/tex/latex/$package");
+  &SYSTEM("$MV doc/* .");
+  &SYSTEM("rmdir doc");
+}
+
 sub POSTcontext_games {
   print "POST$package - remove duplicated fonts\n";
   &SYSTEM ("$RM -rf fonts");