* scripts/convert-ly.py (conv): add warning about

set-global-staff-size.

* Doxyfile: add.

* scripts/convert-ly.py (conv): add raggedlastbottom rule
(conv): warn for TextSpanner split.
(conv): warn for textheight.

diff --git a/ChangeLog b/ChangeLog
index 4b05df04cbfaf11ac14ef027f1b3317ad415c574..fa9e180ed48126c7905cf69cb6b075c9fa17b483 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scripts/convert-ly.py (conv): add warning about
+       set-global-staff-size.
+
+       * Doxyfile: add. 
+
+       * scripts/convert-ly.py (conv): add raggedlastbottom rule
+       (conv): warn for TextSpanner split.
+       (conv): warn for textheight.
+
 2004-11-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * GNUmakefile.in (install-WWW): Invoke install-info, so that when

diff --git a/Doxyfile b/Doxyfile
new file mode 100644 (file)
index 0000000..3a007ec
--- /dev/null
+++ b/Doxyfile
@@ -0,0 +1,261 @@
+# Doxyfile 1.3.9
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = LilyPond
+PROJECT_NUMBER         = 2.5
+OUTPUT_DIRECTORY       = 
+CREATE_SUBDIRS         = YES
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = NO
+REPEAT_BRIEF           = NO
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        = .
+STRIP_FROM_INC_PATH    = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = NO
+GENERATE_TESTLIST      = NO
+GENERATE_BUGLIST       = NO
+GENERATE_DEPRECATEDLIST= NO
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = NO
+SHOW_DIRECTORIES       = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = .
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox \
+                         *.C \
+                         *.CC \
+                         *.C++ \
+                         *.II \
+                         *.I++ \
+                         *.H \
+                         *.HH \
+                         *.H++ \
+                         *.CS \
+                         *.PHP \
+                         *.PHP3 \
+                         *.M \
+                         *.MM
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = *
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_PATTERNS        = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = NO
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+XML_PROGRAMLISTING     = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = YES
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = NO
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = NO
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 1000
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO

diff --git a/THANKS b/THANKS
index 70b16e6a799eeb244d6f2f3194ba3f9b0385fbbe..7f0fcfb724bb08552e020f7648be3ca55025ddb3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -14,6 +14,7 @@ CONTRIBUTORS
 Carl Sorensen
 Heikki Junes
 Werner Lemberg
+Andreas Scherer
 
 BUG HUNTERS/SUGGESTIONS
 

diff --git a/mf/feta-nummer8.mf b/mf/feta-nummer8.mf
index d23a9f31b32d4fc8b39c97b1f536f0cbbd90bc38..a35b177f782bb2c7b4ab1e912b3a3ab1c094bace 100644 (file)
--- a/mf/feta-nummer8.mf
+++ b/mf/feta-nummer8.mf
@@ -4,4 +4,4 @@
 design_size:=8; % feta16 = 16pt
 
 input feta-nummer.mf;
-
+end.

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 44f01d24d6ec2a3c3e122b2ac83fdda43dd4b1fe..d0acbc44255a22b1b490c70b4f3b53a9d74e6b6c 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -295,9 +295,7 @@ e.g. @code{\\mark \"A\"}.")
      . (
        (description .  "Start or stop a melisma.
 
-
-
-Syntax:@code{c4\\melisma d\\melismaEnd}.")
+Syntax: @code{c4\\melisma d\\melismaEnd}.")
        (internal-class-name . "Event")
        (types . (general-music melisma-span-event event))
        ))
@@ -346,7 +344,6 @@ SYNTAX
 @code{\\propery Foo.Bar \\override} @var{SYMBOL} = @var{VALUE}
 
 ")
-
        (internal-class-name . "Music")
        (types . (general-music layout-instruction))
        (iterator-ctor . ,      Push_property_iterator::constructor)
@@ -355,7 +352,6 @@ SYNTAX
      . (
        (description .  "Combine two parts on a staff, either merged or
 as separate voices.")
-
        (internal-class-name . "Simultaneous_music")
        (types . (general-music part-combine-music))
        (iterator-ctor . ,Part_combine_iterator::constructor)

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 5c5ea69d36c7433f26a18f110ffd54e466581e93..7ad48eaf1bb17544993a001029db6ee291390a36 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2077,6 +2077,9 @@ conversions.append (((2, 3, 1), conv,
                     '''\\apply -> \\applymusic'''))
 
 def conv (str):
+       if re.search ('textheight', str):
+               sys.stderr.write("\nWarning: tuning of page layout has changed. See reference manual.\n")
+               
        str = re.sub (r'\\OrchestralScoreContext', '\\Score', str)
        def func(m):
                if m.group(1) not in ['RemoveEmptyStaff',
@@ -2105,6 +2108,15 @@ conversions.append (((2, 3, 4), conv,
 
 
 
+def conv (str):
+       str = re.sub (r'lastpagefill\s*=\s*"?1"', 'raggedlastbottom = ##t', str)
+       return str
+
+conversions.append (((2, 3, 6), conv,
+                    '''lastpagefill -> raggedlastbottom'''))
+
+
+
 def conv (str):
        str = re.sub (r'\\consistsend', '\\consists', str)
        str = re.sub (r'\\lyricsto\s+("?[a-zA-Z]+"?)(\s*\\new Lyrics\s*)?\\lyrics',
@@ -2127,6 +2139,8 @@ conversions.append (((2, 3, 9), conv,
 def conv (str):
        str = re.sub (r'\\addlyrics', r'\\oldaddlyrics', str)
        str = re.sub (r'\\newlyrics', r'\\addlyrics', str)
+       if re.search (r"\\override\s*TextSpanner", str):
+               sys.stderr.write ("\nWarning: TextSpanner has been split into DynamicTextSpanner and TextSpanner\n") 
        return str
 
 conversions.append (((2, 3, 10), conv,
@@ -2157,6 +2171,8 @@ def conv (str):
        str = re.sub ('soloADue', 'printPartCombineTexts', str)
        str = re.sub (r'\\applymusic\s*#notes-to-clusters',
                      '\\makeClusters', str)
+
+       str = re.sub (r'pagenumber\s*=', 'firstpagenumber', str)
        return str
 
 conversions.append (((2, 3, 12), conv,
@@ -2206,7 +2222,16 @@ conversions.append (((2, 3, 18),
 def conv (str):
        str = re.sub (r'\\paper', r'\\layout', str)
        str = re.sub (r'\\bookpaper', r'\\paper', str)
-       str = re.sub (r'paper-set-staff-size', r'layout-set-staff-size', str)
+       if re.search ('paper-set-staff-size', str):
+               sys.stderr.write ('''\nWarning: staff size should be changed at top-level
+with
+
+  #(set-global-staff-size <STAFF-HEIGHT-IN-POINT>)
+
+''')
+               
+               
+       str = re.sub (r'#\(paper-set-staff-size', '%Use set-global-staff-size at toplevel\n% #(layout-set-staff-size', str)
        return str
 
 conversions.append (((2, 3, 22),
@@ -2226,7 +2251,6 @@ conversions.append (((2, 3, 23),
                     '''\context Foo = NOTENAME -> \context Foo = "NOTENAME"'''))
 
 
-# nothing, just to make version numbers look good.
 def conv (str):
        return str
 
@@ -2235,7 +2259,6 @@ conversions.append (((2, 4, 0),
                     ''))
 
 
-# nothing, just to make version numbers look good.
 def conv (str):
        str = re.sub (r'\\quote\s+"?([a-zA-Z0-9]+)"?\s+([0-9.*/]+)',
                      r'\\quoteDuring #"\1" { \skip \2 }',