metrix (14may19)

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

1 files changed, 29 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/metrix/metrix.sty b/Master/texmf-dist/tex/latex/metrix/metrix.sty
index 6148ee53202..ab2ec91af87 100644
--- a/Master/texmf-dist/tex/latex/metrix/metrix.sty
+++ b/Master/texmf-dist/tex/latex/metrix/metrix.sty
@@ -20,9 +20,9 @@
 %% original source files, as listed above, are part of the
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
-%% File: metrix.dtx Copyright (C) 2013-2016 Tobias Weh
+%% File: metrix.dtx Copyright (c) Tobias Weh
 %%
-%% It may be distributed and/or modified under the conditions of the
+%% This file may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
 %% license or (at your option) any later version.  The latest version
 %% of this license is in the file
@@ -44,8 +44,8 @@
   }
 \def\metrixFileName{metrix}
 \def\metrixFileDescription{Typset prosody/metric symbols.}
-\def\metrixFileDate{2019/05/05}
-\def\metrixFileVersion{1.4}
+\def\metrixFileDate{2019/05/13}
+\def\metrixFileVersion{1.4a}
 \ProvidesExplPackage
   {\metrixFileName}{\metrixFileDate}{\metrixFileVersion}{\metrixFileDescription}
 \RequirePackage{xparse}
@@ -54,8 +54,9 @@
 \ExplSyntaxOff
  \usetikzlibrary{calc}
 \ExplSyntaxOn
-\tl_const:Nn \c__metrix_acute_accent_tl { ´ }
-\tl_const:Nn \c__metrix_grave_accent_tl { ` }
+\RequirePackage{textcomp}
+\tl_const:Nn \c__metrix_acute_accent_tl { / }
+\tl_const:Nn \c__metrix_grave_accent_tl { * }
 \tl_new:N \l__metrix_words_tl
 \seq_new:N \l__metrix_syllables_seq
 \seq_new:N \l__metrix_symbols_seq
@@ -133,9 +134,9 @@
 \tl_new:N \g__metrix_variable_emptywidth_tl
 \tl_set:Nn \g__metrix_variable_emptywidth_tl { 1em }
 \tl_new:N \g__metrix_variable_acute_tl
-\tl_set:Nn \g__metrix_variable_acute_tl { ´ }
+\tl_set:Nn \g__metrix_variable_acute_tl { \textasciiacute }
 \tl_new:N \g__metrix_variable_grave_tl
-\tl_set:Nn \g__metrix_variable_grave_tl { \`{} }
+\tl_set:Nn \g__metrix_variable_grave_tl { \textasciigrave }
 \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 }
@@ -264,7 +265,7 @@
     \int_incr:N \l__metrix_process_int
     \int_compare:nT { \l__metrix_process_int > 1 }
      {
-      \hspace{\usemetrixvar{symbolsep}}
+      \hspace { \usemetrixvar{symbolsep} }
      }
     \str_case:nnF { ##1 }
      {
@@ -399,7 +400,7 @@
  }
 \cs_new_protected:Npn \__metrix_break_gap:
  {
-  \hspace{\usemetrixvar{breakgap}}
+  \hspace { \usemetrixvar { breakgap } }
  }
 \cs_new:Npn \__metrix_break_node:n #1
  {
@@ -415,7 +416,7 @@
  }
 \cs_new_protected:Npn \__metrix_e_gap:
  {
-  \hspace*{\usemetrixvar{emptywidth}}
+  \hspace* { \usemetrixvar { emptywidth } }
  }
 \cs_new_protected:Npn \__metrix_evaluate_higlights:n #1
  {
@@ -486,11 +487,11 @@
    \draw (0,0) arc [start~angle=0, end~angle=180, radius=-0.225];
    \bool_if:NT \l__metrix_has_acute_accent_bool
     {
-     \node at (0.225,0) {\usemetrixvar{acute}};
+     \node [every~metrix~ictus~node] at (0.225,0) { \usemetrixvar { acute } };
     }
    \bool_if:NT \l__metrix_has_grave_accent_bool
     {
-     \node at (0.225,0) {\usemetrixvar{grave}};
+     \node [every~metrix~ictus~node] at (0.225,0) { \usemetrixvar { grave } };
     }
   \end{tikzpicture}
  }
@@ -502,11 +503,11 @@
      \draw (0,0) -- ++(0.4,0);
      \bool_if:NT \l__metrix_has_acute_accent_bool
       {
-       \node at (0.2,0) {\usemetrixvar{acute}};
+       \node [every~metrix~ictus~node] at (0.2,0) { \usemetrixvar { acute } };
       }
      \bool_if:NT \l__metrix_has_grave_accent_bool
       {
-       \node at (0.2,0) {\usemetrixvar{grave}};
+       \node [every~metrix~ictus~node] at (0.2,0) { \usemetrixvar { grave } };
       }
     \end{tikzpicture}
    }
@@ -515,11 +516,11 @@
      \draw (0,0) -- ++(0.75,0);
      \bool_if:NT \l__metrix_has_acute_accent_bool
       {
-       \node at (0.375,0) {\usemetrixvar{acute}};
+       \node [every~metrix~ictus~node] at (0.375,0) { \usemetrixvar { acute } };
       }
      \bool_if:NT \l__metrix_has_grave_accent_bool
       {
-       \node at (0.375,0) {\usemetrixvar{grave}};
+       \node [every~metrix~ictus~node] at (0.375,0) { \usemetrixvar { grave } };
       }
     \end{tikzpicture}
    }
@@ -818,6 +819,9 @@
  every metrix symbol node/.style={
   inner sep=0pt, anchor=center,
  },
+ every metrix ictus node/.style={
+   overlay,
+ },
  every metrix break node/.style={
   inner sep=0pt, anchor=base,
  },
@@ -917,25 +921,25 @@
    \string\verseref\space can~only~be~used~in~{metricverses}~env.
   }
  }
-\NewDocumentEnvironment{metricverses} { }
+\NewDocumentEnvironment { metricverses } { }
  {
   \RenewDocumentCommand { \verseref } { m }
    {
     \__metrix_print_vers_ref:n { ##1 }
    }
   \par
-  \addvspace{0.7\baselineskip}
-  \fp_compare:nT { \usemetrixvar{symbolshift} < 0.0 }
+  \addvspace { 0.7\baselineskip }
+  \fp_compare:nT { \usemetrixvar { symbolshift } < 0.0 }
    {
-    \vspace{\usemetrixvar{symbolshift}}
+    \vspace { \usemetrixvar { symbolshift } }
    }
-  \addtolength{\baselineskip}{0.6\baselineskip}
+  \addtolength { \baselineskip } { 0.6\baselineskip }
  }
  {
   \par
-  \addtolength{\baselineskip}{-0.6\baselineskip}
-  \vspace{\baselineskip}
-  \noindent\ignorespacesafterend
+  \addtolength { \baselineskip } { -0.6\baselineskip }
+  \vspace { \baselineskip }
+  \noindent \ignorespacesafterend
  }
 \endinput
 %%