metrix (9oct19)

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

3 files changed, 34 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/metrix/metrix.pdf b/Master/texmf-dist/doc/latex/metrix/metrix.pdf
index 51322393d34..43ddf903ab0 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 421fc5ab775..e238d36c0a3 100644
--- a/Master/texmf-dist/source/latex/metrix/metrix.dtx
+++ b/Master/texmf-dist/source/latex/metrix/metrix.dtx
@@ -26,9 +26,9 @@
 %<package>    \endinput
 %<package>  }
 \def\metrixFileName{metrix}
-\def\metrixFileDescription{Typset prosody/metric symbols.}
-\def\metrixFileDate{2019/05/13}
-\def\metrixFileVersion{1.4a}
+\def\metrixFileDescription{Typeset prosody/metric symbols.}
+\def\metrixFileDate{2019/10/09}
+\def\metrixFileVersion{1.5}
 %</driver|package>
 %<*driver>
 \documentclass[full,english]{l3doc}
@@ -228,12 +228,13 @@
 %    +x+ && \metricsymbols{x} & elementum anceps & \\
 %    +n+ && \metricsymbols{n} & elementum indifferens & \\
 %    +u_+ && \metricsymbols{u_} & elementum indifferens & \\
+%    +_u+ && \metricsymbols{_u} & elementum indifferens & \\
 %    +A+ && \metricsymbols{A} & * & \\
 %    +v+ && \metricsymbols{v} & * & \\
 %    +o+ && \metricsymbols{o} & * & \\
 %    +oo+ && \metricsymbols{oo} & aeolic base & \\
-%    +l+ && \metricsymbols{l} & * & \\
-%    +ll+ && \metricsymbols{ll} & * & \\
+%    +l+ && \metricsymbols{l} & caesura or break & \\
+%    +ll+ && \metricsymbols{ll} & caesura or end of period & \\
 %    +p+ && \metricsymbols{p} & primary stress & \\
 %    +s+ && \metricsymbols{s} & secondary stress & \\
 %    +|+ & pipe & \metricsymbols{|} & break (see \ref{sec:breaks}) & \\
@@ -2065,6 +2066,21 @@
  }
 %    \end{macrocode}
 % \end{macro}
+% \begin{macro}[internal,added=2019/10/09]{\@@__u_mark:}
+% \changes{v1.5}{2019/10/09}{Added.}
+%    The indifferent symbol \MakePrivateLetters\metricsymbols*{_u}.
+%    \begin{macrocode}
+\cs_new:Npn \@@__u_mark:
+ {
+  \begin{tikzpicture}[every~metrix~symbol]
+   \draw (0,0) arc [start~angle=0, end~angle=180, radius=-0.2];
+   \draw ($(0,0)+(-0.5\pgflinewidth,0.5\pgflinewidth)+(0,\usemetrixvar{gap})$) --
+    ($(0.4,0)+(0.5\pgflinewidth,0.5\pgflinewidth)
+    +(0,\usemetrixvar{gap})$);
+  \end{tikzpicture}
+ }
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}[internal]{\@@_n_mark:}
 %    An alternative indifferent symbol \metricsymbols*{n}.
 %    \begin{macrocode}
@@ -2545,4 +2561,4 @@
 % \changes{v1.4a}{2019/05/13}{Fix: Icuts/accents didn't work with unicode.}
 % \changes{v1.4a}{2019/05/13}{New style: \texttt{every metrix ictus node}}
 %
-% \PrintIndex^^A use: makeindex -s l3doc.ist -o metrix-doc.ind metrix-doc.idx 
\ No newline at end of file
+% \PrintIndex^^A use: makeindex -s l3doc.ist -o metrix-doc.ind metrix-doc.idx 
diff --git a/Master/texmf-dist/tex/latex/metrix/metrix.sty b/Master/texmf-dist/tex/latex/metrix/metrix.sty
index ab2ec91af87..65208fcd678 100644
--- a/Master/texmf-dist/tex/latex/metrix/metrix.sty
+++ b/Master/texmf-dist/tex/latex/metrix/metrix.sty
@@ -43,9 +43,9 @@
     \endinput
   }
 \def\metrixFileName{metrix}
-\def\metrixFileDescription{Typset prosody/metric symbols.}
-\def\metrixFileDate{2019/05/13}
-\def\metrixFileVersion{1.4a}
+\def\metrixFileDescription{Typeset prosody/metric symbols.}
+\def\metrixFileDate{2019/10/09}
+\def\metrixFileVersion{1.5}
 \ProvidesExplPackage
   {\metrixFileName}{\metrixFileDate}{\metrixFileVersion}{\metrixFileDescription}
 \RequirePackage{xparse}
@@ -610,6 +610,15 @@
     +(0,-\usemetrixvar{gap})$);
   \end{tikzpicture}
  }
+\cs_new:Npn \__metrix__u_mark:
+ {
+  \begin{tikzpicture}[every~metrix~symbol]
+   \draw (0,0) arc [start~angle=0, end~angle=180, radius=-0.2];
+   \draw ($(0,0)+(-0.5\pgflinewidth,0.5\pgflinewidth)+(0,\usemetrixvar{gap})$) --
+    ($(0.4,0)+(0.5\pgflinewidth,0.5\pgflinewidth)
+    +(0,\usemetrixvar{gap})$);
+  \end{tikzpicture}
+ }
 \cs_new:Npn \__metrix_n_mark:
  {
   \begin{tikzpicture}[every~metrix~symbol]