LATEX_FILES =$(call src-wildcard,*.latex)
-EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt convert-ly.txt $(EPS_ILLUSTRATIONS)
+EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt $(EPS_ILLUSTRATIONS)
IMAGES=$(call src-wildcard,*.png)
EPS_ILLUSTRATIONS=context-example.eps
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=11
-PATCH_LEVEL=30
+PATCH_LEVEL=31
MY_PATCH_LEVEL=
str = '<font size="-2"><pre>%s</pre></font>' % str
return str
+class LogFileCompareLink (TextFileCompareLink):
+ def get_content (self, f):
+ c = TextFileCompareLink.get_content (self, f)
+ c = re.sub ("\nProcessing `[^\n]+'\n", '', c)
+ return c
class ProfileFileLink (FileCompareLink):
def __init__ (self, f1, f2):
ext = os.path.splitext (f1)[1]
klasses = {
'.midi': MidiFileLink,
- '.log' : TextFileCompareLink,
+ '.log' : LogFileCompareLink,
'.profile': ProfileFileLink,
'.gittxt': GitFileCompareLink,
}
= neighbor_stem->relative_coordinate (commonx, X_AXIS);
notehead_width = min (notehead_width,
- fabs (neighbor_stem_x - segs[j].stem_x_)/2);
+ fabs (neighbor_stem_x - segs[j].stem_x_)/2.5);
}
current.horizontal_[event_dir] += event_dir * notehead_width;
}
#include "smobs.hh"
-/**
- auto resizing hash table.
+/*
+ hash table.
- 1. ALWAYS USE THIS AS VIA A POINTER, i.e.
+ 1. ALWAYS USE THIS AS VIA A POINTER, i.e.
- class Foo {
- Scheme_hash_table * tab;
- };
+ class Foo {
+ Scheme_hash_table * tab;
+ };
- and NOT
+ and NOT
- class Foo {
- Scheme_hash_table tab;
- }
+ class Foo {
+ Scheme_hash_table tab;
+ }
- 2. UPON DESTRUCTION, DO
+ 2. UPON DESTRUCTION, DO
- scm_gc_unprotect_object (tab->self_scm_);
+ scm_gc_unprotect_object (tab->self_scm_);
*/
class Scheme_hash_table
public:
bool try_retrieve (SCM key, SCM *val);
bool contains (SCM key) const;
-
- /**
- WARNING: putting something in assumes responsibility for cleaning
- up. */
void set (SCM k, SCM v);
SCM get (SCM k) const;
void remove (SCM k);
Scheme_hash_table ();
void operator = (Scheme_hash_table const &);
Scheme_hash_table (Scheme_hash_table const &);
-
SCM to_alist () const;
private:
SCM hash_tab_;
- unsigned elt_count_;
-
+ void copy (Scheme_hash_table const &src);
DECLARE_SMOBS (Scheme_hash_table);
};
/*
Return: number of objects.
*/
-int
+SCM
+copy_handle (void *closure, SCM handle)
+{
+ SCM tab = (SCM) closure;
+ scm_hashq_set_x (tab, scm_car (handle), scm_cdr (handle));
+ return tab;
+}
+
+static void
copy_scm_hashes (SCM dest, SCM src)
{
- int k = 0;
- for (int i = scm_c_vector_length (src); i--;)
- for (SCM s = scm_vector_ref (src, scm_from_int (i)); scm_is_pair (s); s = scm_cdr (s))
- {
- scm_hashq_set_x (dest, scm_caar (s), scm_cdar (s));
- k++;
- }
- return k;
+ scm_internal_hash_for_each_handle ( (SCM (*)(GUILE_ELLIPSIS)) ©_handle, dest, src);
}
Scheme_hash_table::Scheme_hash_table ()
{
hash_tab_ = SCM_EOL;
smobify_self ();
- hash_tab_ = scm_make_vector (scm_from_int (119), SCM_EOL);
- elt_count_ = 0;
+ hash_tab_ = scm_c_make_hash_table (119);
}
Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
-
{
hash_tab_ = SCM_EOL;
- elt_count_ = 0;
smobify_self ();
-
- hash_tab_ = scm_make_vector (scm_from_int (max ((int) src.elt_count_, 11)), SCM_EOL);
- elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
+ copy (src);
}
void
-Scheme_hash_table::operator = (Scheme_hash_table const &src)
+Scheme_hash_table::copy (Scheme_hash_table const &src)
{
if (&src == this)
return;
- hash_tab_ = scm_make_vector (scm_from_int (max ((int) src.elt_count_, 11)), SCM_EOL);
- elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
+ hash_tab_ = scm_c_make_hash_table (SCM_HASHTABLE_N_ITEMS(src.hash_tab_));
+ copy_scm_hashes (hash_tab_, src.hash_tab_);
}
Scheme_hash_table::~Scheme_hash_table ()
{
assert (scm_is_symbol (k));
SCM handle = scm_hashq_create_handle_x (hash_tab_, k, SCM_UNDEFINED);
- if (scm_cdr (handle) == SCM_UNDEFINED)
- elt_count_++;
-
scm_set_cdr_x (handle, v);
-
- /*
- resize if getting too large.
- */
- if (elt_count_ > 2 * scm_c_vector_length (hash_tab_))
- {
- SCM nh = scm_make_vector (scm_from_int (3 * elt_count_ + 1), SCM_EOL);
- elt_count_ = copy_scm_hashes (nh, hash_tab_);
- hash_tab_ = nh;
- }
}
-// UGH.
SCM
Scheme_hash_table::get (SCM k) const
{
- /*
- 42 will stick out like a sore thumb, hopefully.
+ /* SCM_UNSPECIFIED will stick out like a sore thumb, hopefully.
*/
- return scm_hashq_ref (hash_tab_, k, scm_from_int (42));
+ return scm_hashq_ref (hash_tab_, k, SCM_UNSPECIFIED);
}
void
Scheme_hash_table::remove (SCM k)
{
scm_hashq_remove_x (hash_tab_, k);
- /* Do not decrease elt_count_ as this may cause underflow. The exact
- value of elt_count_ is not important. */
+}
+
+static SCM
+collect_handles (void *closure, SCM key, SCM value, SCM result)
+{
+ (void) closure;
+ return scm_acons(key, value, result);
}
SCM
Scheme_hash_table::to_alist () const
{
- SCM lst = SCM_EOL;
- for (int i = scm_c_vector_length (hash_tab_); i--;)
- for (SCM s = scm_vector_ref (hash_tab_, scm_from_int (i)); scm_is_pair (s);
- s = scm_cdr (s))
- lst = scm_acons (scm_caar (s), scm_cdar (s), lst);
- return lst;
+ return scm_internal_hash_fold ((SCM (*)(GUILE_ELLIPSIS)) &collect_handles, NULL, SCM_EOL, hash_tab_);
}
IMPLEMENT_SMOBS (Scheme_hash_table);
#include <algorithm>
using namespace std;
-#include "note-head.hh"
-#include "warn.hh"
+#include "directional-element-interface.hh"
+#include "grob.hh"
#include "main.hh"
-#include "staff-symbol-referencer.hh"
+#include "misc.hh"
+#include "note-head.hh"
#include "pointer-group-interface.hh"
-#include "directional-element-interface.hh"
#include "staff-symbol-referencer.hh"
#include "staff-symbol.hh"
+#include "stem.hh"
#include "string-convert.hh"
-#include "misc.hh"
-#include "grob.hh"
+#include "warn.hh"
void
Side_position_interface::add_support (Grob *me, Grob *e)
dim.unite (staff_extents);
}
+ Direction dir = get_grob_direction (me);
+
for (vsize i = 0; i < support.size (); i++)
{
Grob *e = support[i];
+
+ // In the case of a stem, we will find a note head as well
+ // ignoring the stem solves cyclic dependencies if the stem is
+ // attached to a cross-staff beam.
+ if (a == Y_AXIS
+ && Stem::has_interface (e)
+ && dir == - get_grob_direction (e))
+ continue;
+
if (e)
if (use_extents)
dim.unite (e->maybe_pure_extent (common, a, pure, start, end));
if (dim.is_empty ())
dim = Interval (0, 0);
- Direction dir = get_grob_direction (me);
-
Real off = me->get_parent (a)->maybe_pure_coordinate (common, a, pure, start, end);
Real minimum_space = ss * robust_scm2double (me->get_property ("minimum-space"), -1);
#include "performer-group.hh"
#include "context.hh"
-/** Perform a staff. Individual notes should have their instrument
- (staff-wide) set, so we override play_element ()
+/* Perform a staff. Individual notes should have their instrument
+ (staff-wide) set, so we override play_element ()
*/
class Staff_performer : public Performer
{
(Y-extent . ,ly:accidental-interface::height)
(X-offset . ,(ly:make-simple-closure
`(,+
- ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
- ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
+ ,(ly:make-simple-closure
+ (list ly:self-alignment-interface::centered-on-x-parent))
+ ,(ly:make-simple-closure
+ (list ly:self-alignment-interface::x-aligned-on-self)))))
(self-alignment-X . ,CENTER)
(font-size . -2)
(glyph-name-alist . ,standard-alteration-glyph-name-alist)
(* f0 (- x1 staff-space)))
(- x1 x0))))
-(define-public (layout-set-absolute-staff-size-in-module m staff-height)
+(define-public (layout-set-absolute-staff-size-in-module module staff-height)
(let*
- ((pt (eval 'pt m))
+ ((pt (eval 'pt module))
(ss (/ staff-height 4))
- (factor (/ staff-height (* 20 pt))))
+ (factor (/ staff-height (* 20 pt)))
+ (setm! (lambda (sym val)
+ (module-define! module sym val))))
- (module-define! m 'text-font-size (* 12 factor))
+ (setm! 'text-font-size (* 12 factor))
- (module-define! m 'output-scale ss)
- (module-define! m 'fonts
+ (setm! 'output-scale ss)
+ (setm! 'fonts
(if tex-backend?
(make-cmr-tree factor)
(make-century-schoolbook-tree factor)))
- (module-define! m 'staff-height staff-height)
- (module-define! m 'staff-space ss)
+ (setm! 'staff-height staff-height)
+ (setm! 'staff-space ss)
- (module-define! m 'line-thickness (calc-line-thickness ss pt))
+ (setm! 'line-thickness (calc-line-thickness ss pt))
;; sync with feta
- (module-define! m 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10)))
+ (setm! 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10)))
;; sync with feta
- (module-define! m 'blot-diameter (* 0.4 pt))
+ (setm! 'blot-diameter (* 0.4 pt))
))
- (define-public (layout-set-absolute-staff-size sz)
- "Function to be called inside a \\layout{} block to set the staff size. SZ is in
-points"
-
+(define-public (layout-set-absolute-staff-size sz)
+ "Function to be called inside a \\layout{} block to set the staff
+size. SZ is in points"
(layout-set-absolute-staff-size-in-module (current-module) sz))
(define-public (layout-set-staff-size sz)
"Function to be called inside a \\layout{} block to set the staff
size. SZ is in points"
-
+
(layout-set-absolute-staff-size (* (eval 'pt (current-module)) sz)))
(define-safe-public (set-global-staff-size sz)
projects / lilypond.git / commitdiff