summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-25 22:32:19 +0000
committerKarl Berry <karl@freefriends.org>2018-05-25 22:32:19 +0000
commitcb61d6c63a3041cb8330026476b606ad5cc54508 (patch)
treecf42c299b6b840331bbfbe111b78d09210618447 /Master/texmf-dist/tex
parent6831c582e3c680827276b5089549bac3060a0891 (diff)
musicography (25may18)
git-svn-id: svn://tug.org/texlive/trunk@47838 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/musicography/musicography.sty21
1 files changed, 13 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/musicography/musicography.sty b/Master/texmf-dist/tex/latex/musicography/musicography.sty
index 636c03bb6f1..4578bdcb017 100644
--- a/Master/texmf-dist/tex/latex/musicography/musicography.sty
+++ b/Master/texmf-dist/tex/latex/musicography/musicography.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{musicography}
-[2017/10/31 Symbols for music writing with pdflatex]
+\ProvidesClass{musicography}[2018/05/21
+ Symbols for music writing with pdflatex]
% Copyright 2017 Andrew A. Cashner, andrewacashner@gmail.com
@@ -19,6 +19,7 @@
% and the documentation file musicography.tex.
% CHANGE LOG
+% 2018-05-21 Override semantic-markup's \fl, \sh, \na commands if it is loaded
% 2017-10-31 Corrected glyph for \musHalf and documented
% \musMeter and \musFigures
% 2017-08-29 First version on CTAN
@@ -70,12 +71,16 @@
% Shorthand accidental commands
% These commands are defined differently in the semantic-markup package,
-% so LaTeX will use musicography commands instead, if this package is called
-% after
-\let\fl\musFlat
-\let\sh\musSharp
-\let\na\musNatural
-
+% so LaTeX will use musicography commands instead
+\@ifpackageloaded{semantic-markup}{%
+ \RenewDocumentCommand{\fl}{}{\musFlat}
+ \RenewDocumentCommand{\sh}{}{\musSharp}
+ \RenewDocumentCommand{\na}{}{\musNatural}
+}{%
+ \NewDocumentCommand{\fl}{}{\musFlat}
+ \NewDocumentCommand{\sh}{}{\musSharp}
+ \NewDocumentCommand{\na}{}{\musNatural}
+}
% Print a composite music symbol of a notehead plus stem
% #1 Symbol musSymbol command for notehead
\NewDocumentCommand{\musStemmedNote}{ m }{%