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

Side by Side Diff: lily/relocate.cc

Issue 5626052: Gets vertical skylines from grob stencils (Closed)
Patch Set: Run astyle on c++ files Created 12 years, 6 months 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) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl> 4 Copyright (C) 2005--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
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 { 205 {
206 prefix_relocation (argv0_prefix); 206 prefix_relocation (argv0_prefix);
207 prefix_directory = argv0_prefix; 207 prefix_directory = argv0_prefix;
208 } 208 }
209 if (argv0_prefix != compile_prefix || string (FRAMEWORKDIR) != "..") 209 if (argv0_prefix != compile_prefix || string (FRAMEWORKDIR) != "..")
210 { 210 {
211 framework_relocation (bindir + "/" + FRAMEWORKDIR); 211 framework_relocation (bindir + "/" + FRAMEWORKDIR);
212 prefix_directory = bindir + "/" + FRAMEWORKDIR; 212 prefix_directory = bindir + "/" + FRAMEWORKDIR;
213 } 213 }
214 214
215
216 lilypond_datadir = prefix_directory 215 lilypond_datadir = prefix_directory
217 + "/share/lilypond/" TOPLEVEL_VERSION; 216 + "/share/lilypond/" TOPLEVEL_VERSION;
218 } 217 }
219 218
220 if (getenv ("LILYPONDPREFIX")) 219 if (getenv ("LILYPONDPREFIX"))
221 error (_ ("LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR")); 220 error (_ ("LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR"));
222 221
223 if (char const *env = getenv ("LILYPOND_DATADIR")) 222 if (char const *env = getenv ("LILYPOND_DATADIR"))
224 { 223 {
225 /* Normalize file name. */ 224 /* Normalize file name. */
226 lilypond_datadir = File_name (env).to_string (); 225 lilypond_datadir = File_name (env).to_string ();
227 } 226 }
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 read_relocation_dir (string dirname) 386 read_relocation_dir (string dirname)
388 { 387 {
389 if (DIR *dir = opendir (dirname.c_str ())) 388 if (DIR *dir = opendir (dirname.c_str ()))
390 while (struct dirent *ent = readdir (dir)) 389 while (struct dirent *ent = readdir (dir))
391 { 390 {
392 File_name name (ent->d_name); 391 File_name name (ent->d_name);
393 if (name.ext_ == "reloc") 392 if (name.ext_ == "reloc")
394 read_relocation_file (dirname + "/" + name.to_string ()); 393 read_relocation_file (dirname + "/" + name.to_string ());
395 } 394 }
396 } 395 }
OLDNEW
« no previous file with comments | « lily/pango-font.cc ('k') | lily/script-interface.cc » ('j') | lily/skyline.cc » ('J')

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