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

Unified Diff: lily/break-alignment-interface.cc

Issue 549480043: Run scripts/auxiliar/fixcc.py (Closed)
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lily/bracket.cc ('k') | lily/change-sequence-iterator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lily/break-alignment-interface.cc
diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index 12f86f5eabef28d09644653e968a1ac66337da7c..4d35959cf3346e3b219bd7cee28534c36329310d 100644
--- a/lily/break-alignment-interface.cc
+++ b/lily/break-alignment-interface.cc
@@ -269,8 +269,8 @@ Break_alignable_interface::find_parent (SCM grob)
return alignment_parent ? alignment_parent->self_scm () : SCM_BOOL_F;
}
-Grob*
-Break_alignable_interface::find_parent (Grob* me)
+Grob *
+Break_alignable_interface::find_parent (Grob *me)
{
Item *alignment = dynamic_cast<Item *> (me->get_parent (X_AXIS));
if (!has_interface<Break_alignment_interface> (alignment))
@@ -365,15 +365,18 @@ Break_aligned_interface::calc_joint_anchor_alignment (Grob *me)
{
SCM s = elts[i]->get_property ("break-align-anchor-alignment");
double alignment = robust_scm2double (s, 0.0);
- if (alignment < CENTER) {
- if (direction > CENTER)
- return CENTER; // conflict
- direction = -1;
- } else if (alignment > CENTER) {
- if (direction < CENTER)
- return CENTER; // conflict
- direction = 1;
- }
+ if (alignment < CENTER)
+ {
+ if (direction > CENTER)
+ return CENTER; // conflict
+ direction = -1;
+ }
+ else if (alignment > CENTER)
+ {
+ if (direction < CENTER)
+ return CENTER; // conflict
+ direction = 1;
+ }
}
return direction;
« no previous file with comments | « lily/bracket.cc ('k') | lily/change-sequence-iterator.cc » ('j') | no next file with comments »

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