diff options
author | Karl Berry <karl@freefriends.org> | 2015-09-03 00:06:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-09-03 00:06:29 +0000 |
commit | 83d9bb4119eca716b3746ba7c6dd0aaa66ead9a6 (patch) | |
tree | 48b436ebff0d3509c2a974646c08a1fc1fbe404e /Master/texmf-dist/tex/latex/metrix | |
parent | ee35629997c416cefa5a2b1bd25756bec014cd43 (diff) |
metrix (2sep15)
git-svn-id: svn://tug.org/texlive/trunk@38280 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/metrix')
-rw-r--r-- | Master/texmf-dist/tex/latex/metrix/metrix.sty | 82 |
1 files changed, 45 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/metrix/metrix.sty b/Master/texmf-dist/tex/latex/metrix/metrix.sty index aa997295770..2fd1821a86b 100644 --- a/Master/texmf-dist/tex/latex/metrix/metrix.sty +++ b/Master/texmf-dist/tex/latex/metrix/metrix.sty @@ -44,8 +44,8 @@ } \def\metrixFileName{metrix} \def\metrixFileDescription{Typset prosody/metric symbols.} -\def\metrixFileDate{2015/07/23} -\def\metrixFileVersion{1.1a} +\def\metrixFileDate{2015/09/02} +\def\metrixFileVersion{1.2} \ProvidesExplPackage {\metrixFileName}{\metrixFileDate}{\metrixFileVersion}{\metrixFileDescription} \RequirePackage{xparse} @@ -589,61 +589,69 @@ \__metrix_metricsymbols:n { #3 } \group_end: } -\NewDocumentCommand { \lng } { m } +\NewDocumentCommand { \lng } { D(){0,0} O{0pt} m O{0pt} } { \begin{tikzpicture}[baseline=(l__metrix_syllable_node.base),every~metrix~accent] - \node [every~metrix~syllable~node] (l__metrix_syllable_node) {#1}; + \node [every~metrix~syllable~node] (l__metrix_syllable_node) {#3}; \begin{pgfinterruptboundingbox} - \draw - ($(l__metrix_syllable_node.north) - - (\usemetrixvar{lngminlength}/2,0) - +(\usemetrixvar{accentxshift},\usemetrixvar{lngshift}) - + (\tl_use:N \l__metrix_internal_itcorrection_tl,0)$) - -- - ($(l__metrix_syllable_node.north) - + (\usemetrixvar{lngminlength}/2,0) - +(\usemetrixvar{accentxshift},\usemetrixvar{lngshift}) - + (\tl_use:N \l__metrix_internal_itcorrection_tl,0)$) - - ($(l__metrix_syllable_node.north~west) - +(\usemetrixvar{lngshortening}+\usemetrixvar{accentxshift},\usemetrixvar{lngshift}) - + (\tl_use:N \l__metrix_internal_itcorrection_tl,0)$) - -- - ($(l__metrix_syllable_node.north~east) - +(-\usemetrixvar{lngshortening}+\usemetrixvar{accentxshift},\usemetrixvar{lngshift}) - + (\tl_use:N \l__metrix_internal_itcorrection_tl,0)$) - ; + \draw [shorten~< = -#2, shorten~> = -#4] + ($(l__metrix_syllable_node.north) + - (\usemetrixvar{lngminlength}/2,0) + +(\usemetrixvar{accentxshift},\usemetrixvar{lngshift}) + + (\tl_use:N \l__metrix_internal_itcorrection_tl,0) + + (#1)$) + -- + ($(l__metrix_syllable_node.north) + + (\usemetrixvar{lngminlength}/2,0) + +(\usemetrixvar{accentxshift},\usemetrixvar{lngshift}) + + (\tl_use:N \l__metrix_internal_itcorrection_tl,0) + + (#1)$) + ; + \draw [shorten~< = -#2, shorten~> = -#4] + ($(l__metrix_syllable_node.north~west) + +(\usemetrixvar{lngshortening}+\usemetrixvar{accentxshift},\usemetrixvar{lngshift}) + + (\tl_use:N \l__metrix_internal_itcorrection_tl,0) + + (#1)$) + -- + ($(l__metrix_syllable_node.north~east) + +(-\usemetrixvar{lngshortening}+\usemetrixvar{accentxshift},\usemetrixvar{lngshift}) + + (\tl_use:N \l__metrix_internal_itcorrection_tl,0) + + (#1)$) + ; \end{pgfinterruptboundingbox} \end{tikzpicture}% } -\NewDocumentCommand { \brv } { m } +\NewDocumentCommand { \brv } { D(){0,0} m } { \begin{tikzpicture}[baseline=(l__metrix_syllable_node.base),every~metrix~accent] - \node [every~metrix~syllable~node] (l__metrix_syllable_node) {#1}; + \node [every~metrix~syllable~node] (l__metrix_syllable_node) {#2}; \begin{pgfinterruptboundingbox} - \draw ($(l__metrix_syllable_node.north)+(-0.15,0) - + (\usemetrixvar{accentxshift},\usemetrixvar{brvshift}) - + (\tl_use:N \l__metrix_internal_itcorrection_tl,0)$) - arc [start~angle=0, end~angle=180, radius=-0.15]; + \draw ($(l__metrix_syllable_node.north)+(-0.15,0) + + (\usemetrixvar{accentxshift},\usemetrixvar{brvshift}) + + (\tl_use:N \l__metrix_internal_itcorrection_tl,0) + + (#1)$) + arc [start~angle=0, end~angle=180, radius=-0.15]; \end{pgfinterruptboundingbox} \end{tikzpicture} } -\NewDocumentCommand { \acct } { m } +\NewDocumentCommand { \acct } { D(){0,0} m } { \begin{tikzpicture}[baseline=(l__metrix_syllable_node.base),every~metrix~accent] - \node [every~metrix~syllable~node] (l__metrix_syllable_node) {#1}; + \node [every~metrix~syllable~node] (l__metrix_syllable_node) {#2}; \begin{pgfinterruptboundingbox} - \fill ($(l__metrix_syllable_node.south) - + (0,\usemetrixvar{dotshift})$) - circle [radius=1.25\pgflinewidth]; + \fill ($(l__metrix_syllable_node.south) + + (0,\usemetrixvar{dotshift}) + + (#1)$) + circle [radius=1.25\pgflinewidth]; \end{pgfinterruptboundingbox} \end{tikzpicture} } -\NewDocumentCommand { \bow } { m } +\NewDocumentCommand { \bow } { O{0pt} m O{0pt} } { \begin{tikzpicture}[baseline=(l__metrix_syllable_node.base),every~metrix~bow] - \node [every~metrix~syllable~node] (l__metrix_syllable_node) {#1}; - \draw ($(l__metrix_syllable_node.base~west)+ + \node [every~metrix~syllable~node] (l__metrix_syllable_node) {#2}; + \draw [shorten~< = #1, shorten~> = #3] + ($(l__metrix_syllable_node.base~west)+ (\usemetrixvar{bowshortening},\usemetrixvar{bowshift})$) to [out=-45, in=225,looseness=\usemetrixvar{bowlooseness}] ($(l__metrix_syllable_node.base~east)+ (-\usemetrixvar{bowshortening},\usemetrixvar{bowshift})$); |