From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 7 Nov 2010 17:13:59 +0000 (+0000)
Subject: layout: fix largescale_text_reduce
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=738a50cb0552f75d368b73df9650b2a4aa6bd085;p=trains.git

layout: fix largescale_text_reduce
---

diff --git a/layout/layout b/layout/layout
index bf06fa5..59196dd 100755
--- a/layout/layout
+++ b/layout/layout
@@ -10,7 +10,8 @@ no strict 'subs';
 our $file_lineno= 0;
 our $file_filename;
 
-our $scale= 7.0;
+our $defscale= 7.0;
+our $scale= $defscale;
 our $page_x= 0;
 our $page_y= 0;
 our $quiet=0;
@@ -241,12 +242,9 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
 our $ptscale= 72/25.4 / $scale;
 
 sub largescale_text_reduce ($) {
-    my ($maxmag) = @_;
-    # for maxmag=2
-    # scale 7: abs size 1  rel size 1      = 1
-    # scale 2: abs size 2  rel size 2*1/7  = 1    = 2/$scale
-    # scale 1: abs size 2  rel size 2*1/7  = 2/7  = 2/$scale
-    $scale < $maxmag ? ($maxmag * $scale / 7.0)." dup scale" : '';
+    my ($maxmag) = @_; # bigger means bigger letters at low reductions
+    my $scalethresh= $defscale / $maxmag;
+    $scale < $scalethresh ? ($scale / $scalethresh)." dup scale" : '';
 }
 
 our $psu_ulen= 4.5;