installfont (15jul13)

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

6 files changed, 89 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/support/installfont/LICENSE b/Master/texmf-dist/doc/support/installfont/LICENSE
index 97b1f5cb6d9..2405e77e1e7 100644
--- a/Master/texmf-dist/doc/support/installfont/LICENSE
+++ b/Master/texmf-dist/doc/support/installfont/LICENSE
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2009-2012 by:
+%% Copyright (C) 2009-2010,2013 by:
 %% Josef Kleber
 %% <josef.kleber@gmx.de>
 %% 
diff --git a/Master/texmf-dist/doc/support/installfont/README b/Master/texmf-dist/doc/support/installfont/README
index ad6c25b93ae..c67d009b529 100644
--- a/Master/texmf-dist/doc/support/installfont/README
+++ b/Master/texmf-dist/doc/support/installfont/README
@@ -1,16 +1,26 @@
-With this script 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 
+With this script (installfont for MiKTeX; installfont-tl for
+TeXLive), 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.
 
+For this month's (07/2013) free font on www.freefont.de,
+simply run
+
+installfont-tl -t otf -f 6sf -n 'Softmaker Stafford Serial'
+-c Staffort -P SMFF@Ssf -p stafford -m stafford -O -d 2013/07/15
+-v v1.0 -s softmakerfreefont/Stafford
+
+to create and install support files for the usage of Softmaker
+Stafford Serial from light to ultra bold font series.
+
 License: LPPL
 
-Changes in v1.6b:
+Changes in v1.7:
 
-- revised documentation
-  project moved to https://bitbucket.org/kleberj/installfont/
\ No newline at end of file
+- fixed broken TeXLive version installfont-tl
+  kpseexpand ... -> kpsewhich --expand-var=...
\ 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 baaf7642128..1c9fdb23fbe 100644
--- a/Master/texmf-dist/doc/support/installfont/installfont
+++ b/Master/texmf-dist/doc/support/installfont/installfont
@@ -9,9 +9,9 @@
 # Otherwise the *.afm and *.pfb files must be named in Karl Berry scheme
 # (e.g. 5bbr8a.pfb)
 # (tested with MiKTeX 2.8) v1.6a (03.11.2010)
-# (C) Josef Kleber 2009-2012  License: LPPL
+# (C) Josef Kleber 2009-2010,2013  License: LPPL
 #
-VERSION="v1.6b (2012/01/25)"
+VERSION="v1.7 (2013/07/15)"
 #
 FONTFAMILY="5bb"
 FONTNAME="Softmaker Barbedor"
@@ -293,6 +293,22 @@ then
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
     done
+    # rename the extra light font(s)
+    FILES=$(grep -e "XLight" -e "Xlight" -e "extra light" *.afm | cut -d':' -f1 | uniq)
+    for file in $FILES
+    do
+      ITALICANGLE=$(grep -e "ItalicAngle" "$file" | tr ' ' '+' | cut -d'+' -f2 | cut -d'.' -f1)
+      if [ $ITALICANGLE -lt 0 -o $ITALICANGLE -gt 0 ]
+      then
+        FONTCUT="ji"
+      else
+        FONTCUT="j"
+      fi
+      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;
+      SMFFSTY="\RequirePackage{softmakerfreefont}%"
+    done
     # rename the light font(s)
     FILES=$(grep -e "Light" *.afm | cut -d':' -f1 | uniq)
     for file in $FILES
@@ -307,7 +323,7 @@ then
       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;
-	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
+    SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the semi(bold) font
     FILES=$(grep -e "Semibold" -e "SemiBold" *.afm | cut -d':' -f1 | uniq)
@@ -323,7 +339,7 @@ then
       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;
-	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
+    SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the demi(bold) font
     FILES=$(grep -e "FontName" -e "FullName" *.afm | grep -e "Demi" -e "Demibold" -e "DemiBold" | cut -d':' -f1 | uniq)
@@ -339,7 +355,7 @@ then
       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;
-	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
+    SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the extra bold font
     FILES=$(grep -e "Extrabold" -e "ExtraBold" *.afm | cut -d':' -f1 | uniq)
@@ -370,7 +386,7 @@ then
       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;
-	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
+    SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the bold font
     FILES=$(grep -e "Bold" -e "bold" *.afm | cut -d':' -f1 | uniq)
diff --git a/Master/texmf-dist/doc/support/installfont/installfont.pdf b/Master/texmf-dist/doc/support/installfont/installfont.pdf
index b8ef46c932d..770d54f5a25 100644
--- a/Master/texmf-dist/doc/support/installfont/installfont.pdf
+++ 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 4682d169061..992580b055c 100644
--- a/Master/texmf-dist/doc/support/installfont/installfont.tex
+++ b/Master/texmf-dist/doc/support/installfont/installfont.tex
@@ -106,9 +106,9 @@
 \renewcommand\notesname{Links}
 \title{\texttt{installfont(-tl)}}
 \Subtitle{A bash script for installing a \LaTeX{} font family}
-\Fileversion{v1.6b}
-\Authorline{Package authors:}
-\Author{Josef Kleber \and Christoph Bier (TeXLive version)}
+\Fileversion{v1.7}
+\Authorline{Package author:}
+\Author{Josef Kleber}
 \Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/installfont/}{\texttt{https://bitbucket.org/kleberj/installfont/}}}
 \maketitle
 \Headline{Abstract}
@@ -116,8 +116,7 @@
 \begin{abstract}
 With this script\footnote{This script automates the procedure described in 'Tutorial I
 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.
+\href{ftp://dante.ctan.org/tex-archive/info/Type1fonts/fontinstallationguide/fontinstallationguide.pdf}{fontinstallationguide.pdf}} (installfont for MiKTeX; installfont-tl for TeXLive), 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.
 \end{abstract}
 \clearpage
 \Headline{Dependencies}
@@ -137,7 +136,7 @@ Download \texttt{setup.exe} and follow the instructions on the \texttt{cygwin} h
 Download the \Link{http://gnuwin32.sourceforge.net/packages/ttf2pt1.htm}{ttf2pt1 Installer}, install \texttt{ttf2pt1} and add the installation directory to your \texttt{PATH}
 \item Opentype
 
-Download the \Link{ftp://akagi.ms.u-tokyo.ac.jp/pub/TeX/win32/lcdf-typetools-w32.tar.bz2}{LCDF Typetools} and run (bash/cygwin)\newline\texttt{bunzip2 lcdf-typetools-w32.tar.bz2} followed by \newline\texttt{tar -xf lcdf-typetools-w32.tar} and add the \texttt{bin} directory to the \texttt{PATH}. You need to install \Link{http://www.ghostscript.com/}{Ghostscript} if you are using TeXLive!
+Download the \Link{ftp://akagi.ms.u-tokyo.ac.jp/pub/TeX/win32/lcdf-typetools-w32.tar.xz}{LCDF Typetools} and run (bash/cygwin)\newline\texttt{unxz lcdf-typetools-w32.tar.xz} followed by \newline\texttt{tar -xf lcdf-typetools-w32.tar} and add the \texttt{bin} directory to the \texttt{PATH}. You need to install \Link{http://www.ghostscript.com/}{Ghostscript} if you are using TeXLive!
 \end{itemize}
 \end{itemize}
 \item *nix
@@ -151,12 +150,12 @@ Download the \Link{ftp://akagi.ms.u-tokyo.ac.jp/pub/TeX/win32/lcdf-typetools-w32
 Install the \texttt{ttf2pt1} package with your distribution package manager or download a package from a \Link{http://packages.ubuntu.com/search?lang=en&keywords=ttf2pt1}{webpage}.
 \item Opentype
 
-Install the \texttt{lcdf-typetools} package with your distribution package manager or download a package from a \Link{http://packages.ubuntu.com/search?lang=en&keywords=lcdf-typetools}{webpage}.
+Install the \texttt{lcdf-typetools} package with your distribution package manager or download a package from a \Link{http://packages.ubuntu.com/search?lang=en&keywords=lcdf-typetools}{webpage}. Should be available in recent versions of TeXLive! 
 \end{itemize}
 \end{itemize}
 \end{itemize}
 
-You can also convert the font manually, e.g. with \Link{http://fontforge.sourceforge.net/}{Fontforge}. Load the font, reencode the font to 'Adobe Standard' and generate the font (PS Type1 (Binary)). There's a pre-built package for \texttt{cygwin}!
+You can also convert the font manually, e.g. with \Link{http://fontforge.sourceforge.net/}{Fontforge}. Load the font, reencode the font to 'Adobe Standard' and generate the font (PS Type1 (Binary)).
 \clearpage
 \Headline{The font(s)}
 \section*{The font(s)}
@@ -212,7 +211,7 @@ To install a font family simply call the script:
 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}
+\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}.
@@ -230,7 +229,7 @@ The script offers the following command line options:
 \texttt{-p} & \texttt{\doubledash packagename} & Name of the LaTeX package\\
 \texttt{-d} & \texttt{\doubledash packagedate} & Date of the LaTeX package\\
 \texttt{-v} & \texttt{\doubledash packageversion} & Version of the LaTeX package\\
-\texttt{-l} & \texttt{\doubledash localtexmf} & root of your local TeX tree, e.g. \newline\texttt{/cygdrive/c/LocalTeXMF}\newline (TeXLive version default: \texttt{\$TEXMFHOME)}\\
+\texttt{-l} & \texttt{\doubledash localtexmf} & root of your local TeX tree, e.g. \newline\texttt{/cygdrive/c/LocalTeXMF}\newline (TeXLive version default: \texttt{\$TEXMFLOCAL)}\\
 \texttt{-s} & \texttt{\doubledash fontsubdir} & location where the fonts and support files should be installed, e.g. \texttt{MyFonts/AdobeTimes}\\
 \texttt{-e} & \texttt{\doubledash fontencoding} & encoding of the font (default: 8a (AdobeStandardEncoding))\\
 \texttt{-o} & \texttt{\doubledash otffontfeatures} & choosing Opentype font features (default: -fkern -fliga)\\
diff --git a/Master/texmf-dist/scripts/installfont/installfont-tl b/Master/texmf-dist/scripts/installfont/installfont-tl
index ac072039959..7a046426a94 100755
--- a/Master/texmf-dist/scripts/installfont/installfont-tl
+++ b/Master/texmf-dist/scripts/installfont/installfont-tl
@@ -8,10 +8,10 @@
 # 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.6a (03.11.2010)
-# (C) Josef Kleber, Christoph Bier 2009-2012  License: LPPL
+# (tested with TeXLive2013/Cygwin) v1.7 (15.07.2013)
+# (C) Josef Kleber 2009-2010,2013  License: LPPL
 #
-VERSION="v1.6b (2012/01/25)"
+VERSION="v1.7 (2013/07/15)"
 #
 FONTFAMILY="5bb"
 FONTNAME="Softmaker Barbedor"
@@ -23,7 +23,15 @@ PACKAGEDATE="2010/03/05"
 PACKAGEVERSION="v1.0"
 MAPFILENAME=""
 OFN="false"
-LOCALTEXMF="`kpsexpand '$TEXMFHOME'`"
+WINLOCALTEXMF="`kpsewhich --expand-var='$TEXMFLOCAL' | sed s/\r//`"
+USEDOS=`uname | cut -c1-6`
+if [ "$USEDOS" = "CYGWIN" ]
+then
+  WINLOCALTEXMFII="`cygpath -u $WINLOCALTEXMF`"
+  LOCALTEXMF="$WINLOCALTEXMFII"
+else
+  LOCALTEXMF="$WINLOCALTEXMF"
+fi
 FONTSUBDIR="MyFonts/Barbedor"
 # Font encoding default: 8a (AdobeStandardEncoding)
 FONTENCODING="8a"
@@ -287,6 +295,22 @@ then
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
     done
+    # rename the extra light font(s)
+    FILES=$(grep -e "XLight" -e "Xlight" -e "extra light" *.afm | cut -d':' -f1 | uniq)
+    for file in $FILES
+    do
+      ITALICANGLE=$(grep -e "ItalicAngle" "$file" | tr ' ' '+' | cut -d'+' -f2 | cut -d'.' -f1)
+      if [ $ITALICANGLE -lt 0 -o $ITALICANGLE -gt 0 ]
+      then
+        FONTCUT="ji"
+      else
+        FONTCUT="j"
+      fi
+      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;
+      SMFFSTY="\RequirePackage{softmakerfreefont}%"
+    done
     # rename the light font(s)
     FILES=$(grep -e "Light" *.afm | cut -d':' -f1 | uniq)
     for file in $FILES
@@ -301,7 +325,7 @@ then
       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;
-	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
+      SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the semi(bold) font
     FILES=$(grep -e "Semibold" -e "SemiBold" *.afm | cut -d':' -f1 | uniq)
@@ -317,7 +341,7 @@ then
       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;
-	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
+      SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the demi(bold) font
     FILES=$(grep -e "FontName" -e "FullName" *.afm | grep -e "Demi" -e "Demibold" -e "DemiBold" | cut -d':' -f1 | uniq)
@@ -333,7 +357,7 @@ then
       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;
-	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
+      SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the extra bold font
     FILES=$(grep -e "Extrabold" -e "ExtraBold" *.afm | cut -d':' -f1 | uniq)
@@ -364,7 +388,7 @@ then
       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;
-	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
+      SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the bold font
     FILES=$(grep -e "Bold" -e "bold" *.afm | cut -d':' -f1 | uniq)
@@ -564,6 +588,11 @@ fi
 mv *.sty $DIR
 #
 ((STEP++))
+echo -e "\n\n$STEP) Update FNDB"
+echo -e "\n\n"
+texhash
+#
+((STEP++))
 echo -e "\n\n$STEP) Include the map file"
 echo -e "\n\n"
 updmap --enable Map ${UMAP}.map