Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(88)

Delta Between Two Patch Sets: lily/include/self-alignment-interface.hh

Issue 7768043: rewrite Self_alignment_interface
Left Patch Set: don't report additional programming errors Created 12 years ago
Right Patch Set: align MMR and perc.rep. stuff using xparents Created 12 years ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lily/include/paper-column.hh ('k') | lily/multi-measure-rest-engraver.cc » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 This file is part of LilyPond, the GNU music typesetter. 2 This file is part of LilyPond, the GNU music typesetter.
3 3
4 Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl> 4 Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
5 5
6 LilyPond is free software: you can redistribute it and/or modify 6 LilyPond is free software: you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 7 it under the terms of the GNU General Public License as published by
8 the Free Software Foundation, either version 3 of the License, or 8 the Free Software Foundation, either version 3 of the License, or
9 (at your option) any later version. 9 (at your option) any later version.
10 10
11 LilyPond is distributed in the hope that it will be useful, 11 LilyPond is distributed in the hope that it will be useful,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 12 but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details. 14 GNU General Public License for more details.
15 15
16 You should have received a copy of the GNU General Public License 16 You should have received a copy of the GNU General Public License
17 along with LilyPond. If not, see <http://www.gnu.org/licenses/>. 17 along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
18 */ 18 */
19 19
20 #ifndef SELF_ALIGNMENT_INTERFACE_HH 20 #ifndef SELF_ALIGNMENT_INTERFACE_HH
21 #define SELF_ALIGNMENT_INTERFACE_HH 21 #define SELF_ALIGNMENT_INTERFACE_HH
22 22
23 #include "lily-proto.hh" 23 #include "lily-proto.hh"
24 #include "grob-interface.hh" 24 #include "grob-interface.hh"
25 25
26 struct Self_alignment_interface 26 struct Self_alignment_interface
27 { 27 {
28 DECLARE_GROB_INTERFACE (); 28 DECLARE_GROB_INTERFACE ();
29 29
30 static SCM get_alignment (Grob *me, Axis a); 30 static SCM centered_on_object (Grob *me, Axis a);
31 static SCM align_grob (Grob *me, Grob *him, SCM alignment, Axis a, bool pure, int start, int end); 31 static SCM align_grob (Grob *me, Grob *him, Axis a, bool pure, int start, int end);
32 static void set_center_parent (Grob *me, Axis a);
33 static void set_align_self (Grob *me, Axis a);
34 32
35 DECLARE_SCHEME_CALLBACK (x_aligned_on_self, (SCM element)); 33 DECLARE_SCHEME_CALLBACK (x_aligned_on_self, (SCM element));
36 DECLARE_SCHEME_CALLBACK (y_aligned_on_self, (SCM element)); 34 DECLARE_SCHEME_CALLBACK (y_aligned_on_self, (SCM element));
37 35
38 DECLARE_SCHEME_CALLBACK (pure_y_aligned_on_self, (SCM element, SCM start, SCM end)); 36 DECLARE_SCHEME_CALLBACK (pure_y_aligned_on_self, (SCM element, SCM start, SCM end));
39 37
40 DECLARE_SCHEME_CALLBACK (centered_on_note_columns, (SCM element));
41 DECLARE_SCHEME_CALLBACK (centered_on_x_parent, (SCM element)); 38 DECLARE_SCHEME_CALLBACK (centered_on_x_parent, (SCM element));
42 DECLARE_SCHEME_CALLBACK (centered_on_y_parent, (SCM element)); 39 DECLARE_SCHEME_CALLBACK (centered_on_y_parent, (SCM element));
43 DECLARE_SCHEME_CALLBACK (x_centered_on_y_parent, (SCM element)); 40 DECLARE_SCHEME_CALLBACK (x_centered_on_y_parent, (SCM element));
44 DECLARE_SCHEME_CALLBACK (aligned_on_x_parent, (SCM element)); 41 DECLARE_SCHEME_CALLBACK (x_align_grob, (SCM element));
45 DECLARE_SCHEME_CALLBACK (aligned_on_y_parent, (SCM element)); 42 DECLARE_SCHEME_CALLBACK (y_align_grob, (SCM element));
46 }; 43 };
47 #endif 44 #endif
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b