name. Remove windows comment.
2005-05-15 Jan Nieuwenhuizen <janneke@gnu.org>
2005-05-15 Jan Nieuwenhuizen <janneke@gnu.org>
+ * lily/pango-font.cc (pango_item_string_stencil): Normalize file
+ name. Remove windows comment.
+
* scm/editor.scm (slashify): New function.
(get-editor-command): Use it.
(get-command-template): Do not alter editor command if
* scm/editor.scm (slashify): New function.
(get-editor-command): Use it.
(get-command-template): Do not alter editor command if
*/
#define PANGO_ENABLE_BACKEND // ugh, why necessary?
*/
#define PANGO_ENABLE_BACKEND // ugh, why necessary?
#include <pango/pangoft2.h>
#include <pango/pangoft2.h>
-#include "main.hh"
-#include "lookup.hh"
-#include "dimensions.hh"
+
+#include "dimensions.hh"
+#include "file-name.hh"
+#include "lookup.hh"
+#include "main.hh"
#include "warn.hh"
#if HAVE_PANGO_FT2
#include "warn.hh"
#if HAVE_PANGO_FT2
}
else
char_id = scm_makfrom0str (glyph_name);
}
else
char_id = scm_makfrom0str (glyph_name);
- *tail = scm_cons (scm_list_3 (scm_from_double (ggeo.x_offset * scale_ + dx),
+ *tail = scm_cons (scm_list_3 (scm_from_double (ggeo.x_offset * scale_
+ + dx),
scm_from_double (ggeo.y_offset * scale_),
char_id),
SCM_EOL);
scm_from_double (ggeo.y_offset * scale_),
char_id),
SCM_EOL);
/ (Real (PANGO_SCALE));
FcPattern *fcpat = fcfont->font_pattern;
/ (Real (PANGO_SCALE));
FcPattern *fcpat = fcfont->font_pattern;
- char *filename = 0;
- FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & filename);
+ char *file_name = 0;
+ FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & file_name);
+#ifdef __MINGW32__
+ /* Normalize file name. */
+ // FIXME: memleak(s?)
+ file_name = File_name (file_name).to_string ().get_copy_str0 ();
+#endif
+
char const *ps_name_str0 = FT_Get_Postscript_Name (ftface);
if (!ps_name_str0)
char const *ps_name_str0 = FT_Get_Postscript_Name (ftface);
if (!ps_name_str0)
- warning (_f ("no PostScript font name for font `%s'", filename));
+ warning (_f ("no PostScript font name for font `%s'", file_name));
String ps_name;
if (!ps_name_str0
String ps_name;
if (!ps_name_str0
- && filename
- && (String (filename).index (".otf") >= 0
- || String (filename).index (".cff") >= 0))
+ && file_name
+ && (String (file_name).index (".otf") >= 0
+ || String (file_name).index (".cff") >= 0))
- /*
- UGH: kludge a PS name for OTF/CFF fonts.
-
- */
-
- String name = filename;
- int idx = max (String (filename).index (".otf"),
- String (filename).index (".cff"));
+ /* UGH: kludge a PS name for OTF/CFF fonts. */
+ String name = file_name;
+ int idx = max (String (file_name).index (".otf"),
+ String (file_name).index (".cff"));
name = name.left_string (idx);
name = name.left_string (idx);
- int slash_idx = name.index_last ('/'); // UGh. What's happens on windows?
+ int slash_idx = name.index_last ('/');
if (slash_idx >= 0)
name = name.right_string (name.length () - slash_idx - 1);
if (slash_idx >= 0)
name = name.right_string (name.length () - slash_idx - 1);
- ((Pango_font *) this)->register_font_file (filename, ps_name);
+ ((Pango_font *) this)->register_font_file (file_name, ps_name);
pango_fc_font_unlock_face (fcfont);
SCM expr = scm_list_4 (ly_symbol2scm ("glyph-string"),
pango_fc_font_unlock_face (fcfont);
SCM expr = scm_list_4 (ly_symbol2scm ("glyph-string"),
return Stencil (b, expr);
}
return Stencil (b, expr);
}
- else
- {
- warning (_ ("FreeType face has no PostScript font name"));
- return Stencil ();
- }
+
+ warning (_ ("FreeType face has no PostScript font name"));
+ return Stencil ();
(munge-lily-font-name name)
(cond
((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
(munge-lily-font-name name)
(cond
((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
- (ps-load-file (ly:find-file (format "~a.pfa" (munge-lily-font-name file-name)))))
+ (ps-load-file (ly:find-file
+ (format "~a.pfa" (munge-lily-font-name file-name)))))
((string? bare-file-name)
(ps-load-file (munge-lily-font-name file-name)))
(else
(ly:warning (_ "don't know how to embed ~S=~S") name file-name)
((string? bare-file-name)
(ps-load-file (munge-lily-font-name file-name)))
(else
(ly:warning (_ "don't know how to embed ~S=~S") name file-name)
(define (load-font font-name-filename)
(let* ((font (car font-name-filename))
(define (load-font font-name-filename)
(let* ((font (car font-name-filename))
0))
(else
(ly:warning (_ "don't know how to embed ~S=~S") name file-name)
0))
(else
(ly:warning (_ "don't know how to embed ~S=~S") name file-name)
(define (load-fonts paper)
(let* ((fonts (ly:paper-fonts paper))
(define (load-fonts paper)
(let* ((fonts (ly:paper-fonts paper))
(all-font-names
(map
(lambda (font)
(all-font-names
(map
(lambda (font)
; adobe note 5002: should initialize variables before loading routines.
(display (procset "music-drawing-routines.ps") port)
(display (procset "lilyponddefs.ps") port)
; adobe note 5002: should initialize variables before loading routines.
(display (procset "music-drawing-routines.ps") port)
(display (procset "lilyponddefs.ps") port)
- (display "init-lilypond-parameters\n" port)
-
- )
+ (display "init-lilypond-parameters\n" port))
(define-public (output-framework basename book scopes fields)
(let* ((filename (format "~a.ps" basename))
(define-public (output-framework basename book scopes fields)
(let* ((filename (format "~a.ps" basename))