From a8fcaf6b2f32eaf0146c31c69323280bd90697e1 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:13:30 +0000 Subject: [PATCH] lilypond-1.0.1 --- TODO | 346 +++++++++++++++++++++++++++++++++---------------- configure.in | 316 +++++--------------------------------------- lily/header.cc | 12 +- 3 files changed, 274 insertions(+), 400 deletions(-) diff --git a/TODO b/TODO index 7f9b738c65..893aa58eac 100644 --- a/TODO +++ b/TODO @@ -1,21 +1,114 @@ Features you cannot find in the doco as working, should be mentioned here. + This is an assorted collection of stuff that will be done, might be done, or is an idea that I want to think about Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr/urg + * fix plain tex footer line. -0.2: - * junk My_lily_parser::abbrev_beam_type_i_ + * portable libs for flowerlib/lilylib - * w32 blurb + * install TeX stuff into tex/generic directory. - * make sure all ex's have a mudela-version - * notes almost touch barline: whitespace at the begin of the bar - should be at fixed at at least (about) one interline. - hack at spring-spacer.cc:662 doesn't work anymore + * make GNU style webpages. + + * There seems to be an install error in lilypond-1.0.0. Most of the + files in the "init" directory don't get installed in the + /usr/local/share/lilypond directory. The files installed are of + the form feta*.ly. In particular init.ly doesn't get installed. + I installed the files by hand and then the system seems to work. + + * I things it's more than appropriate for an GNU project to ship Info + files (and manpages) with the source package. The "Standard" tells to + do so (ftp://ftp.gnu.org/pub/gnu/standards/standards.text): + + + * a `make check' target (without installing stuff!) + + * midi_instrument -> midiInstrument + + * horizontal centering of dynamics + + * \font\fontA=feta20.afm (.afm?) + + * gzip RH manpage + + * stable make/config stuff + + * stemup/stemdown; see test/updown.fly + - check examples; add \type Staff hither and thether + + * $DEPENDENCIES_OUTPUT support + + * use a fake-yodl.sh to mimick yodl when yodl is not installed + + * fix BUGs + + * fix weird behaviour when .AFMs not found. + + * Xdvi zooming ?! + gs: Error: /undefined in draw_beam + gs: Operand stack: + + * run texhash after installing .tex + + * fix vertical alignment and stafflines + + *GrandStaff needs more work -- I want a single word `harpsichord' to the + left of the grandstaff, not one on each stave. + (Organ staff -- with separate pedal -- but common properties may be + something to think about. Of course for organ you want to be able + to give stop indications on the way through, so the \property + Voice.Instrument would be a stop, and \property + GrandStaff.instrument would be PipeOrgan...) + + + * make Tie_req a "command" { ~ } + + * bib ep1988 + + * mix engraver hacking with music ? + + * revise the Score_priority_align_engraver concept. It sucks. + + * ly2xdvi + + * make new VoiceOne, VoiceTwo, VoiceThree contexts with +ydirection and hshift preset + + * StepMake install + - /usr/bin/make-patch? + + * *.yo: fix pod manpage layout legacy + + * text-items clash with stems/beams + + * --include, -I option for ly2dvi (pass on to lily) + + * fix placement of beam-less abbrev + + * \meter 3/4; + <{\voiceone cis4. cis8 cis4 | cis4 cis cis | r1 } + {\voicetwo cis,4 r r | r2. | r1 }> | + } + + * try to use template iso MACRO(Type) + + - NEWS: ... Musical_pitch (analogous to Duration and Rhythmic_req) + think about, analogous to pitch: + * { a4 a16 } c <-- duration of c? + * c <-- duration of c? + + * \tempo 4. = 90; + + * fix audio-items (don't use (input) requests, but copy data) + + * junk My_lily_parser::abbrev_beam_type_i_ + + * make sure all ex's have a mudela-version * do rest-collisions for Multi_measure_rests as well. @@ -26,10 +119,6 @@ grep for TODO and ugh/ugr/urg * deps for ly2dvi - * fix .txt rules / make dist from freshly configured tar-ball - - * document use of ly2dvi more prominently - * clean up abbrev/plet/beam/abbrevbeam/duration mess in parser. * minimum length second part broken tie @@ -43,35 +132,41 @@ grep for TODO and ugh/ugr/urg * fix variable define/lookup parser global<->paper - * fix position of bar number - - * fix position of brace in conjunction with bracket - * fix title/instrument placements; see input/test/title.ly * <\voiceone c4. \voicetwo c4> * add full cello suites to web site (kom op, Maarten!) + * Rethink Time_description + * \cadenza , \meter, \grouping should all be \properties + * rename - plet -> tuplet - - grav -> engraver - measure -> bar - abbreviation-beam -> (measured/unmeasured) tremolo * libtoolize flowerlib + * shared lib * robustify Beam (in case of no stems, 32nd notes) + * decentralised spring factory + + * move paper vars into engraver properties + * check for groff / troff/ nroff et + * more intelligent file searching + - use kpsepath + - make LilyPond fully relocatable + * use kpsepath to find all TeX dirs - configure.in - clean-fonts.sh * nicen examples: - - remove all \multi - break-up heavily-nested score blocks * disable spaces in TeX stuff @@ -80,16 +175,12 @@ grep for TODO and ugh/ugr/urg * dots & rest collisions. - * add a screenshot to the website. :) - * documentation - introduction? - info? - LaTeX? - more manpages? - * naming Mozarella, Madeira, Muella? - * versioning for Feta * the warning about the negative slur/tie length appears twice @@ -98,32 +189,16 @@ grep for TODO and ugh/ugr/urg * The `3' in the meter key is a one or two pixels too thin (at 600dpi) in the middle: - * the tenuto script is too long and too thin - * the bracket is ugly (wings are too parabolic, should be more circular) - * better hshift (dots, distance, head dependent) - - * stem len adjustable -STUFF - * convert-mudela: - - automatically add a \version if not present. - - better parsing - - make smarter - - fix convert-mudela -e *.ly ; - - convert-mudela -e empty.ly - - redo in python. + * better hshift (dots, distance, head dependent) * clefs (AG): The "8" should appear closer to the actual clef, touching it. * give Items/Spanners access to unbroken originals - * generalised scopes for Parser/identifiers. - - * speed up PS code. - - * scoping for properties + * scoping for properties? { c4 \multi 2 < { \stemup .. } { \stemdown .. } > @@ -132,41 +207,52 @@ STUFF this modifies \stem for the c2 - * emacs mudela-mode - - should handle block comments too. - - handle lexer modes (\header, \melodic, \lyric) etc. - - indentation - - notenames? - - fontlock: \melodic \melodic - + * put errorlevel in Input class - * use properties for: - - Text_style - - default_octave - - plet? - - default_duration? - - default abbreviation - - Staff_sym size - - default tempo. - - font size - - bartypes (get rid of derived Span_bar_engravers) - - cadenza mode? - - MIDI instrument - - staff title + * junk nesting slurs - * page handling: - - PS output - - optimal pagebreaking. + * integrate midi-elts from mi2mu and lily? - * put errorlevel in Input class + * cautionary accidental - * AFM for font input? + * score-bar-scripts + FMR: Free memory read: + * This is occurring while in: + Bar_column::do_substitute_dependency(Score_element*,Score_element*) [bar + -column.cc:29] + Score_element::unlink() [score-elem.cc:383] + Paper_score::set_breaking(const Array&) [p-score.cc: + 150] + Paper_score::calc_breaking() [p-score.cc:189] + Paper_score::process() [p-score.cc:203] + Score::run_translator(Music_output_def*) [score.cc:117] + * Reading 4 bytes from 0x65d3a0 in the heap. + * Address 0x65d3a0 is 160 bytes into a freed block at 0x65d300 of 208 bytes. + * This block was allocated from: + malloc [rtlib.o] + __builtin_new [libgcc.a] + Span_score_bar::clone()const [span-score-bar.hh:20] + Item::copy_breakable_items() [item.cc:69] + Item::do_breakable_col_processing() [item.cc:89] + Score_element::calcalute_dependencies(int,int,void(Score_element::*)()*) + [score-elem.cc:171] + * There have been 22 frees since this block was freed from: + free [rtlib.o] + __builtin_delete [libgcc.a] + Span_score_bar::~Span_score_bar() [span-score-bar.hh:18] + Paper_score::set_breaking(const Array&) [p-score.cc: + 156] + Paper_score::calc_breaking() [p-score.cc:189] + Paper_score::process() [p-score.cc:203] + Postprocessing elements... + TeX output to score-bar-scripts.tex... 3RD PARTY BUGS: - * tried egcs 1.0.2: failed on lily/stem.cc -> flower/include/interval.hh - should narrow down and send bug report + * redhat (v?) graphical install bomb-out? + + * egcs-1.03 ice: stem.cc:327; should localize bug (mine's still 10K) * gcc 2.8.1: see ice and RESIZE_ICE @@ -181,9 +267,65 @@ STUFF without a trace of failure (create .rej file, print error or dump core) and just ignore any further diffs. + * glibc 2.0: + + f = fopen ("/dev/null", "r") + assert (feof (f)) + +3RD PARTY PROJECTS: + + * GNU indent: handle C++ + + * GNU make: move hardcoded builtin rules to runtime ? + + * GNU patch + - rewrite ? -> check out GNU patch 2.5 + - 'double-fix' mode: ignore identical fix, rather than suggest + to revert patch direction when (more or less? exactly) the same + thing is fixed + PROJECTS - * Unicode support? + * Scripts: + - fix position of bar number + - stack scripts in chords: + % fingering: footing: + < a-4 c-2 g-1 > < c-\ltoe e-\lheel > + - script-spacing + - slur parts as a script + - stack parameterised scripts for fingering and footing: + + * convert-mudela: + - automatically add a \version if not present. + - better parsing + - make smarter + - convert-mudela -e empty.ly + + * emacs mudela-mode + - should handle block comments too. + - handle lexer modes (\header, \melodic, \lyric) etc. + - indentation + - notenames? + - fontlock: \melodic \melodic + + + * use properties for: + - Text_style + - default_octave + - plet? + - Staff_sym size + - default tempo. + - font size + - bartypes (get rid of derived Span_bar_engravers) + - cadenza mode? + - MIDI instrument + - staff title + + * page handling: + - PS output + - optimal pagebreaking. + + * Unicode support? -> man 7 unicode - 16 bit Strings - -u switch - detect of 16/8 bit files @@ -198,10 +340,10 @@ PROJECTS * \header - output header info to MIDI too. - * Add mudela-output to Rosegarden. + * Add mudela-output to Rosegarden. (contact Derek Wyatt) * a musical dictionary. See Documentation/vocabulary-*, other -languages: + languages: - explanation - italian - german @@ -217,8 +359,6 @@ languages: - MIDI output? - typesetting - * integrate midi-elts from mi2mu and lily? - * Debug logs: - derive lily_stream, Dstream, texstream from ostream? - indentable stream as baseclass for TeX stream, lily stream, Dstream. @@ -262,7 +402,11 @@ languages: - text - slur start/end - * cautionary accidental + * PS + - speed up PS code. + - PS lines to .eps files + - write custom prolog + * Output an output format independent (ofi) typeset file; and make ofi2 TeX, MusiXTex, Display PostScript, PostScript, @@ -272,13 +416,15 @@ languages: - Common Music Notation - PostScript output (esp. Beams, Slurs, etc) - Move all Score_elems, into libmutype.a + - SGML + * Documentation - Doc (C) stuff of sheet music - a better format? SGML? TeX? Info? - a tutorial - * TeX spanners , use texbeam.cc as an example (smallish) + * more spanners (smallish) - Glissando - trill @@ -289,9 +435,10 @@ languages: - use plet grouping - separate visual from rhythmic info even more - beams over bars + - endbeam req should be *after* the duration, so you can do + < { [c4] } + { c8. c16 } > - * Redo fonts - - adapt for multiple font sizes. * lines: - Ledger lines, should be separate item: Ledger_lines, Ledger_lines @@ -304,11 +451,7 @@ languages: * Keys: - merge key{item} & localkey{item}? - - do conventional keys (C G A, F B E, a e fis, d as des, etc ), - besides lists of flats/sharps, possibly via declaration - - key transposition. - - key undo: \key bes; .. . \key; should print natural - - special key: \key bes 'b bis'; + - Major/Minor - spacing, national styles? * Support for TAB @@ -320,11 +463,8 @@ languages: * breaking: - caching breakpoints - saving them - - penalties - specify number of lines - * Rhythmic staff. - * markers INPUTLANGUAGE @@ -348,22 +488,26 @@ INPUTLANGUAGE * relative mode for pitch entering - * bracket (bracketplets) + * bracket: volta 1,2 * configure pitch_byte * rest name configurable - * Raw request syntax - SMALLISH PROJECTS + * limit memory usage; the full coriolan takes up too much resources. + + * fix confusing naming in Engraver vs Engraver_group_engraver (context) + * progress when creating MIDI elts. * A range for context errors (eg. mark both { and }. ) * lyric in staff (sharpsharp in staff, text below) + * half sharps/flats + * write Dynamic_line (to group dynamics horizontally) * use Real for all y positions. @@ -374,8 +518,6 @@ SMALLISH PROJECTS * adaptive accidental spacing. * handle EOF graciously in error messages. -oo - * caching Item/spanner dimensions. * centered whole rest @@ -395,10 +537,6 @@ oo * stafftypes: voice names/ instrument names. - * TeX stuff: - - Decent TeX titledefs (\tempo, \metron, etc. ) - - decent TeX page layout - * lily \tempo * C meter iso 4/4, idem for alla breve, etc. @@ -407,13 +545,6 @@ oo * Brackets - * Scripts: - - stack scripts in chords: - % fingering: footing: - < a-4 c-2 g-1 > < c-\ltoe e-\lheel > - - script-spacing - - slur parts as a script - - stack parameterised scripts for fingering and footing: % toe to bheel four to five % ^_u 4_5 @@ -435,6 +566,7 @@ oo IDEAS + * Output data structures of Mudela in XML/SGML. * create libmudela, or liblily_frontend @@ -444,9 +576,7 @@ IDEAS * use an embedded language: Python, Scheme for: - Score_elems - - Engraver - Translators - - Complex mudela? * y -dims in internote? Staff-space? X-dimensions? @@ -454,8 +584,6 @@ IDEAS * caching breakpoints - * #c <-> cis - * breath marks * used fixedpoint arithmetic for min. energy. @@ -466,17 +594,9 @@ IDEAS - design meta-language like TeX and Metafont - programming/macros input - * Global type registration. - - My_class * p = create_object( My_class ) - Type t = get_type ( *p ); - if ( t <= get_type( q )) - .. - * versioning stuff (cvt mudela, mudela, etc.) - - * dots into separate item. + * padded vertical alignment (rods for vertical placement) * use String iso Text_def for lyrics. @@ -484,6 +604,4 @@ IDEAS * lyrics in chords still fuck up. - * pushgroup/popgroup - * Use hooks/dependency graphs for properties diff --git a/configure.in b/configure.in index de0b59611d..c77794dc88 100644 --- a/configure.in +++ b/configure.in @@ -1,311 +1,57 @@ -dnl -*-shell-script-*- -dnl Process this file with autoconf to produce a configure script. +dnl configure.in -*-shell-script-*- +dnl Process this file with autoconf to produce a configure script. +# Bootstrap the init proces. List a file identifies your package. +AC_INIT(make/lilypond.lsm.in) +AC_CONFIG_HEADER($CONFIGFILE.hh:config.hh.in) -AC_INIT(flower/choleski.cc) -AC_CONFIG_HEADER($CONFIGFILE.hh:config.hh.in) #ugh flower/out/ -AC_CONFIG_AUX_DIR(bin) -AC_CANONICAL_HOST +# Bootstrap StepMake configure +AC_STEPMAKE_INIT +# For all packages except the StepMake package itself +AC_CONFIG_SUBDIRS(stepmake) -. $srcdir/VERSION -FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL -if test x$MY_PATCH_LEVEL != x; then - FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL -fi - - -. $srcdir/flower/VERSION -FULL_FLOWER_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL - -# libtool.info ... -# **Never** try to set library version numbers so that they correspond -# to the release number of your package. This is an abuse that only -# fosters misunderstanding of the purpose of library versions. - -REVISION=$PATCH_LEVEL -# CURRENT=$MINOR_VERSION -CURRENT=`expr $MINOR_VERSION + 1` -# AGE=$(expr $MAJOR_VERSION + 1) -AGE=$MAJOR_VERSION -AC_SUBST(CURRENT) -AC_SUBST(REVISION) -AC_SUBST(AGE) - -# turn off shared libraries by default (may be enabled using --enable-shared) -#AM_DISABLE_SHARED -#AM_PROG_LIBTOOL - -# ugh, automake: we want (and check for) bison -AC_PROG_YACC - -# ugh, automake: we want (and check for) flex -# AC_PROG_LEX -# urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... +# Uncomment the configuration options your package needs. +AC_STEPMAKE_COMPILE +# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) -# AC_DECL_YYTEXT -# ugh, ugh -ac_cv_prog_lex_root=lex.yy - -# -O is necessary to get inlining -OPTIMIZE="-O" printing_b=no -checking_b=yes -optimise_b=tja -profile_b=no -CONFIGSUFFIX= -debug_b=yes - - - -AC_LANG_CPLUSPLUS - -AC_CACHE_CHECK([whether explicit instantiation is needed], - lily_cv_need_explicit_instantiation, - AC_TRY_LINK([ -template struct foo { static int baz; }; -template int foo::baz = 1; -], [ return foo::baz; ], - lily_cv_need_explicit_instantiation=no, - lily_cv_need_explicit_instantiation=yes)) -if test x"$lily_cv_need_explicit_instantiation"x = x"yes"x; then - AC_DEFINE(NEED_EXPLICIT_INSTANTIATION) -fi - AC_ARG_ENABLE(printing, [ enable-printing turn on debug printing. Default: off], [printing_b=$enableval]) -AC_ARG_ENABLE(checking, - [ enable-checking set runtime checks (assert calls). Default: on], - [checking_b=$enableval] ) - -AC_ARG_ENABLE(optimise, - [ enable-optimise use maximal speed optimisations. Default: off], - [optimise_b=$enableval]) - -AC_ARG_ENABLE(profiling, - [ enable-profiling compile with gprof support. Default: off], - [profile_b=$enableval]) - -AC_ARG_ENABLE(debugging, - [ enable-debugging set debug info. Default: on], - [debug_b=$enableval]) - -AC_ARG_ENABLE(mingw-prefix, - [ enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)], - [MINGWPREFIX=$enableval], - [MINGWPREFIX=no]) - -AC_ARG_ENABLE(tex-prefix, - [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. (default: PREFIX)], - [TEXPREFIX=$enableval], - [TEXPREFIX=auto] ) - -AC_ARG_ENABLE(tex-dir, - [ enable-tex-dir=DIR set the directory to put LilyPond TeX files in. ], - [TEXDIR=$enableval], - [TEXDIR=auto] ) - -AC_ARG_ENABLE(mf-dir, - [ enable-mf-dir=DIR set the directory to put LilyPond MetaFont files in. ], - [MFDIR=$enableval], - [MFDIR=auto]) - -AC_ARG_ENABLE(config, - [ enable-config=FILE put configure settings in config-FILE.make], - [CONFIGSUFFIX=$enableval]) - - -if test "$printing_b" = no; then - # ugh - AC_DEFINE(NPRINT) - DEFINES="$DEFINES -DNPRINT" -fi - -if test "$checking_b" = no; then - # ugh - AC_DEFINE(NDEBUG) - DEFINES="$DEFINES -DNDEBUG" -fi - if test "$optimise_b" = yes; then - DEFINES="$DEFINES -finline-functions -DSTRING_UTILS_INLINED" - OPTIMIZE="-O2" + DEFINES="$DEFINES -DSTRING_UTILS_INLINED" AC_DEFINE(STRINGS_UTILS_INLINED) fi -if test "$optimise_b" = no; then - OPTIMIZE="" -fi - -if test $profile_b = yes; then - EXTRA_LIBES="-pg" - DEFINES="$DEFINES -pg" -fi - -if test $debug_b = yes; then - DEFINES="$DEFINES -g" -fi - -# however, C++ support in mingw32 v 0.1.4 is still flaky -if test x$MINGWPREFIX != xno; then - ICFLAGS="-I$MINGWPREFIX/include" - ILDFLAGS="-$MINGWPREFIX/lib" -fi - -if test "x$OSTYPE" = "xWindows_NT"; then - LN=cp # hard link does not work under cygnus-nt (yet?) - ZIP="zip -r -9" # -else - LN=ln - ZIP="zip -r -9" -fi - -if test "$CONFIGSUFFIX" != "" ; then - CONFIGFILE=config-$CONFIGSUFFIX -else - CONFIGFILE=config -fi - - - -dnl COMPILEINFO="$HOST $host $TARGET $target" -AUTOGENERATE="This file was automatically generated by configure" -CPPFLAGS=${CPPFLAGS:-""} # we don't want -g -O junk -# CXXFLAGS=${CXXFLAGS:-""} # we don't want -g -O junk -CXXFLAGS="$DEFINES $OPTIMIZE" -LDFLAGS=$EXTRA_LIBES +AC_STEPMAKE_CXX +AC_STEPMAKE_GXX +AC_STEPMAKE_CXXTEMPLATE +AC_STEPMAKE_LEXYACC +AC_STEPMAKE_LIB +# AC_STEPMAKE_LIBTOOL +AC_STEPMAKE_LOCALE +AC_STEPMAKE_GETTEXT +AC_STEPMAKE_MSGFMT +AC_STEPMAKE_TEXMF +AC_STEPMAKE_YODL -AC_PROG_CXX -AC_PROG_RANLIB -AC_PROG_INSTALL -AC_CHECK_PROGS(TAR, tar, error) -AC_CHECK_PROGS(FIND, find, error) dnl should check out -print -AC_CHECK_SEARCH_RESULT($FIND, \`find\'. Please use --enable-tex-dir) +dnl huh? +AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir) AC_FUNC_MEMCMP AC_FUNC_VPRINTF -AC_CHECK_FUNCS(memmem snprintf ) +AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext) AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") -# ugh: produces "${prefix}/share/lilypond" -# DIR_DATADIR=$datadir/lilypond -# ugh: produces "NONE/share/lilypond" -# DIR_DATADIR=$prefix/share/lilypond - -DIR_DATADIR=$prefix/share/lilypond -if test x$prefix = xNONE; then - DIR_DATADIR=/usr/local/share/lilypond -fi -AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}") - -absolute_builddir="`pwd`" - -AC_SUBST(CXXFLAGS) -AC_SUBST(CPPFLAGS) -AC_SUBST(LDFLAGS) -AC_SUBST(CXX) -AC_SUBST(ICFLAGS) -AC_SUBST(ILDFLAGS) -AC_SUBST(DEFINES) -AC_SUBST(RANLIB) -AC_SUBST(COMPILEINFO) -AC_SUBST(AUTOGENERATE) -AC_SUBST(BISON) -AC_SUBST(FLEX) -AC_SUBST(LN) -AC_SUBST(PERL) -AC_SUBST(PYTHON) -AC_SUBST(ZIP) -AC_SUBST(TEXPREFIX) -AC_SUBST(TEXDIR) -AC_SUBST(MFDIR) -AC_SUBST(DIR_DATADIR) -AC_SUBST(absolute_builddir) -AC_SUBST(EXTRA_LIBES) -AC_SUBST(CONFIGSUFFIX) -AC_CHECK_PROGS(BISON, bison, error) -AC_CHECK_PROGS(FLEX, flex, error) -AC_CHECK_PROGS(MAKE, make, error) -AC_PATH_PROG(PERL, perl, error) -AC_PATH_PROG(PYTHON, python, error) -AC_CHECK_PROGS(POD2HTML, pod2html, error) -AC_CHECK_PROGS(POD2MAN, pod2man, error) - - -if test "x$TEXPREFIX" = xauto ; then - AC_TEX_PREFIX(TEXPREFIX) -else - find_texprefix=$TEXPREFIX -fi - -if test "x$MFDIR" = xauto; then - AC_MF_SUBDIR(MFDIR) -fi - -if test "x$TEXDIR" = xauto ; then - AC_TEX_SUBDIR(TEXDIR) -fi - - -# AC_JUNK_ARGS( [if test "x$MFDIR" = xauto; then -# AC_MF_SUBDIR(MFDIR) -# fi] -# ) - -AC_CHECK_SEARCH_RESULT($MAKE, GNU make, You should install GNU make) -AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or better) -AC_CHECK_SEARCH_RESULT($PERL, perl, You should install Perl, version 5 or better) -AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) -AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or better) -AC_CHECK_SEARCH_RESULT($POD2MAN, pod, You should install Perl, version 5 or better) - - -if test $MAKE != "error" ; then - $MAKE -v| grep GNU > /dev/null - if test "$?" = 1 - then - AC_LILY_WARN(Please install *GNU* make) - fi -fi - -if test $BISON != "error"; then - bison_version=`$BISON --version| sed 's/^.*version 1.//g' ` - if test $bison_version -lt 25; then - AC_LILY_WARN(Your bison is too old (1.$bison_version). Please install 1.25) - fi -fi - -if test "$INSTALL" = "bin/install-sh"; then - export INSTALL="\$\(depth\)/bin/install-sh" -fi - -# ugh autoconf -changequote(<<, >>)dnl -if $CXX --version | grep '2\.[78]' > /dev/null || - $CXX --version | grep 'egcs' > /dev/null -changequote([, ])dnl -then - true -else - AC_LILY_WARN(can't find g++ 2.7, 2.8 or egcs) -fi - -AC_CHECK_HEADER(FlexLexer.h, true, - AC_LILY_WARN(can't find flex header. Please install Flex headers correctly)) - -touch stamp-h.in - - -# first do Foobar/Makefile then Foobar/include/Makefile -AC_OUTPUT($CONFIGFILE.make:config.make.in) +AC_CHECK_PROGS(MAKEINFO, makeinfo, error) +AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl, + You should install Yodl 1.30.pre4 or better) -rm -f Makefile -cp make/Toplevel.make.in ./Makefile -chmod 444 Makefile +AC_STEPMAKE_END diff --git a/lily/header.cc b/lily/header.cc index 39dffd5dbf..2a38c5e597 100644 --- a/lily/header.cc +++ b/lily/header.cc @@ -3,12 +3,16 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--1998 Han-Wen Nienhuys */ #include "string.hh" #include "dictionary-iter.hh" #include "header.hh" +#include "main.hh" + +extern char const *lily_version_number_sz(); + String Header::TeX_string() const @@ -23,3 +27,9 @@ Header::TeX_string() const } return s; } + +Header::Header () +{ + lily_id_str_ = "Lily was here, " + + String (lily_version_number_sz ()); +} -- 2.39.5