release commit

diff --git a/ChangeLog b/ChangeLog
index 46c2154916ef7b2049411a660ae8a4449f26509a..bf9b4bb5c7fc22c3603dcd34f09a5c4263ff029c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-09-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * VERSION: release 2.0.0
+
+       * GNUmakefile.in (rsync-web): version independent rsync target.
+
        * input/test/+.ly (texidoc): idem.
 
        * input/regression/+.ly: print version number.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5286a881089cec0595a17d993dca1256d9606a60..aebcd55cbc089da04c6c6e33405fa43e915b72ab 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -151,5 +151,5 @@ rsync-web:
        chgrp -R lilypond . && \
        chmod -R g+w .  && \
        chmod 2775 `find -type d` . && \
-       rsync --delete --stats --progress -gorltvu -e ssh . x:/var/www/lilypond/doc/v1.9/
+       rsync --delete --stats --progress -gorltvu -e ssh . x:/var/www/lilypond/doc/v$(MAJOR_VERSION).$(MINOR_VERSION)/
        cd out-www && rm -rf web/

diff --git a/VERSION b/VERSION
index bdcde1f130b07770211a3d787ff82dd6b7f1795a..75b15c6fed6b9b933dd746cf22b7b2201d9c4faa 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
-MAJOR_VERSION=1
-MINOR_VERSION=9
-PATCH_LEVEL=10
+MAJOR_VERSION=2
+MINOR_VERSION=0
+PATCH_LEVEL=0
 MY_PATCH_LEVEL=
 

diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly
new file mode 100644 (file)
index 0000000..1f4ea6c
--- /dev/null
+++ b/input/regression/breathing-sign-ancient.ly
@@ -0,0 +1,50 @@
+\version "1.9.8"
+
+\header{
+texidoc="
+Gregorian chant notation sometimes also uses commas and ticks, but in
+smaller font size (we call it 'virgula' and 'caesura').  However, the
+most common breathing signs are divisio minima/maior/maxima and
+finalis, the latter three looking similar to bar glyphs.
+
+" }
+
+\include "gregorian-init.ly"
+
+\score {
+
+    %
+    % Gregorian notation:
+    %
+    \context VaticanaStaff {
+      \notes \relative c' {
+
+       % we turn bars and bar numbers off for Gregorian stuff
+       \property Staff.BarLine \set #'transparent = ##t
+       \property Score.BarNumber \set #'transparent = ##t
+
+       % here is no \breathe
+       c g c
+
+       % \virgula applies rcomma, but in a smaller font
+       c \virgula g c
+
+       % \caesura applies rvarcomma, but in a smaller font
+       c \caesura g c
+
+       % \divisioMinima is a simple vertical stroke through the
+       % uppermost staffline, just like the original implementation
+       % of breathing signs.
+       c \divisioMinima g c
+
+       % \divisio{maior,maxima} and \finalis look like bars and are
+       % vertically centered on the staff; the direction property has
+       % no effect
+       c \divisioMaior g c
+       c \divisioMaxima g c
+
+       % this one looks almost like a "||" type bar
+       \finalis
+      }
+    }
+}

diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly
index 81a2641907c729f18864048ea17e0a7f913d9dc7..c32b0e2db12e0d27bcdaba956cfa9dd1ccfb1aba 100644 (file)
--- a/ly/scale-definitions-init.ly
+++ b/ly/scale-definitions-init.ly
@@ -70,7 +70,7 @@ lydian = #`(
     (0 . 0)
     (1 . 0)
     (2 . 0)
-    (3 . SHARP)
+    (3 . ,SHARP)
     (4 . 0)
     (5 . 0)
     (6 . 0)

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 0d0abd6f444013d7eee662f2185cea1e6ae16933..a256a3d83e6a94f9ace2e064b1eedd12b159c6a2 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -71,7 +71,8 @@ gzip -9fn $RPM_BUILD_ROOT%{_infodir}/*
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-install -m 644 elisp/lilypond-init.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/site-start.d
+install -m 755 -d  $RPM_BUILD_ROOT/etc/emacs/site-start.d
+install -m 644 elisp/lilypond-init.el $RPM_BUILD_ROOT/etc/emacs/site-start.d
 
 gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man1/*
 
@@ -118,7 +119,7 @@ scrollkeeper-update
 %files
 %defattr(-, root, root)
 %{_datadir}/emacs/site-lisp/lilypond*
-%{_datadir}/emacs/site-lisp/site-start.d/lilypond-*
+/etc/emacs/site-start.d/lilypond-*
 
 %{_bindir}/abc2ly
 %{_bindir}/as2text