summaryrefslogtreecommitdiff
path: root/macros/generic
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-03-30 03:03:36 +0000
committerNorbert Preining <norbert@preining.info>2024-03-30 03:03:36 +0000
commit16a9aadc4ae32ef5d7f20d62a3606b05e20f3405 (patch)
tree4cdbef1301bfdfe766434e49385bd2d251a7827e /macros/generic
parent23724df30adf3c6356ee7877833b8096987c643f (diff)
CTAN sync 202403300303
Diffstat (limited to 'macros/generic')
-rw-r--r--macros/generic/musixtex/README2
-rw-r--r--macros/generic/musixtex/doc/musixdoc.pdfbin1448431 -> 1448598 bytes
-rw-r--r--macros/generic/musixtex/doc/musixdoc/extensions.tex1
-rw-r--r--macros/generic/musixtex/doc/musixdoc/frontmatter.tex2
-rw-r--r--macros/generic/musixtex/doc/musixdoc/musixdoc.sty2
-rw-r--r--macros/generic/musixtex/tex/musixmtab.tex15
-rw-r--r--macros/generic/musixtex/tex/musixtex.tex12
7 files changed, 27 insertions, 7 deletions
diff --git a/macros/generic/musixtex/README b/macros/generic/musixtex/README
index 001f12edda..9ec2b02660 100644
--- a/macros/generic/musixtex/README
+++ b/macros/generic/musixtex/README
@@ -1,4 +1,4 @@
-This is MusiXTeX, version 1.37 (2023-10-07).
+This is MusiXTeX, version 1.38 (2024-03-29).
MusiXTeX is a TeX-based system for typesetting music.
The main author was Daniel Taupin, who died in a climbing
diff --git a/macros/generic/musixtex/doc/musixdoc.pdf b/macros/generic/musixtex/doc/musixdoc.pdf
index c01420e9c0..5e3a8cc8ab 100644
--- a/macros/generic/musixtex/doc/musixdoc.pdf
+++ b/macros/generic/musixtex/doc/musixdoc.pdf
Binary files differ
diff --git a/macros/generic/musixtex/doc/musixdoc/extensions.tex b/macros/generic/musixtex/doc/musixdoc/extensions.tex
index c11c389efa..56d1853c31 100644
--- a/macros/generic/musixtex/doc/musixdoc/extensions.tex
+++ b/macros/generic/musixtex/doc/musixdoc/extensions.tex
@@ -2467,6 +2467,7 @@ For example, compare
\hss
\raise20pt\hbox{ and }
\hss
+\input musixvbm
\vectorizedbeamtrue % re-enable vectorized beams
\startextract
\nnotes\ibbl0G1\qb0{GJKLMLMLMLMLMLMK}\tqb0L\en
diff --git a/macros/generic/musixtex/doc/musixdoc/frontmatter.tex b/macros/generic/musixtex/doc/musixdoc/frontmatter.tex
index e62408b2ac..9e7441c4f2 100644
--- a/macros/generic/musixtex/doc/musixdoc/frontmatter.tex
+++ b/macros/generic/musixtex/doc/musixdoc/frontmatter.tex
@@ -1,6 +1,6 @@
\title{\Huge\bfseries\musixtex\\[\bigskipamount]
\LARGE\bfseries Using \TeX{} to write polyphonic\\or
-instrumental music\\\Large\itshape Version 1.37}
+instrumental music\\\Large\itshape Version 1.38}
\author{}
diff --git a/macros/generic/musixtex/doc/musixdoc/musixdoc.sty b/macros/generic/musixtex/doc/musixdoc/musixdoc.sty
index d07d8ddcd4..8bf59cad3b 100644
--- a/macros/generic/musixtex/doc/musixdoc/musixdoc.sty
+++ b/macros/generic/musixtex/doc/musixdoc/musixdoc.sty
@@ -47,7 +47,6 @@
\usepackage{textcomp}
\input musixtex
-\input musixvbm % experimental vectorized beams
\input musixbm
\input musixcho
\input musixdat
@@ -57,6 +56,7 @@
\input musixlit
\input musixltx
\input musixper
+\input musixvbm
%%% \input musixps deferred to Section 10.2
diff --git a/macros/generic/musixtex/tex/musixmtab.tex b/macros/generic/musixtex/tex/musixmtab.tex
index 087395a2a9..0a5d971445 100644
--- a/macros/generic/musixtex/tex/musixmtab.tex
+++ b/macros/generic/musixtex/tex/musixmtab.tex
@@ -24,7 +24,7 @@
% Copyright 2023 Bob Tennent rdtennent@gmail.com
%
-\immediate\write16{musixmtab\space<2023/07/21>}
+\immediate\write16{musixmtab\space<2023/10/07>}
\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixmtab.tex}\fi
\makeatletter
@@ -109,6 +109,19 @@
\let\n@sym\q@u\y@v\qn@width\writ@note%
}
+% a sixteenth note (with a double flag)
+% argument 1 is the string number
+% argument 2 is the note number
+\def\ucc#1#2{%
+ \zltab{#1}{#2}%
+ \stringraise\nblines%
+ \advance\stringraise by -#1%
+ \multiply\stringraise by 2%
+ \n@i\stringraise%
+ \def\q@u{}\n@vii46\let\st@m\down@flag%
+ \let\n@sym\q@u\y@v\qn@width\writ@note%
+}
+
% a non-spacing stemless quarter or eighth note
% argument 1 is the string number
% argument 2 is the note number
diff --git a/macros/generic/musixtex/tex/musixtex.tex b/macros/generic/musixtex/tex/musixtex.tex
index a46abeec61..41820152f5 100644
--- a/macros/generic/musixtex/tex/musixtex.tex
+++ b/macros/generic/musixtex/tex/musixtex.tex
@@ -25,15 +25,20 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{37}
+\def\mxminorvernumber{38}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
\def\mxversuffix{}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2023-10-07}
+\def\mxdate{2024-03-29}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.38
+%
+% added \lastbarpos\lin@pos into \updat@context
+% (error reported by Wilfried Lingenberg to tex-music mail list)
+%
% version 1.37
%
% added small ss fonts
@@ -2717,7 +2722,8 @@
\let\Writ@newsigns\empty
\def\updat@context{\writ@newclefs
- \T@bil \wbarno@x\Writ@newsigns\Writ@meters\addspace\afterruleskip
+ \T@bil \wbarno@x\Writ@newsigns\Writ@meters\lastbarpos\lin@pos\addspace\afterruleskip
+%%% 1.38: added \lastbarpos\lin@pos
%%% 1.21: added \lastbarno setting
\else\Writ@newsigns\z@suspend\contpiece \fi}