11 files changed, 70 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/fonts/qpxqtx/00README b/Master/texmf-dist/doc/fonts/qpxqtx/00README
index 3c5cc0bf461..3e0943c041a 100644
--- a/Master/texmf-dist/doc/fonts/qpxqtx/00README
+++ b/Master/texmf-dist/doc/fonts/qpxqtx/00README
@@ -1,5 +1,5 @@
 %% iso8859-2
-%% 25.01.2007, ver. 0.9. Public domain.
+%% 03.02.2007, ver. 0.95. Public domain.
 %% Jacek Mierczyński <mier@ibwpan.gda.pl>
 %% Staszek Wawrykiewicz <staw@gust.org.pl>
 
@@ -122,6 +122,6 @@ wer. 0.8 15.02.2002 - usunięto niepoż±dane spacje w pliku qpxmath.tex
 wer. 0.9 25.01.2007 - zmiana wykorzystywanych fontów z QusiPalatino na 
                       Pagella i QuasiTimes na Termes; poł±czenie poprzednio
                       udostępnianych pakietów qpx i qtx w jeden pakiet
-
+wer. 0.95 3.02.2007 - drobne poprawki
 
 Wszelkie uwagi s± mile widziane.
diff --git a/Master/texmf-dist/doc/fonts/qpxqtx/p01tst.tex b/Master/texmf-dist/doc/fonts/qpxqtx/p01tst.tex
index 2a03e4c973e..bd379256d54 100644
--- a/Master/texmf-dist/doc/fonts/qpxqtx/p01tst.tex
+++ b/Master/texmf-dist/doc/fonts/qpxqtx/p01tst.tex
@@ -1,5 +1,5 @@
 %&mex --translate-file=il2-pl
-%% test of qpxmath.tex (25.01.2007, StaW. Public domain)
+%% test of qpxmath.tex (03.02.2007. Public domain)
 \def\PT{dd} %% skład 10dd zamiast 10pt ;-)
 %\def\altg{a}
 %\def\fontenc{rm}
@@ -66,7 +66,7 @@ $$\def\\#1#2{(1-q^{#1_#2+n})} % to save typing
 $$\int_0^\infty{t-ib\over t^2+b^2}e^{iat}\,dt=e^{ab}E_1(ab),\qquad a,b>0$$
 
 %%
-\smallskip\ninepoint 9pt (albo czego¶tam)
+\smallskip\ninepoint 9pt (albo dd)
 $$A,\dots,Z\quad a,\dots,z\quad \Gamma, \dots,\Omega\quad
  \varGamma, \dots, \varOmega\quad
  \alpha,\dots,\omega\quad g\dots\varg$$ %\quad \varv\quad \varw\quad \vary
@@ -113,7 +113,7 @@ $$\def\\#1#2{(1-q^{#1_#2+n})} % to save typing
 $$\int_0^\infty{t-ib\over t^2+b^2}e^{iat}\,dt=e^{ab}E_1(ab),\qquad a,b>0$$
 
 %%
-\smallskip \eightpoint 8pt (albo czego¶tam)
+\smallskip \eightpoint 8pt (albo dd)
 $$A,\dots,Z\quad a,\dots,z\quad \Gamma, \dots,\Omega\quad
  \varGamma, \dots, \varOmega\quad
  \alpha,\dots,\omega\quad g\dots\varg$$ %\varv \varw \vary
diff --git a/Master/texmf-dist/doc/fonts/qpxqtx/qpxsymb.tex b/Master/texmf-dist/doc/fonts/qpxqtx/qpxsymb.tex
index 0b34af4b217..a7501afbc9d 100644
--- a/Master/texmf-dist/doc/fonts/qpxqtx/qpxsymb.tex
+++ b/Master/texmf-dist/doc/fonts/qpxqtx/qpxsymb.tex
@@ -1,5 +1,5 @@
 %&mex --translate-file=il2-pl
-%% StaW (25.01.2007). Public domain
+%% 03.02.2007. Public domain
 %% qpxsymb -- zestawienie symboli AMS w fontach PXFONTS
 \input qpxmath.tex
 \input amsqpx.tex % ładuje amsqtx.def
diff --git a/Master/texmf-dist/doc/fonts/qpxqtx/qpxtest.tex b/Master/texmf-dist/doc/fonts/qpxqtx/qpxtest.tex
index 2a5b9ca48c2..4b00d188a20 100644
--- a/Master/texmf-dist/doc/fonts/qpxqtx/qpxtest.tex
+++ b/Master/texmf-dist/doc/fonts/qpxqtx/qpxtest.tex
@@ -1,4 +1,4 @@
-%&platex  --translate-file=il2-pl
+%& --translate-file=il2-pl
 \documentclass[a4paper,11pt]{article}
 \usepackage{polski}
 \usepackage{tgpagella}
diff --git a/Master/texmf-dist/doc/fonts/qpxqtx/qtxsymb.tex b/Master/texmf-dist/doc/fonts/qpxqtx/qtxsymb.tex
index 9966307c8e3..7b0be0f5fc3 100644
--- a/Master/texmf-dist/doc/fonts/qpxqtx/qtxsymb.tex
+++ b/Master/texmf-dist/doc/fonts/qpxqtx/qtxsymb.tex
@@ -1,5 +1,5 @@
 %&mex --translate-file=il2-pl
-%% StaW (25.01.2007). Public domain
+%% 03.02.2007. Public domain
 %% qtxsymb.tex -- zestawienie symboli AMS w fontach TXFONTS
 \input qtxmath
 \input amsqtx.tex % ładuje amsqtx.def
diff --git a/Master/texmf-dist/doc/fonts/qpxqtx/qtxtest.tex b/Master/texmf-dist/doc/fonts/qpxqtx/qtxtest.tex
index 60295613c02..5df7761ecbe 100644
--- a/Master/texmf-dist/doc/fonts/qpxqtx/qtxtest.tex
+++ b/Master/texmf-dist/doc/fonts/qpxqtx/qtxtest.tex
@@ -1,4 +1,4 @@
-%&platex  --translate-file=il2-pl
+%& --translate-file=il2-pl
 \documentclass[a4paper,12pt]{article}
 \usepackage{polski}
 \usepackage{tgtermes}
diff --git a/Master/texmf-dist/doc/fonts/qpxqtx/t01tst.tex b/Master/texmf-dist/doc/fonts/qpxqtx/t01tst.tex
index 850c65da748..34824820492 100644
--- a/Master/texmf-dist/doc/fonts/qpxqtx/t01tst.tex
+++ b/Master/texmf-dist/doc/fonts/qpxqtx/t01tst.tex
@@ -1,5 +1,5 @@
 %&mex --translate-file=il2-pl
-%% test of qtxmath.tex (25.01.2007, StaW. Public domain)
+%% test of qtxmath.tex (03.02.2007. Public domain)
 \def\PT{dd} %% skład 10dd zamiast 10pt ;-)
 %\def\altg{a}
 %\def\fontenc{rm}
@@ -67,7 +67,7 @@ $$\def\\#1#2{(1-q^{#1_#2+n})} % to save typing
 $$\int_0^\infty{t-ib\over t^2+b^2}e^{iat}\,dt=e^{ab}E_1(ab),\qquad a,b>0$$
 
 %%
-\smallskip\ninepoint 9pt (albo czego¶tam)
+\smallskip\ninepoint 9pt (albo dd)
 $$A,\dots,Z\quad a,\dots,z\quad \Gamma, \dots,\Omega\quad
  \varGamma, \dots, \varOmega\quad
  \alpha,\dots,\omega\quad \varg\quad \varv\quad \varw\quad \vary$$
@@ -115,7 +115,7 @@ $$\def\\#1#2{(1-q^{#1_#2+n})} % to save typing
 $$\int_0^\infty{t-ib\over t^2+b^2}e^{iat}\,dt=e^{ab}E_1(ab),\qquad a,b>0$$
 
 %%
-\smallskip \eightpoint 8pt (albo czego¶tam)
+\smallskip \eightpoint 8pt (albo dd)
 $$A,\dots,Z\quad a,\dots,z\quad \Gamma, \dots,\Omega\quad
  \varGamma, \dots, \varOmega\quad
  \alpha,\dots,\omega\quad \varg\quad \varv\quad \varw\quad \vary$$
diff --git a/Master/texmf-dist/tex/generic/qpxqtx/qpxmath.sty b/Master/texmf-dist/tex/generic/qpxqtx/qpxmath.sty
index c96f60c83d6..77255720a09 100644
--- a/Master/texmf-dist/tex/generic/qpxqtx/qpxmath.sty
+++ b/Master/texmf-dist/tex/generic/qpxqtx/qpxmath.sty
@@ -1,3 +1,6 @@
+%% Jacek Mierczy\'nski, Staszek Wawrykiewicz, ver. 0.95 (03.02.2007) 
+%% Public domain.
+%% -----
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{qpxmath}
 %%
@@ -12,11 +15,11 @@
 }
 \ProcessOptions\relax
 %
-\DeclareSymbolFont{operators}   {\encodingdefault}{qpl} {m}{n}
+\DeclareSymbolFont{operators}   {OT1}{qpl} {m}{n}
 \DeclareSymbolFont{letters}     {OML}{qpxmi} {m}{it}
 \DeclareSymbolFont{symbols}     {OMS}{pxsy} {m}{n}
 \DeclareSymbolFont{largesymbols}     {OMX}{pxex} {m}{n}
-\SetSymbolFont{operators}{bold}{\encodingdefault}{qpl} {b}{n}
+\SetSymbolFont{operators}{bold}{OT1}{qpl} {b}{n}
 \SetSymbolFont{letters}  {bold}{OML}{qpxmi} {b}{it}
 \SetSymbolFont{symbols}  {bold}{OMS}{pxsy}{b}{n}
 \SetSymbolFont{largesymbols}  {bold}{OMX}{pxex}{b}{n}
diff --git a/Master/texmf-dist/tex/generic/qpxqtx/qpxmath.tex b/Master/texmf-dist/tex/generic/qpxqtx/qpxmath.tex
index 76ea553b9d9..b62b80356b3 100644
--- a/Master/texmf-dist/tex/generic/qpxqtx/qpxmath.tex
+++ b/Master/texmf-dist/tex/generic/qpxqtx/qpxmath.tex
@@ -1,12 +1,12 @@
-%% macros for QuasiPalladio and math fonts from pxfonts package
-%% Jacek Mierczy\'nski, Staszek Wawrykiewicz, ver. 0.8 (15.02.2002) 
+%% macros for TeX Gyre Pagella and math fonts from pxfonts package
+%% Jacek Mierczy\'nski, Staszek Wawrykiewicz, ver. 0.95 (03.02.2007) 
 %% Public domain.
 %% -----
 % basic unit, can be defined before \input qtxmath.tex and changed to dd ;-)
 \ifx\PT\undefined\def\PT{pt}\fi
 \ifx\altg\undefined\def\altg{}\fi
 \ifx\fontenc\undefined\def\fontenc{qx}\fi
-% -- fonts 
+% -- fonts %%% to remember: (qx-qplr) and sc !!!
 \font\tenrm=\fontenc-qplr at10\PT \font\sevenrm=\fontenc-qplr at7\PT 
 \font\fiverm=\fontenc-qplr at5\PT \font\eightrm=\fontenc-qplr at8\PT 
 \font\ninerm=\fontenc-qplr at9\PT \font\sixrm=\fontenc-qplr at6\PT
@@ -124,4 +124,26 @@
 \mathchardef\varOmega="010A
 \mathchardef\varg="0190
 %%
+\def\ecmathaccdef{%
+\def\acute{\mathaccent"7001 }
+\def\grave{\mathaccent"7000 }
+\def\ddot{\mathaccent"7004 }
+\def\tilde{\mathaccent"7003 }
+\def\bar{\mathaccent"7009 }
+\def\breve{\mathaccent"7008 }
+\def\check{\mathaccent"7007 }
+\def\hat{\mathaccent"7002 }
+\def\dot{\mathaccent"700A }
+}
+%
+\def\qxfontenc{qx}\def\rmfontenc{rm}\def\csfontenc{cs}
+%
+\ifx\fontenc\qxfontenc\else
+   \ifx\fontenc\rmfontenc\else
+      \ifx\fontenc\csfontenc\else
+      \ecmathaccdef
+      \fi
+   \fi
+\fi
+
 \endinput
diff --git a/Master/texmf-dist/tex/generic/qpxqtx/qtxmath.sty b/Master/texmf-dist/tex/generic/qpxqtx/qtxmath.sty
index 753bf4a1ced..4bd1ce3f4d8 100644
--- a/Master/texmf-dist/tex/generic/qpxqtx/qtxmath.sty
+++ b/Master/texmf-dist/tex/generic/qpxqtx/qtxmath.sty
@@ -1,3 +1,6 @@
+%% Jacek Mierczy\'nski, Staszek Wawrykiewicz, ver. 0.95 (03.02.2007) 
+%% Public domain.
+%% -----
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{qtxmath}
 %%
@@ -12,11 +15,11 @@
 }
 \ProcessOptions\relax
 %
-\DeclareSymbolFont{operators}   {\encodingdefault}{qtm} {m}{n}
+\DeclareSymbolFont{operators}   {OT1}{qtm} {m}{n}
 \DeclareSymbolFont{letters}     {OML}{qtxmi} {m}{it}
 \DeclareSymbolFont{symbols}     {OMS}{txsy} {m}{n}
 \DeclareSymbolFont{largesymbols}     {OMX}{txex} {m}{n}
-\SetSymbolFont{operators}{bold}{\encodingdefault}{qtm} {b}{n}
+\SetSymbolFont{operators}{bold}{OT1}{qtm} {b}{n}
 \SetSymbolFont{letters}  {bold}{OML}{qtxmi} {b}{it}
 \SetSymbolFont{symbols}  {bold}{OMS}{txsy}{b}{n}
 \SetSymbolFont{largesymbols}  {bold}{OMX}{txex}{b}{n}
diff --git a/Master/texmf-dist/tex/generic/qpxqtx/qtxmath.tex b/Master/texmf-dist/tex/generic/qpxqtx/qtxmath.tex
index 95e5b06977c..49a7048aad7 100644
--- a/Master/texmf-dist/tex/generic/qpxqtx/qtxmath.tex
+++ b/Master/texmf-dist/tex/generic/qpxqtx/qtxmath.tex
@@ -1,5 +1,5 @@
 %% macros for TeXGyre Termes and math fonts from txfonts package
-%% Jacek Mierczy\'nski, Staszek Wawrykiewicz, ver. 0.9 (15.01.2007)
+%% Jacek Mierczy\'nski, Staszek Wawrykiewicz, ver. 0.95 (03.02.2007)
 %% Public domain.
 %% -----
 % basic unit, can be defined before \input qtxmath.tex and changed to dd ;-)
@@ -126,4 +126,26 @@
 \mathchardef\varw="0192
 \mathchardef\vary="0193
 %%
+\def\ecmathaccdef{%
+\def\acute{\mathaccent"7001 }
+\def\grave{\mathaccent"7000 }
+\def\ddot{\mathaccent"7004 }
+\def\tilde{\mathaccent"7003 }
+\def\bar{\mathaccent"7009 }
+\def\breve{\mathaccent"7008 }
+\def\check{\mathaccent"7007 }
+\def\hat{\mathaccent"7002 }
+\def\dot{\mathaccent"700A }
+}
+%
+\def\qxfontenc{qx}\def\rmfontenc{rm}\def\csfontenc{cs}
+%
+\ifx\fontenc\qxfontenc\else
+   \ifx\fontenc\rmfontenc\else
+      \ifx\fontenc\csfontenc\else
+      \ecmathaccdef
+      \fi
+   \fi
+\fi
+%
 \endinput