3 files changed, 29 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-asr/README b/Master/texmf-dist/doc/generic/pst-asr/README
index 516186e83e7..a2ddcb9ffe2 100644
--- a/Master/texmf-dist/doc/generic/pst-asr/README
+++ b/Master/texmf-dist/doc/generic/pst-asr/README
@@ -1,23 +1,23 @@
-
-The pst-asr package is based on PSTricks and is intended to be
-used by linguists to typeset autosegmental representations. The
-core files are 1) pst-asr.tex, the Tex macro file, 2)
-pst-asr.sty, a LaTex wrapper which calls pst-asr.tex, and 3)
-pst-asr-doc.pdf, the documentation.  The complete Tex source for
-the documentation is zipped into pst-asr-doc-source.zip along
-with README.txt, which has instructions for generating the
-documentation.
-
-The file pst-asr-examples.tex is a LaTex file which contains
-almost all the examples in the documentation, very simply
-formatted (no packages other than pstricks, pst-xkey, and pst-asr
-are used) in order to facilitate user experimentation with
-pst-asr typesetting.  Users should be able to run this file with
-little difficulty if pst-asr is fully installed or is simply
-in the same directory that pst-asr-examples.tex is in.
-pst-asr-examples.pdf shows what the source produces.
-
-This material is subject to the LaTeX Project Public License. See
-http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
-for the details of that license.
-
+
+The pst-asr package is based on PSTricks and is intended to be
+used by linguists to typeset autosegmental representations. The
+core files are 1) pst-asr.tex, the Tex macro file, 2)
+pst-asr.sty, a LaTex wrapper which calls pst-asr.tex, and 3)
+pst-asr-doc.pdf, the documentation.  The complete Tex source for
+the documentation is zipped into pst-asr-doc-source.zip along
+with README.txt, which has instructions for generating the
+documentation.
+
+The file pst-asr-examples.tex is a LaTex file which contains
+almost all the examples in the documentation, very simply
+formatted (no packages other than pstricks, pst-xkey, and pst-asr
+are used) in order to facilitate user experimentation with
+pst-asr typesetting.  Users should be able to run this file with
+little difficulty if pst-asr is fully installed or is simply
+in the same directory that pst-asr-examples.tex is in.
+pst-asr-examples.pdf shows what the source produces.
+
+This material is subject to the LaTeX Project Public License. See
+http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
+for the details of that license.
+
diff --git a/Master/texmf-dist/tex/generic/pst-asr/pst-asr.tex b/Master/texmf-dist/tex/generic/pst-asr/pst-asr.tex
index 0427be4ce37..4a4e27eb977 100644
--- a/Master/texmf-dist/tex/generic/pst-asr/pst-asr.tex
+++ b/Master/texmf-dist/tex/generic/pst-asr/pst-asr.tex
@@ -1,6 +1,5 @@
-
-\def\fileversion{1.2}
-\def\filedate{2006/09/23}
+\def\fileversion{1.3}
+\def\filedate{2010/02/22}
 \csname ASRLoaded\endcsname
 \let\ASRLoaded\endinput
 \ifx\PSTricksLoaded\endinput \else \input pstricks \fi\relax
@@ -34,7 +33,6 @@
 %%% end utilities
 \pst@addfams{ASR}
 \def\asrsetkeys#1{\setkeys[psset]{ASR}{#1}\ignorespaces}
-\def\pssetkeys#1{\setkeys[psset]{}{#1}\ignorespaces}
 \def\pssetpst@pars{\expandafter\psset\expandafter{\pst@pars}}
 \def\xaddto#1#2{%
    \pssetxlength\pst@dimg{#2}%
@@ -126,7 +124,7 @@
 \def\ASR@updateafter{%
    \ASR@trimtoks\everyhbox
    \ASR@dputht=\ht\pst@hbox
-   \expandafter\pssetkeys\expandafter{\pst@par}%
+   \expandafter\psset\expandafter{\pst@par}%
    \advance\ASR@xpos by -\psk@xref\wd\pst@hbox
    \ifdim\ASR@xpos<\ASR@maxleft \ASR@maxleft=\ASR@xpos \fi
    \advance\ASR@xpos by \wd\pst@hbox
@@ -357,7 +355,7 @@
 \newdimen\xpos
 \newdimen\ASRxgap
 \define@boolkey[psset]{ASR}[ASR@]{unitxgap}%
-   {\setkeys[psset]{}{xunit=\ASRxgap}}
+   {\psset{xunit=\ASRxgap}}
 \define@key[psset]{ASR}{xgap}%
    {\@setxgapaux#1\@nil
    \edef\ASR@xgap{\the\pst@dima}%
@@ -470,7 +468,7 @@
    \pssetylength\ASR@dimd{#3}\pssetylength\ASR@dimf{#6}
    \advance\ASR@dimf by -\ASR@dimd
    \advance\ASR@dimd by \ASR@xedratio\ASR@dimf
-   \pssetkeys{linewidth=\ASR@xedlinewidth}
+   \psset{linewidth=\ASR@xedlinewidth}
    \SpecialCoor
    \rput{(\ASR@dime,\ASR@dimf)}(\ASR@dimc,\ASR@dimd){\ASR@xedtype}
    \NormalCoor
diff --git a/Master/texmf-dist/tex/latex/pst-asr/pst-asr.sty b/Master/texmf-dist/tex/latex/pst-asr/pst-asr.sty
index cc30b7c2657..9fc0da55305 100644
--- a/Master/texmf-dist/tex/latex/pst-asr/pst-asr.sty
+++ b/Master/texmf-dist/tex/latex/pst-asr/pst-asr.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{pst-asr}%
-   [2006/09/17 package wrapper for PSTricks pst-asr.tex]
+   [2010/02/22 package wrapper for PSTricks pst-asr.tex]
 \RequirePackage{pstricks,pst-xkey}
 \input pst-asr
 \endinput