Attachment #613154 for bug #706402

View | Details | Raw Unified | Return to bug 706402
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-71 / +142 lines)
0	-- a/texk/web2c/luatexdir/font/luatexfont.h	0	++ b/texk/web2c/luatexdir/font/luatexfont.h
Lines 128-135 Link Here
128	void replace_packet_fonts(internal_font_number f, int old_fontid, int new_fontid, int count);	128	void replace_packet_fonts(internal_font_number f, int old_fontid, int new_fontid, int count);
129	int packet_local_fonts(internal_font_number f, int num);	129	int packet_local_fonts(internal_font_number f, int num);
130		130
131	int packet_cur_s; /* current \|do_vf_packet()\| recursion level */	131	extern int packet_cur_s; /* current \|do_vf_packet()\| recursion level */
132	int packet_stack_ptr; /* pointer into \|packet_stack\| */	132	extern int packet_stack_ptr; /* pointer into \|packet_stack\| */
133	vf_struct *new_vfstruct(void);	133	vf_struct *new_vfstruct(void);
134		134
135	/* writecff.c */	135	/* writecff.c */
136	-- a/texk/web2c/luatexdir/font/vfpacket.c	136	++ b/texk/web2c/luatexdir/font/vfpacket.c
Lines 29-34 Link Here
29		29
30	*/	30	*/
31		31
		32	int packet_cur_s;
		33	int packet_stack_ptr;
		34
32	#define packet_number(fw) { \	35	#define packet_number(fw) { \
33	fw = *(vfp++); \	36	fw = *(vfp++); \
34	fw = fw * 256 + *(vfp++); \	37	fw = fw * 256 + *(vfp++); \
35	-- a/texk/web2c/luatexdir/image/writeimg.h	38	++ b/texk/web2c/luatexdir/image/writeimg.h
Lines 26-32 Link Here
26	# include "pdf/pdfpage.h"	26	# include "pdf/pdfpage.h"
27		27
28	typedef image_dict *idict_entry;	28	typedef image_dict *idict_entry;
29	idict_entry *idict_array;	29	extern idict_entry *idict_array;
30		30
31	void new_img_pdfstream_struct(image_dict *);	31	void new_img_pdfstream_struct(image_dict *);
32	image *new_image(void);	32	image *new_image(void);
33	-- a/texk/web2c/luatexdir/pdf/pdftables.c	33	++ b/texk/web2c/luatexdir/pdf/pdftables.c
Lines 31-37 Link Here
31	int pdf_last_link;	31	int pdf_last_link;
32	int pdf_last_obj;	32	int pdf_last_obj;
33	int pdf_retval;	33	int pdf_retval;
34	int pdf_cur_form;
35		34
36	/*tex	35	/*tex
37		36
38	-- a/texk/web2c/luatexdir/pdf/pdftables.h	37	++ b/texk/web2c/luatexdir/pdf/pdftables.h
Lines 21-27 Link Here
21	#ifndef PDFTABLES_H	21	#ifndef PDFTABLES_H
22	# define PDFTABLES_H	22	# define PDFTABLES_H
23		23
24	const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];	24	extern const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];
25		25
26	typedef enum {	26	typedef enum {
27	union_type_int,	27	union_type_int,
28	-- a/texk/web2c/luatexdir/tex/textoken.c	28	++ b/texk/web2c/luatexdir/tex/textoken.c
Lines 76-82 Link Here
76		76
77	/tex how much memory is in use /	77	/tex how much memory is in use /
78		78
79	int var_used, dyn_used;	79	int dyn_used;
80		80
81	/tex head of the list of available one-word nodes /	81	/tex head of the list of available one-word nodes /
82		82
83	-- a/texk/web2c/mplibdir/mp.w	83	++ b/texk/web2c/mplibdir/mp.w
Lines 2958-2969 Link Here
2958	}	2958	}
2959		2959
2960	@ @<Internal library declarations@>=	2960	@ @<Internal library declarations@>=
2961	int mp_snprintf_res ;	2961	extern int mp_snprintf_res ;
2962	/* Some compilers (i.e. gcc 8.2.0 ) complained with the old */	2962	/* Some compilers (i.e. gcc 8.2.0 ) complained with the old */
2963	/* #define mp_snprintf (void)snprintf */	2963	/* #define mp_snprintf (void)snprintf */
2964	/* about truncation. For the moment we store the result. */	2964	/* about truncation. For the moment we store the result. */
2965	# define mp_snprintf mp_snprintf_res=snprintf	2965	# define mp_snprintf mp_snprintf_res=snprintf
2966		2966
		2967	@ @c
		2968	int mp_snprintf_res ;
		2969
2967	@* Dynamic memory allocation.	2970	@* Dynamic memory allocation.
2968		2971
2969	The \MP\ system does nearly all of its own memory allocation, so that it	2972	The \MP\ system does nearly all of its own memory allocation, so that it
2970	-- a/utils/autosp/autosp-src/autosp.c	2973	++ b/utils/autosp/autosp-src/autosp.c
Lines 82-87 Link Here
82		82
83	# include "autosp.h"	83	# include "autosp.h"
84		84
		85	bool debug;
		86	bool dottedbeamnotes;
		87
		88	char infilename[SHORT_LEN];
		89	char *infilename_n;
		90	char outfilename[SHORT_LEN];
		91	char *outfilename_n;
		92	char logfilename[SHORT_LEN];
		93	char *logfilename_n;
		94	FILE infile, outfile, *logfile;
85		95
86	PRIVATE void	96	PRIVATE void
87	usage ()	97	usage ()
88	-- a/utils/autosp/autosp-src/autosp.h	98	++ b/utils/autosp/autosp-src/autosp.h
Lines 25-40 Link Here
25		25
26	# define SHORT_LEN 256	26	# define SHORT_LEN 256
27		27
28	bool debug;	28	extern bool debug;
29	bool dottedbeamnotes; /* dotted beam notes ignored? */	29	extern bool dottedbeamnotes; /* dotted beam notes ignored? */
30		30
31	char infilename[SHORT_LEN];	31	extern char infilename[SHORT_LEN];
32	char *infilename_n;	32	extern char *infilename_n;
33	char outfilename[SHORT_LEN];	33	extern char outfilename[SHORT_LEN];
34	char *outfilename_n;	34	extern char *outfilename_n;
35	char logfilename[SHORT_LEN];	35	extern char logfilename[SHORT_LEN];
36	char *logfilename_n;	36	extern char *logfilename_n;
37	FILE infile, outfile, *logfile;	37	extern FILE infile, outfile, *logfile;
38		38
39		39
40	void process_score ();	40	void process_score ();
41	-- a/utils/autosp/autosp-src/process_command.c	41	++ b/utils/autosp/autosp-src/process_command.c
Lines 1-5 Link Here
1	# include "process_command.h"	1	# include "process_command.h"
2		2
		3	char terminator[MAX_STAFFS];
		4
		5	char *notes[MAX_STAFFS];
		6	char *current[MAX_STAFFS];
		7
		8	int spacings[MAX_STAFFS];
		9
		10	int vspacing[MAX_STAFFS];
		11	bool vspacing_active[MAX_STAFFS];
		12
		13	bool nonvirtual_notes;
		14
		15	int cspacing[MAX_STAFFS];
		16	char collective[MAX_STAFFS][SHORT_LEN];
		17	bool first_collective[MAX_STAFFS];
		18
		19	char deferred_bar[SHORT_LEN];
		20
		21	int beaming[MAX_STAFFS];
		22	int new_beaming;
		23	int semiauto_beam_notes[MAX_STAFFS];
		24
		25	int beamingi;
		26	char *currenti;
		27	int cspacingi;
		28	int vspacingi;
		29	char collectivei[SHORT_LEN];
		30	bool first_collectivei;
		31
		32	int xtuplet[MAX_STAFFS];
		33
		34	bool appoggiatura;
		35
		36	char outstrings[MAX_STAFFS][LINE_LEN];
		37
		38	char *n_outstrings[MAX_STAFFS];
		39
		40	int global_skip;
3		41
4	void process_xtuplet (void);	42	void process_xtuplet (void);
5		43
6	-- a/utils/autosp/autosp-src/process_command.h	44	++ b/utils/autosp/autosp-src/process_command.h
Lines 8-54 Link Here
8	# define NOTEsp "\\vnotes9.52\\elemskip"	8	# define NOTEsp "\\vnotes9.52\\elemskip"
9	# define APPOGG_NOTES "\\vnotes1.45\\elemskip"	9	# define APPOGG_NOTES "\\vnotes1.45\\elemskip"
10		10
11	char terminator[MAX_STAFFS]; /* one of '&' "\|', '$' */	11	extern char terminator[MAX_STAFFS]; /* one of '&' "\|', '$' */
12		12
13	char notes[MAX_STAFFS]; / note segment for ith staff */	13	extern char notes[MAX_STAFFS]; / note segment for ith staff */
14	char *current[MAX_STAFFS];	14	extern char *current[MAX_STAFFS];
15		15
16	int spacings[MAX_STAFFS]; /* spacing for ith staff */	16	extern int spacings[MAX_STAFFS]; /* spacing for ith staff */
17		17
18	int vspacing[MAX_STAFFS]; /* virtual-note (skip) spacing */	18	extern int vspacing[MAX_STAFFS]; /* virtual-note (skip) spacing */
19	bool vspacing_active[MAX_STAFFS]; /* virtual-note spacing active? */	19	extern bool vspacing_active[MAX_STAFFS]; /* virtual-note spacing active? */
20	/* used to preclude unnecessary pre-accidental skips */	20	/* used to preclude unnecessary pre-accidental skips */
21		21
22	bool nonvirtual_notes; /* used to preclude output of only virtual notes */	22	extern bool nonvirtual_notes; /* used to preclude output of only virtual notes */
23		23
24	int cspacing[MAX_STAFFS]; /* nominal collective-note spacing */	24	extern int cspacing[MAX_STAFFS]; /* nominal collective-note spacing */
25	char collective[MAX_STAFFS][SHORT_LEN];	25	extern char collective[MAX_STAFFS][SHORT_LEN];
26	/* prefixes for collective note sequences */	26	/* prefixes for collective note sequences */
27	bool first_collective[MAX_STAFFS];	27	extern bool first_collective[MAX_STAFFS];
28		28
29	char deferred_bar[SHORT_LEN]; /* deferred \bar (or \endpiece etc.) */	29	extern char deferred_bar[SHORT_LEN]; /* deferred \bar (or \endpiece etc.) */
30		30
31	int beaming[MAX_STAFFS]; /* spacing for beamed notes */	31	extern int beaming[MAX_STAFFS]; /* spacing for beamed notes */
32	int new_beaming;	32	extern int new_beaming;
33	int semiauto_beam_notes[MAX_STAFFS]; /* semi-automatic beam notes */	33	extern int semiauto_beam_notes[MAX_STAFFS]; /* semi-automatic beam notes */
34		34
35	/* save-restore state for a staff; used in process_xtuplet */	35	/* save-restore state for a staff; used in process_xtuplet */
36	int beamingi;	36	extern int beamingi;
37	char *currenti;	37	extern char *currenti;
38	int cspacingi;	38	extern int cspacingi;
39	int vspacingi;	39	extern int vspacingi;
40	char collectivei[SHORT_LEN];	40	extern char collectivei[SHORT_LEN];
41	bool first_collectivei;	41	extern bool first_collectivei;
42		42
43	int xtuplet[MAX_STAFFS]; /* x for xtuplet in staff i */	43	extern int xtuplet[MAX_STAFFS]; /* x for xtuplet in staff i */
44		44
45	bool appoggiatura;	45	extern bool appoggiatura;
46		46
47	char outstrings[MAX_STAFFS][LINE_LEN];	47	extern char outstrings[MAX_STAFFS][LINE_LEN];
48	/* accumulate commands to be output */	48	/* accumulate commands to be output */
49	char *n_outstrings[MAX_STAFFS];	49	extern char *n_outstrings[MAX_STAFFS];
50		50
51	int global_skip;	51	extern int global_skip;
52	/* = 1, 2, 3, or 4 for (non-standard) commands \QQsk \HQsk \TQsk \Qsk */	52	/* = 1, 2, 3, or 4 for (non-standard) commands \QQsk \HQsk \TQsk \Qsk */
53	/* = 5 for five commas and double-flat accidental spacing */	53	/* = 5 for five commas and double-flat accidental spacing */
54	/* = 6 for six commas */	54	/* = 6 for six commas */
55	-- a/utils/autosp/autosp-src/process_score.c	55	++ b/utils/autosp/autosp-src/process_score.c
Lines 1-5 Link Here
1	# include "process_score.h"	1	# include "process_score.h"
2		2
		3	int staffs[MAX_STAFFS];
		4	bool active[MAX_STAFFS];
		5	bool bar_rest[MAX_STAFFS];
		6	int spacing;
		7	int restbars;
		8	char global_skip_str[7][16];
		9	int ninstr;
		10	int nstaffs;
		11	int nastaffs;
		12	int old_spacing;
		13	bool Changeclefs;
		14	char TransformNotes2[SHORT_LEN];
		15	bool TransformNotesDefined;
		16
		17	char line[LINE_LEN];
		18
3	void process_line ()	19	void process_line ()
4	{	20	{
5	char *ln;	21	char *ln;
6	-- a/utils/autosp/autosp-src/process_score.h	22	++ b/utils/autosp/autosp-src/process_score.h
Lines 6-26 Link Here
6	# define SP(note) (SMALL_NOTE/note)	6	# define SP(note) (SMALL_NOTE/note)
7	/* note = { 256 \| 128 \| 64 \| 32 \| 16 \| 8 \| 4 \| 2 \| 1 } */	7	/* note = { 256 \| 128 \| 64 \| 32 \| 16 \| 8 \| 4 \| 2 \| 1 } */
8	# define MAX_SPACING 2*SP(1)	8	# define MAX_SPACING 2*SP(1)
9	int staffs[MAX_STAFFS]; /* number of staffs for ith instrument*/	9	extern int staffs[MAX_STAFFS]; /* number of staffs for ith instrument*/
10	bool active[MAX_STAFFS]; /* is staff i active? */	10	extern bool active[MAX_STAFFS]; /* is staff i active? */
11	bool bar_rest[MAX_STAFFS];	11	extern bool bar_rest[MAX_STAFFS];
12	int spacing; /* spacing for current notes */	12	extern int spacing; /* spacing for current notes */
13	int restbars;	13	extern int restbars;
14	char global_skip_str[7][16];	14	extern char global_skip_str[7][16];
15	int ninstr; /* number of instruments */	15	extern int ninstr; /* number of instruments */
16	int nstaffs; /* number of staffs */	16	extern int nstaffs; /* number of staffs */
17	int nastaffs; /* number of active staffs; */	17	extern int nastaffs; /* number of active staffs; */
18	int old_spacing;	18	extern int old_spacing;
19	bool Changeclefs; /* output \Changeclefs after \def\atnextbar */	19	extern bool Changeclefs; /* output \Changeclefs after \def\atnextbar */
20	char TransformNotes2[SHORT_LEN]; /* 2nd argument of \TransformNotes */	20	extern char TransformNotes2[SHORT_LEN]; /* 2nd argument of \TransformNotes */
21	bool TransformNotesDefined;	21	extern bool TransformNotesDefined;
22		22
23	char line[LINE_LEN]; /* line of input */	23	extern char line[LINE_LEN]; /* line of input */
24		24
25	void process_line ();	25	void process_line ();
26		26
27	-- a/utils/autosp/autosp-src/utils.c	27	++ b/utils/autosp/autosp-src/utils.c
Lines 24-29 Link Here
24		24
25	# include "utils.h"	25	# include "utils.h"
26		26
		27	int lineno;
		28
27	void	29	void
28	warning (const char msg[]) /* output warning message msg to stderr */	30	warning (const char msg[]) /* output warning message msg to stderr */
29	{	31	{
30	-- a/utils/autosp/autosp-src/utils.h	32	++ b/utils/autosp/autosp-src/utils.h
Lines 61-66 Link Here
61	extern bool prefix (const char cs, const char ct); /* is string cs[] a prefix of ct[]? */	61	extern bool prefix (const char cs, const char ct); /* is string cs[] a prefix of ct[]? */
62	extern bool suffix (const char cs, const char ct); /* is string cs[] a suffix of ct[]? */	62	extern bool suffix (const char cs, const char ct); /* is string cs[] a suffix of ct[]? */
63		63
64	int lineno;	64	extern int lineno;
65	extern void error (const char msg[]); /* abort with stderr message msg */	65	extern void error (const char msg[]); /* abort with stderr message msg */
66	extern void warning (const char msg[]); /* output warning message msg to stderr */	66	extern void warning (const char msg[]); /* output warning message msg to stderr */

Return to bug 706402