X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=36ede54bb45236d4307738ac355aecf4a1b7e81f;hb=f4c712ec8d705f02d42c5c00724de44554edd97e;hp=d42811c0a7c096adfa1d9609fe8f9f77efa81e6a;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index d42811c0a7..36ede54bb4 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Han-Wen Nienhuys + Copyright (C) 1999--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -86,8 +86,7 @@ All_font_metrics::find_pango_font (PangoFontDescription const *description, SCM val; if (!pango_dict_->try_retrieve (key, &val)) { - if (be_verbose_global) - progress_indication ("\n[" + string (pango_fn)); + debug_output ("[" + string (pango_fn), true); // start on a new line Pango_font *pf = new Pango_font (pango_ft2_fontmap_, description, @@ -98,8 +97,7 @@ All_font_metrics::find_pango_font (PangoFontDescription const *description, pango_dict_->set (key, val); pf->unprotect (); - if (be_verbose_global) - progress_indication ("]"); + debug_output ("]", false); pf->description_ = scm_cons (SCM_BOOL_F, scm_from_double (1.0)); @@ -124,13 +122,11 @@ All_font_metrics::find_otf (string name) if (file_name.empty ()) return 0; - if (be_verbose_global) - progress_indication ("\n[" + file_name); + debug_output ("[" + file_name, true); // start on a new line val = Open_type_font::make_otf (file_name); - if (be_verbose_global) - progress_indication ("]"); + debug_output ("]", false); unsmob_metrics (val)->file_name_ = file_name; SCM name_string = ly_string2scm (name);