diff options
Diffstat (limited to 'Master')
18 files changed, 381 insertions, 467 deletions
diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog b/Master/texmf-dist/doc/generic/musixtex/ChangeLog deleted file mode 100644 index 7d588009ee2..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ -2011-10-23 All font-related files moved to a new package musixtex-fonts, - which obsoletes musixtex-t1fonts. -2011-06-27 Small revisions to the README. Moved the scripts documentation - to doc/generic/musixtex/scripts -2011-05-21 Augmented the musixtex.lua script to allow multiple filenames, - and added -l (latex) and -f (default) options. -2011-04-25 Rainer Dunker patch to curly.tex; Mthimkhulu Molekwa e-mail updated; - added options to musixtex.lua -2011-04-19 replaced musixflx.c by musixflx.lua and musixtex.sh by musixtex.lua -2011-04-04 added musixtex scripts to run etex && musixflx && etex && dvips && ps2pdf -2011-04-03 updated musixtex.tex to version 1.15 (T-115) -2010-12-18 "universal" OS-X binary for musixflx -2010-11-28 added Joel Hunsberger as an author of musixflx.c -2010-11-10 added font-map configuration to musixtex-install; - updated mail-list info -2010-11-07 moved musixcrd.tex from doc to tex -2010-11-05 psslurs re-licensed to GPL -2010-11-02 musixcrd source files added -2010-11-01 underbracket.sty etc. moved to doc -2010-10-26 added tests and improved the error message for - version-incompatibility in musixflx -2010-10-18 first version of musixflx-0.83.2 -2010-09-28 type 1 font for mxsk added to psfonts and musix.map -2010-09-27 musixflx.c GPLed - diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README index b319fd5f376..99e92a5308a 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.15 (packaged 2011-10-23). MusiXTeX is a +This is MusiXTeX, version 1.15 (packaged 2013-01-21). MusiXTeX is a TeX-based system for typesetting music. The main author was Daniel Taupin, who died in a climbing accident in @@ -8,10 +8,7 @@ and Ross Mitchell. MusiXTeX is now being maintained by Don Simons dsimons(at)roadrunner(dot)com Hiroaki Morimoto CQX05646(at)nifty(dot)com -The package consists of - -musixtex-texmf.zip, which contains macros, documentation and -support files, including +The package includes + Postscript slur support, due to Stanislav Kneifl @@ -30,19 +27,20 @@ support files, including + 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. +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. musixtex-install.{pdf,tex} is a more-detailed version of the following instructions: To install (on TDS-compliant TeX systems): - + unzip musixtex-texmf.zip at the root of a texmf tree and, if - necessary, update the filename database; e.g., texhash texmf. + + unzip tex-archive/install/macros/musixtex.tds.zip at the root of a + texmf tree and, if necessary, update the filename database; + e.g., texhash texmf. - + on Windows: move the scripts in scripts\musixtex\Windows to a folder + + on Windows: move the scripts in Windows to a folder on the executable PATH (or add that folder to the PATH) + on any Unix-like system: install symbolic links musixflx diff --git a/Master/texmf-dist/doc/generic/musixtex/addons/README.underbracket b/Master/texmf-dist/doc/generic/musixtex/addons/README.underbracket new file mode 100644 index 00000000000..4345cb63fdc --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/addons/README.underbracket @@ -0,0 +1,64 @@ +LaTeX package underbracket + +draws brackets to underline (song) text + +v1.2 by Bernd Jantzen +For e-mail contact please use "ctan" before the "@"-sign +and "bernd-jantzen.de" after it to form my address +(not given in full clear text here to prevent spam). + +This package draws brackets to underline text (especially, +but not exclusively, syllables of song text). +It may be combined with musixtex/musixlyr, within the argument of +the \setlyrics command or outside the music score. +It provides several macros to define brackets which may e.g. start +and end centered below syllables. +Three length variables are provided to allow a fine adjustment +of the bracket parameters. + +This material is subject to the LaTeX Project Public License. +See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html +for the details of that license. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +Commands: + +\underbracket{TEXT} + draws a bracket underlining TEXT + the bracket starts below the left end of TEXT + and stops below the right end of TEXT + +\Underbracket{TEXT} + like \underbracket, but reserves no vertical space below the text + +\cunderbracket{LEFT}{TEXT}{RIGHT} + draws a bracket underlining LEFTTEXTRIGHT + the bracket starts centered below LEFT and stops centered below RIGHT + +\cUnderbracket{LEFT}{TEXT}{RIGHT} + like cunderbracket, but reserves no vertical space below the text + + +The commands \[c]underbracket do well in normal text which is aligned +according to the baseline. The vertical space reserved below the text +guarantees the distance to the next line. +The commands \[c]Underbracket do well within the \setlyrics command of +musixlyr where the text is vertically centered between the staves. Vertical +space reserved below the text would shift the whole text upwards here. + + +Adjustable length parameters: +(change e.g. with \setlength{\underbracketheight}{4pt}) + +\underbracketwidth (default 0.3pt): + linewidth of the bracket + +\underbracketheight (default 3pt): + height of the bracket (length of the vertical lines) + +\underbracketsep (default 2pt): + vertical distance between the lowest part of the text + and the upper end of the bracket; + also minimal vertical distance below the bracket + diff --git a/Master/texmf-dist/doc/generic/musixtex/gpl.txt b/Master/texmf-dist/doc/generic/musixtex/gpl.txt deleted file mode 100644 index 8de98afaaf9..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/gpl.txt +++ /dev/null @@ -1,251 +0,0 @@ - - GNU GENERAL PUBLIC LICENSE - Version 1, February 1989 - - Copyright (C) 1989 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The license agreements of most software companies try to keep users -at the mercy of those companies. By contrast, our General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. The -General Public License applies to the Free Software Foundation's -software and to any other program whose authors commit to using it. -You can use it for your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Specifically, the General Public License is designed to make -sure that you have the freedom to give away or sell copies of free -software, that you receive source code or can get it if you want it, -that you can change the software or use pieces of it in new free -programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of a such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must tell them their rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any program or other work which -contains a notice placed by the copyright holder saying it may be -distributed under the terms of this General Public License. The -"Program", below, refers to any such program or work, and a "work based -on the Program" means either the Program or any work containing the -Program or a portion of it, either verbatim or with modifications. Each -licensee is addressed as "you". - - 1. You may copy and distribute verbatim copies of the Program's source -code as you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this -General Public License and to the absence of any warranty; and give any -other recipients of the Program a copy of this General Public License -along with the Program. You may charge a fee for the physical act of -transferring a copy. - - 2. You may modify your copy or copies of the Program or any portion of -it, and copy and distribute such modifications under the terms of Paragraph -1 above, provided that you also do the following: - - a) cause the modified files to carry prominent notices stating that - you changed the files and the date of any change; and - - b) cause the whole of any work that you distribute or publish, that - in whole or in part contains the Program or any part thereof, either - with or without modifications, to be licensed at no charge to all - third parties under the terms of this General Public License (except - that you may choose to grant warranty protection to some or all - third parties, at your option). - - c) If the modified program normally reads commands interactively when - run, you must cause it, when started running for such interactive use - in the simplest and most usual way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this General - Public License. - - d) You may charge a fee for the physical act of transferring a - copy, and you may at your option offer warranty protection in - exchange for a fee. - -Mere aggregation of another independent work with the Program (or its -derivative) on a volume of a storage or distribution medium does not bring -the other work under the scope of these terms. - - 3. You may copy and distribute the Program (or a portion or derivative of -it, under Paragraph 2) in object code or executable form under the terms of -Paragraphs 1 and 2 above provided that you also do one of the following: - - a) accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of - Paragraphs 1 and 2 above; or, - - b) accompany it with a written offer, valid for at least three - years, to give any third party free (except for a nominal charge - for the cost of distribution) a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of - Paragraphs 1 and 2 above; or, - - c) accompany it with the information you received as to where the - corresponding source code may be obtained. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form alone.) - -Source code for a work means the preferred form of the work for making -modifications to it. For an executable file, complete source code means -all the source code for all modules it contains; but, as a special -exception, it need not include source code for modules which are standard -libraries that accompany the operating system on which the executable -file runs, or for standard header files or definitions files that -accompany that operating system. - - 4. You may not copy, modify, sublicense, distribute or transfer the -Program except as expressly provided under this General Public License. -Any attempt otherwise to copy, modify, sublicense, distribute or transfer -the Program is void, and will automatically terminate your rights to use -the Program under this License. However, parties who have received -copies, or rights to use copies, from you under this General Public -License will not have their licenses terminated so long as such parties -remain in full compliance. - - 5. By copying, distributing or modifying the Program (or any work based -on the Program) you indicate your acceptance of this license to do so, -and all its terms and conditions. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the original -licensor to copy, distribute or modify the Program subject to these -terms and conditions. You may not impose any further restrictions on the -recipients' exercise of the rights granted herein. - - 7. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of the license which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -the license, you may choose any version ever published by the Free Software -Foundation. - - 8. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to humanity, the best way to achieve this is to make it -free software which everyone can redistribute and change under these -terms. - - To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively convey -the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 1, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19xx name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the -appropriate parts of the General Public License. Of course, the -commands you use may be called something other than `show w' and `show -c'; they could even be mouse-clicks or menu items--whatever suits your -program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (a program to direct compilers to make passes - at assemblers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -That's all there is to it! 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 08fc01aae49..a1cdd54d1e6 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 2375565aa5c..d962dbdfe3d 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex @@ -32,12 +32,14 @@ which tree to use\footnote{% and installing files\footnote{% \myurl{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf}}. -\section{Installing \texttt{musixtex-texmf.zip}} +\section{Installing \texttt{musixtex.tds.zip}} In this distribution of MusiXTeX, most of the files to be installed -(including macros, scripts, and documentation) are in -\texttt{musixtex-texmf.zip}, a zipped TEXMF -hierarchy. Simply unzip this archive in the root folder/directory of whichever TEXMF tree +(including macros, scripts, and documentation) are in a zipped TEXMF hierarchy +\begin{list}{}{}\item +\texttt{tex-archive/install/macros/musixtex.tds.zip} +\end{list} +at CTAN. Simply download and unzip this archive in the root folder/directory of whichever TEXMF tree you decide is most appropriate, likely a ``local'' or ``personal'' one. This should work with any TDS\footnote{% \myurl{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds}} @@ -75,11 +77,11 @@ symbolic link to \texttt{musixflx.lua} in any directory on the executable PATH a On Windows, you can \emph{either} copy the batch file \begin{list}{}{} -\item \verb|...\scripts\musixtex\Windows\musixflx.bat| +\item \verb|Windows\musixflx.bat| \end{list} to a folder on the executable PATH \emph{or} add the folder -\verb|...\scripts\musixtex\Windows| to the executable PATH +\verb|Windows| to the executable PATH as follows: in ``My Computer'' click on @@ -87,7 +89,7 @@ click on View System Information\quad$\rightarrow$\quad Advanced\quad$\rightarrow$\quad Environment Variables \end{center} scroll -down to ``path'', select it, click edit, and add the path to \verb|...\scripts\musixtex\Windows| after a semi-colon. +down to ``path'', select it, click edit, and add the path to \verb|Windows| after a semi-colon. Documentation for \verb\musixflx\ is in the \verb\doc/generic/musixtex/scripts\ directory. \section{Installing \texttt{musixtex}} diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixflx.1 b/Master/texmf-dist/doc/generic/musixtex/scripts/musixflx.1 deleted file mode 100644 index a3c214535e2..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/scripts/musixflx.1 +++ /dev/null @@ -1,43 +0,0 @@ -.\" This manpage is licensed under the GNU Public License -.TH MUSIXFLX 1 2011-04-21 "musixflx-0.83.3lua7" "" - -.SH NAME -musixflx \- process mx1 files (the second pass of 3-pass MusiXTeX typesetting) - -.SH SYNOPSIS -[ texlua ] -.B musixflx[.lua] -.I jobname -[ .mx1 | .tex ] -[ -.I debugmode -] - -where -.I debugmode -can be -.br - d output debugging information to the screen -.br - m output line numbers to the screen -.br - f output debugging information to jobname.mxl (not mx1) -.br - s output computed lines to the screen - -To allow for ease of use with a batch file, \fB musixflx.lua\fR -can be fed with either \fI jobname.mx1\fP, \fI jobname.tex\fP, -or just \fI jobname\fP, any of which open \fI jobname.mx1\fP -and create \fI jobname.mx2\fP. - -.SH SEE ALSO -.BR musixtex (1) -.br -musixdoc.pdf - -.SH AUTHOR -This manual page was written by Andreas Tille -<tille@debian.org> for the Debian GNU/Linux system (but may be used -by others). Corrections to the synopsis were pointed out by Peter -Breitenlohner <peb@mppmu.mpg.de> and implemented by Bob Tennent -<rdt@cs.queensu.ca>. diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixflx.html b/Master/texmf-dist/doc/generic/musixtex/scripts/musixflx.html new file mode 100644 index 00000000000..6d7c8612268 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/scripts/musixflx.html @@ -0,0 +1,84 @@ +Content-type: text/html + +<HTML><HEAD><TITLE>Manpage of MUSIXFLX</TITLE> +</HEAD><BODY> +<H1>MUSIXFLX</H1> +Section: (1)<BR>Updated: 2011-04-21<BR><A HREF="#index">Index</A> +<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR> + +<P> +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +musixflx - process mx1 files (the second pass of 3-pass MusiXTeX typesetting) +<P> +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + +[ texlua ] +<B>musixflx[.lua]</B> + +<I>jobname </I> + +[ .mx1 | .tex ] +[ +<I>debugmode </I> + +] +<P> +where +<I>debugmode </I> + +can be +<BR> + +<TT> </TT>d<TT> </TT>output debugging information to the screen<BR> +<BR> + +<TT> </TT>m<TT> </TT>output line numbers to the screen<BR> +<BR> + +<TT> </TT>f<TT> </TT>output debugging information to jobname.mxl (not mx1)<BR> +<BR> + +<TT> </TT>s<TT> </TT>output computed lines to the screen<BR> +<P> +To allow for ease of use with a batch file, <B> musixflx.lua</B> +can be fed with either <I> jobname.mx1</I>, <I> jobname.tex</I>, +or just <I> jobname</I>, any of which open <I> jobname.mx1</I> +and create <I> jobname.mx2</I>. +<P> +<A NAME="lbAD"> </A> +<H2>SEE ALSO</H2> + +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+musixtex">musixtex</A></B>(1) + +<BR> + +musixdoc.pdf +<P> +<A NAME="lbAE"> </A> +<H2>AUTHOR </H2> + +This manual page was written by Andreas Tille +<<A HREF="mailto:tille@debian.org">tille@debian.org</A>> for the Debian GNU/Linux system (but may be used +by others). Corrections to the synopsis were pointed out by Peter +Breitenlohner <<A HREF="mailto:peb@mppmu.mpg.de">peb@mppmu.mpg.de</A>> and implemented by Bob Tennent +<<A HREF="mailto:rdt@cs.queensu.ca">rdt@cs.queensu.ca</A>>. +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">SEE ALSO</A><DD> +<DT><A HREF="#lbAE">AUTHOR </A><DD> +</DL> +<HR> +This document was created by +<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 08:30:52 GMT, September 14, 2012 +</BODY> +</HTML> diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixflx.pdf b/Master/texmf-dist/doc/generic/musixtex/scripts/musixflx.pdf Binary files differdeleted file mode 100644 index 1052dbf8342..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/scripts/musixflx.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.1 b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.1 deleted file mode 100644 index c8460885b4a..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.1 +++ /dev/null @@ -1,88 +0,0 @@ -.\" This manpage is licensed under the GNU Public License -.TH MUSIXTEX 1 2011-05-21 "musixtex version 0.4" "" - -.SH NAME -musixtex \- processes MusiXTeX files, deleting intermediate files - -.SH SYNOPSIS -[ texlua ] -.B musixtex[.lua] -{ -.IR option -| -.IR jobname -[ .tex ] -} ... -.TP -The default effect is to process each file using -.TP 12 -.BR etex (1) -(first pass) -.TP -.BR musixflx (1) -(second pass) -.TP -.BR etex (1) -(third pass) -.TP -.BR dvips (1) -(dvi to Postscript) -.TP -.BR ps2pdf (1) -(Postscript to Portable Document Format) -.TP -followed by removal of intermediate files. - -.SH OPTIONS -.TP 8 -.B -v -output program name and version number, and quit -.TP -.B -h -output usage summary and quit -.TP -.B -l -changes the TeX processor to -.BR latex (1) -or -.BR pdflatex (1) -.TP -.B -p -changes the TeX processor to -.BR pdfetex (1) -or -.BR pdflatex (1) -(and doesn't run -.BR dvips (1) -and -.BR ps2pdf (1) -or -.BR dvipdfm (1) -) -.TP -.B -d -changes the dvi processor to -.BR dvipdfm (1) -.TP -.B -s -stops processing at the dvi file -.TP -.B -f -default processing -.TP 0 -Options affect processing of all succeeding MusiXTeX files unless changed by another option. - -.SH SEE ALSO -.BR etex (1), -.BR latex (1), -.BR pdfetex (1), -.BR pdflatex (1), -.BR musixflx (1), -.BR dvipdfm (1), -.BR dvips (1), -.BR ps2pdf (1). -.br -musixdoc.pdf - -.SH AUTHOR -This manual page was written by Bob Tennent <rdt@cs.queensu.ca>. diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.html b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.html new file mode 100644 index 00000000000..fca335c0ee7 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.html @@ -0,0 +1,163 @@ +Content-type: text/html + +<HTML><HEAD><TITLE>Manpage of MUSIXTEX</TITLE> +</HEAD><BODY> +<H1>MUSIXTEX</H1> +Section: (1)<BR>Updated: 2012-09-14<BR><A HREF="#index">Index</A> +<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR> + +<P> +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +musixtex - processes MusiXTeX files, deleting intermediate files +<P> +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + +[ texlua ] +<B>musixtex[.lua]</B> + +{ +<I>option</I> + +| +<I>jobname</I> + +[ .tex ] +} ... +<DL COMPACT> +<DT>The default effect is to process each file using <DD> +<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+etex">etex</A></B>(1) + +<DD> +(first pass) +<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+musixflx">musixflx</A></B>(1) + +<DD> +(second pass) +<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+etex">etex</A></B>(1) + +<DD> +(third pass) +<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvips">dvips</A></B>(1) + +<DD> +(dvi to Postscript) +<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+ps2pdf">ps2pdf</A></B>(1) + +<DD> +(Postscript to Portable Document Format) +<DT>followed by removal of intermediate files.<DD> +<P> +</DL> +<A NAME="lbAD"> </A> +<H2>OPTIONS</H2> + +<DL COMPACT> +<DT><B>-v </B> + +<DD> +output program name and version number, and quit +<DT><B>-h</B> + +<DD> +output usage summary and quit +<DT><B>-l </B> + +<DD> +changes the TeX processor to +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+latex">latex</A></B>(1) + +or +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdflatex">pdflatex</A></B>(1) + +<DT><B>-p </B> + +<DD> +changes the TeX processor to +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdfetex">pdfetex</A></B>(1) + +or +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdflatex">pdflatex</A></B>(1) + +(and doesn't run +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvips">dvips</A></B>(1) + +and +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+ps2pdf">ps2pdf</A></B>(1) + +or +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvipdfm">dvipdfm</A></B>(1) + +) +<DT><B>-d </B> + +<DD> +changes the dvi processor to +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvipdfm">dvipdfm</A></B>(1) + +<DT><B>-s </B> + +<DD> +stops processing at the dvi file +<DT><B>-i</B> + +<DD> +retain intermediate files +<DT><B>-1</B> + +<DD> +one-pass [pdf][la]tex processing +<DT><B>-f</B> + +<DD> +default processing +<DT>Options affect processing of all succeeding MusiXTeX files unless changed by another option.<DD> +<P> +</DL> +<A NAME="lbAE"> </A> +<H2>SEE ALSO</H2> + +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+etex">etex</A></B>(1), + +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+latex">latex</A></B>(1), + +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdfetex">pdfetex</A></B>(1), + +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdflatex">pdflatex</A></B>(1), + +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+musixflx">musixflx</A></B>(1), + +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvipdfm">dvipdfm</A></B>(1), + +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvips">dvips</A></B>(1), + +<B><A HREF="http://localhost/cgi-bin/man/man2html?1+ps2pdf">ps2pdf</A></B>(1). + +<BR> + +musixdoc.pdf +<P> +<A NAME="lbAF"> </A> +<H2>AUTHOR </H2> + +This manual page was written by Bob Tennent <<A HREF="mailto:rdt@cs.queensu.ca">rdt@cs.queensu.ca</A>>. +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">OPTIONS</A><DD> +<DT><A HREF="#lbAE">SEE ALSO</A><DD> +<DT><A HREF="#lbAF">AUTHOR </A><DD> +</DL> +<HR> +This document was created by +<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 08:25:23 GMT, September 14, 2012 +</BODY> +</HTML> diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf Binary files differdeleted file mode 100644 index e3f9c8128d5..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf +++ /dev/null diff --git a/Master/texmf-dist/scripts/musixtex/Windows/musixflx.bat b/Master/texmf-dist/scripts/musixtex/Windows/musixflx.bat deleted file mode 100755 index 684441ebb3d..00000000000 --- a/Master/texmf-dist/scripts/musixtex/Windows/musixflx.bat +++ /dev/null @@ -1,6 +0,0 @@ -:: wrapper script to call musixflx.lua
-:: Usage: musixflx basename[.mx1 | .tex] [debug mode]
-:: Suggested by Tomasz Luczak (Tomek) t34www@googlemail.com
-
-@for /f "delims=" %%I in ('kpsewhich --format=texmfscripts %~n0.lua') do texlua "%%I" %*
-:end
diff --git a/Master/texmf-dist/scripts/musixtex/Windows/musixtex.bat b/Master/texmf-dist/scripts/musixtex/Windows/musixtex.bat deleted file mode 100755 index 70c136972de..00000000000 --- a/Master/texmf-dist/scripts/musixtex/Windows/musixtex.bat +++ /dev/null @@ -1,6 +0,0 @@ -:: wrapper script to call musixtex.lua
-:: Usage: musixtex [options] basename[.tex]
-:: Suggested by Tomasz Luczak (Tomek) t34www@googlemail.com
-
-@for /f "delims=" %%I in ('kpsewhich --format=texmfscripts %~n0.lua') do texlua "%%I" %*
-:end
diff --git a/Master/texmf-dist/scripts/musixtex/musixtex.lua b/Master/texmf-dist/scripts/musixtex/musixtex.lua index 6bac25e8d8a..1386db71fde 100755 --- a/Master/texmf-dist/scripts/musixtex/musixtex.lua +++ b/Master/texmf-dist/scripts/musixtex/musixtex.lua @@ -1,11 +1,11 @@ #!/usr/bin/env texlua -VERSION = "0.4" +VERSION = "0.6" --[[ musixtex.lua: processes MusiXTeX files (and deletes intermediate files) - (c) Copyright 2011 Bob Tennent rdt@cs.queensu.ca + (c) Copyright 2012 Bob Tennent rdt@cs.queensu.ca This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -26,6 +26,11 @@ VERSION = "0.4" --[[ ChangeLog: + version 0.6 2012-09-14 RDT + Add -1 (one-pass [pdf][la]tex processing) option. + + version 0.5 2011-11-28 RDT + Add -i (retain intermediate files) option. version 0.4 2011-04-30 RDT Allow multiple filenames (and options). @@ -49,6 +54,8 @@ function usage() print(" -p pdfetex (or pdflatex)") print(" -d dvipdfm") print(" -s stop at dvi") + print(" -i retain intermediate files") + print(" -1 one-pass [pdf][la]tex processing") print(" -f restore default processing") end @@ -66,7 +73,9 @@ end tex = "etex" musixflx = "musixflx" dvi = "dvips" -ps2pdf = "ps2pdf" +ps2pdf = "/usr/local/bin/ps2pdf" +intermediate = 1 +passes = 2 exit_code = 0 narg = 1 @@ -94,8 +103,12 @@ repeat dvi = "dvipdfm"; ps2pdf = "" elseif this_arg == "-s" then dvi = ""; ps2pdf = "" + elseif this_arg == "-i" then + intermediate = 0 + elseif this_arg == "-1" then + passes = 1 elseif this_arg == "-f" then - tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf" + tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1; passes = 2 else filename = this_arg if filename ~= "" and string.sub(filename, -4, -1) == ".tex" then @@ -106,24 +119,27 @@ repeat else print("Processing ".. filename .. ".tex.") os.remove( filename .. ".mx2" ) - if (os.execute(tex .. " " .. filename) == 0) and - (os.execute(musixflx .. " " .. filename) == 0) and + if (passes == 1 or os.execute(tex .. " " .. filename) == 0) and + (passes == 1 or os.execute(musixflx .. " " .. filename) == 0) and (os.execute(tex .. " " .. filename) == 0) and ((tex ~= "latex" and tex ~= "pdflatex") or (os.execute(tex .. " " .. filename) == 0)) and (dvi == "" or (os.execute(dvi .. " " .. filename) == 0)) and (ps2pdf == "" or (os.execute(ps2pdf .. " " .. filename .. ".ps") == 0) ) - then -- clean-up: - os.remove( filename .. ".mx1" ) - os.remove( filename .. ".mx2" ) - if dvi ~= "" then - os.remove( filename .. ".dvi" ) - end + then if ps2pdf ~= "" then print(filename .. ".pdf generated by " .. ps2pdf .. ".") - os.remove( filename .. ".ps" ) end - print("") + if intermediate == 1 then -- clean-up: + os.remove( filename .. ".mx1" ) + os.remove( filename .. ".mx2" ) + if dvi ~= "" then + os.remove( filename .. ".dvi" ) + end + if ps2pdf ~= "" then + os.remove( filename .. ".ps" ) + end + end else print("Musixtex processing of " .. filename .. ".tex fails.\n") exit_code = 2 diff --git a/Master/texmf/doc/man/man1/musixtex.1 b/Master/texmf/doc/man/man1/musixtex.1 index c8460885b4a..669f8bd2ff5 100644 --- a/Master/texmf/doc/man/man1/musixtex.1 +++ b/Master/texmf/doc/man/man1/musixtex.1 @@ -1,5 +1,5 @@ .\" This manpage is licensed under the GNU Public License -.TH MUSIXTEX 1 2011-05-21 "musixtex version 0.4" "" +.TH MUSIXTEX 1 2012-09-14 "musixtex version 0.6" "" .SH NAME musixtex \- processes MusiXTeX files, deleting intermediate files @@ -66,6 +66,12 @@ changes the dvi processor to .TP .B -s stops processing at the dvi file +.TP +.B -i +retain intermediate files +.TP +.B -1 +one-pass [pdf][la]tex processing .TP .B -f default processing diff --git a/Master/texmf/doc/man/man1/musixtex.man1.pdf b/Master/texmf/doc/man/man1/musixtex.man1.pdf Binary files differindex 5588a85c6d6..a1a8bf2d114 100644 --- a/Master/texmf/doc/man/man1/musixtex.man1.pdf +++ b/Master/texmf/doc/man/man1/musixtex.man1.pdf diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 4dfe0b69ffa..9ae5be649d0 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1071,7 +1071,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'latexdiff' => '&PREHOOK_latexdiff', 'mathspic' => '&PREHOOK_mathspic', 'movie15' => '&PREHOOK_flatten1', - 'musixtex' => '&PREHOOK_musixtex', 'musixtex-fonts' => '&PREHOOK_unzip', 'mp3d' => '&PREHOOK_mp3d', 'pgf-blur' => '&PREHOOK_pgfblur', @@ -1120,6 +1119,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'luatexja' => '&POSTluatexja', 'm-tx' => '&POST_do_man', 'montex' => '&POSTmontex', + 'musixtex' => '&POSTmusixtex', 'niceframe' => '&POST_rmsymlink', 'pedigree-perl' => '&POSTpedigreeperl', 'pgf' => '&POSTpgf', @@ -4684,17 +4684,6 @@ sub PREHOOK_mp3d { &SYSTEM ("$RM -rf v1.0"); } -sub PREHOOK_musixtex { - print "PREHOOK_$package - unzip, scripts\n"; - # must unzip first so we can find the scripts. - &PREHOOK_unzip (); - # - my $mandest = "$TOPDEST/texmf/doc/man/man1/"; - &xmkdir ($mandest); - &SYSTEM ("$CP $DEST/doc/generic/$package/scripts/*.1 $mandest/"); - &tl_man_to_pdf (); -} - sub PREHOOK_pgfblur { print "PREHOOK_$package - build pdf doc\n"; &SYSTEM ("pdflatex pgf-blur.dtx"); @@ -5126,6 +5115,11 @@ sub POSTluatexja { &SYSTEM ("$MV doc/* .; rmdir doc"); } +sub POSTmusixtex { + print "POST$package - man pages\n"; + &POST_do_man ("doc/generic/$package/scripts"); +} + sub POSTmontex { print "\t POST$package - avoid 00readme case clash\n"; # these files are no longer used in TL. @@ -5238,14 +5232,20 @@ sub POSTzhspacing { &SYSTEM ("$MV doc/* .; rmdir doc"); } +# (Generic post hook actions.) + # has to be post instead of specialman because we use the tds.zip. +# Optional argument is directory where the man pages are as distributed +# on CTAN. sub POST_do_man { - print "POST$package - mv man page\n"; + my ($src_mandir) = @_; + $src_mandir = "doc/*/$package" if ! $src_mandir; + # + print "POST$package - mv *.1 man pages from $src_mandir\n"; my $mydest = "$TOPDEST/texmf/doc/man/man1/"; &xmkdir ($mydest); &xchdir ($DEST); - print STDERR `pwd`; - &SYSTEM ("$MV doc/*/$package/*.1 $mydest"); + &SYSTEM ("$MV $src_mandir/*.1 $mydest"); &tl_man_to_pdf (); } |