From 1f2683ba3ec9c1855d5518e773c72d2241637449 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 30 Jan 2020 03:00:45 +0000 Subject: CTAN sync 202001300300 --- .../contrib/semantic-markup/semantic-markup.pdf | Bin 274152 -> 266707 bytes .../contrib/semantic-markup/semantic-markup.sty | 24 +++++++++++---------- .../contrib/semantic-markup/semantic-markup.tex | 5 ++++- 3 files changed, 17 insertions(+), 12 deletions(-) (limited to 'macros/latex/contrib/semantic-markup') diff --git a/macros/latex/contrib/semantic-markup/semantic-markup.pdf b/macros/latex/contrib/semantic-markup/semantic-markup.pdf index cc01f01022..29617ea035 100644 Binary files a/macros/latex/contrib/semantic-markup/semantic-markup.pdf and b/macros/latex/contrib/semantic-markup/semantic-markup.pdf differ diff --git a/macros/latex/contrib/semantic-markup/semantic-markup.sty b/macros/latex/contrib/semantic-markup/semantic-markup.sty index e6d33668f9..9a5223347f 100644 --- a/macros/latex/contrib/semantic-markup/semantic-markup.sty +++ b/macros/latex/contrib/semantic-markup/semantic-markup.sty @@ -1,7 +1,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{semantic-markup}[2018/05/21 +\ProvidesPackage{semantic-markup}[2020/01/29 Macros for TEI-like semantic markup] -% Copyright 2018 Andrew A. Cashner, andrewacashner@gmail.com +% Copyright 2020 Andrew A. Cashner, andrewacashner@gmail.com % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -18,6 +18,8 @@ % and the documentation file semantic-markup.tex. % CHANGE LOG +% 2020-01-29 - \musfig uses stackengine now instead of amsmath +% 2018-09-07 - ! and ? removed from autopunct for csquotes % 2018-05-21 - Use fontspec's definition of `\strong` if it is loaded % - Use musicography's definition of `\fl`, `\sh`, `\na` commands if % it is loaded @@ -49,7 +51,7 @@ % Put end punctuation inside quotation marks % for the specified marks \renewcommand{\mktextquote}[6]{#1#2#4#5#3#6} - \DeclareAutoPunct{.,!?} + \DeclareAutoPunct{.,} \fi % NB: fontspec defines its own \strong command, so only define this if fontspec @@ -99,13 +101,13 @@ %******************* % Identify problem spot in draft -\NewDocumentCommand{\XXX}{ O{\add{FIX}} }{% - \strong{#1}% +\NewDocumentCommand{\XXX}{ O{FIX} }{% + \strong{\add{#1}}% } % Indicate citation to be filled in later % Optional argument for indicating the source \NewDocumentCommand{\citXXX}{ o }{% - \footnote{\strong{\add{Citation needed}\IfValueTF{#1}{#1}{}}}% + \footnote{\strong{\add{Citation needed\IfValueTF{#1}{: #1}{}}}}% } %******************* @@ -153,13 +155,13 @@ \NewDocumentCommand{\octave}{ }{\textsubscript} % Music figures -\RequirePackage{amsmath} +\RequirePackage{stackengine} +\setstackgap{S}{2pt} \NewDocumentCommand{\musfig}{ m m }{% - $\genfrac{}{}{0pt}{1}{\text{#1}}{\text{#2}}$% -} + \Shortstack{#1 #2}% +} % Meter signatures -\RequirePackage[rm]{harmony} -\NewDocumentCommand{\meter}{ m m }{\Takt{#1}{#2}} +\NewDocumentCommand{\meter}{}{\musfig} \endinput diff --git a/macros/latex/contrib/semantic-markup/semantic-markup.tex b/macros/latex/contrib/semantic-markup/semantic-markup.tex index c53f395306..7d08454bc8 100644 --- a/macros/latex/contrib/semantic-markup/semantic-markup.tex +++ b/macros/latex/contrib/semantic-markup/semantic-markup.tex @@ -18,6 +18,7 @@ \author{Andrew A. Cashner% \thanks{\href{mailto:andrewacashner@gmail.com}{\nolinkurl{andrewacashner@gmail.com}}}% } +\date{January 29, 2020} \begin{document} \maketitle @@ -147,7 +148,9 @@ Command & Alias\\ \end{tabular} \end{center} -For stacked numerals, as in meter signatures or figured bass, we provide two simple options, \verb|\musfig| using \verb|\genfrac| from \texttt{amsmath}, and \verb|\meter|, which uses \verb|\Takt| from the \texttt{harmony} package, which spaces the numerals more closely. +For stacked numerals, as in meter signatures or figured bass, we provide two +simple options, \verb|\musfig| using \verb|\Shortstack| from +\texttt{stackengine}, and \verb|\meter|, which is an alias for the same thing. Both commands take two arguments, one for the top numeral and the second for the bottom numeral. You could write, for example: -- cgit v1.2.3