[Pkg-octave-commit] r1343 - in octave/trunk/debian: . in patches

[Thomas Weber]

tags 469240 pending
thanks

Author: thomas-guest
Date: 2008-03-04 08:44:59 +0000 (Tue, 04 Mar 2008)
New Revision: 1343

Added:
   octave/trunk/debian/patches/50_dont_downcase_font_names.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/octave3.0-00list
Log:
Bug fix for #469240

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-03-03 16:31:20 UTC (rev 1342)
+++ octave/trunk/debian/changelog	2008-03-04 08:44:59 UTC (rev 1343)
@@ -1,3 +1,10 @@
+octave3.0 (1:3.0.0-8) UNRELEASED; urgency=low
+
+  * Don't uppercase font names for Postscript printing (closes: #469240)
+    Thanks John Eaton for the patch.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 04 Mar 2008 10:47:33 +0100
+
 octave3.0 (1:3.0.0-7) unstable; urgency=low
 
   * debian/rules: Use correct linker option for BLAS library (closes:

Modified: octave/trunk/debian/in/octave3.0-00list
===================================================================
--- octave/trunk/debian/in/octave3.0-00list	2008-03-03 16:31:20 UTC (rev 1342)
+++ octave/trunk/debian/in/octave3.0-00list	2008-03-04 08:44:59 UTC (rev 1343)
@@ -2,3 +2,4 @@
 50_drop-lo-manpages
 50_include-cstring-mxarray
 50_clean-doc
+50_dont_downcase_font_names

Added: octave/trunk/debian/patches/50_dont_downcase_font_names.dpatch
===================================================================
--- octave/trunk/debian/patches/50_dont_downcase_font_names.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/50_dont_downcase_font_names.dpatch	2008-03-04 08:44:59 UTC (rev 1343)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_dont_downcase_font_names.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't lowercase the font names; bug fix for #469240
+## DP: Upstream patch is 71209cfdaebe, thanks John Eaton
+
+ at DPATCH@
+diff -urNad octave3.0-3.0.0~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.0/scripts/plot/__go_draw_axes__.m
+--- octave3.0-3.0.0~/scripts/plot/__go_draw_axes__.m	2007-12-18 04:48:04.000000000 +0100
++++ octave3.0-3.0.0/scripts/plot/__go_draw_axes__.m	2008-03-04 10:44:04.000000000 +0100
+@@ -1602,17 +1602,17 @@
+ 
+ function [f, s, fnt, it, bld] = get_fontname_and_size (t)
+   if (isempty (t.fontname))
+-    fnt = "helvetica";
++    fnt = "Helvetica";
+   else
+-    fnt = tolower (t.fontname);
++    fnt = t.fontname;
+   endif
+   f = fnt;
+   it = false;
+   bld = false;
+-  if (! isempty (t.fontweight) && strcmp (tolower (t.fontweight), "bold"))
++  if (! isempty (t.fontweight) && strcmpi (t.fontweight, "bold"))
+     if (! isempty(t.fontangle)
+-	&& (strcmp (tolower (t.fontangle), "italic")
+-	    || strcmp (tolower (t.fontangle), "oblique")))
++	&& (strcmpi (t.fontangle, "italic")
++	    || strcmpi (t.fontangle, "oblique")))
+       f = strcat (f, "-bolditalic");
+       it = true;
+       bld = true;
+@@ -1621,8 +1621,8 @@
+       bld = true;
+     endif
+   elseif (! isempty(t.fontangle)
+-	  && (strcmp (tolower (t.fontangle), "italic")
+-	      || strcmp (tolower (t.fontangle), "oblique")))
++	  && (strcmpi (t.fontangle, "italic")
++	      || strcmpi (t.fontangle, "oblique")))
+     f = strcat (f, "-italic");
+     it = true;
+   endif
+@@ -1640,7 +1640,7 @@
+   if (strcmp (fld, "string"))
+     [f, s, fnt, it, bld] = get_fontname_and_size (obj);
+   else
+-    f = "Helvectica";
++    f = "Helvetica";
+     s = 10;
+     fnt = f;
+     it = false;


Property changes on: octave/trunk/debian/patches/50_dont_downcase_font_names.dpatch
___________________________________________________________________
Name: svn:executable
   + *