Skip to content

Commit

Permalink
this is 4.3.50 from Dec 29 2006
Browse files Browse the repository at this point in the history
  • Loading branch information
Wayne B Cripps committed Jan 16, 2012
1 parent dec7ce5 commit 5d628c0
Show file tree
Hide file tree
Showing 33 changed files with 550 additions and 307 deletions.
28 changes: 28 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@

VERSION "4.3.50" Nov 20 2006

fixes to after ornament spacing
added -staff-line-thickness option
fix to certain slurs

VERSION "4.3.49" Oct 20 2006

fixes to highlighting, -listfonts option fixed converting x after dotted
note in midi and piano music
Fixed missing time sig in second staff line

VERSION "4.3.48" Oct 6 2006

many little fixes to compile in Visual Studio C++ 2005
changes to nmidi.
Old Mac preX and old windows stuff removed

VERSION "4.3.47" Sept 6 2006

fix for single line music and 5 or 4 line in staff tablature
fixed "v" marks for non italian music, when used between barlines. Sept 03 06

VERSION "4.3.46"

added $left_margin (set in points) and -guitar (to do music on one staff)

VERSION "4.3.45" July 11 2006

Added inverted italian 3 flag note
Expand Down
13 changes: 9 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ MISC = README blute.mf blute9.mf blute8.mf blute85.mf \
ptmbi.tfm ptmr.tfm ptmri.tfm ptmrre.tfm \
pzcmi.tfm \
mk_font_local mk_test mk_300 mk_600 mk_1200 mk_2400 \
sample.tab demo.tab t.tab AboutTab.txt mac.cc mkdep \
sample.tab demo.tab c.tab t.tab AboutTab.txt mac.cc mkdep \
version.pl makedepend CHANGELOG \
midi-docs/midi-dump.c midi-docs/Makefile

DISTFILE = lute_tab4.3.45.tar
DISTFILE = lute_tab4.3.50.tar

distrib: ${DISTFILE}

Expand All @@ -124,6 +124,7 @@ ${DISTFILE}: \
tar cvf ${DISTFILE} \
Makefile \
t.tab \
c.tab \
${HEADERS} \
${SOURCES} main.cc ${MISC}

Expand Down Expand Up @@ -193,13 +194,17 @@ Palatino-BoldItalic.tfm: /usr/lib/tex/fonts/tfm/Palatino-BoldItalic.tfm
cp /usr/lib/tex/fonts/tfm/Palatino-BoldItalic.tfm .

win: ${HEADERS} ${SOURCES} main.cc c.tab sample.tab
mkdir win
rm -rf win/*
cp ${HEADERS} ${SOURCES} main.cc win
cp c.tab sample.tab README AboutTab.txt win

for f in win/*.cc ;do \
ff=`echo $$f| awk '{print substr($$0, 1, index($$0, ".")-1)}'`; \
mv $$f $$ff.cpp; \
echo '#include "stdafx.h"' > $$ff.cpp; \
echo '#include <io.h>' >> $$ff.cpp; \
echo '#define _CRT_SECURE_NO_DEPRECATE' >> $$ff.cpp; \
cat $$f >> $$ff.cpp; rm $$f; \
done

cp blute[6789].300pk win
Expand All @@ -212,7 +217,7 @@ win: ${HEADERS} ${SOURCES} main.cc c.tab sample.tab
cp lute[6789].600pk win
cp cmr1[02].tfm cmti1[02].tfm win
cp pncb.tfm pncbi.tfm pncr.tfm pncri.tfm psyr.tfm ptmr.tfm win
cp tab.rsrc.bin win
# cp tab.rsrc.bin win

version:
./version.pl
Expand Down
23 changes: 16 additions & 7 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ Options:
-C prints every fifth measure number below the staff.
-CC prints every measure number below the staff.
-c prints measure numbers only at the start of a line
-compressStaff sets interspace to 9.0 pt and m_space to 0.068 which makes things tighter
-dvi output in dvi format to out.dvi
-pdf generate pdf output to out.pdf
WARNING! - this is under development and does not work. If you
Expand All @@ -94,6 +95,7 @@ Options:
-fontpath <path> sets font directory to path
-G prints a copyright notice at the bottom of the page
useful if you have the right name.....
-guitar printe manuscript on a single guitar staff
-h converts french tab to italian tab automatically!
-H does the same, but for 7 course tablature
the second -h or -H unsets the conversion
Expand All @@ -117,9 +119,11 @@ Options:
of mm, in or pt. The default is "6.5 in". The double
quotes are mandatory.
-l reset resets the line length to the previous length.
-staff_line_thickness "x.x in" sets the thickness of the staff line
-listfonts lists the PostScsript fonts, with short name
that you specify in the $titlefont= command and the
long name that must be on your printer.
long name that must be on your printer. This lists the
font names that are built in to tab.
-longbar with music draws bar lines between tablature and staff
-m print out the piano version of the tablature. This is kind of basic!
-midi sends a midi file to standard output. Be sure to say -midi
Expand Down Expand Up @@ -177,7 +181,7 @@ Options:
-t prints the notes on the line and does nothing else
-v prints the intermediate language to the screen
-V gives the version and date
-x notes on the line, thin flags, standard characters
-x notes on the line, thin flags, standard characters
italian numers and italian notes.
-wide in ascii mode prints 132 characters wide.
-X supresses note expansion for debugging
Expand Down Expand Up @@ -268,6 +272,7 @@ L - longa
I filename - include filename
i - indent a bit (used at the beginning of a line
that doesn't start with a bar)
j - the same as i but less padding when the line is justified
. - after a number, dot the value of the flag
! - after a number or b - don't print flag but use its value
for spacing - for replicating manuscripts.
Expand Down Expand Up @@ -305,12 +310,14 @@ t - first note of a triplet, followed by the
if there were lines - eg. t3 a,x b, xb,
this places a 3 above the second note.
- a t before a barline is a tie across the barline
v - a mark above and below the staff, indicating a line break in the
original ms. It can also follow a b or B.
V " 2.2 in" - vertical skip
x - more notes in same grid
Y - fermata
y - another fermata
a Yb or yb draws a fermata above a barline
Y. YW YB also work
Y. YW Yw YB also work
$ - used to set these values. This flag must be
outside of the systems to work. A $flag in a system
is ignored.
Expand Down Expand Up @@ -369,6 +376,7 @@ $ - used to set these values. This flag must be
not look good.
$scribe="scribe" Adds a name after the copyright
(the -G flag)
$left_margin=nn sets the left margin in 1/72 inch (points)

the following characters have special significance as the
second letter on a line - in most cases, if not needed
Expand Down Expand Up @@ -442,14 +450,15 @@ of tablature, as the second to tenth character.
bass note. line starts beside character above U
With PostSCript output this is a curved line like a slur
X - ends the underline
[ ] - horizontal underline with a curve to it
[ ] - horizontal underline with a curve to it, a slur
- a ]v (a v after the ] ) draws an upside down slur
( ) - another horizontal underline, so you can use two.
- a ]w (a w after the ] ) draws a wavy up-down slur
( ) - a straight horizontal underline, so you can use two.
the slope is determined by the position of
the beginning and end parenthesis.
you can use the & to start a line beside a note.
{ } - a horizontal underline with no curve to it
the above two must end on th eline they start on!
the above two must end on the same line they start on!
/ - a slash for a bourdon if used on bottom line
otherwise a light slash
// - two slashes
Expand Down Expand Up @@ -503,7 +512,7 @@ the following are currently working:
\[ is [, \] is ]
\{ is {, \} is }
] is a tie between letters
\wt is a tie between letters
\wt is a tie between letters (May not work now)
@ is a ~ with dots for repeat
| as the last letter buts the word against
the next word
Expand Down
18 changes: 16 additions & 2 deletions args.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/

#include "tab.h"
#include <setjmp.h>
#include "system.h"
#include "tree.h"

Expand All @@ -31,7 +30,6 @@ void set_ps_size(int num, int size);
void set_ps_font(int num, char * name);
void ps_text_tfm(struct file_info *f, int fontnum);
extern char flag_to_staff[];
extern jmp_buf m_env;
extern int title_font, text_font;
char *get_real_name(const char *short_name, int dump);
int setflag(file_info *f, char * string, pass pass);
Expand Down Expand Up @@ -395,6 +393,17 @@ void set_amidi_patch(const char *value, struct file_info *f)
{
f->midi_patch = atoi(value);
}
void set_guitar(const char *value, struct file_info *f)
{
f->m_flags |= GUIT;
f->flags |= MANUSCRIPT;
}

void set_line_thickness(const char *value, struct file_info *f)
{
strncpy(staff_height, value, 20);
}

void args(int argc, char ** argv, struct file_info *f)
{
char *aa=0;
Expand Down Expand Up @@ -494,6 +503,8 @@ void args(int argc, char ** argv, struct file_info *f)
{"milan", (void*)set_milan},
{"nmidi", (void*)set_nmidi},
{"midi-patch", (void*)set_amidi_patch},
{"guitar", (void*)set_guitar},
{"staff-line-thickness", (void*)set_line_thickness},
{0, 0}
};

Expand Down Expand Up @@ -541,6 +552,9 @@ void args(int argc, char ** argv, struct file_info *f)
case 'm':
if (strncmp(argv[0], "midi-patch", 10 ))
break;
case 's':
if (strncmp(argv[0], "staff-line-thickness", 18 ))
break;
case 'l':
case 'o':
*argv++;
Expand Down
5 changes: 3 additions & 2 deletions buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ char * buffer::GetLine(char *buf, int buflen)
if (buf[0] == 'e')
dbg0(Warning,
"tab: buffer: file ends with no trailing newline\n");
else
dbg1(Warning, "buffer: GetLine EOF at end of line %d\n",
else {
dbg1(Error, "buffer: GetLine EOF at end of line %d\n",
(void *)((int)*buf & 0xff));
/* *buf suggestion of insight */
}
}
else {
dbg0(Flow, "buffer: GetLine EOF\n");
Expand Down
110 changes: 110 additions & 0 deletions c.tab
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@

bb.
1 a
xc&( a
b
1 da
3")e
xa
xc
xe
b
0fc a
1a
xf
b
0f a
b
1h
xh&(
b
2
3")g
xe
1g
b
2h
1h
2h
b
0a
b
1h
x a
b
1e
xf

% line 2

b
0f
b
1ha
xab&(
b
1d")
2 d
xc
b
1a d
2 d
xa
b
2c a
x a
1 d
b
2 d
x d
x a
xc
b
2 d
x d
2.d
3f
b
2h
xh
1h f
b
% line 3
b
2f da
x a
1 d&(a
b
2f ")d
x d
1f d
x a
b
2.f dc
3 a
2 e
xf a
b
1c a
xc
b
1aa
2ca
x a
b
2ca
3 a
xd
2fc
x d
b
3fd
x c
2 d
2.ca
3 d
b
e

Loading

0 comments on commit 5d628c0

Please sign in to comment.