diff options
author | Karl Berry <karl@freefriends.org> | 2021-08-31 20:53:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-08-31 20:53:07 +0000 |
commit | f52b8911451c2e87a74754f3b6011778d0405081 (patch) | |
tree | 75e6512320a4dfe1c7d14938f9b189676d2419d3 | |
parent | 3c86b311ec6299d93c1ef4cca6966dbabdaa72fa (diff) |
musixtex (31aug21)
git-svn-id: svn://tug.org/texlive/trunk@60382 c570f23f-e606-0410-a88d-b1316a301751
15 files changed, 11 insertions, 225 deletions
diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-135.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-135.txt index 42c7e044b2f..ae00d0c07be 100644 --- a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-135.txt +++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-135.txt @@ -1,5 +1,8 @@ -Changes from MusiXTeX 133 to 134: +Changes from MusiXTeX 134 to 135: * new extension library musixjt.tex to support using the handwriting font MuseJazzText for all textual elements of a MusiXTeX score. + + * Aug. 30, 2021: moved frenchtab and MuseJazzText fonts and + associated support files to the musixtex-fonts package diff --git a/Master/texmf-dist/doc/generic/musixtex/MuseJazzText/MuseJazzText.Glyphs.pdf b/Master/texmf-dist/doc/generic/musixtex/MuseJazzText/MuseJazzText.Glyphs.pdf Binary files differdeleted file mode 100644 index f4b563604fc..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/MuseJazzText/MuseJazzText.Glyphs.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/musixtex/MuseJazzText/OFL.txt b/Master/texmf-dist/doc/generic/musixtex/MuseJazzText/OFL.txt deleted file mode 100644 index b27909bd222..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/MuseJazzText/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright © 2016, Torsten Hämmerle, Abraham Lee (https://www.musictypefoundry.com). - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README index 0d0ded9e0cb..eef46a11444 100644 --- a/Master/texmf-dist/doc/generic/musixtex/README +++ b/Master/texmf-dist/doc/generic/musixtex/README @@ -1,4 +1,4 @@ -This is MusiXTeX, version 1.35 (2021-08-29). +This is MusiXTeX, version 1.35 (2021-08-30). MusiXTeX is a TeX-based system for typesetting music. The main author was Daniel Taupin, who died in a climbing @@ -34,9 +34,10 @@ The package includes + wrapper scripts musixflx.bat and musixtex.bat for use on Windows MusiXTeX fonts, including both the original metafont sources -and Type 1 versions by Takanori Uchiyama are in a separate -musixtex-fonts package, which must be installed before using -the MusiXTeX macros. +and Type 1 versions by Takanori Uchiyama, and specialized +fonts frenchtab and MuseJazzText have been moved to a +separate musixtex-fonts package, which must be installed +before using the MusiXTeX macros. musixtex-install.{pdf,tex} is a more-detailed version of the following instructions: @@ -47,11 +48,6 @@ To install (on TDS-compliant TeX systems): texmf tree and, if necessary, update the filename database; e.g., texhash texmf. - + update the font maps, for example, by executing - - updmap-user -enable Map frenchtab.map - updmap-user -enable Map MuseJazzText.map - + on Windows: move the scripts in Windows to a folder on the executable PATH (or add that folder to the PATH) @@ -90,21 +86,5 @@ conformance to the GNU General Public License (Version 2, 1991, see included file gpl.txt) or (at your option) any later version. -The font file frenchtab.pfb is derived from mscoreTab.ttf -by Maurizio M. Gavioli. It was obtained from - -https://github.com/musescore/MuseScore/blob/master/fonts/ - -and is licensed under the SIL Open Font Licence, -Version 1.1; the text may be found in the doc directory. - -The font file MuseJazzText.pfb is derived from MuseJazzText.otf -by Torsten Hämmerle and Abraham Lee. It was obtained from - -https://github.com/musescore/MuseScore/blob/master/fonts - -and is licensed under the SIL Open Font Licence, -Version 1.1; the text may be found in the doc directory. - This distribution is maintained by Bob Tennent rdt(at)cs(dot)queensu(dot)ca. diff --git a/Master/texmf-dist/doc/generic/musixtex/musixftab/OFL.txt b/Master/texmf-dist/doc/generic/musixtex/musixftab/OFL.txt deleted file mode 100644 index caa9e01e460..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/musixftab/OFL.txt +++ /dev/null @@ -1,95 +0,0 @@ -frenchtab.pfb is derived from mscoreTab.ttf, -Copyright (c) 2012-15, Maurizio M. Gavioli, -adapted by R.D. Tennent 2021. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf Binary files differindex 814f25449f4..763ba6964a4 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf +++ b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf diff --git a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex index cf8e1438b52..b3e78f43285 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex @@ -48,12 +48,6 @@ compliant TeX distribution, including MikTeX, TeXlive and teTeX. After unzipping the archive, update the filename database as necessary, for example, by executing \verb\texhash ~/texmf\ or clicking the button labelled ``Refresh FNDB" in the MikTeX settings program. -Update the font map files, for example, by executing -\begin{list}{}{}\item -\verb|updmap-user -enable Map frenchtab.map| -\item -\verb|updmap-user -enable Map MuseJazzText.map| -\end{list} MusiXTeX requires a large set of specialized fonts. If necessary, install the \texttt{musixtex-fonts} package. diff --git a/Master/texmf-dist/fonts/map/dvips/musixtex/MuseJazzText.map b/Master/texmf-dist/fonts/map/dvips/musixtex/MuseJazzText.map deleted file mode 100644 index c6c60724c67..00000000000 --- a/Master/texmf-dist/fonts/map/dvips/musixtex/MuseJazzText.map +++ /dev/null @@ -1 +0,0 @@ -MuseJazzText MuseJazzText <MuseJazzText.pfb diff --git a/Master/texmf-dist/fonts/map/dvips/musixtex/frenchtab.map b/Master/texmf-dist/fonts/map/dvips/musixtex/frenchtab.map deleted file mode 100644 index 116a3f2e219..00000000000 --- a/Master/texmf-dist/fonts/map/dvips/musixtex/frenchtab.map +++ /dev/null @@ -1 +0,0 @@ -frenchtab frenchtab <frenchtab.pfb diff --git a/Master/texmf-dist/fonts/opentype/public/musixtex/MuseJazzText.otf b/Master/texmf-dist/fonts/opentype/public/musixtex/MuseJazzText.otf Binary files differdeleted file mode 100644 index 1c3c4614fc5..00000000000 --- a/Master/texmf-dist/fonts/opentype/public/musixtex/MuseJazzText.otf +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/public/musixtex/MuseJazzText.tfm b/Master/texmf-dist/fonts/tfm/public/musixtex/MuseJazzText.tfm Binary files differdeleted file mode 100644 index aafe40a85ac..00000000000 --- a/Master/texmf-dist/fonts/tfm/public/musixtex/MuseJazzText.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/public/musixtex/frenchtab.tfm b/Master/texmf-dist/fonts/tfm/public/musixtex/frenchtab.tfm Binary files differdeleted file mode 100644 index a072ef9172e..00000000000 --- a/Master/texmf-dist/fonts/tfm/public/musixtex/frenchtab.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/public/musixtex/MuseJazzText.pfb b/Master/texmf-dist/fonts/type1/public/musixtex/MuseJazzText.pfb Binary files differdeleted file mode 100644 index 6daca64a85f..00000000000 --- a/Master/texmf-dist/fonts/type1/public/musixtex/MuseJazzText.pfb +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/public/musixtex/frenchtab.pfb b/Master/texmf-dist/fonts/type1/public/musixtex/frenchtab.pfb Binary files differdeleted file mode 100644 index 99ea0e03541..00000000000 --- a/Master/texmf-dist/fonts/type1/public/musixtex/frenchtab.pfb +++ /dev/null diff --git a/Master/tlpkg/tlpsrc/musixtex.tlpsrc b/Master/tlpkg/tlpsrc/musixtex.tlpsrc index e486d0628c8..2bc2a9ab011 100644 --- a/Master/tlpkg/tlpsrc/musixtex.tlpsrc +++ b/Master/tlpkg/tlpsrc/musixtex.tlpsrc @@ -2,6 +2,5 @@ binpattern f bin/${ARCH}/${PKGNAME} # binpattern f bin/${ARCH}/musixflx docpattern +f texmf-dist/doc/man/man1/musixflx.* -# -execute addMap frenchtab.map -execute addMap MuseJazzText.map + + |