kpfonts update (10mar10)

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

9 files changed, 406 insertions, 85 deletions

diff --git a/Master/texmf-dist/tex/latex/kpfonts/kpfonts.sty b/Master/texmf-dist/tex/latex/kpfonts/kpfonts.sty
index e0d9ff7e0c3..c3e49b8ad99 100644
--- a/Master/texmf-dist/tex/latex/kpfonts/kpfonts.sty
+++ b/Master/texmf-dist/tex/latex/kpfonts/kpfonts.sty
@@ -1,7 +1,7 @@
 \NeedsTeXFormat{LaTeX2e}
 %
 \ProvidesPackage{kpfonts}
-	[ 2010/01/31 v3.12]
+	[ 2010/03/03 v3.2]
 	
 \newif\ifkp@math	  \kp@mathtrue
 \newif\ifkp@text  	\kp@texttrue
@@ -31,6 +31,9 @@
 \newif\ifkp@nofligatures
 \newif\ifkp@Qtail
 \newif\ifkp@widermath
+\newif\ifkp@sfmath
+\newif\ifkp@sfmathbb
+\newif\ifkp@rmmathbb
 
 \DeclareOption{nomath}         		{\kp@mathfalse}
 \DeclareOption{notext}         		{\kp@textfalse}
@@ -65,6 +68,9 @@
 \DeclareOption{noDcommand}        {\kp@Dcommandfalse}
 \DeclareOption{nofligatures}      {\kp@nofligaturestrue}
 \DeclareOption{widermath}         {\kp@widermathtrue}
+\DeclareOption{sfmath}            {\kp@sfmathtrue}
+\DeclareOption{sfmathbb}          {\kp@sfmathbbtrue}
+\DeclareOption{rmmathbb}          {\kp@rmmathbbtrue}
 \DeclareOption{intlimits}         {\let\kp@ilimits\displaylimits}
 \DeclareOption{fullintlimits}     {\let\kp@ilimits\limits}
 \DeclareOption{nointlimits}       {\let\kp@ilimits\nolimits}
@@ -102,6 +108,16 @@
 \ifkp@math\else\kp@osnmfalse\kp@osmfalse\kp@vosmfalse\fi
 \ifkp@text\else\kp@osnfalse\kp@osfalse\kp@vosfalse\fi
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Stupid \mathbb options %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\ifkp@sfmathbb\ifkp@rmmathbb
+  \kp@sfmathbbfalse\kp@rmmathbbfalse
+  \PackageWarning{kpfonts}%
+  {'sfmathbb' and 'rmmathbb' are incompatible and ignored}
+\fi\fi
+
 %%%%%%%%
 % Text %
 %%%%%%%%
@@ -145,6 +161,10 @@
     \ifkp@Qtail\def\kp@othertail{}
       \else\def\kp@othertail{os}
         \fi
+    \ifkp@vos\def\kp@otherctst{}
+      \else\ifkp@os\def\kp@otherctst{}
+        \else\def\kp@otherctst{os}
+          \fi\fi
 %
 %%% start rm
 %
@@ -215,7 +235,7 @@
         \otherscslshape#1%
       \endgroup}
 %
-%%% O ther Q and other smallcap q tails
+%%% Other Q and other smallcap q tails
 %
 		\newcommand{\othertailQ}{%
 		  \begingroup%
@@ -240,6 +260,7 @@
             \fontfamily{jkp\kp@famille\kp@petitesmajuscules\kp@othertail}}}%
             \fontshape{scsl}\selectfont{}q%
 		      \endgroup}
+
 %
 \fi	% end text
 %
@@ -253,12 +274,13 @@
 
 
 %
-%%% \kp@famillemn \kp@stylem and \kp@widerm
+%%% \kp@famillem \kp@stylem and \kp@widerm
 %
 		
 		\ifkp@light\def\kp@famillem{l}
 			\else\def\kp@famillem{}
 				\fi
+				
 		\ifkp@vosm\def\kp@stylem{vos}
 			\else\ifkp@osm\def\kp@stylem{os}
 				\else\ifkp@osnm\def\kp@stylem{osn}
@@ -267,50 +289,126 @@
     \ifkp@nofligatures\def\kp@fligm{f}
       \else\def\kp@fligm{}
         \fi
+        
     \ifkp@widermath\def\kp@widerm{w}
       \else\def\kp@widerm{}
         \fi
+	  \ifkp@sfmath\def\kp@widerm{}\fi
+
+%
+%%% \kp@stylemi et \kp@stylemath
+%
+		
+		\ifkp@vosm\def\kp@stylemi{vos}
+			\else\def\kp@stylemi{}\fi
+		
+		\ifkp@sfmath
+		    \def\kp@stylemath{ss}
+			\else
+			  \def\kp@stylemath{}
+			\fi
+			
+%
+%%% New math Versions
+%
+
+\DeclareMathVersion{rm}
+\DeclareMathVersion{boldrm}
+\DeclareMathVersion{sf}
+\DeclareMathVersion{boldsf}
 
 % Roman
 
-			\DeclareSymbolFont{operators}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{n}
+			\ifkp@sfmath
+			  \DeclareSymbolFont{operators}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n}
+				\SetSymbolFont{operators}{bold}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
+			\else	
+			  \DeclareSymbolFont{operators}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{n}
 				\SetSymbolFont{operators}{bold}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
-			\def\operator@font{\mathgroup\symoperators}	
-			\DeclareSymbolFontAlphabet{\mathrm}{operators}
+			\fi
+				\SetSymbolFont{operators}{rm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{n}
+				\SetSymbolFont{operators}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
+				\SetSymbolFont{operators}{sf}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n}
+				\SetSymbolFont{operators}{boldsf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
+			
+			\def\operator@font{\mathgroup\symoperators}
+			
+			\DeclareMathAlphabet{\mathrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{n}
+				\SetMathAlphabet{\mathrm}{bold}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
+				\SetMathAlphabet{\mathrm}{rm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{n}
+				\SetMathAlphabet{\mathrm}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
+				\SetMathAlphabet{\mathrm}{sf}{OT1}{jkp\kp@fligm\kp@stylem}{m}{n}
+				\SetMathAlphabet{\mathrm}{boldsf}{OT1}{jkp\kp@fligm\kp@stylem}{b}{n}
 			
-			\DeclareMathAlphabet{\mathbf}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
-			\DeclareMathAlphabet{\mathit}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{it}
-				\SetMathAlphabet{\mathit}{bold}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{it}
+			\ifkp@sfmath
+			  \DeclareMathAlphabet{\mathbf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
+			\else
+			  \DeclareMathAlphabet{\mathbf}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
+			\fi
+				\SetMathAlphabet{\mathbf}{rm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
+				\SetMathAlphabet{\mathbf}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
+				\SetMathAlphabet{\mathbf}{sf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
+				\SetMathAlphabet{\mathbf}{boldsf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
+			      
+			\ifkp@sfmath
+			  \DeclareMathAlphabet{\mathit}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{it}
+				  \SetMathAlphabet{\mathit}{bold}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{it}
+			\else
+				\DeclareMathAlphabet{\mathit}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{it}
+				  \SetMathAlphabet{\mathit}{bold}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{it}
+		  \fi
+				\SetMathAlphabet{\mathit}{rm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{it}
+				\SetMathAlphabet{\mathit}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{it}
+				\SetMathAlphabet{\mathit}{sf}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{it}
+				\SetMathAlphabet{\mathit}{boldsf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{it}
 
 
 % Sans Serif
 
 		\DeclareMathAlphabet{\mathsf}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n}
 			\SetMathAlphabet{\mathsf}{bold}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
+			\SetMathAlphabet{\mathsf}{rm}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n}
+			\SetMathAlphabet{\mathsf}{boldrm}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
+			\SetMathAlphabet{\mathsf}{sf}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n}
+			\SetMathAlphabet{\mathsf}{boldsf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
 
 % Typewriter
 
 		\DeclareMathAlphabet{\mathtt}{OT1}{jkptt\kp@stylem}{m}{n}
 			\SetMathAlphabet{\mathtt}{bold}{OT1}{jkptt\kp@stylem}{b}{n}
-
-
-%
-%%% \kp@stylemi
-%
-		
-		\ifkp@vosm\def\kp@stylemi{vos}
-			\else\def\kp@stylemi{}\fi
+			\SetMathAlphabet{\mathtt}{rm}{OT1}{jkptt\kp@stylem}{m}{n}
+			\SetMathAlphabet{\mathtt}{boldrm}{OT1}{jkptt\kp@stylem}{b}{n}
+			\SetMathAlphabet{\mathtt}{sf}{OT1}{jkptt\kp@stylem}{m}{n}
+			\SetMathAlphabet{\mathtt}{boldsf}{OT1}{jkptt\kp@stylem}{b}{n}
 
 % Math Italic
 
-		\DeclareSymbolFont{letters}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{m}{it}
-			\SetSymbolFont{letters}{bold}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{bx}{it}
+      \ifkp@sfmath
+			  \DeclareSymbolFont{letters}{OML}{jkpss\kp@stylemi}{m}{it}
+				\SetSymbolFont{letters}{bold}{OML}{jkpss\kp@stylemi}{bx}{it}
+			\else	
+			  \DeclareSymbolFont{letters}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{m}{it}
+				\SetSymbolFont{letters}{bold}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{bx}{it}
+			\fi
+			\SetSymbolFont{letters}{rm}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{m}{it}
+			\SetSymbolFont{letters}{boldrm}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{bx}{it}
+			\SetSymbolFont{letters}{sf}{OML}{jkpss\kp@stylemi}{m}{it}
+			\SetSymbolFont{letters}{boldsf}{OML}{jkpss\kp@stylemi}{bx}{it}
 			\DeclareFontSubstitution{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{m}{it}
 
 % Math Italic A
 
-		\DeclareSymbolFont{lettersA}{U}{jkp\kp@famillem mia\kp@widerm}{m}{it}
-			\SetSymbolFont{lettersA}{bold}{U}{jkp\kp@famillem mia\kp@widerm}{bx}{it}
+      \ifkp@sfmath
+		    \DeclareSymbolFont{lettersA}{U}{jkpssmia}{m}{it}
+			  \SetSymbolFont{lettersA}{bold}{U}{jkpssmia}{bx}{it}
+			\else	
+		    \DeclareSymbolFont{lettersA}{U}{jkp\kp@famillem mia\kp@widerm}{m}{it}
+			  \SetSymbolFont{lettersA}{bold}{U}{jkp\kp@famillem mia\kp@widerm}{bx}{it}
+			\fi	
+			\SetSymbolFont{lettersA}{rm}{U}{jkp\kp@famillem mia\kp@widerm}{m}{it}
+			\SetSymbolFont{lettersA}{boldrm}{U}{jkp\kp@famillem mia\kp@widerm}{bx}{it}
+			\SetSymbolFont{lettersA}{sf}{U}{jkpssmia}{m}{it}
+			\SetSymbolFont{lettersA}{boldsf}{U}{jkpssmia}{bx}{it}
 			\DeclareFontSubstitution{U}{jkp\kp@famillem mia\kp@widerm}{m}{it}
 
 		\DeclareSymbolFontAlphabet{\mathfrak}{lettersA}
@@ -318,8 +416,17 @@
 
 % Math Symbol
 
-		\DeclareSymbolFont{symbols}{OMS}{jkp\kp@famillem\kp@widerm}{m}{n}
-			\SetSymbolFont{symbols}{bold}{OMS}{jkp\kp@famillem\kp@widerm}{bx}{n}
+      \ifkp@sfmath
+		    \DeclareSymbolFont{symbols}{OMS}{jkp}{m}{n}
+			  \SetSymbolFont{symbols}{bold}{OMS}{jkp}{bx}{n}
+			\else
+		    \DeclareSymbolFont{symbols}{OMS}{jkp\kp@famillem\kp@widerm}{m}{n}
+			  \SetSymbolFont{symbols}{bold}{OMS}{jkp\kp@famillem\kp@widerm}{bx}{n}
+			\fi
+			\SetSymbolFont{symbols}{rm}{OMS}{jkp\kp@famillem\kp@widerm}{m}{n}
+			\SetSymbolFont{symbols}{boldrm}{OMS}{jkp\kp@famillem\kp@widerm}{bx}{n}
+			\SetSymbolFont{symbols}{sf}{OMS}{jkp}{m}{n}
+			\SetSymbolFont{symbols}{boldsf}{OMS}{jkp}{bx}{n}
 			\DeclareFontSubstitution{OMS}{jkp\kp@famillem\kp@widerm}{m}{n}
 			
 \ifkp@amsmath{
@@ -334,22 +441,84 @@
 
    \DeclareSymbolFont{AMSa}{U}{jkpsya}{m}{n}
      \SetSymbolFont{AMSa}{bold}{U}{jkpsya}{bx}{n}
+     \SetSymbolFont{AMSa}{rm}{U}{jkpsya}{m}{n}
+     \SetSymbolFont{AMSa}{boldrm}{U}{jkpsya}{bx}{n}
+     \SetSymbolFont{AMSa}{sf}{U}{jkpsya}{m}{n}
+     \SetSymbolFont{AMSa}{boldsf}{U}{jkpsya}{bx}{n}
      \DeclareFontSubstitution{U}{jkpsya}{m}{n}
 
 
 % Math Symbols B (AMSb)
 
-		\DeclareSymbolFont{AMSb}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}
-			\SetSymbolFont{AMSb}{bold}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n}
-			\DeclareFontSubstitution{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}
+\ifkp@rmmathbb
+    \ifkp@sfmath
+		  \DeclareSymbolFont{AMSb}{U}{jkpsyb}{m}{n}% rmmathbb, sfmath
+		  \SetSymbolFont{AMSb}{bold}{U}{jkpsyb}{bx}{n}			
+			\SetSymbolFont{AMSb}{rm}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}
+			\SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n}
+			\SetSymbolFont{AMSb}{sf}{U}{jkpsyb}{m}{n}
+			\SetSymbolFont{AMSb}{boldsf}{U}{jkpsyb}{bx}{n}
+		\else
+		  \DeclareSymbolFont{AMSb}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}% rmmathbb
+		  \SetSymbolFont{AMSb}{bold}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n}			
+			\SetSymbolFont{AMSb}{rm}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}
+			\SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n}
+			\SetSymbolFont{AMSb}{sf}{U}{jkpsyb}{m}{n}
+			\SetSymbolFont{AMSb}{boldsf}{U}{jkpsyb}{bx}{n}
+		\fi
+\else
+	\ifkp@sfmathbb
+    \ifkp@sfmath
+		  \DeclareSymbolFont{AMSb}{U}{jkpsssyb}{m}{n}% sfmathbb, sfmath
+		  \SetSymbolFont{AMSb}{bold}{U}{jkpsssyb}{bx}{n}			
+			\SetSymbolFont{AMSb}{rm}{U}{jkpss\kp@famillem syb\kp@widerm}{m}{n}
+			\SetSymbolFont{AMSb}{boldrm}{U}{jkpss\kp@famillem syb\kp@widerm}{bx}{n}
+			\SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n}
+			\SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n}
+	  \else
+		  \DeclareSymbolFont{AMSb}{U}{jkpss\kp@famillem syb\kp@widerm}{m}{n}% sfmathbb
+		  \SetSymbolFont{AMSb}{bold}{U}{jkpss\kp@famillem syb\kp@widerm}{bx}{n}			
+			\SetSymbolFont{AMSb}{rm}{U}{jkpss\kp@famillem syb\kp@widerm}{m}{n}
+			\SetSymbolFont{AMSb}{boldrm}{U}{jkpss\kp@famillem syb\kp@widerm}{bx}{n}
+			\SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n}
+			\SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n}
+	  \fi
+	\else
+    \ifkp@sfmath
+		  \DeclareSymbolFont{AMSb}{U}{jkpsssyb}{m}{n}% sfmath
+			\SetSymbolFont{AMSb}{bold}{U}{jkpsssyb}{bx}{n}			
+			\SetSymbolFont{AMSb}{rm}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}
+			\SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n}
+			\SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n}
+			\SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n}
+		\else
+		  \DeclareSymbolFont{AMSb}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}% default
+			\SetSymbolFont{AMSb}{bold}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n}			
+			\SetSymbolFont{AMSb}{rm}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}
+			\SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n}
+			\SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n}
+			\SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n}
+		\fi
+	\fi
+\fi	
 
+		\DeclareFontSubstitution{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}
 		\DeclareSymbolFontAlphabet{\mathbb}{AMSb}
 
 
 % Math Symbols C
 
-		\DeclareSymbolFont{symbolsC}{U}{jkp\kp@famillem syc}{m}{n}
-		\SetSymbolFont{symbolsC}{bold}{U}{jkp\kp@famillem syc}{bx}{n}
+    \ifkp@sfmath
+		  \DeclareSymbolFont{symbolsC}{U}{jkpsyc}{m}{n}
+		  \SetSymbolFont{symbolsC}{bold}{U}{jkpsyc}{bx}{n}
+	  \else
+		  \DeclareSymbolFont{symbolsC}{U}{jkp\kp@famillem syc}{m}{n}
+		  \SetSymbolFont{symbolsC}{bold}{U}{jkp\kp@famillem syc}{bx}{n}
+		\fi
+		\SetSymbolFont{symbolsC}{rm}{U}{jkp\kp@famillem syc}{m}{n}
+		\SetSymbolFont{symbolsC}{boldrm}{U}{jkp\kp@famillem syc}{bx}{n}
+		\SetSymbolFont{symbolsC}{sf}{U}{jkpsyc}{m}{n}
+		\SetSymbolFont{symbolsC}{boldsf}{U}{jkpsyc}{bx}{n}
 		\DeclareFontSubstitution{U}{jkp\kp@famillem syc}{m}{n}
 
 
@@ -357,29 +526,65 @@
 
 \ifkp@calasscr
 	\let\mathcal\undefined
+    \ifkp@sfmath
+			\DeclareMathAlphabet{\mathcal}{U}{jkpsyd}{m}{n}
+			\SetMathAlphabet{\mathcal}{bold}{U}{jkpsyd}{bx}{n}
+	  \else
 			\DeclareMathAlphabet{\mathcal}{U}{jkp\kp@famillem syd\kp@widerm}{m}{n}
-				\SetMathAlphabet{\mathcal}{bold}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n}
+			\SetMathAlphabet{\mathcal}{bold}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n}
+		\fi
+			\SetMathAlphabet{\mathcal}{rm}{U}{jkp\kp@famillem syd\kp@widerm}{m}{n}
+			\SetMathAlphabet{\mathcal}{boldrm}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n}
+			\SetMathAlphabet{\mathcal}{sf}{U}{jkpsyd}{m}{n}
+			\SetMathAlphabet{\mathcal}{boldsf}{U}{jkpsyd}{bx}{n}
 		\ifkp@mathscr
 			\DeclareSymbolFontAlphabet{\mathscr}{symbols}
 		\fi
 \else
 		\ifkp@mathscr
-			\DeclareMathAlphabet{\mathscr}{U}{jkp\kp@famillem syd\kp@widerm}{m}{n}
-				\SetMathAlphabet{\mathscr}{bold}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n}
+      \ifkp@sfmath
+		  	\DeclareMathAlphabet{\mathscr}{U}{jkpsyd}{m}{n}
+	  		\SetMathAlphabet{\mathscr}{bold}{U}{jkpsyd}{bx}{n}
+	    \else
+	  		\DeclareMathAlphabet{\mathscr}{U}{jkp\kp@famillem syd\kp@widerm}{m}{n}
+	  		\SetMathAlphabet{\mathscr}{bold}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n}
+	  	\fi
+	  		\SetMathAlphabet{\mathscr}{rm}{U}{jkp\kp@famillem syd\kp@widerm}{m}{n}
+	  		\SetMathAlphabet{\mathscr}{boldrm}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n}
+	  		\SetMathAlphabet{\mathscr}{sf}{U}{jkpsyd}{m}{n}
+	  		\SetMathAlphabet{\mathscr}{boldsf}{U}{jkpsyd}{bx}{n}
 		\fi
 \fi
 
 % Math Extension
 
-		\DeclareSymbolFont{largesymbols}{OMX}{jkp\kp@famillem}{m}{n}
+    \ifkp@sfmath
+		  \DeclareSymbolFont{largesymbols}{OMX}{jkpss}{m}{n}
+			\SetSymbolFont{largesymbols}{bold}{OMX}{jkpss}{bx}{n}
+	  \else
+		  \DeclareSymbolFont{largesymbols}{OMX}{jkp\kp@famillem}{m}{n}
 			\SetSymbolFont{largesymbols}{bold}{OMX}{jkp\kp@famillem}{bx}{n}
+		\fi
+			\SetSymbolFont{largesymbols}{rm}{OMX}{jkp\kp@famillem}{m}{n}
+			\SetSymbolFont{largesymbols}{boldrm}{OMX}{jkp\kp@famillem}{bx}{n}
+			\SetSymbolFont{largesymbols}{sf}{OMX}{jkpss}{m}{n}
+			\SetSymbolFont{largesymbols}{boldsf}{OMX}{jkpss}{bx}{n}
 			\DeclareFontSubstitution{OMX}{jkp\kp@famillem}{m}{n}
 
 
 % Math Extension A
 
-		\DeclareSymbolFont{largesymbolsA}{U}{jkp\kp@famillem exa}{m}{n}
+    \ifkp@sfmath
+		  \DeclareSymbolFont{largesymbolsA}{U}{jkpexa}{m}{n}
+			\SetSymbolFont{largesymbolsA}{bold}{U}{jkpexa}{bx}{n}
+	  \else
+		  \DeclareSymbolFont{largesymbolsA}{U}{jkp\kp@famillem exa}{m}{n}
 			\SetSymbolFont{largesymbolsA}{bold}{U}{jkp\kp@famillem exa}{bx}{n}
+		\fi
+			\SetSymbolFont{largesymbolsA}{rm}{U}{jkp\kp@famillem exa}{m}{n}
+			\SetSymbolFont{largesymbolsA}{boldrm}{U}{jkp\kp@famillem exa}{bx}{n}
+			\SetSymbolFont{largesymbolsA}{sf}{U}{jkpexa}{m}{n}
+			\SetSymbolFont{largesymbolsA}{boldsf}{U}{jkpexa}{bx}{n}
 			\DeclareFontSubstitution{U}{jkp\kp@famillem exa}{m}{n}
 
 
@@ -690,8 +895,8 @@
 \re@DeclareMathSymbol{\thicksim}{\mathrel}{AMSb}{115}
 \re@DeclareMathSymbol{\thickapprox}{\mathrel}{AMSb}{116}
 \re@DeclareMathSymbol{\approxeq}{\mathrel}{AMSb}{117}
-\re@DeclareMathSymbol{\succapprox}{\mathrel}{AMSb}{118}
-\re@DeclareMathSymbol{\precapprox}{\mathrel}{AMSb}{119}
+\re@DeclareMathSymbol{\succapprox}{\mathrel}{AMSb}{119}
+\re@DeclareMathSymbol{\precapprox}{\mathrel}{AMSb}{118}
 \re@DeclareMathSymbol{\curvearrowleft}{\mathrel}{AMSb}{120}
 \re@DeclareMathSymbol{\curvearrowright}{\mathrel}{AMSb}{121}
 \re@DeclareMathSymbol{\digamma}{\mathord}{AMSb}{122}
@@ -900,16 +1105,16 @@
 \re@DeclareMathSymbol{\Psisl}{\mathord}{letters}{9}
 \re@DeclareMathSymbol{\Omegasl}{\mathord}{letters}{10}
 
-\re@DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersA}{0}
-\re@DeclareMathSymbol{\Deltaup}{\mathalpha}{lettersA}{1}
-\re@DeclareMathSymbol{\Thetaup}{\mathalpha}{lettersA}{2}
-\re@DeclareMathSymbol{\Lambdaup}{\mathalpha}{lettersA}{3}
-\re@DeclareMathSymbol{\Xiup}{\mathalpha}{lettersA}{4}
-\re@DeclareMathSymbol{\Piup}{\mathalpha}{lettersA}{5}
-\re@DeclareMathSymbol{\Sigmaup}{\mathalpha}{lettersA}{6}
-\re@DeclareMathSymbol{\Upsilonup}{\mathalpha}{lettersA}{7}
-\re@DeclareMathSymbol{\Phiup}{\mathalpha}{lettersA}{8}
-\re@DeclareMathSymbol{\Psiup}{\mathalpha}{lettersA}{9}
+\re@DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersA}{00}
+\re@DeclareMathSymbol{\Deltaup}{\mathalpha}{lettersA}{01}
+\re@DeclareMathSymbol{\Thetaup}{\mathalpha}{lettersA}{02}
+\re@DeclareMathSymbol{\Lambdaup}{\mathalpha}{lettersA}{03}
+\re@DeclareMathSymbol{\Xiup}{\mathalpha}{lettersA}{04}
+\re@DeclareMathSymbol{\Piup}{\mathalpha}{lettersA}{05}
+\re@DeclareMathSymbol{\Sigmaup}{\mathalpha}{lettersA}{06}
+\re@DeclareMathSymbol{\Upsilonup}{\mathalpha}{lettersA}{07}
+\re@DeclareMathSymbol{\Phiup}{\mathalpha}{lettersA}{08}
+\re@DeclareMathSymbol{\Psiup}{\mathalpha}{lettersA}{09}
 \re@DeclareMathSymbol{\Omegaup}{\mathalpha}{lettersA}{10}
 
 \re@DeclareMathSymbol{\alphaup}{\mathord}{lettersA}{11}
@@ -1123,42 +1328,42 @@
 	\re@DeclareMathSymbol{\Psi}{\mathord}{letters}{9}
 	\re@DeclareMathSymbol{\Omega}{\mathord}{letters}{10}
 	
-	\re@DeclareMathSymbol{\otherGamma}{\mathord}{lettersA}{0}
-	\re@DeclareMathSymbol{\otherDelta}{\mathord}{lettersA}{1}
-	\re@DeclareMathSymbol{\otherTheta}{\mathord}{lettersA}{2}
-	\re@DeclareMathSymbol{\otherLambda}{\mathord}{lettersA}{3}
-	\re@DeclareMathSymbol{\otherXi}{\mathord}{lettersA}{4}
-	\re@DeclareMathSymbol{\otherPi}{\mathord}{lettersA}{5}
-	\re@DeclareMathSymbol{\otherSigma}{\mathord}{lettersA}{6}
-	\re@DeclareMathSymbol{\otherUpsilon}{\mathord}{lettersA}{7}
-	\re@DeclareMathSymbol{\otherPhi}{\mathord}{lettersA}{8}
-	\re@DeclareMathSymbol{\otherPsi}{\mathord}{lettersA}{9}
+	\re@DeclareMathSymbol{\otherGamma}{\mathord}{lettersA}{00}
+	\re@DeclareMathSymbol{\otherDelta}{\mathord}{lettersA}{01}
+	\re@DeclareMathSymbol{\otherTheta}{\mathord}{lettersA}{02}
+	\re@DeclareMathSymbol{\otherLambda}{\mathord}{lettersA}{03}
+	\re@DeclareMathSymbol{\otherXi}{\mathord}{lettersA}{04}
+	\re@DeclareMathSymbol{\otherPi}{\mathord}{lettersA}{05}
+	\re@DeclareMathSymbol{\otherSigma}{\mathord}{lettersA}{06}
+	\re@DeclareMathSymbol{\otherUpsilon}{\mathord}{lettersA}{07}
+	\re@DeclareMathSymbol{\otherPhi}{\mathord}{lettersA}{08}
+	\re@DeclareMathSymbol{\otherPsi}{\mathord}{lettersA}{09}
 	\re@DeclareMathSymbol{\otherOmega}{\mathord}{lettersA}{10}	
 	
-	\re@DeclareMathSymbol{\varGamma}{\mathord}{lettersA}{0}
-	\re@DeclareMathSymbol{\varDelta}{\mathord}{lettersA}{1}
-	\re@DeclareMathSymbol{\varTheta}{\mathord}{lettersA}{2}
-	\re@DeclareMathSymbol{\varLambda}{\mathord}{lettersA}{3}
-	\re@DeclareMathSymbol{\varXi}{\mathord}{lettersA}{4}
-	\re@DeclareMathSymbol{\varPi}{\mathord}{lettersA}{5}
-	\re@DeclareMathSymbol{\varSigma}{\mathord}{lettersA}{6}
-	\re@DeclareMathSymbol{\varUpsilon}{\mathord}{lettersA}{7}
-	\re@DeclareMathSymbol{\varPhi}{\mathord}{lettersA}{8}
-	\re@DeclareMathSymbol{\varPsi}{\mathord}{lettersA}{9}
+	\re@DeclareMathSymbol{\varGamma}{\mathord}{lettersA}{00}
+	\re@DeclareMathSymbol{\varDelta}{\mathord}{lettersA}{01}
+	\re@DeclareMathSymbol{\varTheta}{\mathord}{lettersA}{02}
+	\re@DeclareMathSymbol{\varLambda}{\mathord}{lettersA}{03}
+	\re@DeclareMathSymbol{\varXi}{\mathord}{lettersA}{04}
+	\re@DeclareMathSymbol{\varPi}{\mathord}{lettersA}{05}
+	\re@DeclareMathSymbol{\varSigma}{\mathord}{lettersA}{06}
+	\re@DeclareMathSymbol{\varUpsilon}{\mathord}{lettersA}{07}
+	\re@DeclareMathSymbol{\varPhi}{\mathord}{lettersA}{08}
+	\re@DeclareMathSymbol{\varPsi}{\mathord}{lettersA}{09}
 	\re@DeclareMathSymbol{\varOmega}{\mathord}{lettersA}{10}	
 
 \else
 	
-	\re@DeclareMathSymbol{\Gamma}{\mathalpha}{lettersA}{0}
-	\re@DeclareMathSymbol{\Delta}{\mathalpha}{lettersA}{1}
-	\re@DeclareMathSymbol{\Theta}{\mathalpha}{lettersA}{2}
-	\re@DeclareMathSymbol{\Lambda}{\mathalpha}{lettersA}{3}
-	\re@DeclareMathSymbol{\Xi}{\mathalpha}{lettersA}{4}
-	\re@DeclareMathSymbol{\Pi}{\mathalpha}{lettersA}{5}
-	\re@DeclareMathSymbol{\Sigma}{\mathalpha}{lettersA}{6}
-	\re@DeclareMathSymbol{\Upsilon}{\mathalpha}{lettersA}{7}
-	\re@DeclareMathSymbol{\Phi}{\mathalpha}{lettersA}{8}
-	\re@DeclareMathSymbol{\Psi}{\mathalpha}{lettersA}{9}
+	\re@DeclareMathSymbol{\Gamma}{\mathalpha}{lettersA}{00}
+	\re@DeclareMathSymbol{\Delta}{\mathalpha}{lettersA}{01}
+	\re@DeclareMathSymbol{\Theta}{\mathalpha}{lettersA}{02}
+	\re@DeclareMathSymbol{\Lambda}{\mathalpha}{lettersA}{03}
+	\re@DeclareMathSymbol{\Xi}{\mathalpha}{lettersA}{04}
+	\re@DeclareMathSymbol{\Pi}{\mathalpha}{lettersA}{05}
+	\re@DeclareMathSymbol{\Sigma}{\mathalpha}{lettersA}{06}
+	\re@DeclareMathSymbol{\Upsilon}{\mathalpha}{lettersA}{07}
+	\re@DeclareMathSymbol{\Phi}{\mathalpha}{lettersA}{08}
+	\re@DeclareMathSymbol{\Psi}{\mathalpha}{lettersA}{09}
 	\re@DeclareMathSymbol{\Omega}{\mathalpha}{lettersA}{10}
 
 	\re@DeclareMathSymbol{\otherGamma}{\mathord}{letters}{0}
@@ -1202,14 +1407,13 @@
 \renewcommand{\int}{\intop\kp@ilimits}
 \renewcommand{\oint}{\ointop\kp@ilimits}
 
-
 \re@DeclareMathSymbol{\coprodop}{\mathop}{largesymbols}{96}
     \def\coprod{\coprodop\kp@slimits}
 \re@DeclareMathSymbol{\bigveeop}{\mathop}{largesymbols}{87}
     \def\bigvee{\bigveeop\kp@slimits}
 \re@DeclareMathSymbol{\bigwedgeop}{\mathop}{largesymbols}{86}
     \def\bigwedge{\bigwedgeop\kp@slimits}
-\re@DeclareMathSymbol{\bigplusop}{\mathop}{largesymbols}{85}
+\re@DeclareMathSymbol{\biguplusop}{\mathop}{largesymbols}{85}
     \def\biguplus{\biguplusop\kp@slimits}
 \re@DeclareMathSymbol{\bigcapop}{\mathop}{largesymbols}{84}
     \def\bigcap{\bigcapop\kp@slimits}
@@ -1360,9 +1564,12 @@
 % \D close integral
 %%%%%%%%%%%%%%%%%%%
 
-\ifkp@Dcommand\def\D#1{\mathclose{\,\ifkp@upRm\mathrm{d}%
-		\else\mathit{d}%
-		\fi}#1}\fi
+\ifkp@Dcommand
+  \DeclareMathSymbol{\kp@D}{\mathord}{operators}{100}
+  \def\D#1{\mathclose{\,\ifkp@upRm\kp@D%
+    \else\mathit{d}%
+		  \fi}#1}
+\fi
 
 %%%%%%%%%%%%
 % new arrows
@@ -1388,11 +1595,7 @@
 % \classicstylenums and \olstylenums
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ifkp@light
-		\def\classicstylenums#1{{\fontfamily{jkpl}\selectfont #1}}
-\else
-		\def\classicstylenums#1{{\fontfamily{jkp}\selectfont #1}}
-\fi
+\def\classicstylenums#1{{\fontfamily{jkp\kp@stymemath\kp@famillem}\selectfont #1}}
 
 %%%
 
diff --git a/Master/texmf-dist/tex/latex/kpfonts/omljkpss.fd b/Master/texmf-dist/tex/latex/kpfonts/omljkpss.fd
new file mode 100755
index 00000000000..4cc5c46e5ac
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kpfonts/omljkpss.fd
@@ -0,0 +1,17 @@
+\ProvidesFile{omljkpss.fd}
+	[2006/08/15 v1.0]
+
+\DeclareFontFamily{OML}{jkpss}{\skewchar\font127 }
+
+\ifkp@upRm
+	\DeclareFontShape{OML}{jkpss}{m}{it}{<-> jkpssmif}{}
+	\DeclareFontShape{OML}{jkpss}{bx}{it}{<-> jkpssbmif}{}
+\else
+	\DeclareFontShape{OML}{jkpss}{m}{it}{<-> jkpssmi}{}
+	\DeclareFontShape{OML}{jkpss}{bx}{it}{<-> jkpssbmi}{}
+\fi
+
+\DeclareFontShape{OML}{jkpss}{l}{it}{<->ssub * jkpss/m/it}{}
+\DeclareFontShape{OML}{jkpss}{b}{it}{<->ssub * jkpss/bx/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/kpfonts/omljkpssvos.fd b/Master/texmf-dist/tex/latex/kpfonts/omljkpssvos.fd
new file mode 100755
index 00000000000..a6589643fd9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kpfonts/omljkpssvos.fd
@@ -0,0 +1,17 @@
+\ProvidesFile{omljkpssvos.fd}
+	[2006/08/15 v1.0]
+
+\DeclareFontFamily{OML}{jkpssvos}{\skewchar\font127 }
+
+\ifkp@upRm
+	\DeclareFontShape{OML}{jkpssvos}{m}{it}{<-> jkpssvosmif}{}
+	\DeclareFontShape{OML}{jkpssvos}{bx}{it}{<-> jkpssvosbmif}{}
+\else
+	\DeclareFontShape{OML}{jkpssvos}{m}{it}{<-> jkpssvosmi}{}
+	\DeclareFontShape{OML}{jkpssvos}{bx}{it}{<-> jkpssvosbmi}{}
+\fi
+
+\DeclareFontShape{OML}{jkpssvos}{l}{it}{<->ssub * jkpssvos/m/it}{}
+\DeclareFontShape{OML}{jkpssvos}{b}{it}{<->ssub * jkpssvos/bx/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/kpfonts/omxjkpss.fd b/Master/texmf-dist/tex/latex/kpfonts/omxjkpss.fd
new file mode 100755
index 00000000000..34b92e0e19a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kpfonts/omxjkpss.fd
@@ -0,0 +1,14 @@
+\ProvidesFile{omxjkpss.fd}
+	[2006/08/15 v1.0]
+
+\DeclareFontFamily{OMX}{jkpss}{}
+\DeclareFontShape{OMX}{jkpss}{m}{n}{
+   <-> jkpssex%
+}{}
+\DeclareFontShape{OMX}{jkpss}{bx}{n}{
+   <-> jkpssbex%
+}{}
+\DeclareFontShape{OMX}{jkpss}{l}{n}{<->ssub * jkpss/m/n}{}
+\DeclareFontShape{OMX}{jkpss}{b}{n}{<->ssub * jkpss/bx/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/kpfonts/ujkpsslsyb.fd b/Master/texmf-dist/tex/latex/kpfonts/ujkpsslsyb.fd
new file mode 100755
index 00000000000..fe901e11b38
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kpfonts/ujkpsslsyb.fd
@@ -0,0 +1,14 @@
+\ProvidesFile{ujkpsslsyb.fd}
+	[2006/08/15 v1.0]
+
+\DeclareFontFamily{U}{jkpsslsyb}{}
+\DeclareFontShape{U}{jkpsslsyb}{m}{n}{
+   <-> jkpsslsyb%
+}{}
+\DeclareFontShape{U}{jkpsslsyb}{bx}{n}{
+   <-> jkpsslbsyb%
+}{}
+\DeclareFontShape{U}{jkpsslsyb}{l}{n}{<->ssub * jkpsslsyb/m/n}{}
+\DeclareFontShape{U}{jkpsslsyb}{b}{n}{<->ssub * jkpsslsyb/bx/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/kpfonts/ujkpsslsybw.fd b/Master/texmf-dist/tex/latex/kpfonts/ujkpsslsybw.fd
new file mode 100755
index 00000000000..e1d896de6a4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kpfonts/ujkpsslsybw.fd
@@ -0,0 +1,14 @@
+\ProvidesFile{ujkpsslsybw.fd}
+	[2006/08/15 v1.0]
+
+\DeclareFontFamily{U}{jkpsslsybw}{}
+\DeclareFontShape{U}{jkpsslsybw}{m}{n}{
+   <-> jkpsslsybw%
+}{}
+\DeclareFontShape{U}{jkpsslsybw}{bx}{n}{
+   <-> jkpsslbsybw%
+}{}
+\DeclareFontShape{U}{jkpsslsybw}{l}{n}{<->ssub * jkpsslsybw/m/n}{}
+\DeclareFontShape{U}{jkpsslsybw}{b}{n}{<->ssub * jkpsslsybw/bx/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/kpfonts/ujkpssmia.fd b/Master/texmf-dist/tex/latex/kpfonts/ujkpssmia.fd
new file mode 100755
index 00000000000..4fc553da48b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kpfonts/ujkpssmia.fd
@@ -0,0 +1,14 @@
+\ProvidesFile{ujkpssmia.fd}
+	[2006/08/15 v1.0]
+
+\DeclareFontFamily{U}{jkpssmia}{}
+\DeclareFontShape{U}{jkpssmia}{m}{it}{
+   <-> jkpssmia%
+}{}
+\DeclareFontShape{U}{jkpssmia}{bx}{it}{
+   <-> jkpssbmia%
+}{}
+\DeclareFontShape{U}{jkpssmia}{l}{it}{<->ssub * jkpssmia/m/it}{}
+\DeclareFontShape{U}{jkpssmia}{b}{it}{<->ssub * jkpssmia/bx/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/kpfonts/ujkpsssyb.fd b/Master/texmf-dist/tex/latex/kpfonts/ujkpsssyb.fd
new file mode 100755
index 00000000000..a52cc97aa95
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kpfonts/ujkpsssyb.fd
@@ -0,0 +1,14 @@
+\ProvidesFile{ujkpsssyb.fd}
+	[2006/08/15 v1.0]
+
+\DeclareFontFamily{U}{jkpsssyb}{}
+\DeclareFontShape{U}{jkpsssyb}{m}{n}{
+   <-> jkpsssyb%
+}{}
+\DeclareFontShape{U}{jkpsssyb}{bx}{n}{
+   <-> jkpssbsyb%
+}{}
+\DeclareFontShape{U}{jkpsssyb}{l}{n}{<->ssub * jkpsssyb/m/n}{}
+\DeclareFontShape{U}{jkpsssyb}{b}{n}{<->ssub * jkpsssyb/bx/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/kpfonts/ujkpsssybw.fd b/Master/texmf-dist/tex/latex/kpfonts/ujkpsssybw.fd
new file mode 100755
index 00000000000..0d3ef33e643
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kpfonts/ujkpsssybw.fd
@@ -0,0 +1,14 @@
+\ProvidesFile{ujkpsssybw.fd}
+	[2006/08/15 v1.0]
+
+\DeclareFontFamily{U}{jkpsssybw}{}
+\DeclareFontShape{U}{jkpsssybw}{m}{n}{
+   <-> jkpsssybw%
+}{}
+\DeclareFontShape{U}{jkpsssybw}{bx}{n}{
+   <-> jkpssbsybw%
+}{}
+\DeclareFontShape{U}{jkpsssybw}{l}{n}{<->ssub * jkpsssybw/m/n}{}
+\DeclareFontShape{U}{jkpsssybw}{b}{n}{<->ssub * jkpsssybw/bx/n}{}
+
+\endinput