ptserif (10feb11)

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

31 files changed, 252 insertions, 63 deletions

diff --git a/Master/texmf-dist/doc/fonts/ptserif/CHANGELOG b/Master/texmf-dist/doc/fonts/ptserif/CHANGELOG
index 805678f63b4..fa039c53b98 100644
--- a/Master/texmf-dist/doc/fonts/ptserif/CHANGELOG
+++ b/Master/texmf-dist/doc/fonts/ptserif/CHANGELOG
@@ -1,3 +1,26 @@
+2011-02-10
+----------
+
+- In the fonts/enc/ and fonts/map directories omitted the "paratype" level
+	(suggested by Karl Berry).
+
+- Changed style files in this way:
+
+	1) Added an option to scale the fonts. In the font definition files
+		was support for it but not in the style files. It was caused
+		by creating simpler style files than those created by autoinst
+		from fontools (they were created because the original files
+		required the package fontenc with all supported encodings --
+		which might be a problem).
+
+	2) Style files do not change neither \familydefault nor \bfdefault.
+		There are font substitutions in the font definition files now.
+
+	Both suggested by Ricard Torres. Used his patches (based on Walter
+	Schmidt's macros) for PTSerif.sty and T1PTSerif-TLF.fd. The changes
+	extended to all other files.
+
+
 2011-02-02
 ----------
 
diff --git a/Master/texmf-dist/doc/fonts/ptserif/manifest.txt b/Master/texmf-dist/doc/fonts/ptserif/manifest.txt
index a21036b00d8..0bfd0cf57ac 100644
--- a/Master/texmf-dist/doc/fonts/ptserif/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/ptserif/manifest.txt
@@ -5,16 +5,16 @@
 ./doc/fonts/ptserif/ptserif-sample.tex
 ./doc/fonts/ptserif/ptserif.pdf
 ./doc/fonts/ptserif/ptserif.tex
-./fonts/enc/dvips/paratype/ptserif/ptserif_4vthwy.enc
-./fonts/enc/dvips/paratype/ptserif/ptserif_ehhm7n.enc
-./fonts/enc/dvips/paratype/ptserif/ptserif_gbnwo7.enc
-./fonts/enc/dvips/paratype/ptserif/ptserif_j74iyp.enc
-./fonts/enc/dvips/paratype/ptserif/ptserif_kojssb.enc
-./fonts/enc/dvips/paratype/ptserif/ptserif_ngryl2.enc
-./fonts/enc/dvips/paratype/ptserif/ptserif_vvnrpx.enc
-./fonts/enc/dvips/paratype/ptserif/ptserif_ztjweu.enc
-./fonts/map/dvips/paratype/ptserif/PTSerif-truetype.map
-./fonts/map/dvips/paratype/ptserif/PTSerif-type1.map
+./fonts/enc/dvips/ptserif/ptserif_4vthwy.enc
+./fonts/enc/dvips/ptserif/ptserif_ehhm7n.enc
+./fonts/enc/dvips/ptserif/ptserif_gbnwo7.enc
+./fonts/enc/dvips/ptserif/ptserif_j74iyp.enc
+./fonts/enc/dvips/ptserif/ptserif_kojssb.enc
+./fonts/enc/dvips/ptserif/ptserif_ngryl2.enc
+./fonts/enc/dvips/ptserif/ptserif_vvnrpx.enc
+./fonts/enc/dvips/ptserif/ptserif_ztjweu.enc
+./fonts/map/dvips/ptserif/PTSerif-truetype.map
+./fonts/map/dvips/ptserif/PTSerif-type1.map
 ./fonts/tfm/paratype/ptserif/PTSerif-Bold-tlf-il2.tfm
 ./fonts/tfm/paratype/ptserif/PTSerif-Bold-tlf-ot1.tfm
 ./fonts/tfm/paratype/ptserif/PTSerif-Bold-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/doc/fonts/ptserif/ptserif-sample.pdf b/Master/texmf-dist/doc/fonts/ptserif/ptserif-sample.pdf
index fbee841a314..0a9713aa14c 100644
--- a/Master/texmf-dist/doc/fonts/ptserif/ptserif-sample.pdf
+++ b/Master/texmf-dist/doc/fonts/ptserif/ptserif-sample.pdf
diff --git a/Master/texmf-dist/doc/fonts/ptserif/ptserif.pdf b/Master/texmf-dist/doc/fonts/ptserif/ptserif.pdf
index b84180a4beb..c2e3ba3f21f 100644
--- a/Master/texmf-dist/doc/fonts/ptserif/ptserif.pdf
+++ b/Master/texmf-dist/doc/fonts/ptserif/ptserif.pdf
diff --git a/Master/texmf-dist/doc/fonts/ptserif/ptserif.tex b/Master/texmf-dist/doc/fonts/ptserif/ptserif.tex
index f551d12bfc0..77ed6179c50 100644
--- a/Master/texmf-dist/doc/fonts/ptserif/ptserif.tex
+++ b/Master/texmf-dist/doc/fonts/ptserif/ptserif.tex
@@ -82,15 +82,10 @@ either version 1.3 of this license or (at  your option) any later version.
 \section{Implementation}
 
 The package was created using \emph{fontools} but with some changes.
-
 The prefix of the encoding files was changed from \emph{a\_} to
 \emph{ptserif\_} to avoid name clashes.
-
-The style files created by \emph{fontools} required the package
-\emph{fontenc} with all supported encodings. This might be a problem (for
-example if the encoding IL2 is not installed). Moreover the font has only
-tabular lining figures and therefore it does not need any extra support.
-That is why I created much simpler style files.
+The style files are very different and font definition files include
+also font substitutions.
 
 There are two map-files that you can use for the installation of the fonts
 with \emph{updmap}: \emph{PTSerif-truetype.map} and \emph{PTSerif-type1.map}.
@@ -111,6 +106,17 @@ For example:
 \usepackage{PTSerif}
 \end{verbatim}
 
+If you want to use this font together with another font with somewhat different
+proportions, you may use the option \emph{scaled}:
+\begin{verbatim}
+\usepackage[scaled=0.9]{PTSerif}
+\end{verbatim}
+
+You might also want to change the default font family of the document:
+\begin{verbatim}
+\renewcommand{\familydefault}{\sfdefault}
+\end{verbatim}
+
 You can typeset some text in a desired font like this:
 \begin{verbatim}
 {\usefont{T1}{PTSerifCaption-TLF}{m}{it}Text in caption italic font}
diff --git a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_4vthwy.enc b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_4vthwy.enc
index 144a71bcac4..68cdc012151 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_4vthwy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_4vthwy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4vthwyh5o4noyncynfkhd4z46b
-% Encoding created by otftotfm on Wed Feb  2 22:48:23 2011
+% Encoding created by otftotfm on Thu Feb 10 03:50:02 2011
 % Command line follows encoding
 /AutoEnc_4vthwyh5o4noyncynfkhd4z46b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ehhm7n.enc b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ehhm7n.enc
index 6b03a2b47e4..da39759d171 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ehhm7n.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ehhm7n.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ehhm7n3xr4datoyz4ttzeogy4h
-% Encoding created by otftotfm on Wed Feb  2 22:48:26 2011
+% Encoding created by otftotfm on Thu Feb 10 03:50:06 2011
 % Command line follows encoding
 /AutoEnc_ehhm7n3xr4datoyz4ttzeogy4h [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_gbnwo7.enc b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_gbnwo7.enc
index ea0bc48a6d4..f51f5e79c92 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_gbnwo7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_gbnwo7.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gbnwo77kukwc5x6dmf7pos2z4e
-% Encoding created by otftotfm on Wed Feb  2 22:48:27 2011
+% Encoding created by otftotfm on Thu Feb 10 03:50:07 2011
 % Command line follows encoding
 /AutoEnc_gbnwo77kukwc5x6dmf7pos2z4e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_j74iyp.enc b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_j74iyp.enc
index 5ff0c47df6b..a4002c9d4c0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_j74iyp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_j74iyp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_j74iyppnecvbbzdv4wb45ejmrb
-% Encoding created by otftotfm on Wed Feb  2 22:48:22 2011
+% Encoding created by otftotfm on Thu Feb 10 03:50:01 2011
 % Command line follows encoding
 /AutoEnc_j74iyppnecvbbzdv4wb45ejmrb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_kojssb.enc b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_kojssb.enc
index cfbad925677..67d5aeff180 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_kojssb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_kojssb.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kojssbss3hmzpqrl72u7hieg5b
-% Encoding created by otftotfm on Wed Feb  2 22:48:25 2011
+% Encoding created by otftotfm on Thu Feb 10 03:50:05 2011
 % Command line follows encoding
 /AutoEnc_kojssbss3hmzpqrl72u7hieg5b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ngryl2.enc b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ngryl2.enc
index f7d6b268db3..5c4abdd6679 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ngryl2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ngryl2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ngryl2b24srssjb4pblhctafwb
-% Encoding created by otftotfm on Wed Feb  2 22:48:24 2011
+% Encoding created by otftotfm on Thu Feb 10 03:50:04 2011
 % Command line follows encoding
 /AutoEnc_ngryl2b24srssjb4pblhctafwb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_vvnrpx.enc b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_vvnrpx.enc
index f9b149cf9c4..26300357c40 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_vvnrpx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_vvnrpx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vvnrpxj3y6uj3u4jpsw3usylsb
-% Encoding created by otftotfm on Wed Feb  2 22:48:21 2011
+% Encoding created by otftotfm on Thu Feb 10 03:50:00 2011
 % Command line follows encoding
 /AutoEnc_vvnrpxj3y6uj3u4jpsw3usylsb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ztjweu.enc b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ztjweu.enc
index feeff5870fa..75923f97c61 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ztjweu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ptserif/ptserif_ztjweu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ztjweupb4wmzk2qp6h53fz6yke
-% Encoding created by otftotfm on Wed Feb  2 22:48:28 2011
+% Encoding created by otftotfm on Thu Feb 10 03:50:08 2011
 % Command line follows encoding
 /AutoEnc_ztjweupb4wmzk2qp6h53fz6yke [
 %00
diff --git a/Master/texmf-dist/tex/latex/ptserif/IL2PTSerif-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/IL2PTSerif-TLF.fd
index aa12f88eacd..a6f1f2e8ff7 100644
--- a/Master/texmf-dist/tex/latex/ptserif/IL2PTSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/IL2PTSerif-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{IL2PTSerif-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for IL2/PTSerif-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for IL2/PTSerif-TLF.]
 
 \expandafter\ifx\csname PTSerif@scale\endcsname\relax
     \let\PTSerif@@scale\@empty
@@ -27,4 +27,10 @@
             <->     \PTSerif@@scale PTSerif-Regular-tlf-il2
 }{}
 
+\DeclareFontShape{IL2}{PTSerif-TLF}{m}{sl}{<->ssub * PTSerif-TLF/m/it}{}
+\DeclareFontShape{IL2}{PTSerif-TLF}{b}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{IL2}{PTSerif-TLF}{bx}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{IL2}{PTSerif-TLF}{bx}{it}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{IL2}{PTSerif-TLF}{bx}{n}{<->ssub * PTSerif-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/IL2PTSerifCaption-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/IL2PTSerifCaption-TLF.fd
index 857592610f0..0deb2ebdac6 100644
--- a/Master/texmf-dist/tex/latex/ptserif/IL2PTSerifCaption-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/IL2PTSerifCaption-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{IL2PTSerifCaption-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for IL2/PTSerifCaption-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for IL2/PTSerifCaption-TLF.]
 
 \expandafter\ifx\csname PTSerifCaption@scale\endcsname\relax
     \let\PTSerifCaption@@scale\@empty
@@ -19,4 +19,10 @@
             <->     \PTSerifCaption@@scale PTSerif-Caption-tlf-il2
 }{}
 
+\DeclareFontShape{IL2}{PTSerifCaption-TLF}{m}{sl}{<->ssub * PTSerifCaption-TLF/m/it}{}
+\DeclareFontShape{IL2}{PTSerifCaption-TLF}{b}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{IL2}{PTSerifCaption-TLF}{bx}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{IL2}{PTSerifCaption-TLF}{bx}{it}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{IL2}{PTSerifCaption-TLF}{bx}{n}{<->ssub * PTSerifCaption-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/OT1PTSerif-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/OT1PTSerif-TLF.fd
index 83d947db83d..a2146e96c42 100644
--- a/Master/texmf-dist/tex/latex/ptserif/OT1PTSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/OT1PTSerif-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{OT1PTSerif-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for OT1/PTSerif-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for OT1/PTSerif-TLF.]
 
 \expandafter\ifx\csname PTSerif@scale\endcsname\relax
     \let\PTSerif@@scale\@empty
@@ -27,4 +27,10 @@
             <->     \PTSerif@@scale PTSerif-Regular-tlf-ot1
 }{}
 
+\DeclareFontShape{OT1}{PTSerif-TLF}{m}{sl}{<->ssub * PTSerif-TLF/m/it}{}
+\DeclareFontShape{OT1}{PTSerif-TLF}{b}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{OT1}{PTSerif-TLF}{bx}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{OT1}{PTSerif-TLF}{bx}{it}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{OT1}{PTSerif-TLF}{bx}{n}{<->ssub * PTSerif-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/OT1PTSerifCaption-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/OT1PTSerifCaption-TLF.fd
index dcb6c7666ae..d97086235e5 100644
--- a/Master/texmf-dist/tex/latex/ptserif/OT1PTSerifCaption-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/OT1PTSerifCaption-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{OT1PTSerifCaption-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for OT1/PTSerifCaption-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for OT1/PTSerifCaption-TLF.]
 
 \expandafter\ifx\csname PTSerifCaption@scale\endcsname\relax
     \let\PTSerifCaption@@scale\@empty
@@ -19,4 +19,10 @@
             <->     \PTSerifCaption@@scale PTSerif-Caption-tlf-ot1
 }{}
 
+\DeclareFontShape{OT1}{PTSerifCaption-TLF}{m}{sl}{<->ssub * PTSerifCaption-TLF/m/it}{}
+\DeclareFontShape{OT1}{PTSerifCaption-TLF}{b}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{OT1}{PTSerifCaption-TLF}{bx}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{OT1}{PTSerifCaption-TLF}{bx}{it}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{OT1}{PTSerifCaption-TLF}{bx}{n}{<->ssub * PTSerifCaption-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/PTSerif.sty b/Master/texmf-dist/tex/latex/ptserif/PTSerif.sty
index 0a8f3552fdc..28066516b59 100644
--- a/Master/texmf-dist/tex/latex/ptserif/PTSerif.sty
+++ b/Master/texmf-dist/tex/latex/ptserif/PTSerif.sty
@@ -1,7 +1,39 @@
-\ProvidesPackage{PTSerif} [2011/01/29 Style file for PTSerif.]
+\ProvidesPackage{PTSerif} [2011/02/10 Style file for PTSerif.]
+%%
+%% Options:
+%%  [scaled]       --> Scale = 0.95
+%%  [scaled=0.9]   --> Scale = 0.90
+%%
+\RequirePackage{keyval}
+\define@key{PTSerif}{scaled}[0.95]{%
+  \def\PTSerif@scale{#1}}
+\def\ProcessOptionsWithKV#1{%
+  \let\@tempc\relax
+  \let\PTSerif@tempa\@empty
+  \@for\CurrentOption:=\@classoptionslist\do{%
+    \@ifundefined{KV@#1@\CurrentOption}%
+    {}%
+    {%
+      \edef\PTSerif@tempa{\PTSerif@tempa,\CurrentOption,}%
+      \@expandtwoargs\@removeelement\CurrentOption
+        \@unusedoptionlist\@unusedoptionlist
+    }%
+  }%
+  \edef\PTSerif@tempa{%
+    \noexpand\setkeys{#1}{%
+      \PTSerif@tempa\@ptionlist{\@currname.\@currext}%
+    }%
+  }%
+  \PTSerif@tempa
+  \let\CurrentOption\@empty
+}
+\ProcessOptionsWithKV{PTSerif}
+\AtEndOfPackage{%
+  \let\@unprocessedoptions\relax
+}
     
 \renewcommand{\rmdefault}{PTSerif-TLF}
-\renewcommand{\familydefault}{\rmdefault}
-\renewcommand{\bfdefault}{b}
+%%\renewcommand{\familydefault}{\rmdefault}
+%%\renewcommand{\bfdefault}{b}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/PTSerifCaption.sty b/Master/texmf-dist/tex/latex/ptserif/PTSerifCaption.sty
index 6e7fe5f245a..728c637a4b9 100644
--- a/Master/texmf-dist/tex/latex/ptserif/PTSerifCaption.sty
+++ b/Master/texmf-dist/tex/latex/ptserif/PTSerifCaption.sty
@@ -1,7 +1,39 @@
-\ProvidesPackage{PTSerifCaption}[2011/01/29 Style file for PTSerifCaption.]
+\ProvidesPackage{PTSerifCaption} [2011/02/10 Style file for PTSerifCaption.]
+%%
+%% Options:
+%%  [scaled]       --> Scale = 0.95
+%%  [scaled=0.9]   --> Scale = 0.90
+%%
+\RequirePackage{keyval}
+\define@key{PTSerifCaption}{scaled}[0.95]{%
+  \def\PTSerifCaption@scale{#1}}
+\def\ProcessOptionsWithKV#1{%
+  \let\@tempc\relax
+  \let\PTSerifCaption@tempa\@empty
+  \@for\CurrentOption:=\@classoptionslist\do{%
+    \@ifundefined{KV@#1@\CurrentOption}%
+    {}%
+    {%
+      \edef\PTSerifCaption@tempa{\PTSerifCaption@tempa,\CurrentOption,}%
+      \@expandtwoargs\@removeelement\CurrentOption
+        \@unusedoptionlist\@unusedoptionlist
+    }%
+  }%
+  \edef\PTSerifCaption@tempa{%
+    \noexpand\setkeys{#1}{%
+      \PTSerifCaption@tempa\@ptionlist{\@currname.\@currext}%
+    }%
+  }%
+  \PTSerifCaption@tempa
+  \let\CurrentOption\@empty
+}
+\ProcessOptionsWithKV{PTSerifCaption}
+\AtEndOfPackage{%
+  \let\@unprocessedoptions\relax
+}
     
 \renewcommand{\rmdefault}{PTSerifCaption-TLF}
-\renewcommand{\familydefault}{\rmdefault}
-\renewcommand{\bfdefault}{b}
+%%\renewcommand{\familydefault}{\rmdefault}
+%%\renewcommand{\bfdefault}{b}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/T1PTSerif-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/T1PTSerif-TLF.fd
index da74a3f759d..4e45905333d 100644
--- a/Master/texmf-dist/tex/latex/ptserif/T1PTSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/T1PTSerif-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{T1PTSerif-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for T1/PTSerif-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for T1/PTSerif-TLF.]
 
 \expandafter\ifx\csname PTSerif@scale\endcsname\relax
     \let\PTSerif@@scale\@empty
@@ -27,4 +27,10 @@
             <->     \PTSerif@@scale PTSerif-Regular-tlf-t1
 }{}
 
+\DeclareFontShape{T1}{PTSerif-TLF}{m}{sl}{<->ssub * PTSerif-TLF/m/it}{}
+\DeclareFontShape{T1}{PTSerif-TLF}{b}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T1}{PTSerif-TLF}{bx}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T1}{PTSerif-TLF}{bx}{it}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T1}{PTSerif-TLF}{bx}{n}{<->ssub * PTSerif-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/T1PTSerifCaption-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/T1PTSerifCaption-TLF.fd
index ba8a87401d8..13fc1ffb4ec 100644
--- a/Master/texmf-dist/tex/latex/ptserif/T1PTSerifCaption-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/T1PTSerifCaption-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{T1PTSerifCaption-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for T1/PTSerifCaption-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for T1/PTSerifCaption-TLF.]
 
 \expandafter\ifx\csname PTSerifCaption@scale\endcsname\relax
     \let\PTSerifCaption@@scale\@empty
@@ -19,4 +19,10 @@
             <->     \PTSerifCaption@@scale PTSerif-Caption-tlf-t1
 }{}
 
+\DeclareFontShape{T1}{PTSerifCaption-TLF}{m}{sl}{<->ssub * PTSerifCaption-TLF/m/it}{}
+\DeclareFontShape{T1}{PTSerifCaption-TLF}{b}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T1}{PTSerifCaption-TLF}{bx}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T1}{PTSerifCaption-TLF}{bx}{it}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T1}{PTSerifCaption-TLF}{bx}{n}{<->ssub * PTSerifCaption-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/T2APTSerif-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/T2APTSerif-TLF.fd
index bc5ab9d4fae..55ac6ab2ca8 100644
--- a/Master/texmf-dist/tex/latex/ptserif/T2APTSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/T2APTSerif-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{T2APTSerif-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for T2A/PTSerif-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for T2A/PTSerif-TLF.]
 
 \expandafter\ifx\csname PTSerif@scale\endcsname\relax
     \let\PTSerif@@scale\@empty
@@ -27,4 +27,10 @@
             <->     \PTSerif@@scale PTSerif-Regular-tlf-t2a
 }{}
 
+\DeclareFontShape{T2A}{PTSerif-TLF}{m}{sl}{<->ssub * PTSerif-TLF/m/it}{}
+\DeclareFontShape{T2A}{PTSerif-TLF}{b}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T2A}{PTSerif-TLF}{bx}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T2A}{PTSerif-TLF}{bx}{it}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T2A}{PTSerif-TLF}{bx}{n}{<->ssub * PTSerif-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/T2APTSerifCaption-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/T2APTSerifCaption-TLF.fd
index 6e7ea492254..c8404995262 100644
--- a/Master/texmf-dist/tex/latex/ptserif/T2APTSerifCaption-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/T2APTSerifCaption-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{T2APTSerifCaption-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for T2A/PTSerifCaption-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for T2A/PTSerifCaption-TLF.]
 
 \expandafter\ifx\csname PTSerifCaption@scale\endcsname\relax
     \let\PTSerifCaption@@scale\@empty
@@ -19,4 +19,10 @@
             <->     \PTSerifCaption@@scale PTSerif-Caption-tlf-t2a
 }{}
 
+\DeclareFontShape{T2A}{PTSerifCaption-TLF}{m}{sl}{<->ssub * PTSerifCaption-TLF/m/it}{}
+\DeclareFontShape{T2A}{PTSerifCaption-TLF}{b}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T2A}{PTSerifCaption-TLF}{bx}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T2A}{PTSerifCaption-TLF}{bx}{it}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T2A}{PTSerifCaption-TLF}{bx}{n}{<->ssub * PTSerifCaption-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/T2BPTSerif-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/T2BPTSerif-TLF.fd
index ec09e553ad4..cdf4a3e5082 100644
--- a/Master/texmf-dist/tex/latex/ptserif/T2BPTSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/T2BPTSerif-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{T2BPTSerif-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for T2B/PTSerif-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for T2B/PTSerif-TLF.]
 
 \expandafter\ifx\csname PTSerif@scale\endcsname\relax
     \let\PTSerif@@scale\@empty
@@ -27,4 +27,10 @@
             <->     \PTSerif@@scale PTSerif-Regular-tlf-t2b
 }{}
 
+\DeclareFontShape{T2B}{PTSerif-TLF}{m}{sl}{<->ssub * PTSerif-TLF/m/it}{}
+\DeclareFontShape{T2B}{PTSerif-TLF}{b}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T2B}{PTSerif-TLF}{bx}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T2B}{PTSerif-TLF}{bx}{it}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T2B}{PTSerif-TLF}{bx}{n}{<->ssub * PTSerif-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/T2BPTSerifCaption-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/T2BPTSerifCaption-TLF.fd
index a5ad17006c6..cde6dbfd18e 100644
--- a/Master/texmf-dist/tex/latex/ptserif/T2BPTSerifCaption-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/T2BPTSerifCaption-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{T2BPTSerifCaption-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for T2B/PTSerifCaption-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for T2B/PTSerifCaption-TLF.]
 
 \expandafter\ifx\csname PTSerifCaption@scale\endcsname\relax
     \let\PTSerifCaption@@scale\@empty
@@ -19,4 +19,10 @@
             <->     \PTSerifCaption@@scale PTSerif-Caption-tlf-t2b
 }{}
 
+\DeclareFontShape{T2B}{PTSerifCaption-TLF}{m}{sl}{<->ssub * PTSerifCaption-TLF/m/it}{}
+\DeclareFontShape{T2B}{PTSerifCaption-TLF}{b}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T2B}{PTSerifCaption-TLF}{bx}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T2B}{PTSerifCaption-TLF}{bx}{it}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T2B}{PTSerifCaption-TLF}{bx}{n}{<->ssub * PTSerifCaption-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/T2CPTSerif-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/T2CPTSerif-TLF.fd
index 43f2f34dbe2..fe33c8c50d3 100644
--- a/Master/texmf-dist/tex/latex/ptserif/T2CPTSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/T2CPTSerif-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{T2CPTSerif-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for T2C/PTSerif-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for T2C/PTSerif-TLF.]
 
 \expandafter\ifx\csname PTSerif@scale\endcsname\relax
     \let\PTSerif@@scale\@empty
@@ -27,4 +27,10 @@
             <->     \PTSerif@@scale PTSerif-Regular-tlf-t2c
 }{}
 
+\DeclareFontShape{T2C}{PTSerif-TLF}{m}{sl}{<->ssub * PTSerif-TLF/m/it}{}
+\DeclareFontShape{T2C}{PTSerif-TLF}{b}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T2C}{PTSerif-TLF}{bx}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T2C}{PTSerif-TLF}{bx}{it}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{T2C}{PTSerif-TLF}{bx}{n}{<->ssub * PTSerif-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/T2CPTSerifCaption-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/T2CPTSerifCaption-TLF.fd
index 5d5c9b3b316..81c1cc13e2b 100644
--- a/Master/texmf-dist/tex/latex/ptserif/T2CPTSerifCaption-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/T2CPTSerifCaption-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{T2CPTSerifCaption-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for T2C/PTSerifCaption-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for T2C/PTSerifCaption-TLF.]
 
 \expandafter\ifx\csname PTSerifCaption@scale\endcsname\relax
     \let\PTSerifCaption@@scale\@empty
@@ -19,4 +19,10 @@
             <->     \PTSerifCaption@@scale PTSerif-Caption-tlf-t2c
 }{}
 
+\DeclareFontShape{T2C}{PTSerifCaption-TLF}{m}{sl}{<->ssub * PTSerifCaption-TLF/m/it}{}
+\DeclareFontShape{T2C}{PTSerifCaption-TLF}{b}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T2C}{PTSerifCaption-TLF}{bx}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T2C}{PTSerifCaption-TLF}{bx}{it}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{T2C}{PTSerifCaption-TLF}{bx}{n}{<->ssub * PTSerifCaption-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/TS1PTSerif-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/TS1PTSerif-TLF.fd
index 30b795fb993..658093965a0 100644
--- a/Master/texmf-dist/tex/latex/ptserif/TS1PTSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/TS1PTSerif-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{TS1PTSerif-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for TS1/PTSerif-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for TS1/PTSerif-TLF.]
 
 \expandafter\ifx\csname PTSerif@scale\endcsname\relax
     \let\PTSerif@@scale\@empty
@@ -27,4 +27,10 @@
             <->     \PTSerif@@scale PTSerif-Regular-tlf-ts1
 }{}
 
+\DeclareFontShape{TS1}{PTSerif-TLF}{m}{sl}{<->ssub * PTSerif-TLF/m/it}{}
+\DeclareFontShape{TS1}{PTSerif-TLF}{b}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{TS1}{PTSerif-TLF}{bx}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{TS1}{PTSerif-TLF}{bx}{it}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{TS1}{PTSerif-TLF}{bx}{n}{<->ssub * PTSerif-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/TS1PTSerifCaption-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/TS1PTSerifCaption-TLF.fd
index f9929f8188d..479d57a9050 100644
--- a/Master/texmf-dist/tex/latex/ptserif/TS1PTSerifCaption-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/TS1PTSerifCaption-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{TS1PTSerifCaption-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for TS1/PTSerifCaption-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for TS1/PTSerifCaption-TLF.]
 
 \expandafter\ifx\csname PTSerifCaption@scale\endcsname\relax
     \let\PTSerifCaption@@scale\@empty
@@ -19,4 +19,10 @@
             <->     \PTSerifCaption@@scale PTSerif-Caption-tlf-ts1
 }{}
 
+\DeclareFontShape{TS1}{PTSerifCaption-TLF}{m}{sl}{<->ssub * PTSerifCaption-TLF/m/it}{}
+\DeclareFontShape{TS1}{PTSerifCaption-TLF}{b}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{TS1}{PTSerifCaption-TLF}{bx}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{TS1}{PTSerifCaption-TLF}{bx}{it}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{TS1}{PTSerifCaption-TLF}{bx}{n}{<->ssub * PTSerifCaption-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/X2PTSerif-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/X2PTSerif-TLF.fd
index 4c03637e7db..376b74d8c5e 100644
--- a/Master/texmf-dist/tex/latex/ptserif/X2PTSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/X2PTSerif-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{X2PTSerif-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for X2/PTSerif-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for X2/PTSerif-TLF.]
 
 \expandafter\ifx\csname PTSerif@scale\endcsname\relax
     \let\PTSerif@@scale\@empty
@@ -27,4 +27,10 @@
             <->     \PTSerif@@scale PTSerif-Regular-tlf-x2
 }{}
 
+\DeclareFontShape{X2}{PTSerif-TLF}{m}{sl}{<->ssub * PTSerif-TLF/m/it}{}
+\DeclareFontShape{X2}{PTSerif-TLF}{b}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{X2}{PTSerif-TLF}{bx}{sl}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{X2}{PTSerif-TLF}{bx}{it}{<->ssub * PTSerif-TLF/b/it}{}
+\DeclareFontShape{X2}{PTSerif-TLF}{bx}{n}{<->ssub * PTSerif-TLF/b/n}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ptserif/X2PTSerifCaption-TLF.fd b/Master/texmf-dist/tex/latex/ptserif/X2PTSerifCaption-TLF.fd
index 716c80df36e..a3f5cc6d03a 100644
--- a/Master/texmf-dist/tex/latex/ptserif/X2PTSerifCaption-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ptserif/X2PTSerifCaption-TLF.fd
@@ -1,7 +1,7 @@
-%%Generated by autoinst on 2011/02/02
+%%Generated on 2011/02/10
 %%
 \ProvidesFile{X2PTSerifCaption-TLF.fd}
-    [2011/02/02 (autoinst)  Font definitions for X2/PTSerifCaption-TLF.]
+    [2011/02/10 (autoinst with patch)  Font definitions for X2/PTSerifCaption-TLF.]
 
 \expandafter\ifx\csname PTSerifCaption@scale\endcsname\relax
     \let\PTSerifCaption@@scale\@empty
@@ -19,4 +19,10 @@
             <->     \PTSerifCaption@@scale PTSerif-Caption-tlf-x2
 }{}
 
+\DeclareFontShape{X2}{PTSerifCaption-TLF}{m}{sl}{<->ssub * PTSerifCaption-TLF/m/it}{}
+\DeclareFontShape{X2}{PTSerifCaption-TLF}{b}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{X2}{PTSerifCaption-TLF}{bx}{sl}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{X2}{PTSerifCaption-TLF}{bx}{it}{<->ssub * PTSerifCaption-TLF/b/it}{}
+\DeclareFontShape{X2}{PTSerifCaption-TLF}{bx}{n}{<->ssub * PTSerifCaption-TLF/b/n}{}
+
 \endinput