metrix (21jan16)

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

4 files changed, 24 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/metrix/README b/Master/texmf-dist/doc/latex/metrix/README
index c9729126093..723bca02297 100644
--- a/Master/texmf-dist/doc/latex/metrix/README
+++ b/Master/texmf-dist/doc/latex/metrix/README
@@ -1,11 +1,12 @@
 
 
-                        M E T R I X
+          M E T R I X
 
 
-                         Tobias Weh
-                      www.tobias-weh.de
-                    github.com/tweh/metrix
+          Tobias Weh
+          mail@tobiw.de
+          http://tobiw.de/en
+          github.com/tweh/metrix
 
           _   _    _   _ _    _  u u  _  u  u _
           et quod temptabam scribere versus erat
@@ -20,8 +21,8 @@ new brevis and a longa accent and a bow to contract syllables.
 
 # License
 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.
+See http://mirror.ctan.org/help/Catalogue/licenses.lppl.html
+for the details of that license.
 
 
 # Files
diff --git a/Master/texmf-dist/doc/latex/metrix/metrix.pdf b/Master/texmf-dist/doc/latex/metrix/metrix.pdf
index dcc8bb4a3d5..b92204b8d91 100644
--- a/Master/texmf-dist/doc/latex/metrix/metrix.pdf
+++ b/Master/texmf-dist/doc/latex/metrix/metrix.pdf
diff --git a/Master/texmf-dist/source/latex/metrix/metrix.dtx b/Master/texmf-dist/source/latex/metrix/metrix.dtx
index 7ae0f8c50b5..bc9def105ce 100644
--- a/Master/texmf-dist/source/latex/metrix/metrix.dtx
+++ b/Master/texmf-dist/source/latex/metrix/metrix.dtx
@@ -12,8 +12,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2013/07/12]
-%<package>\@ifpackagelater{expl3}{2013/03/14}
+\RequirePackage{expl3}[2016/01/03]
+%<package>\@ifpackagelater{expl3}{2016/01/03}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{metrix}{Support package l3kernel too old}
@@ -27,8 +27,8 @@
 %<package>  }
 \def\metrixFileName{metrix}
 \def\metrixFileDescription{Typset prosody/metric symbols.}
-\def\metrixFileDate{2015/09/02}
-\def\metrixFileVersion{1.2}
+\def\metrixFileDate{2016/01/21}
+\def\metrixFileVersion{1.2a}
 %</driver|package>
 %<*driver>
 \documentclass[full,english]{l3doc}
@@ -1220,7 +1220,7 @@
 % \subsection{Variants}
 % Later we'll need the following variant.
 %    \begin{macrocode}
-\cs_generate_variant:Nn \prop_get:Nn { No , Nf , NV , Nx }
+\cs_generate_variant:Nn \prop_item:Nn { No , Nf , NV , Nx }
 \cs_generate_variant:Nn \prop_put:Nnn { Nnx , Nxx , Nff  , Noo }
 \cs_generate_variant:Nn \seq_item:Nn { Nf , NV , Nx }
 \cs_generate_variant:Nn \seq_set_split:Nnn { Nnf , NnV , Nnx }
@@ -1428,7 +1428,7 @@
 %    Set up the currend highlight is it is definded
 %    \begin{macrocode}
    \cs_set:Npx \@@_current_highlight: {
-    \prop_get:NV \l_@@_highlights_prop \l_@@_process_int
+    \prop_item:NV \l_@@_highlights_prop \l_@@_process_int
    }
    \expandafter\tikzset\expandafter{\@@_current_highlight:}
 %    \end{macrocode}
@@ -1507,7 +1507,7 @@
  {
   \group_begin:
    \cs_set:Npx \@@_current_highlight: {
-    \prop_get:NV \l_@@_highlights_prop \l_@@_process_int
+    \prop_item:NV \l_@@_highlights_prop \l_@@_process_int
    }
    \expandafter\tikzset\expandafter{\@@_current_highlight:}
    \begin{tikzpicture}
@@ -1537,7 +1537,7 @@
  {
   \group_begin:
    \cs_set:Npx \@@_current_highlight: {
-    \prop_get:NV \l_@@_highlights_prop \l_@@_process_int
+    \prop_item:NV \l_@@_highlights_prop \l_@@_process_int
    }
    \expandafter\tikzset\expandafter{\@@_current_highlight:}
    \tikz[baseline=(l_@@_break_node.base)]
@@ -2196,5 +2196,6 @@
 % \PrintChanges^^A use makeindex -s gglo.ist -o metrix-doc.gls metrix-doc.glo
 %              ^^A use updated=YYYY-MM-DD or new=YYY-MM-DD in {documentation} section
 % \changes{v1.0}{2013/08/12}{Initial version}
+% \changes{v1.2a}{2016/01/21}{Replaced deprecated \cs{prop_get} variants (Thanks to J. Wright).}
 %
 % \PrintIndex^^A use: makeindex -s l3doc.ist -o metrix-doc.ind metrix-doc.idx 
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/metrix/metrix.sty b/Master/texmf-dist/tex/latex/metrix/metrix.sty
index 2fd1821a86b..593e6da8982 100644
--- a/Master/texmf-dist/tex/latex/metrix/metrix.sty
+++ b/Master/texmf-dist/tex/latex/metrix/metrix.sty
@@ -29,8 +29,8 @@
 %%
 %%    http://www.latex-project.org/lppl.txt
 %%
-\RequirePackage{expl3}[2013/07/12]
-\@ifpackagelater{expl3}{2013/03/14}
+\RequirePackage{expl3}[2016/01/03]
+\@ifpackagelater{expl3}{2016/01/03}
   {}
   {%
     \PackageError{metrix}{Support package l3kernel too old}
@@ -44,8 +44,8 @@
   }
 \def\metrixFileName{metrix}
 \def\metrixFileDescription{Typset prosody/metric symbols.}
-\def\metrixFileDate{2015/09/02}
-\def\metrixFileVersion{1.2}
+\def\metrixFileDate{2016/01/21}
+\def\metrixFileVersion{1.2a}
 \ProvidesExplPackage
   {\metrixFileName}{\metrixFileDate}{\metrixFileVersion}{\metrixFileDescription}
 \RequirePackage{xparse}
@@ -123,7 +123,7 @@
 \box_new:N \l__metrix_syllable_box
 \tl_new:N \g__metrix_variable_shortsyllablelimit_tl
 \tl_set:Nn \g__metrix_variable_shortsyllablelimit_tl { 0.8em }
-\cs_generate_variant:Nn \prop_get:Nn { No , Nf , NV , Nx }
+\cs_generate_variant:Nn \prop_item:Nn { No , Nf , NV , Nx }
 \cs_generate_variant:Nn \prop_put:Nnn { Nnx , Nxx , Nff  , Noo }
 \cs_generate_variant:Nn \seq_item:Nn { Nf , NV , Nx }
 \cs_generate_variant:Nn \seq_set_split:Nnn { Nnf , NnV , Nnx }
@@ -265,7 +265,7 @@
       { \bool_set_true:N \l__metrix_short_syllable_bool }
       { \bool_set_false:N \l__metrix_short_syllable_bool }
    \cs_set:Npx \__metrix_current_highlight: {
-    \prop_get:NV \l__metrix_highlights_prop \l__metrix_process_int
+    \prop_item:NV \l__metrix_highlights_prop \l__metrix_process_int
    }
    \expandafter\tikzset\expandafter{\__metrix_current_highlight:}
    \hbox_set:Nn \l_tmpa_box { \__metrix_print_symbol: }
@@ -315,7 +315,7 @@
  {
   \group_begin:
    \cs_set:Npx \__metrix_current_highlight: {
-    \prop_get:NV \l__metrix_highlights_prop \l__metrix_process_int
+    \prop_item:NV \l__metrix_highlights_prop \l__metrix_process_int
    }
    \expandafter\tikzset\expandafter{\__metrix_current_highlight:}
    \begin{tikzpicture}
@@ -335,7 +335,7 @@
  {
   \group_begin:
    \cs_set:Npx \__metrix_current_highlight: {
-    \prop_get:NV \l__metrix_highlights_prop \l__metrix_process_int
+    \prop_item:NV \l__metrix_highlights_prop \l__metrix_process_int
    }
    \expandafter\tikzset\expandafter{\__metrix_current_highlight:}
    \tikz[baseline=(l__metrix_break_node.base)]