From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 14 Jun 2004 17:27:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.2.3~1^2~40
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cbe8ae0faa91be7a2b130b313f22019522f17b0a;p=lilypond.git
*** empty log message ***
---
diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index c1d6e4954d..2020d35a57 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -257,10 +257,21 @@ lilypond-bin -fgnome input/simple-song.ly
(define (pango-font-size font)
(let* ((designsize (ly:font-design-size font))
(magnification (* (ly:font-magnification font)))
+
;;(ops (ly:paper-lookup paper 'outputscale))
;;(ops (* pixels-per-unit OUTPUT-SCALE))
;;(ops (* pixels-per-unit pixels-per-unit))
- (ops (* (/ 12 20) (* pixels-per-unit pixels-per-unit)))
+ ;;(ops (* (/ 12 20) (* pixels-per-unit pixels-per-unit)))
+ ;;(ops (* (/ 12 20) (* OUTPUT-SCALE pixels-per-unit)))
+
+ ;; experimental sizing:
+ ;; where does factor come from?
+ ;;
+ ;; 0.435 * (12 / 20) = 0.261
+ ;; 2.8346456692913/ 0.261 = 10.86071137659501915708
+
+ (ops (* 0.435 (/ 12 20) (* output-scale pixels-per-unit)))
+
(scaling (* ops magnification designsize)))
scaling))
@@ -276,7 +287,17 @@ lilypond-bin -fgnome input/simple-song.ly
(cons
(make <gnome-canvas-text>
#:parent (root main-canvas)
- #:x 0 #:y 0
+
+ ;; experimental text placement corrections.
+ ;; UGHR? What happened to tex offsets? south-west?
+ ;; is pango doing something 'smart' wrt baseline ?
+ #:anchor 'south-west
+ #:x 0.003 #:y 0.123
+
+ ;;
+ ;;#:anchor 'west
+ ;;#:x 0.015 #:y -3.71
+
#:font (pango-font-name font)
#:size-points (pango-font-size font)
#:size-set #t
@@ -286,8 +307,7 @@ lilypond-bin -fgnome input/simple-song.ly
;;#:scale-set #t
#:fill-color "black"
- #:text string
- #:anchor 'west)
+ #:text string)
text-items))
(car text-items))