installfont (22sep10)

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

6 files changed, 257 insertions, 115 deletions

diff --git a/Master/texmf-dist/doc/support/installfont/README b/Master/texmf-dist/doc/support/installfont/README
index fc415ab14ed..129677736be 100644
--- a/Master/texmf-dist/doc/support/installfont/README
+++ b/Master/texmf-dist/doc/support/installfont/README
@@ -10,22 +10,24 @@ have a working font installation in your local TeX tree.
 
 License: LPPL
 
-New in v1.5:
+New in v1.6:
 
-- added new switches:
+- added new switch:
   
-  * -m, --mapfilename  file name of the map file
-  * -O. --origfontname  use original font names 
-                        instead of Karl Berry names
+  -L, --log  redirect terminal output of programms to
+             LOG file
 
-- added support for more font series. The script now
-  installs:
+- added support for small caps font in all supported 
+  font series. The script now installs:
   
-  * light, light italic
-  * regular/medium, regular/medium italic
-  * small caps (regular + bold)
-  * semi bold, semi bold italic
-  * demi, demi italic
-  * bold, bold italic
-  * extra bold, extra bold italic
-  * ultra bold/heavy, ultra bold/heavy italic
\ No newline at end of file
+  * light, light italic, light small caps
+  * regular/medium, regular/medium italic,
+    regular/medium small caps
+  * semi bold, semi bold italic, semi bold small caps
+  * demi, demi italic, demi small caps
+  * bold, bold italic, bold small caps
+  * extra bold, extra bold italic, extra bold small caps
+  * ultra bold/heavy, ultra bold/heavy italic,
+    ultra bold/heavy small caps
+  
+  feature requests by: Kurt Lidwin
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/installfont/installfont b/Master/texmf-dist/doc/support/installfont/installfont
index aa40e367ffc..6242c5d136c 100644
--- a/Master/texmf-dist/doc/support/installfont/installfont
+++ b/Master/texmf-dist/doc/support/installfont/installfont
@@ -4,14 +4,14 @@
 #
 # installs a LaTeX font family (Postscript Type1, Truetype, Opentype)
 # (font series from light to ultra bold + (faked) small caps + faked 
-# slanted, but no expert fonts) for using with LaTeX (MiKTeX) 
+# slanted, but no expert fonts) for using them with LaTeX (MiKTeX) 
 # The script tries to rename the fonts automatically (optional).
 # Otherwise the *.afm and *.pfb files must be named in Karl Berry scheme
 # (e.g. 5bbr8a.pfb)
-# (tested with MiKTeX 2.8) v1.5 (14.09.2010)
+# (tested with MiKTeX 2.8) v1.6 (18.09.2010)
 # (C) Josef Kleber 2009-2010  License: LPPL
 #
-VERSION="v1.5 (2010/09/14)"
+VERSION="v1.6 (2010/09/18)"
 #
 FONTFAMILY="5bb"
 FONTNAME="Softmaker Barbedor"
@@ -37,7 +37,7 @@ ADMIN=""
 OTFFONTFEATURES="-fkern -fliga"
 UNINSTALL="false"
 INSTALLAS="rmdefault"
-SMFFSTY="%"
+LOG="false"
 #
 function printHelp()
 {
@@ -70,6 +70,8 @@ function printHelp()
           " -T, --ttdefault  installs font family as typewriter font family\n\n"\
           " -a, --admin  set administrative mode (MiKTeX v2.8+)\n\n"\
           " -V, --version  will print the version number of `basename $0`\n\n"\
+          " -L, --log  will write the terminal output of the main programms into the\n"\
+          "            LOG file instead of the screen\n\n"\
           " -h, --help  will print this help statement\n\n"\
           " See http://latex.josef-kleber.de/index.htm or\n"\
           "     http://latex.josef-kleber.de/en_index.htm\n"\
@@ -93,8 +95,8 @@ then
   fi
 fi
 #
-LONGOPTS="fontfamily:,fontname:,fontcommand:,fontscaleprefix:,fonttype:,packagename:,packagedate:,packageversion:,mapfilename:,origfilename,localtexmf:,fontsubdir:,fontencoding:,otffontfeatures:,uninstall,rmdefault,sfdefault,ttdefault,version,help,admin"
-SHORTOPTS="f:n:c:P:t:p:d:v:m:Ol:s:e:o:uRSTVha"
+LONGOPTS="fontfamily:,fontname:,fontcommand:,fontscaleprefix:,fonttype:,packagename:,packagedate:,packageversion:,mapfilename:,origfilename,localtexmf:,fontsubdir:,fontencoding:,otffontfeatures:,uninstall,rmdefault,sfdefault,ttdefault,log,version,help,admin"
+SHORTOPTS="f:n:c:P:t:p:d:v:m:Ol:s:e:o:uRSTVLha"
 ARGS=$(getopt -l "$LONGOPTS" "$SHORTOPTS" "$@")
 if [ $? -ne 0 ]
 then
@@ -114,6 +116,7 @@ while [ $# -gt 0 ]; do
       --sfdefault|-S)       shift; INSTALLAS="sfdefault";;
       --ttdefault|-T)       shift; INSTALLAS="ttdefault";;
       --uninstall|-u)       shift; UNINSTALL="true";;
+      --log|-L)             shift; LOG="true";;
       --fontfamily|-f)      shift; FONTFAMILY="$1"; shift;;
       --fontname|-n)        shift; FONTNAME="$1"; shift;;
       --fontcommand|-c)     shift; FONTCOMMAND="$1"; shift;;
@@ -133,6 +136,8 @@ while [ $# -gt 0 ]; do
   esac
 done
 #
+rm LOG 2>>/dev/null;
+#
 if [ -z $MAPFILENAME ]
 then
   MAPFILENAME=$FONTFAMILY
@@ -247,12 +252,41 @@ then
     FILES=$(grep -e "Smc" -e "Caps" -e "SCOsF" *.afm | cut -d':' -f1 | uniq)
     for file in $FILES
     do
-      FWEIGHT=$(grep -e "Weight" "$file" | cut -d' ' -f2 | sed -e "s/\r//")
-      if [ $FWEIGHT = "Bold" -o $FWEIGHT = "Xbold" -o $FWEIGHT = "XBold" ]
+      FONTCUT="rc"
+      FWEIGHT=$(grep -e "Light" "$file" | wc -l)
+      if [ $FWEIGHT -gt 0 ]
       then
-        FONTCUT="bc"
+        FONTCUT="lc"
       else
-        FONTCUT="rc"
+        FWEIGHT=$(grep -e "Semibold" -e "SemiBold" "$file" | wc -l)
+        if [ $FWEIGHT -gt 0 ]
+        then
+          FONTCUT="sc"
+        else
+          FWEIGHT=$(grep -e "Demi" -e "Demibold" -e "DemiBold" "$file" | wc -l)
+          if [ $FWEIGHT -gt 0 ]
+          then
+            FONTCUT="dc"
+          else
+            FWEIGHT=$(grep -e "Extrabold" -e "ExtraBold" "$file" | wc -l)
+            if [ $FWEIGHT -gt 0 ]
+            then
+              FONTCUT="xc"
+            else 
+              FWEIGHT=$(grep -e "Heavy" -e "Ultrabold" -e "UltraBold" "$file" | wc -l)
+              if [ $FWEIGHT -gt 0 ]
+              then
+                FONTCUT="uc"
+              else
+                FWEIGHT=$(grep -e "Bold" -e "bold" "$file" | wc -l)
+                if [ $FWEIGHT -gt 0 ]
+                then
+                  FONTCUT="bc"
+                fi
+              fi
+            fi
+          fi
+        fi
       fi
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
@@ -269,7 +303,6 @@ then
       else
         FONTCUT="l"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -285,7 +318,6 @@ then
       else
         FONTCUT="s"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -301,7 +333,6 @@ then
       else
         FONTCUT="d"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -317,7 +348,6 @@ then
       else
         FONTCUT="x"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -333,7 +363,6 @@ then
       else
         FONTCUT="u"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -395,17 +424,32 @@ cat >${FONTFAMILY}-drv.tex <<EOF
 \endrecordtransforms
 \bye
 EOF
-tex ${FONTFAMILY}-drv.tex
+if [ $LOG = "true" ]
+then
+  tex ${FONTFAMILY}-drv.tex >>LOG 2>&1
+else
+  tex ${FONTFAMILY}-drv.tex
+fi
 #
 ((STEP++))
 echo -e "\n\n$STEP) Compiling metrics and virtual fonts\n\n"
 for file in *.pl; 
 do  
-  pltotf $file ${file%pl}tfm;
+  if [ $LOG = "true" ]
+  then
+    pltotf $file ${file%pl}tfm >>LOG 2>&1
+  else
+    pltotf $file ${file%pl}tfm
+  fi
 done
 for file in *.vpl; 
 do  
-  vptovf $file ${file%vpl}vf ${file%vpl}tfm;
+  if [ $LOG = "true" ]
+  then
+    vptovf $file ${file%vpl}vf ${file%vpl}tfm >>LOG 2>&1
+  else
+    vptovf $file ${file%vpl}vf ${file%vpl}tfm
+  fi
 done
 #
 ((STEP++))
@@ -418,7 +462,12 @@ cat >${FONTFAMILY}-map.tex <<EOF
 \donedrivers
 \bye
 EOF
-tex ${FONTFAMILY}-map.tex
+if [ $LOG = "true" ]
+then
+  tex ${FONTFAMILY}-map.tex >>LOG 2>&1
+else
+  tex ${FONTFAMILY}-map.tex
+fi
 if [ $OFN = "true" ]
 then
   sed -f map.sed ${FONTFAMILY}.map >${MAPFILENAME}.map
@@ -434,7 +483,6 @@ echo -e "\n\n$STEP) Creating the style file"
 cat >${PACKAGENAME}.sty <<EOF
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{$PACKAGENAME}[$PACKAGEDATE $PACKAGEVERSION $FONTNAME]%
-${SMFFSTY}%
 \RequirePackage{textcomp}%
 \RequirePackage{xkeyval}%
 \define@key{${PACKAGENAME}.sty}{scaled}[1.0]%
diff --git a/Master/texmf-dist/doc/support/installfont/installfont.pdf b/Master/texmf-dist/doc/support/installfont/installfont.pdf
new file mode 100644
index 00000000000..baa422717ce
--- /dev/null
+++ b/Master/texmf-dist/doc/support/installfont/installfont.pdf
diff --git a/Master/texmf-dist/doc/support/installfont/installfont.tex b/Master/texmf-dist/doc/support/installfont/installfont.tex
index 483ce69d534..971c2a82392 100644
--- a/Master/texmf-dist/doc/support/installfont/installfont.tex
+++ b/Master/texmf-dist/doc/support/installfont/installfont.tex
@@ -4,22 +4,100 @@
 \usepackage[T1]{fontenc}%
 \usepackage{textcomp}%
 \usepackage{lmodern}%
-\usepackage{typewriter}%
-\usepackage{grenoble}%
-\usepackage[leading=1.1]{nashville}
+\usepackage{bera}%
 \usepackage{tabularx}
 \usepackage{booktabs}
 \usepackage{amsmath}
 \usepackage[symbol]{footmisc}
 \usepackage{endnotes}
-\usepackage{jkdoc}%
+\usepackage[svgnames,rgb]{xcolor}%
+\usepackage{tikz}%
+\usepackage{ragged2e}%
+\usepackage{url}%
+\usepackage[automark,nouppercase]{scrpage2}%
 \usepackage{microtype}
 \usepackage{hyperref}
-\hypersetup{breaklinks=true,pdfauthor={Josef Kleber},pdftitle={A bash script for installing a LaTeX font family},pdfsubject={Documentation for the installfont(-tl) script}}
+\hypersetup{colorlinks=true,urlcolor=NavyBlue,linkcolor=NavyBlue,citecolor=CornflowerBlue,naturalnames=true,hypertexnames=false,breaklinks=true,pdfauthor={Josef Kleber},pdftitle={A bash script for installing a LaTeX font family},pdfsubject={Documentation for the installfont(-tl) script}}
 \renewcommand{\arraystretch}{1.2}
 \newcommand\Link[2]{\href{#1}{#2}\endnote{\href{#1}{\url{#1}}}}
 \makeatletter
-\newcommand\doubledash{-\kern2pt-}
+\setlength{\headheight}{1.1\baselineskip}%
+%
+\renewcommand{\maketitle}%
+{%
+  \thispagestyle{empty}%
+  \pagecolor{Ivory}%
+  \begin{titlepage}%
+    \begin{tikzpicture}[remember picture,overlay]%
+      \node[yshift=-2cm] at (current page.north west)%
+      {%
+        \begin{tikzpicture}[remember picture, overlay]%
+          \draw[fill=CornflowerBlue,color=CornflowerBlue] (0,0) rectangle%
+            (\paperwidth,2cm);%
+          \draw[anchor=west,yshift=-4cm,xshift=3cm,color=NavyBlue] (0,0) node%
+            {\parbox{15cm}{\RaggedRight\Huge\sffamily\textbf{\@title}}};%
+          \draw[anchor=west,yshift=-6cm,xshift=3cm,color=NavyBlue] (0,0) node%
+            {\parbox{15cm}{\huge\sffamily\textbf{\@fileversion}}};%
+          \draw[anchor=west,yshift=-9cm,xshift=3cm,color=NavyBlue] (0,0) node%
+            {\parbox{15cm}{\RaggedRight\huge\sffamily\textbf{\@subtitle}}};%
+          \draw[anchor=west,yshift=-14cm,xshift=3cm,color=NavyBlue] (0,0) node%
+            {\parbox{15cm}{\huge\sffamily\textbf{\@date}}};%
+          \draw[anchor=west,yshift=-20cm,xshift=3cm,color=NavyBlue] (0,0) node%
+            {\parbox{15cm}{\Large\sffamily{\@authorline\\\textbf{\@author}}}};%
+        \end{tikzpicture}%
+      };%
+      \node[yshift=0cm] at (current page.south west)%
+      {%
+        \begin{tikzpicture}[remember picture, overlay]%
+          \draw[fill=NavyBlue,color=NavyBlue,yshift=6cm,xshift=2cm] (0,0) rectangle (0.2cm,19cm);%
+          \draw[fill=CornflowerBlue,color=CornflowerBlue] (0,0) rectangle (\paperwidth,2cm);%
+          \draw[anchor=west,yshift=1cm,xshift=3cm,color=NavyBlue] (0,0) node%
+            {\parbox{15cm}{\large\sffamily{\@refline}}};%
+        \end{tikzpicture}%
+      };%
+    \end{tikzpicture}%
+  \end{titlepage}%
+  \pagecolor{white}%
+}%
+%
+\newcommand*{\@tikzhead}[1]%
+{%
+  \begin{tikzpicture}[remember picture,overlay]%
+    \node[yshift=-2cm] at (current page.north west)%
+    {%
+      \begin{tikzpicture}[remember picture, overlay]%
+        \draw[fill=CornflowerBlue] (0,0) rectangle (\paperwidth,2cm);%
+        \draw[anchor=west,yshift=1cm,xshift=1.5cm,color=NavyBlue] (0,0) node%
+          {\parbox{15cm}{\LARGE\sffamily\textbf{\@title}}};%
+        \node[anchor=east,xshift=.9\paperwidth,rectangle,%
+              rounded corners=15pt,inner sep=11pt,fill=NavyBlue]%
+              {\color{white}\textsc{#1}};%
+      \end{tikzpicture}%
+    };%
+  \end{tikzpicture}%
+}%
+\clearscrheadings%
+\ihead{\@tikzhead{\headmark}}%
+\cfoot{\upshape\thepage}%
+\pagestyle{scrheadings}%
+%
+%\newcommand*{\headline}[1]{\@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}%
+\newcommand*{\Headline}[1]{\@mkboth{#1}{#1}}%
+%
+\renewcommand{\headfont}{\normalfont\mdseries\scshape}
+%
+\gdef\@subtitle{}%
+\providecommand*{\Subtitle}[1]{\gdef\@subtitle{#1}}%
+\gdef\@fileversion{}%
+\providecommand*{\Fileversion}[1]{\gdef\@fileversion{#1}}%
+\gdef\@author{}%
+\providecommand*{\Author}[1]{\gdef\@author{#1}}%
+\gdef\@authorline{Package author:}%
+\providecommand*{\Authorline}[1]{\gdef\@authorline{#1}}%
+\gdef\@refline{}%
+\providecommand*{\Refline}[1]{\gdef\@refline{#1}}%
+\gdef\and{\unskip{}, }%
+\newcommand\doubledash{-\kern0.5pt-}
 \def\enoteformat{\rightskip\z@ \leftskip\z@ \parindent=1em\leavevmode\llap{\makeenmark}}
 \makeatother
 \begin{document}
@@ -28,7 +106,7 @@
 \renewcommand\notesname{Links}
 \title{\texttt{installfont(-tl)}}
 \Subtitle{A bash script for installing a \LaTeX{} font family}
-\Fileversion{v1.5}
+\Fileversion{v1.6}
 \Authorline{Package authors:}
 \Author{Josef Kleber \and Christoph Bier (TeXLive version)}
 \Refline{\href{mailto:installfont@latex.josef-kleber.de}{\texttt{installfont@latex.josef-kleber.de}}\\\href{http://latex.josef-kleber.de/en_index.htm}{\texttt{http://latex.josef-kleber.de/en\_index.htm}}}
@@ -40,11 +118,8 @@ With this script\footnote{This script automates the procedure described in 'Tuto
 The Basics' in 
 \href{ftp://dante.ctan.org/tex-archive/info/Type1fonts/fontinstallationguide/fontinstallationguide.pdf}{fontinstallationguide.pdf}} 
 you can install a LaTeX font family (Postscript Type1, Truetype, Opentype). It supports font series from light to ultra bold + (faked) small caps + faked slanted, but no expert fonts. The script will rename the fonts automatically (optinal) or will otherwise expect *.afm files and the font files (in Postscript Type1 format!) named in the Karl Berry scheme (e.g. 5nar8a.pfb). After running the script, you should have a working font installation in your local TeX tree.
-\footnote{The Nashville, Grenoble and Typewriter font families in this document
-were installed with installfont}
 \end{abstract}
 \clearpage
-\setkomafont{sectioning}{\normalfont\normalcolor\FFNashville}
 \Headline{Dependencies}
 \section*{Dependencies}
 For using this script the following programms have to be installed:
@@ -100,7 +175,7 @@ with the following meaning:
 \begin{tabularx}{\linewidth}{rlX}
 f & supplier (type foundry) & p (Adobe), l (Linotype), f (small foundries, free), ...\\
 xx & typeface & tm (Times), ch (Charter), hv (Helvetica), ...\\
-y(y) & weights/variants & r~(regular/medium), ri~(regular/medium italic), rc~(regular/medium small caps), b~(bold), bi~(bold italic), bc~(bold small caps), l~(light), li~(light italic), s~(semi bold), si~(semi bold italic), d~(demi), di~(demi italic), x~(extra bold), xi~(extra bold italic), u~(ultra bold/heavy), ui~(ultra bold/heavy italic)\\
+y(y) & weights/variants & r~(regular/medium), ri~(regular/medium italic), rc~(regular/medium small caps), b~(bold), bi~(bold italic), bc~(bold small caps), l~(light), li~(light italic), lc~(light small caps), s~(semi bold), si~(semi bold italic), sc~(semi bold small caps), d~(demi), di~(demi italic), dc~(demi small caps), x~(extra bold), xi~(extra bold italic), xc~(extra bold small caps), u~(ultra bold/heavy), ui~(ultra bold/heavy italic), uc~(ultra bold/heavy small caps)\\
 zz & font encoding & 8a (AdobeStandardEncoding), 8r (\TeX\ base encoding), ...\\
 \end{tabularx}
 \end{center}
@@ -109,6 +184,7 @@ The script supports the cuts presented in the table. Don't copy more than these
 
 \medskip\texttt{texdoc fontname}
 
+\clearpage
 \Headline{Options}
 \section*{Options}
 
@@ -121,45 +197,27 @@ You can use the option \texttt{scaled} for scaling the font to better match with
 
 \item leading
 
-For some fonts it might be necessary to increase the leading between lines for a better optical impression, where 1.0 means 100\%. \texttt{\string\usepackage[leading=1.1]\{nash\-ville\}} was used in this document.
+For some fonts it might be necessary to increase the leading between lines for a better optical impression, where 1.0 means 100\%.
 \end{itemize}
 
-\Headline{Example (Nashville)}
-\section*{Example (Nashville)}
-
-\begin{center}
-\begin{tabular}{|l|c|c|c|c|}
-\hline
-\strut Family & Series & Shape(s) & Example of Typeface & Supported Encodings\\
-\hline
-6na & l & n & \fontfamily{6na}\fontseries{l}\fontshape{n}\selectfont Nashville Light & OT1, T1, TS1\\
-6na & l & it & \fontfamily{6na}\fontseries{l}\fontshape{it}\selectfont Nashville Light & OT1, T1, TS1\\
-6na & l & sl & \fontfamily{6na}\fontseries{l}\fontshape{sl}\selectfont Nashville Light & OT1, T1, TS1\\
-6na & l & sc & \fontfamily{6na}\fontseries{l}\fontshape{sc}\selectfont Nashville Light & OT1, T1, TS1\\
-6na & m & n & Nashville & OT1, T1, TS1\\
-6na & m & it & \fontfamily{6na}\fontseries{m}\fontshape{it}\selectfont Nashville & OT1, T1, TS1\\
-6na & m & sl & \fontfamily{6na}\fontseries{m}\fontshape{sl}\selectfont Nashville & OT1, T1, TS1\\
-6na & m & sc & \fontfamily{6na}\fontseries{m}\fontshape{sc}\selectfont Nashville & OT1, T1, TS1\\
-6na & b & n & \fontfamily{6na}\fontseries{b}\fontshape{n}\selectfont Nashville Bold & OT1, T1, TS1\\
-6na & b & it & \fontfamily{6na}\fontseries{b}\fontshape{it}\selectfont Nashville Bold & OT1, T1, TS1\\
-6na & b & sl & \fontfamily{6na}\fontseries{b}\fontshape{sl}\selectfont Nashville Bold & OT1, T1, TS1\\
-6na & b & sc & \fontfamily{6na}\fontseries{b}\fontshape{sc}\selectfont Nashville Bold & OT1, T1, TS1\\
-6na & eb & n & \fontfamily{6na}\fontseries{eb}\fontshape{n}\selectfont Nashville ExtraBold & OT1, T1, TS1\\
-6na & eb & it & \fontfamily{6na}\fontseries{eb}\fontshape{it}\selectfont Nashville ExtraBold & OT1, T1, TS1\\
-6na & eb & sl & \fontfamily{6na}\fontseries{eb}\fontshape{sl}\selectfont Nashville ExtraBold & OT1, T1, TS1\\
-6na & eb & sc & \fontfamily{6na}\fontseries{eb}\fontshape{sc}\selectfont Nashville ExtraBold & OT1, T1, TS1\\
-6na & ub & n & \fontfamily{6na}\fontseries{ub}\fontshape{n}\selectfont Nashville Heavy & OT1, T1, TS1\\
-6na & ub & it & \fontfamily{6na}\fontseries{ub}\fontshape{it}\selectfont Nashville Heavy & OT1, T1, TS1\\
-6na & ub & sl & \fontfamily{6na}\fontseries{ub}\fontshape{sl}\selectfont Nashville Heavy & OT1, T1, TS1\\
-6na & ub & sc & \fontfamily{6na}\fontseries{ub}\fontshape{sc}\selectfont Nashville Heavy & OT1, T1, TS1\\
-\hline
-\end{tabular}
-\end{center}
-\clearpage
-
 \Headline{Usage}
 \section*{Usage}
 
+To install a font family simply call the script:
+
+\bigskip
+\texttt{kleberj@home \texttildelow{}/installfont\\\$ installfont -f 5na -n 'Softmaker Nashville' -c Nashville -P MF@Sna\\-v v1.0 -l /cygdrive/d/LocalTeXMF -s MyFonts/Nashville -p nashville\\-m nashville -O -d 2010/09/14}
+\bigskip
+
+You can also put a copy of the script in your working directory and change the default values of the script variables. Then you can simply call the script with
+
+\bigskip
+\texttt{kleberj@home \texttildelow{}/installfont\\\$ installfont}
+\bigskip
+
+After running the script the font(s) should be properly installed. You can use the font just with \texttt{\textbackslash{}usepackage\{PACKAGENAME\}} or \texttt{\textbackslash{}FONTCOMMAND}.
+
+\clearpage
 The script offers the following command line options:
 
 \bigskip
@@ -184,23 +242,10 @@ The script offers the following command line options:
 \texttt{-O} & \texttt{\doubledash origfontname} & use original font names instead of Karl Berry names\\
 \texttt{-a} & \texttt{\doubledash admin} & set administrative mode (MiKTeX v2.8+)\\
 \texttt{-V} & \texttt{\doubledash version} & will print the version number of the script\\
+\texttt{-L} & \texttt{\doubledash log} & will redirect the terminal output of the programms to the LOG file\\
 \texttt{-h} & \texttt{\doubledash help} & will print this help statement\\
 \end{tabularx}
 
 \clearpage
-To install a font family simply call the script:
-
-\bigskip
-\texttt{kleberj@home \texttildelow{}/installfont\\\$ installfont -f 5na -n 'Softmaker Nashville' -c Nashville -P MF@Sna -p nash\-ville -m nashville -O -d 2010/09/14 -v v1.0 -l /cygdrive/d/LocalTeXMF -s MyFonts/Nashville}
-\bigskip
-
-You can also put a copy of the script in your working directory and change the default values of the script variables. Then you can simply call the script with
-
-\bigskip
-\texttt{kleberj@home \texttildelow{}/installfont\\\$ installfont}
-\bigskip
-
-After running the script the font(s) should be properly installed. You can use the font just with \texttt{\textbackslash{}usepackage\{PACKAGENAME\}} or \texttt{\textbackslash{}FONTCOMMAND}.
-
 \theendnotes
 \end{document}
diff --git a/Master/texmf-dist/scripts/installfont/installfont-tl b/Master/texmf-dist/scripts/installfont/installfont-tl
index 703104e262c..d0ff80bb3a3 100755
--- a/Master/texmf-dist/scripts/installfont/installfont-tl
+++ b/Master/texmf-dist/scripts/installfont/installfont-tl
@@ -4,14 +4,14 @@
 #
 # installs a LaTeX font family (Postscript Type1, Truetype, Opentype)
 # (font series from light to ultra bold + (faked) small caps + faked
-# slanted, but no expert fonts) for using with LaTeX (TeXLive) 
+# slanted, but no expert fonts) for using them with LaTeX (TeXLive) 
 # The script tries to rename the fonts automatically (optional).
 # Otherwise the *.afm and *.pfb files must be named in Karl Berry scheme
 # (e.g. 5bbr8a.pfb)
-# (tested with Ubuntu 9.10) v1.5 (14.09.2010)
+# (tested with Ubuntu 9.10) v1.6 (18.09.2010)
 # (C) Josef Kleber, Christoph Bier 2009-2010  License: LPPL
 #
-VERSION="v1.5 (2010/09/14)"
+VERSION="v1.6 (2010/09/18)"
 #
 FONTFAMILY="5bb"
 FONTNAME="Softmaker Barbedor"
@@ -33,7 +33,7 @@ FONTCUT="r"
 OTFFONTFEATURES="-fkern -fliga"
 UNINSTALL="false"
 INSTALLAS="rmdefault"
-SMFFSTY="%"
+LOG="false"
 #
 function printHelp()
 {
@@ -65,6 +65,8 @@ function printHelp()
           " -S, --sfdefault  installs font family as sans serif font family\n\n"\
           " -T, --ttdefault  installs font family as typewriter font family\n\n"\
           " -V, --version  will print the version number of `basename $0`\n\n"\
+          " -L, --log  will write the terminal output of the main programms into the\n"\
+          "            LOG file instead of the screen\n\n"\
           " -h, --help  will print this help statement\n\n"\
           " See http://latex.josef-kleber.de/index.htm or\n"\
           "     http://latex.josef-kleber.de/en_index.htm\n"\
@@ -88,8 +90,8 @@ then
   fi
 fi
 #
-LONGOPTS="fontfamily:,fontname:,fontcommand:,fontscaleprefix:,fonttype:,packagename:,packagedate:,packageversion:,mapfilename:,origfilename,localtexmf:,fontsubdir:,fontencoding:,otffontfeatures:,uninstall,rmdefault,sfdefault,ttdefault,version,help"
-SHORTOPTS="f:n:c:P:t:p:d:v:m:Ol:s:e:o:uRSTVh"
+LONGOPTS="fontfamily:,fontname:,fontcommand:,fontscaleprefix:,fonttype:,packagename:,packagedate:,packageversion:,mapfilename:,origfilename,localtexmf:,fontsubdir:,fontencoding:,otffontfeatures:,uninstall,rmdefault,sfdefault,ttdefault,log,version,help"
+SHORTOPTS="f:n:c:P:t:p:d:v:m:Ol:s:e:o:uRSTVLh"
 ARGS=$(getopt -l "$LONGOPTS" "$SHORTOPTS" "$@")
 if [ $? -ne 0 ]
 then
@@ -108,6 +110,7 @@ while [ $# -gt 0 ]; do
       --sfdefault|-S)       shift; INSTALLAS="sfdefault";;
       --ttdefault|-T)       shift; INSTALLAS="ttdefault";;
       --uninstall|-u)       shift; UNINSTALL="true";;
+      --log|-L)             shift; LOG="true";;
       --fontfamily|-f)      shift; FONTFAMILY="$1"; shift;;
       --fontname|-n)        shift; FONTNAME="$1"; shift;;
       --fontcommand|-c)     shift; FONTCOMMAND="$1"; shift;;
@@ -127,6 +130,8 @@ while [ $# -gt 0 ]; do
   esac
 done
 #
+rm LOG 2>>/dev/null;
+#
 if [ -z $MAPFILENAME ]
 then
   MAPFILENAME=$FONTFAMILY
@@ -241,12 +246,41 @@ then
     FILES=$(grep -e "Smc" -e "Caps" -e "SCOsF" *.afm | cut -d':' -f1 | uniq)
     for file in $FILES
     do
-      FWEIGHT=$(grep -e "Weight" "$file" | cut -d' ' -f2 | sed -e "s/\r//")
-      if [ $FWEIGHT = "Bold" -o $FWEIGHT = "Xbold" -o $FWEIGHT = "XBold" ]
+      FONTCUT="rc"
+      FWEIGHT=$(grep -e "Light" "$file" | wc -l)
+      if [ $FWEIGHT -gt 0 ]
       then
-        FONTCUT="bc"
+        FONTCUT="lc"
       else
-        FONTCUT="rc"
+        FWEIGHT=$(grep -e "Semibold" -e "SemiBold" "$file" | wc -l)
+        if [ $FWEIGHT -gt 0 ]
+        then
+          FONTCUT="sc"
+        else
+          FWEIGHT=$(grep -e "Demi" -e "Demibold" -e "DemiBold" "$file" | wc -l)
+          if [ $FWEIGHT -gt 0 ]
+          then
+            FONTCUT="dc"
+          else
+            FWEIGHT=$(grep -e "Extrabold" -e "ExtraBold" "$file" | wc -l)
+            if [ $FWEIGHT -gt 0 ]
+            then
+              FONTCUT="xc"
+            else 
+              FWEIGHT=$(grep -e "Heavy" -e "Ultrabold" -e "UltraBold" "$file" | wc -l)
+              if [ $FWEIGHT -gt 0 ]
+              then
+                FONTCUT="uc"
+              else
+                FWEIGHT=$(grep -e "Bold" -e "bold" "$file" | wc -l)
+                if [ $FWEIGHT -gt 0 ]
+                then
+                  FONTCUT="bc"
+                fi
+              fi
+            fi
+          fi
+        fi
       fi
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
@@ -263,7 +297,6 @@ then
       else
         FONTCUT="l"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -279,7 +312,6 @@ then
       else
         FONTCUT="s"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -295,7 +327,6 @@ then
       else
         FONTCUT="d"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -311,7 +342,6 @@ then
       else
         FONTCUT="x"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -327,7 +357,6 @@ then
       else
         FONTCUT="u"
       fi
-      SMFFSTY="\RequirePackage{softmakerfreefont}%"
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
@@ -389,17 +418,32 @@ cat >${FONTFAMILY}-drv.tex <<EOF
 \endrecordtransforms
 \bye
 EOF
-tex ${FONTFAMILY}-drv.tex
+if [ $LOG = "true" ]
+then
+  tex ${FONTFAMILY}-drv.tex >>LOG 2>&1
+else
+  tex ${FONTFAMILY}-drv.tex
+fi
 #
 ((STEP++))
 echo -e "\n\n$STEP) Compiling metrics and virtual fonts\n\n"
 for file in *.pl; 
 do  
-  pltotf $file ${file%pl}tfm;
+  if [ $LOG = "true" ]
+  then
+    pltotf $file ${file%pl}tfm >>LOG 2>&1
+  else
+    pltotf $file ${file%pl}tfm
+  fi
 done
 for file in *.vpl; 
 do  
-  vptovf $file ${file%vpl}vf ${file%vpl}tfm;
+  if [ $LOG = "true" ]
+  then
+    vptovf $file ${file%vpl}vf ${file%vpl}tfm >>LOG 2>&1
+  else
+    vptovf $file ${file%vpl}vf ${file%vpl}tfm
+  fi
 done
 #
 ((STEP++))
@@ -412,7 +456,12 @@ cat >${FONTFAMILY}-map.tex <<EOF
 \donedrivers
 \bye
 EOF
-tex ${FONTFAMILY}-map.tex
+if [ $LOG = "true" ]
+then
+  tex ${FONTFAMILY}-map.tex >>LOG 2>&1
+else
+  tex ${FONTFAMILY}-map.tex
+fi
 if [ $OFN = "true" ]
 then
   sed -f map.sed ${FONTFAMILY}.map >${MAPFILENAME}.map
@@ -428,7 +477,6 @@ echo -e "\n\n$STEP) Creating the style file"
 cat >${PACKAGENAME}.sty <<EOF
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{$PACKAGENAME}[$PACKAGEDATE $PACKAGEVERSION $FONTNAME]%
-${SMFFSTY}%
 \RequirePackage{textcomp}%
 \RequirePackage{xkeyval}%
 \define@key{${PACKAGENAME}.sty}{scaled}[1.0]%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 6d72e3c3973..b74e9d89896 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1801,7 +1801,6 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'gfscomplutum'	 => 'C*Specimen.pdf',			# no source
  'gfsdidot'	 => '[DO]*Specimen.pdf',		# no source
  'gfsneohellenic'=> 'N*Specimen.pdf',	 		# no source
- 'installfont'   => 'installfont.pdf',                  # source partly missing
  'jknapltx'	 => 'ubbold.fd', # clash bbold's Ubbold.fd; sauter bbold fails
  'linguex'	 => 'cgloss4e.sty',			# symlink
  'numericplots'	 => '.*\.m',				# matlab