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

Side by Side Diff: lily/paper-column.cc

Issue 579240043: Issue 4550: Avoid "using namespace std;" in included files (Take 2) (Closed)
Patch Set: Created 5 years, 1 month 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:
View unified diff | Download patch
OLDNEW
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) 1997--2020 Han-Wen Nienhuys <hanwen@xs4all.nl> 4 Copyright (C) 1997--2020 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
(...skipping 21 matching lines...) Expand all
32 #include "rhythmic-head.hh" 32 #include "rhythmic-head.hh"
33 #include "separation-item.hh" 33 #include "separation-item.hh"
34 #include "skyline-pair.hh" 34 #include "skyline-pair.hh"
35 #include "spaceable-grob.hh" 35 #include "spaceable-grob.hh"
36 #include "spring.hh" 36 #include "spring.hh"
37 #include "string-convert.hh" 37 #include "string-convert.hh"
38 #include "system.hh" 38 #include "system.hh"
39 #include "text-interface.hh" 39 #include "text-interface.hh"
40 #include "warn.hh" 40 #include "warn.hh"
41 41
42 using std::string;
43 using std::vector;
44
42 bool 45 bool
43 Paper_column::internal_set_as_bound_of_spanner (Spanner *s, Direction) 46 Paper_column::internal_set_as_bound_of_spanner (Spanner *s, Direction)
44 { 47 {
45 bool ok = s->accepts_as_bound_paper_column (this); 48 bool ok = s->accepts_as_bound_paper_column (this);
46 if (ok) 49 if (ok)
47 { 50 {
48 // Signal that this column needs to be kept alive. They need to be kept 51 // Signal that this column needs to be kept alive. They need to be kept
49 // alive to have meaningful position and linebreaking. [maybe we should 52 // alive to have meaningful position and linebreaking. [maybe we should
50 // try keeping all columns alive?, and perhaps inherit position from 53 // try keeping all columns alive?, and perhaps inherit position from
51 // their (non-)musical brother] 54 // their (non-)musical brother]
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 151
149 for (LEFT_and_RIGHT (d)) 152 for (LEFT_and_RIGHT (d))
150 { 153 {
151 Skyline_pair *sp = unsmob<Skyline_pair> (cols[d]->get_property ("horizonta l-skylines")); 154 Skyline_pair *sp = unsmob<Skyline_pair> (cols[d]->get_property ("horizonta l-skylines"));
152 if (sp) 155 if (sp)
153 skys[d] = (*sp)[-d]; 156 skys[d] = (*sp)[-d];
154 } 157 }
155 158
156 skys[RIGHT].merge (Separation_item::conditional_skyline (right, left)); 159 skys[RIGHT].merge (Separation_item::conditional_skyline (right, left));
157 160
158 return max (0.0, skys[LEFT].distance (skys[RIGHT])); 161 return std::max (0.0, skys[LEFT].distance (skys[RIGHT]));
159 } 162 }
160 163
161 Interval 164 Interval
162 Paper_column::break_align_width (Grob *me, SCM align_syms) 165 Paper_column::break_align_width (Grob *me, SCM align_syms)
163 { 166 {
164 Grob *p = me->get_parent (X_AXIS); 167 Grob *p = me->get_parent (X_AXIS);
165 168
166 if (scm_is_symbol (align_syms)) 169 if (scm_is_symbol (align_syms))
167 align_syms = scm_list_1 (align_syms); 170 align_syms = scm_list_1 (align_syms);
168 171
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 "page-break-penalty " 468 "page-break-penalty "
466 "page-break-permission " 469 "page-break-permission "
467 "page-turn-penalty " 470 "page-turn-penalty "
468 "page-turn-permission " 471 "page-turn-permission "
469 "rhythmic-location " 472 "rhythmic-location "
470 "shortest-playing-duration " 473 "shortest-playing-duration "
471 "shortest-starter-duration " 474 "shortest-starter-duration "
472 "spacing " 475 "spacing "
473 "used " 476 "used "
474 "when "); 477 "when ");
OLDNEW

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