Attachment 943744 Details for Bug 1149230 – patch for distgit

[patch] patch for distgit

lilypond-spec-font.patch (text/plain), 4.52 KB, created by Paolo Bonzini on 2014-10-03 14:49:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paolo Bonzini

Created: 2014-10-03 14:49:10 UTC

Size: 4.52 KB

patch

obsolete

>diff --git a/lilypond-2.18.2-font.patch b/lilypond-2.18.2-font.patch
>index e69de29..0b0276d 100644
>--- a/lilypond-2.18.2-font.patch
>+++ b/lilypond-2.18.2-font.patch
>@@ -0,0 +1,101 @@
>+Not needed with 2.19.x unstable series.
>+
>+--- scm/font.scm	2014-10-03 16:36:13.813436144 +0200
>++++ scm/font.scm	2014-10-03 16:36:45.841700412 +0200
>+@@ -1,6 +1,6 @@
>+ ;;;; This file is part of LilyPond, the GNU music typesetter.
>+ ;;;;
>+-;;;; Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
>++;;;; Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
>+ ;;;;
>+ ;;;; LilyPond is free software: you can redistribute it and/or modify
>+ ;;;; it under the terms of the GNU General Public License as published by
>+@@ -147,7 +147,7 @@
>+ 
>+ ;; Each size family is a vector of fonts, loaded with a delay.  The
>+ ;; vector should be sorted according to ascending design size.
>+-(define-public (add-music-fonts node name family design-size-alist factor)
>++(define-public (add-music-fonts node family name brace design-size-alist factor)
>+   "Set up music fonts.
>+ 
>+ Arguments:
>+@@ -156,12 +156,15 @@
>+ @var{node} is the font tree to modify.
>+ 
>+ @item
>++@var{family} is the family name of the music font.
>++
>++@item
>+ @var{name} is the basename for the music font.
>+ @file{@var{name}-<designsize>.otf} should be the music font,
>+-@file{@var{name}-brace.otf} should have piano braces.
>+ 
>+ @item
>+-@var{family} is the family name of the music font.
>++@var{brace} is the basename for the brace font.
>++@file{@var{brace}-brace.otf} should have piano braces.
>+ 
>+ @item
>+ @var{design-size-alist} is a list of @code{(rounded . designsize)}.
>+@@ -199,7 +202,7 @@
>+                        )))
>+      (fetaBraces ,(ly:pt 20.0)
>+                  #(,(delay (ly:system-font-load
>+-                            (format #f "~a-brace" name)))))
>++                            (format #f "~a-brace" brace)))))
>+      )))
>+ 
>+ (define-public (add-pango-fonts node lily-family family factor)
>+@@ -229,9 +232,40 @@
>+   (add-node 'italic 'normal)
>+   (add-node 'italic 'bold))
>+ 
>++; This function allows the user to change the specific fonts, leaving others
>++; to the default values. This way, "make-pango-font-tree"'s syntax doesn't
>++; have to change from the user's perspective.
>++;
>++; Usage:
>++;   \paper {
>++;     #(define fonts
>++;       (set-global-fonts
>++;        #:music "gonville"  ; (the main notation font)
>++;        #:roman "FreeSerif" ; (the main/serif text font)
>++;       ))
>++;   }
>++;
>++; Leaving out "#:brace", "#:sans", and "#:typewriter" leave them at 
>++; "emmentaler", "sans-serif", and "monospace", respectively. All fonts are
>++; still accesible through the usual scheme symbols: 'feta, 'roman, 'sans, and
>++; 'typewriter.
>++(define*-public (set-global-fonts #:key 
>++  (music "emmentaler")
>++  (brace "emmentaler")
>++  (roman "Century Schoolbook L")
>++  (sans "sans-serif")
>++  (typewriter "monospace")
>++  (factor 1))
>++  (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
>++    (add-music-fonts n 'feta music brace feta-design-size-mapping factor)
>++    (add-pango-fonts n 'roman roman factor)
>++    (add-pango-fonts n 'sans sans factor)
>++    (add-pango-fonts n 'typewriter typewriter factor)
>++    n))
>++    
>+ (define-public (make-pango-font-tree roman-str sans-str typewrite-str factor)
>+   (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
>+-    (add-music-fonts n "emmentaler" 'feta feta-design-size-mapping factor)
>++    (add-music-fonts n 'feta "emmentaler" "emmentaler" feta-design-size-mapping factor)
>+     (add-pango-fonts n 'roman roman-str factor)
>+     (add-pango-fonts n 'sans sans-str factor)
>+     (add-pango-fonts n 'typewriter typewrite-str factor)
>+@@ -240,7 +274,9 @@
>+ (define-public (make-century-schoolbook-tree factor)
>+   (make-pango-font-tree
>+    "Century Schoolbook L"
>+-   "sans-serif" "monospace" factor))
>++   "sans-serif"
>++   "monospace"
>++   factor))
>+ 
>+ (define-public all-text-font-encodings
>+   '(latin1))
>diff --git a/lilypond.spec b/lilypond.spec
>index 5af1a08..558588e 100644
>--- a/lilypond.spec
>+++ b/lilypond.spec
>@@ -9,6 +9,7 @@ URL:		http://www.lilypond.org
> Source0:	http://download.linuxaudio.org/lilypond/sources/v2.18/%{name}-%{version}.tar.gz
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> Patch0:		lilypond-2.21.2-gcc44-relocate.patch
>+Patch1:		lilypond-2.18.2-font.patch
> 
> Requires:	ghostscript >= 8.15
> Obsoletes: 	lilypond-fonts <= 2.12.1-1
>@@ -86,6 +87,7 @@ This contains the directory common to all lilypond fonts.
> %setup -q
> 
> %patch0 -p0
>+%patch1 -p0
> 
> %build
> %configure --without-kpathsea --disable-checking \

Actions: View | Diff

Attachments on bug 1149230: 943744