From e34ba1cbe700c96794b9488ec6922ee328c722f0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 30 Sep 2017 23:08:42 +0000 Subject: musicography (30sep17) git-svn-id: svn://tug.org/texlive/trunk@45440 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/musicography/README.md | 11 + .../doc/latex/musicography/musicography.pdf | Bin 0 -> 262850 bytes .../doc/latex/musicography/musicography.tex | 130 ++++++++++++ .../tex/latex/musicography/musicography.sty | 222 +++++++++++++++++++++ Master/tlpkg/bin/tlpkg-ctan-check | 2 +- Master/tlpkg/tlpsrc/collection-music.tlpsrc | 1 + Master/tlpkg/tlpsrc/musicography.tlpsrc | 0 7 files changed, 365 insertions(+), 1 deletion(-) create mode 100644 Master/texmf-dist/doc/latex/musicography/README.md create mode 100644 Master/texmf-dist/doc/latex/musicography/musicography.pdf create mode 100644 Master/texmf-dist/doc/latex/musicography/musicography.tex create mode 100644 Master/texmf-dist/tex/latex/musicography/musicography.sty create mode 100644 Master/tlpkg/tlpsrc/musicography.tlpsrc diff --git a/Master/texmf-dist/doc/latex/musicography/README.md b/Master/texmf-dist/doc/latex/musicography/README.md new file mode 100644 index 00000000000..65bca60bc05 --- /dev/null +++ b/Master/texmf-dist/doc/latex/musicography/README.md @@ -0,0 +1,11 @@ +# The `musicography` package: Symbols for Music Writing with `pdflatex` + +This package makes available the most commonly used symbols in writing about +music in a way that can be used with `pdflatex` and looks consistent and +attractive. +It includes accidentals, meters, and notes of different rhythmic values. +The package provides a flexible, user-friendly interface written using `xparse`. + +This material is subject to the current version of the LaTeX Project Public +License. +The author and maintainer is Andrew A. Cashner, `andrewacashner@gmail.com`. diff --git a/Master/texmf-dist/doc/latex/musicography/musicography.pdf b/Master/texmf-dist/doc/latex/musicography/musicography.pdf new file mode 100644 index 00000000000..871488be172 Binary files /dev/null and b/Master/texmf-dist/doc/latex/musicography/musicography.pdf differ diff --git a/Master/texmf-dist/doc/latex/musicography/musicography.tex b/Master/texmf-dist/doc/latex/musicography/musicography.tex new file mode 100644 index 00000000000..b20a6c69620 --- /dev/null +++ b/Master/texmf-dist/doc/latex/musicography/musicography.tex @@ -0,0 +1,130 @@ +\documentclass{article} + +\usepackage{lmodern} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{geometry} +\usepackage{semantic-markup} +\usepackage{musicography} +\usepackage{fancyvrb} +\frenchspacing + +\newenvironment{codetable} +{\begin{quote}\begin{tabular}{lll}} +{\end{tabular}\end{quote}} + +\usepackage[ + pdftitle={The musicography Package: Symbols for Music Writing with + pdflatex}, + pdfauthor={Andrew A. Cashner}, + pdfsubject={LaTeX package}, + pdfkeywords={LaTeX, symbols, music, musicology, humanities} +]{hyperref} + +\title{The \code{musicography} Package: Symbols for Music Writing with +\code{pdflatex}} +\author{Andrew A. Cashner\thanks{% + \href{mailto:andrewacashner@gmail.com} + {\nolinkurl{andrewacashner@gmail.com}}% + }% +} + +\begin{document} +\maketitle + +Font packages for \code{pdflatex} only provided a limited range of musical +symbols. +The \code{lilyglyphs} package uses Lilypond's fonts, but requires +\code{lualatex}. +This package makes available the most commonly used symbols in writing about +music in a way that can be used with \code{pdflatex} and looks consistent and +attractive. +It includes accidentals, meters, and notes of different rhythmic values. + +This package builds on the approach used in the \code{harmony} package, where +the symbols are taken from the MusiXTeX fonts. +But it provides a larger range of symbols and a more flexible, user-friendly +interface written using \code{xparse}. + +\tableofcontents + +\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. + +The \code{bigger} option provides larger font sizes that match better with +certain fonts. + +The \verb|\musNumFont| command allows you to change the font of the numerals +used. +For example, if using the \code{ebgaramond} font package, it looks better if you +do this: +\begin{quote} + \verb|\renewcommand{\musNumFont}[1]{\liningnums{#1}}|. +\end{quote} + +\section{Symbols and Commands} + +\subsection{Accidentals} + +\begin{codetable} + Flat & \verb|\musFlat| or \verb|\fl| & \musFlat\\ + Sharp & \verb|\musSharp| or \verb|\sh| & \musSharp\\ + Natural & \verb|\musNatural| or \verb|\na| & \musNatural\\ + Double Flat & \verb|\musDoubleFlat| & \musDoubleFlat\\ + Double Sharp & \verb|\musDoubleSharp| & \musDoubleSharp\\ +\end{codetable} + +\subsection{Notes of Different Rhythmic Values} + +Commands are available using modern (United States) note names; in several cases +there are also aliases for older note names. + +\begin{codetable} + Whole note (semibreve) & \verb|\musWhole| or \verb|\musSemibreve| & + \musWhole\\ + Half note (minim) & \verb|\musHalf| or \verb|\musMinim| & \musHalf\\ + Quarter note (semiminim) & \verb|\musQuarter| or \verb|\musSeminimin| & + \musQuarter\\ + Eighth note (corchea) & \verb|\musEighth| or \verb|\musCorchea| & + \musEighth\\ + Sixteenth note & \verb|\musSixteenth| & \musSixteenth\\ +\end{codetable} + +A dot may be added to any of the above by adding \code{Dotted} to the end of the +command. For example: + +\begin{codetable} + Dotted whole note & \verb|\musWholeDotted| & \musWholeDotted\\ + Dotted quarter note & \verb|\musQuarterDotted| & \musQuarterDotted\\ +\end{codetable} + +\subsection{Meter Signatures} + +\begin{codetable} + Common duple & \verb|\meterC| & \meterC\\ + \term{Alla breve} & \verb|\meterCutC| & \meterCutC\\ + Ternary (16th--18th cent.) & \verb|\meterCThree| & \meterCThree\\ + Ternary with $3:2$ proportion & \verb|\meterCThreeTwo| & + \meterCThreeTwo\\ + Spanish 17th-cent. ternary & \verb|\meterCZ| & \meterCZ\\ +\end{codetable} + +\subsection{Customization} + +It would be a simple matter of using \verb|\newcommand| or \verb|\let| to create +aliases for these commands, say, for British usage (such as \verb|\quaver|). + +\LaTeX{} programmers may wish to use the package's internal commands directly +(such as \verb|\musSymbol| and \verb|\musAccidental|) to +access more symbols from the fonts or to fine-tune their appearance (see the +code listing below). + +\section{Code} + +\VerbatimInput{musicography.sty} + +\end{document} diff --git a/Master/texmf-dist/tex/latex/musicography/musicography.sty b/Master/texmf-dist/tex/latex/musicography/musicography.sty new file mode 100644 index 00000000000..b592b2a8f5f --- /dev/null +++ b/Master/texmf-dist/tex/latex/musicography/musicography.sty @@ -0,0 +1,222 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{musicography} +[2017/08/29 Symbols for music writing with pdflatex] + +% Copyright 2017 Andrew A. Cashner, andrewacashner@gmail.com + +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3 of this license or (at your option) any +% later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% The Current Maintainer of this work is Andrew A. Cashner. +% This work consists of the package file musicography.sty +% and the documentation file musicography.tex. + +% CHANGE LOG +% 2017-08-29 First version on CTAN +% 2017-04-12 Created + +\newif\ifLargeFont +\LargeFontfalse +\DeclareOption{bigger}{\LargeFonttrue} +\ProcessOptions\relax + +\RequirePackage{xparse} + +\ifLargeFont + \newfont{\musFont}{musix13} + \newfont{\musFontBig}{musix16} + \newfont{\musFontLarge}{musix20} +\else + \newfont{\musFont}{musix11} + \newfont{\musFontBig}{musix13} + \newfont{\musFontLarge}{musix16} +\fi + +% Font for numbers in \musStack +% Could redefine to use lining figures, math mode, sans-serif, etc. +% Example for ebgaramond: \renewcommand{\musNumFont}[1]{\liningnums{#1}} +\NewDocumentCommand{\musNumFont}{}{} + +% Print a music symbol from the \musFont, specifying space before, after, and +% baseline adjustment +% #1 optional font command (default: \musFont) +% #2 kern before +% #3 raisebox value +% #4 kern after +% #5 symbol code (e.g., \symbol{4}) +\NewDocumentCommand{\musSymbol}{ O{\musFont} m m m m }{% + {#1\kern#2\raisebox{#3}{#5}\kern#4}% +} + +% Accidentals +% #1 symbol command for accidental +\NewDocumentCommand{\musAccidental}{ m }{% + \musSymbol[\musFontLarge]{0.1em}{0.5ex}{-0.1pt}{#1}% +} +\NewDocumentCommand{\musFlat} {}{\musAccidental{\symbol{90}}} +\NewDocumentCommand{\musDoubleFlat} {}{\musAccidental{\symbol{91}}} +\NewDocumentCommand{\musSharp} {}{\musAccidental{\symbol{92}}} +\NewDocumentCommand{\musDoubleSharp}{}{\musAccidental{\symbol{93}}} +\NewDocumentCommand{\musNatural} {}{\musAccidental{\symbol{94}}} + +% 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 + +% Print a composite music symbol of a notehead plus stem +% #1 Symbol musSymbol command for notehead +\NewDocumentCommand{\musStemmedNote}{ m }{% + \musSymbol{0.05em}{0.5ex}{0.2em}{#1\musStem}% +} + +% Stemmed note plus flag +% #1 symbol command for base note +% #2 symbol command for flag +\NewDocumentCommand{\musFlaggedNote}{ m m }{% + \musSymbol{0.05em}{0.5ex}{0pt}{#1\musStem}% + \musSymbol{0pt}{0pt}{0.9em}{#2}% +} + +% Note plus dot +% #1 \musSymbol command for note to be dotted +\NewDocumentCommand{\musDottedNote}{ m }{#1\musDot} + +\NewDocumentCommand{\musStem}{}{% + \musSymbol{0.955em}{0.55ex}{0pt}{\symbol{16}}% +} +\NewDocumentCommand{\musSegno}{}{% + \musSymbol{0.55em}{-0.4ex}{1.5em}{\symbol{86}}% +} +\NewDocumentCommand{\musDot}{}{% + \musSymbol{-0.2em}{-0.5ex}{0.7em}{\symbol{24}}% +} + +\NewDocumentCommand{\musWhole}{}{% + \musSymbol{0.05em}{0.5ex}{1.35em}{\symbol{9}}% +} +\NewDocumentCommand{\musHalf}{}{% + \musStemmedNote{\symbol{9}}% +} +\NewDocumentCommand{\musQuarter}{}{% + \musStemmedNote{\symbol{7}}% +} +\NewDocumentCommand{\musEighth}{}{% + \musFlaggedNote{\symbol{8}}{\symbol{40}}% +} +\NewDocumentCommand{\musSixteenth}{}{% + \musFlaggedNote{\symbol{8}}{\symbol{41}}% +} + +\NewDocumentCommand{\musWholeDotted}{}{% + \musDottedNote{\musWhole}% +} +\NewDocumentCommand{\musHalfDotted}{}{% + \musDottedNote{\musHalf}% +} +\NewDocumentCommand{\musQuarterDotted}{}{% + \musDottedNote{\musQuarter}% +} +\NewDocumentCommand{\musEighthDotted}{}{% + \musDottedNote{\musEighth}% +} +\NewDocumentCommand{\musSixteenthDotted}{}{% + \musDottedNote{\musSixteenth}% +} + +% Command to stack numerals +% Adapted from harmony.sty's \ueber command +\newdimen\tmpdima +\newdimen\tmpdimb +\newdimen\tmpdimc +\newdimen\tmpdimd +\newdimen\tmpdime +\newbox\nbxa +\newbox\nbxb +\newbox\nbxc +\newbox\nbxd +\newbox\nbxe +\newbox\nbxf +\newbox\nbxg +\newbox\nbxh +\newbox\nbxi + +\NewDocumentCommand{\musStack}{ m m }{% + \setbox\nbxi=\hbox{% + \setbox\nbxa=\hbox{\scriptsize{\musNumFont{#1}}}% + \setbox\nbxb=\hbox{\scriptsize{\musNumFont{#2}}}% + \ifdim\wd\nbxa>\wd\nbxb% + \tmpdima=\wd\nbxa% + \else% + \tmpdima=\wd\nbxb% + \fi% + \setbox\nbxa=\hbox to \tmpdima{% + \scriptsize\hss{\musNumFont{#1}}\hss}% + \setbox\nbxb=\hbox to \tmpdima{\scriptsize\hss{% + \musNumFont{#2}}\hss}% + \lower0.3ex\copy\nbxb% + \kern-\wd\nbxb% + \raise0.8\ht\nbxb% + \box\nbxa% + }% + \unhbox\nbxi% +} + +% Meter symbols +% #1 symbol code for meter sign +\NewDocumentCommand{\musSymbolMeter}{ m }{% + \raisebox{0.58ex}[8pt][2pt]{% + {\kern-1pt\musFontBig\raisebox{0.3ex}{#1}\kern0.3em}% + }% +} +% Meter that combines \meterC with numerals (e.g., C3 C3/2) +\NewDocumentCommand{\meterCplus}{ m }{\meterC{}\kern-0.7pt#1} + +% Numeric meter signatures (e.g., 3/4) +% #1 number on top +% #2 number on bottom +\NewDocumentCommand{\musMeter}{ m m }{% + \musStack{#1}{#2}\kern0.05em +} +% Same command used for figured bass +\NewDocumentCommand{\musFigures}{}{\musMeter} + +\NewDocumentCommand{\meterC}{}{% + \musSymbolMeter{\symbol{83}}% +} +\NewDocumentCommand{\meterCutC}{}{% + \musSymbolMeter{\symbol{82}}% +} +% Ternary meters used in 16th--18th c. music +\NewDocumentCommand{\meterCThree}{}{% + \meterCplus{\musNumFont{3}}% +} +\NewDocumentCommand{\meterCThreeTwo}{}{% + \meterCplus{\musStack{3}{2}}% +} +% Ternary meter used in 17th-century Spanish music +\NewDocumentCommand{\meterCZ}{}{% + \meterCplus{Z}% +} + +% Aliases for older note names +\NewDocumentCommand{\musSemibreve} {}{\musWhole} +\NewDocumentCommand{\musMinim} {}{\musHalf} +\NewDocumentCommand{\musSemiminim} {}{\musQuarter} +\NewDocumentCommand{\musCorchea} {}{\musEighth} +\NewDocumentCommand{\musSemibreveDotted} {}{\musWholeDotted} +\NewDocumentCommand{\musMinimDotted} {}{\musHalfDotted} +\NewDocumentCommand{\musSeminiminimDotted} {}{\musQuarterDotted} +\NewDocumentCommand{\musCorcheaDotted} {}{\musEighthDotted} + +\endinput diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index a48d89b55c1..86ef689d109 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -433,7 +433,7 @@ my @TLP_working = qw( mucproc mugsthesis multenum multiaudience multibbl multibib multibibliography multicap multienv multiexpand multirow - multidef multido multilang multiobjective munich musixguit + multidef multido multilang multiobjective munich musicography musixguit musixtex musixtex-fonts musixtnt musuos muthesis mversion mwcls mwe mweights mxedruli mychemistry mycv mylatexformat mynsfc diff --git a/Master/tlpkg/tlpsrc/collection-music.tlpsrc b/Master/tlpkg/tlpsrc/collection-music.tlpsrc index 3c5397df3b5..25df4193495 100644 --- a/Master/tlpkg/tlpsrc/collection-music.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-music.tlpsrc @@ -17,6 +17,7 @@ depend harmony depend leadsheets depend lilyglyphs depend m-tx +depend musicography depend musixguit depend musixtex depend musixtex-fonts diff --git a/Master/tlpkg/tlpsrc/musicography.tlpsrc b/Master/tlpkg/tlpsrc/musicography.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d -- cgit v1.2.3