texlive[47838] Master/texmf-dist: musicography (25may18)

[commits+karl at tug.org]

Revision: 47838
          http://tug.org/svn/texlive?view=revision&revision=47838
Author:   karl
Date:     2018-05-26 00:32:19 +0200 (Sat, 26 May 2018)
Log Message:
-----------
musicography (25may18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/musicography/musicography.pdf
    trunk/Master/texmf-dist/doc/latex/musicography/musicography.tex
    trunk/Master/texmf-dist/tex/latex/musicography/musicography.sty

Modified: trunk/Master/texmf-dist/doc/latex/musicography/musicography.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/musicography/musicography.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/musicography/musicography.tex	2018-05-25 22:32:04 UTC (rev 47837)
+++ trunk/Master/texmf-dist/doc/latex/musicography/musicography.tex	2018-05-25 22:32:19 UTC (rev 47838)
@@ -27,6 +27,7 @@
     {\nolinkurl{andrewacashner at gmail.com}}%
     }%
 }
+\date{May 21, 2018}
 
 \begin{document}
 \maketitle
@@ -50,9 +51,9 @@
 \section{Package Options}
 
 To use the package, write \verb|\usepackage{musicography}| in your preamble.
-If you are also using this author's \code{semantic-markup} package, load
-\code{semantic-markup} first, since \code{musicography} modifies the commands
-for accidentals in the other package.
+If you are also using this author's \code{semantic-markup} package, 
+\code{musicography} will automatically redefine the commands for accidentals in
+the other package.
 
 The \code{bigger} option provides larger font sizes that match better with
 certain fonts.
@@ -126,13 +127,11 @@
 access more symbols from the fonts or fine-tune their appearance.
 See \verb|\musSymbol| and \verb|\musAccidental| in the code listing below. 
 
-\section{Code}
-
-\VerbatimInput{musicography.sty}
-
 \section{Changes}
 
 \begin{tabular}{r p{0.75\textwidth}}
+    2018/05/21 & Override semantic-markup's \verb|\fl|, \verb|\sh|, \verb|\na|
+    commands if it is loaded \\
     2017/10/31 & Corrected glyph used for \verb|\musHalf| and documented
     \verb|\musMeter| and \verb|\musFigures|\\
     2017/08/29 & First version on CTAN\\
@@ -139,4 +138,9 @@
     2017/04/12 & Created\\
 \end{tabular}
 
+\section{Code}
+
+\VerbatimInput{musicography.sty}
+
+
 \end{document}

Modified: trunk/Master/texmf-dist/tex/latex/musicography/musicography.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/musicography/musicography.sty	2018-05-25 22:32:04 UTC (rev 47837)
+++ trunk/Master/texmf-dist/tex/latex/musicography/musicography.sty	2018-05-25 22:32:19 UTC (rev 47838)
@@ -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 at 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 }{%