X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ChangeLog;h=25e13176e8bcb5f007780eb218b3a31352405268;hb=e93347cf7fd1d43f11a36188d82f7bd09cb4fd26;hp=31fa0c1a720b3e89986f47b8a05e0eb61a099538;hpb=7e33691750a97e1b66192cb484f479a173390132;p=lilypond.git

diff --git a/ChangeLog b/ChangeLog
index 31fa0c1a72..25e13176e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,73 @@
-<<<<<<< ChangeLog
+2006-01-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/ttf.cc (LY_DEFINE): store name before destroying face.
+
+	* mf/GNUmakefile: idem.
+
+	* buildscripts/mf-to-table.py (help): excise fetaXXlist.ly support.
+
+	* stepmake/bin/install.py (dest): Only chmod/chown just created directories
+
+	* Documentation/user/notation-appendices.itely (The Feta font):
+	use it.
+
+	* input/test/font-table.ly: new file. Generate font table within lily.
+
+	* Documentation/user/notation-appendices.itely (The Feta font):
+	use new font-table.ly file. 
+
+	* stepmake/stepmake/install-out-targets.make
+	(local-install-outfiles): only create directory if
+	$(INSTALLATION_OUT_DIR) is defined. This fixes install on Gentoo.
+
+2006-01-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/ttf.cc (LY_DEFINE): new function ly:font-glyph-list.
+
+	* VERSION (PACKAGE_NAME): release 2.7.28
+
+	* scm/framework-ps.scm (write-preamble): use it to pick exactly
+	the right font from a Mac dfont.
+	(write-preamble): don't forget directory, only look at files.
+
+	This fixes problems with TTF files in dfonts that don't match
+	their PostScript names.
+	 
+	* lily/ttf.cc (LY_DEFINE): ly:ttf-ps-name: new routine to extract
+	PS name from TTF font.
+
+	* input/regression/tie-manual.ly: document new feature.
+
+	* Documentation/topdocs/NEWS.tely (Top): add tie NEWS.
+
+	* VERSION (MY_PATCH_LEVEL): bump to .28
+
+	* Documentation/user/basic-notation.itely (Ties): add tie examples
+	refs.
+
+	* lily/tie-formatting-problem.cc (score_ties_configuration):
+	symmetry penalties for outer ties.
+
+2006-01-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/tie-formatting-problem.cc (generate_configuration) 
+	(set_manual_tie_configuration): skip non-pair manual
+	tie-configuration, so you can set individual ties as
+
+	  #'tie-configuration = #'((7 . 1) #t (-3 . 1))
+
+	* input/regression/tie-chord.ly: use generateTiePattern to
+	simplify file.
+
+	* lily/tie-formatting-problem.cc (peak_around): new function.
+	(score_configuration): use sliding criterion for staff line collisions. 
+	(score_configuration): idem for dot collisions.
+	(generate_configuration): use separate stem_gap for gap to stem.
+
+	* lily/include/tie-formatting-problem.hh (struct Tie_details):
+	separate penalty factors for x and y distance.
+	(struct Tie_details): separate penalties for tip and center line collisions.
+
 2006-01-19 Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/tie-formatting-problem.cc (generate_configuration): make
@@ -13,14 +82,12 @@
 	* lily/staff-symbol-referencer.cc (on_line): rename from
 	on_staffline 
 
-=======
 2006-01-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* ly/music-functions-init.ly: remove duplicate tag.
 
 	* lily/include/*.hh: GCC 4.1 fixes.
 
->>>>>>> 1.4455
 006-01-16  Erlend Aasland  <erlenda@gmail.com>
 
 	* Documentation/user/global.itely: fix typos; @bugs -> @refbugs
@@ -66,6 +133,8 @@
 
 2006-01-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* VERSION: release 2.7.27
+
 	* lily/bar-line.cc (calc_bar_size): inspect staff->extent (Y_AXIS)
 	for determining bar size.