OLD | NEW |
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--2019 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 1997--2019 Han-Wen Nienhuys <hanwen@xs4all.nl> |
5 | 5 |
6 Jan Nieuwenhuizen <janneke@gnu.org> | 6 Jan Nieuwenhuizen <janneke@gnu.org> |
7 | 7 |
8 LilyPond is free software: you can redistribute it and/or modify | 8 LilyPond is free software: you can redistribute it and/or modify |
9 it under the terms of the GNU General Public License as published by | 9 it under the terms of the GNU General Public License as published by |
10 the Free Software Foundation, either version 3 of the License, or | 10 the Free Software Foundation, either version 3 of the License, or |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 Stencil | 166 Stencil |
167 Lookup::round_filled_box (Box b, Real blotdiameter) | 167 Lookup::round_filled_box (Box b, Real blotdiameter) |
168 { | 168 { |
169 Real width = b.x ().delta (); | 169 Real width = b.x ().delta (); |
170 blotdiameter = min (blotdiameter, width); | 170 blotdiameter = min (blotdiameter, width); |
171 Real height = b.y ().delta (); | 171 Real height = b.y ().delta (); |
172 blotdiameter = min (blotdiameter, height); | 172 blotdiameter = min (blotdiameter, height); |
173 | 173 |
174 if (blotdiameter < 0.0) | 174 if (blotdiameter < 0.0) |
175 { | 175 { |
176 if (!isinf (blotdiameter)) | 176 if (!std::isinf (blotdiameter)) |
177 warning (_f ("Not drawing a box with negative dimension, %.2f by %.2f.", | 177 warning (_f ("Not drawing a box with negative dimension, %.2f by %.2f.", |
178 width, height)); | 178 width, height)); |
179 return Stencil (b, SCM_EOL); | 179 return Stencil (b, SCM_EOL); |
180 } | 180 } |
181 | 181 |
182 SCM at = (scm_list_n (ly_symbol2scm ("round-filled-box"), | 182 SCM at = (scm_list_n (ly_symbol2scm ("round-filled-box"), |
183 scm_from_double (-b[X_AXIS][LEFT]), | 183 scm_from_double (-b[X_AXIS][LEFT]), |
184 scm_from_double (b[X_AXIS][RIGHT]), | 184 scm_from_double (b[X_AXIS][RIGHT]), |
185 scm_from_double (-b[Y_AXIS][DOWN]), | 185 scm_from_double (-b[Y_AXIS][DOWN]), |
186 scm_from_double (b[Y_AXIS][UP]), | 186 scm_from_double (b[Y_AXIS][UP]), |
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
625 { | 625 { |
626 if (points[i - 1].is_sane () && points[i].is_sane ()) | 626 if (points[i - 1].is_sane () && points[i].is_sane ()) |
627 { | 627 { |
628 Stencil line | 628 Stencil line |
629 = Line_interface::make_line (thick, points[i - 1], points[i]); | 629 = Line_interface::make_line (thick, points[i - 1], points[i]); |
630 ret.add_stencil (line); | 630 ret.add_stencil (line); |
631 } | 631 } |
632 } | 632 } |
633 return ret; | 633 return ret; |
634 } | 634 } |
OLD | NEW |