texlive[54243] Build/source/utils/autosp: autosp 2020-03-11
commits+karl at tug.org
commits+karl at tug.org
Wed Mar 11 23:02:29 CET 2020
Revision: 54243
http://tug.org/svn/texlive?view=revision&revision=54243
Author: karl
Date: 2020-03-11 23:02:29 +0100 (Wed, 11 Mar 2020)
Log Message:
-----------
autosp 2020-03-11
Modified Paths:
--------------
trunk/Build/source/utils/autosp/TLpatches/ChangeLog
trunk/Build/source/utils/autosp/autosp-src/ChangeLog
trunk/Build/source/utils/autosp/autosp-src/README
trunk/Build/source/utils/autosp/autosp-src/autosp.c
trunk/Build/source/utils/autosp/autosp-src/configure
trunk/Build/source/utils/autosp/autosp-src/configure.ac
trunk/Build/source/utils/autosp/autosp-src/process_command.c
trunk/Build/source/utils/autosp/autosp-src/rebar.c
trunk/Build/source/utils/autosp/autosp-src/spacing_note.c
trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex
trunk/Build/source/utils/autosp/autosp-src/tex2aspc.c
trunk/Build/source/utils/autosp/configure
trunk/Build/source/utils/autosp/configure.ac
Removed Paths:
-------------
trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write
Modified: trunk/Build/source/utils/autosp/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2020-03-11 22:02:29 UTC (rev 54243)
@@ -1,3 +1,8 @@
+2020-03-11 Karl Berry <karl at tug.org>
+
+ Import autosp-2020-03-11.
+ * patch-01-binary-write: Remove, now upstream
+
2020-02-07 Akira Kakuto <kakuto at w32tex.org>
Import autosp-2020-02-06.
Deleted: trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2020-03-11 22:02:29 UTC (rev 54243)
@@ -1,75 +0,0 @@
-diff -ur autosp-2020-02-06/autosp.c autosp-src/autosp.c
---- autosp-2020-02-06/autosp.c Thu Feb 06 23:00:34 2020
-+++ autosp-src/autosp.c Fri Feb 07 07:43:38 2020
-@@ -221,7 +221,7 @@
- }
- else
- {
-- outfile = fopen (outfilename, "w");
-+ outfile = fopen (outfilename, "wb");
- if (outfile == NULL)
- { printf ("Can't open %s\n", outfilename);
- exit (EXIT_FAILURE);
-@@ -239,7 +239,7 @@
- *logfilename_n = '\0';
- append (logfilename, &logfilename_n, "alog", sizeof (logfilename));
- if (debug)
-- { logfile = fopen (logfilename, "w");
-+ { logfile = fopen (logfilename, "wb");
- if (logfile == NULL)
- { printf ("Can't open %s\n", logfilename);
- exit (EXIT_FAILURE);
-diff -ur autosp-2020-02-06/rebar.c autosp-src/rebar.c
---- autosp-2020-02-06/rebar.c Thu Feb 06 16:22:35 2020
-+++ autosp-src/rebar.c Fri Feb 07 07:44:13 2020
-@@ -264,7 +264,7 @@
- else
- append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
- }
-- outfile = fopen (outfilename, "w");
-+ outfile = fopen (outfilename, "wb");
- if (outfile == NULL)
- { fprintf (stderr,"Can't open %s\n", outfilename);
- exit (EXIT_FAILURE);
-diff -ur autosp-2020-02-06/spacing_note.c autosp-src/spacing_note.c
---- autosp-2020-02-06/spacing_note.c Thu Feb 06 16:22:35 2020
-+++ autosp-src/spacing_note.c Fri Feb 07 07:47:00 2020
-@@ -30,7 +30,7 @@
- update_global_skip (n);
- /* commas will be discarded by filter_output (i) */
- if (*s == '.' && new_beaming == 0 && !dottedbeamnotes)
-- spacing = spacing * 1.50;
-+ spacing = (int)(spacing * 1.50);
- else if ( (*s == '^' || *s == '_' || *s == '=' || *s == '>')
- && !vspacing_active[i] /* is additional spacing needed? */
- )
-@@ -532,7 +532,7 @@
- || prefix ("\\qbpp", s)
- || prefix ("\\dspp", s)
- || doubledotted )
-- { spacing *= 1.75; doubledotted = false;}
-+ { spacing = (int)(spacing * 1.75); doubledotted = false;}
- else
- if (prefix ("\\whp", s)
- || prefix ("\\hup", s)
-@@ -556,7 +556,7 @@
- || prefix ("\\qbp", s)
- || prefix ("\\dsp", s)
- || dotted )
-- { spacing *= 1.5; dotted = false; }
-+ { spacing = (int)(spacing * 1.5); dotted = false; }
-
- t = strpbrk (s+1, "{\\&|$"); /* collective coding? */
- if (*t == '{') /* {...} */
-diff -ur autosp-2020-02-06/tex2aspc.c autosp-src/tex2aspc.c
---- autosp-2020-02-06/tex2aspc.c Thu Feb 06 16:22:35 2020
-+++ autosp-src/tex2aspc.c Fri Feb 07 07:47:30 2020
-@@ -342,7 +342,7 @@
- append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
- }
-
-- outfile = fopen (outfilename, "w");
-+ outfile = fopen (outfilename, "wb");
- if (outfile == NULL)
- { printf ("Can't open %s\n", outfilename);
- exit (EXIT_FAILURE);
Modified: trunk/Build/source/utils/autosp/autosp-src/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/ChangeLog 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/autosp-src/ChangeLog 2020-03-11 22:02:29 UTC (rev 54243)
@@ -1,5 +1,9 @@
AUTOSP
+2020-02-09
+
+ correct \Cpause handling at \alaligne when \TransformNotes is used
+
2019-12-22
correct \setsize note scaling using instr_numsize in generate_notes
Modified: trunk/Build/source/utils/autosp/autosp-src/README
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/README 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/autosp-src/README 2020-03-11 22:02:29 UTC (rev 54243)
@@ -1,5 +1,5 @@
This is the README for the autosp package,
-version 2019-12-22.
+version 2020-02-06.
autosp is a preprocessor that generates note-spacing
commands for MusiXTeX scores. It simplifies the creation
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.c 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.c 2020-03-11 22:02:29 UTC (rev 54243)
@@ -1,4 +1,4 @@
-char version[12] = "2020-02-06";
+char version[12] = "2020-03-11";
/* Copyright (C) 2014-20 R. D. Tennent School of Computing,
* Queen's University, rdt at cs.queensu.ca
@@ -221,7 +221,7 @@
}
else
{
- outfile = fopen (outfilename, "wb");
+ outfile = fopen (outfilename, "w");
if (outfile == NULL)
{ printf ("Can't open %s\n", outfilename);
exit (EXIT_FAILURE);
@@ -239,7 +239,7 @@
*logfilename_n = '\0';
append (logfilename, &logfilename_n, "alog", sizeof (logfilename));
if (debug)
- { logfile = fopen (logfilename, "wb");
+ { logfile = fopen (logfilename, "w");
if (logfile == NULL)
{ printf ("Can't open %s\n", logfilename);
exit (EXIT_FAILURE);
Modified: trunk/Build/source/utils/autosp/autosp-src/configure
===================================================================
(Binary files differ)
Modified: trunk/Build/source/utils/autosp/autosp-src/configure.ac
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/configure.ac 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/autosp-src/configure.ac 2020-03-11 22:02:29 UTC (rev 54243)
@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
-AC_INIT([autosp],[2020-02-06],[rdt at cs.queensu.ca])
+AC_INIT([autosp],[2020-03-11],[rdt at cs.queensu.ca])
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
Modified: trunk/Build/source/utils/autosp/autosp-src/process_command.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/process_command.c 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/autosp-src/process_command.c 2020-03-11 22:02:29 UTC (rev 54243)
@@ -1009,8 +1009,16 @@
else if (atnextbar)
{
fprintf (outfile, "\\def\\atnextbar{\\znotes");
- for (i=1; i <= nstaffs; i++)
+ t = TransformNotes2;
+ while (true)
{
+ s = strchr (t, '#');
+ if (s == NULL)
+ break;
+ while (t < s) /* output any initial \transpose etc. */
+ { putc (*t, outfile); t++; }
+ t++; /* skip # */
+ i = atoi (t) -1; t++;
if (active[i])
{
if (bar_rest[i])
@@ -1017,7 +1025,8 @@
fprintf (outfile, "\\centerpause");
bar_rest[i] = false;
}
- if ( terminator[i] != '$') putc (terminator[i], outfile);
+ if (*t != '\0')
+ { putc (*t, outfile); t++; } /* terminator */
}
fprintf (outfile, "\\en}%%\n");
if (Changeclefs) /* \Changeclefs has to be output after \def\atnextbar... */
Modified: trunk/Build/source/utils/autosp/autosp-src/rebar.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/rebar.c 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/autosp-src/rebar.c 2020-03-11 22:02:29 UTC (rev 54243)
@@ -264,7 +264,7 @@
else
append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
}
- outfile = fopen (outfilename, "wb");
+ outfile = fopen (outfilename, "w");
if (outfile == NULL)
{ fprintf (stderr,"Can't open %s\n", outfilename);
exit (EXIT_FAILURE);
Modified: trunk/Build/source/utils/autosp/autosp-src/spacing_note.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/spacing_note.c 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/autosp-src/spacing_note.c 2020-03-11 22:02:29 UTC (rev 54243)
@@ -30,7 +30,7 @@
update_global_skip (n);
/* commas will be discarded by filter_output (i) */
if (*s == '.' && new_beaming == 0 && !dottedbeamnotes)
- spacing = (int)(spacing * 1.50);
+ spacing = spacing * 1.50;
else if ( (*s == '^' || *s == '_' || *s == '=' || *s == '>')
&& !vspacing_active[i] /* is additional spacing needed? */
)
@@ -532,7 +532,7 @@
|| prefix ("\\qbpp", s)
|| prefix ("\\dspp", s)
|| doubledotted )
- { spacing = (int)(spacing * 1.75); doubledotted = false;}
+ { spacing *= 1.75; doubledotted = false;}
else
if (prefix ("\\whp", s)
|| prefix ("\\hup", s)
@@ -556,7 +556,7 @@
|| prefix ("\\qbp", s)
|| prefix ("\\dsp", s)
|| dotted )
- { spacing = (int)(spacing * 1.5); dotted = false; }
+ { spacing *= 1.5; dotted = false; }
t = strpbrk (s+1, "{\\&|$"); /* collective coding? */
if (*t == '{') /* {...} */
Modified: trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2020-03-11 22:02:29 UTC (rev 54243)
@@ -1,4 +1,4 @@
-% Generated by autosp (2020-02-06).
+% Generated by autosp (2020-03-11).
\input musixtex
\input musixplt
\input soul.sty
Modified: trunk/Build/source/utils/autosp/autosp-src/tex2aspc.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tex2aspc.c 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/autosp-src/tex2aspc.c 2020-03-11 22:02:29 UTC (rev 54243)
@@ -342,7 +342,7 @@
append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
}
- outfile = fopen (outfilename, "wb");
+ outfile = fopen (outfilename, "w");
if (outfile == NULL)
{ printf ("Can't open %s\n", outfilename);
exit (EXIT_FAILURE);
Modified: trunk/Build/source/utils/autosp/configure
===================================================================
(Binary files differ)
Modified: trunk/Build/source/utils/autosp/configure.ac
===================================================================
--- trunk/Build/source/utils/autosp/configure.ac 2020-03-11 21:58:55 UTC (rev 54242)
+++ trunk/Build/source/utils/autosp/configure.ac 2020-03-11 22:02:29 UTC (rev 54243)
@@ -1,13 +1,13 @@
dnl $Id$
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright 2016-2018 Karl Berry <tex-live at tug.org>
+dnl Copyright 2016-2020 Karl Berry <tex-live at tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-m4_define([autosp_version], [2020-02-06])[]dnl using unmodified autosp source
+m4_define([autosp_version], [2020-03-11])[]dnl using unmodified autosp source
AC_INIT([autosp (TeX Live)], autosp_version, [tex-k at tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([autosp-src/autosp.c])
More information about the tex-live-commits
mailing list.