[Pkg-octave-commit] [SCM] octave-epstk branch, master, updated. d49304a95baeb330382a9bb92a4acfbebee60083
Thomas Weber
tweber at debian.org
Sat Jan 1 21:49:19 UTC 2011
The following commit has been merged in the master branch:
commit 658f30186a1606ba0935e7d713519f3120ea5929
Author: Thomas Weber <tweber at debian.org>
Date: Sun Dec 5 23:12:55 2010 +0100
Drop patch tickless_axes
diff --git a/debian/changelog b/debian/changelog
index 92aac1a..6d5a323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ octave-epstk (2.3-1) UNRELEASED; urgency=low
- 05_faster-ebbox.patch
- 06_edsymbol-for-octave-2.9.13.patch
- plot_whole_line
+ - tickless_axes
* debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571895)
-- Thomas Weber <thomas.weber.mail at gmail.com> Sun, 28 Feb 2010 22:25:19 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 02a73ba..fc18ac6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
02_axis-value-labels.patch
03_psd-path.patch
04_source-etc-epstk-conf.patch
-tickless_axes
update_documentation
modern-str-functions
diff --git a/debian/patches/tickless_axes b/debian/patches/tickless_axes
deleted file mode 100644
index 30ba589..0000000
--- a/debian/patches/tickless_axes
+++ /dev/null
@@ -1,181 +0,0 @@
-Enables setting/removing ticks on individual axes. Thanks to Stefan
-Müller.
-
- -- Thomas Weber <thomas.weber.mail at gmail.com> Wed, 23 Apr 2008 00:01:02 +0200
-
---- a/m/eaxis.m
-+++ b/m/eaxis.m
-@@ -27,6 +27,10 @@
- %% eYAxisWestValueFormat
- %% eXAxisNorthValueFormat
- %% eYAxisEastValueFormat
-+%% eXAxisSouthTicsVisible
-+%% eYAxisWestTicsVisible
-+%% eXAxisNorthTicsVisible
-+%% eYAxisEastTicsVisible
- %% eXAxisSouthValueVisible
- %% eYAxisWestValueVisible
- %% eXAxisNorthValueVisible
-@@ -56,22 +60,40 @@
- if nargin<6
- angle=0;
- end
-+ shortTics=eAxesTicShortLength;
-+ longTics=eAxesTicLongLength;
- if type=='s'
-- valueFormat=eXAxisSouthValueFormat;
-- valueVisible=eXAxisSouthValueVisible;
-- scaleType=eXAxisSouthScaleType;
-+ valueFormat=eXAxisSouthValueFormat;
-+ valueVisible=eXAxisSouthValueVisible;
-+ scaleType=eXAxisSouthScaleType;
-+ if eXAxisSouthTicsVisible==0
-+ shortTics=0;
-+ longTics=0;
-+ end
- elseif type=='w'
-- valueFormat=eYAxisWestValueFormat;
-- valueVisible=eYAxisWestValueVisible;
-- scaleType=eYAxisWestScaleType;
-+ valueFormat=eYAxisWestValueFormat;
-+ valueVisible=eYAxisWestValueVisible;
-+ scaleType=eYAxisWestScaleType;
-+ if eYAxisWestTicsVisible==0
-+ shortTics=0;
-+ longTics=0;
-+ end
- elseif type=='n'
-- valueFormat=eXAxisNorthValueFormat;
-- valueVisible=eXAxisNorthValueVisible;
-- scaleType=eXAxisNorthScaleType;
-+ valueFormat=eXAxisNorthValueFormat;
-+ valueVisible=eXAxisNorthValueVisible;
-+ scaleType=eXAxisNorthScaleType;
-+ if eXAxisNorthTicsVisible==0
-+ shortTics=0;
-+ longTics=0;
-+ end
- else
-- valueFormat=eYAxisEastValueFormat;
-- valueVisible=eYAxisEastValueVisible;
-- scaleType=eYAxisEastScaleType;
-+ valueFormat=eYAxisEastValueFormat;
-+ valueVisible=eYAxisEastValueVisible;
-+ scaleType=eYAxisEastScaleType;
-+ if eYAxisEastTicsVisible==0
-+ shortTics=0;
-+ longTics=0;
-+ end
- end
-
- if scaleType==0
-@@ -80,8 +102,8 @@
- valueFormat,valueVisible,...
- eAxesValueFontSize*eFac,...
- eAxesLineWidth*eFac,...
-- eAxesTicShortLength*eFac,...
-- eAxesTicLongLength*eFac,...
-+ shortTics*eFac,...
-+ longTics*eFac,...
- eAxesTicLongMaxN,...
- eAxesValueSpace*eFac,...
- color);
-@@ -91,7 +113,7 @@
- valueFormat,valueVisible,...
- eAxesValueFontSize*eFac,...
- eAxesLineWidth*eFac,...
-- eAxesTicLongLength*eFac,...
-+ longTics*eFac,...
- eAxesTicLongMaxN,...
- eAxesValueSpace*eFac,...
- color);
-@@ -101,8 +123,8 @@
- valueFormat,valueVisible,...
- eAxesValueFontSize*eFac,...
- eAxesLineWidth*eFac,...
-- eAxesTicShortLength*eFac,...
-- eAxesTicLongLength*eFac,...
-+ shortTics*eFac,...
-+ longTics*eFac,...
- eAxesTicLongMaxN,...
- eAxesValueSpace*eFac,...
- color);
---- a/m/eglobpar.m
-+++ b/m/eglobpar.m
-@@ -77,6 +77,7 @@
- eXAxisSouthScale...
- eXAxisSouthScaleType...
- eXAxisSouthValueFormat...
-+eXAxisSouthTicsVisible...
- eXAxisSouthValueVisible...
- eXAxisSouthValuePos...
- eXAxisSouthLabelDistance...
-@@ -85,6 +86,7 @@
- eXAxisNorthScale...
- eXAxisNorthScaleType...
- eXAxisNorthValueFormat...
-+eXAxisNorthTicsVisible...
- eXAxisNorthValueVisible...
- eXAxisNorthValuePos...
- eXAxisNorthLabelDistance...
-@@ -94,6 +96,7 @@
- eYAxisWestScale...
- eYAxisWestScaleType...
- eYAxisWestValueFormat...
-+eYAxisWestTicsVisible...
- eYAxisWestValueVisible...
- eYAxisWestValuePos...
- eYAxisWestLabelDistance...
-@@ -102,6 +105,7 @@
- eYAxisEastScale...
- eYAxisEastScaleType...
- eYAxisEastValueFormat...
-+eYAxisEastTicsVisible...
- eYAxisEastValueVisible...
- eYAxisEastValuePos...
- eYAxisEastLabelDistance...
---- a/m/einit.m
-+++ b/m/einit.m
-@@ -196,6 +196,7 @@
- eXAxisSouthScaleType=0; % 0=linear 1=classes 2=log10
- eXAxisSouthValueFormat=-1; % n digits after decimal point,-1=auto
- % or format string of printf
-+eXAxisSouthTicsVisible=1; % 0=off 1=on
- eXAxisSouthValueVisible=1; % 0=off 1=on
- eXAxisSouthValuePos=[0 0]; % value positions after drawing of axis
- eXAxisSouthLabelDistance=2; % mm label distance from axis
-@@ -207,6 +208,7 @@
- eXAxisNorthScaleType=0; % 0=linear 1=classes 2=log10
- eXAxisNorthValueFormat=-1; % n digits after decimal point,-1=auto
- % or format string of printf
-+eXAxisNorthTicsVisible=1; % 0=off 1=on
- eXAxisNorthValueVisible=1; % 0=off 1=on
- eXAxisNorthValuePos=[0 0]; % value positions after drawing of axis
- eXAxisNorthLabelDistance=2; % mm label distance from axis
-@@ -218,6 +220,7 @@
- eYAxisWestScaleType=0; % 0=linear 1=classes 2=log10
- eYAxisWestValueFormat=-1; % n digits after decimal point,-1=auto
- % or format string of printf
-+eYAxisWestTicsVisible=1; % 0=off 1=on
- eYAxisWestValueVisible=1; % 0=off 1=on
- eYAxisWestValuePos=[0 0]; % value positions after drawing of axis
- eYAxisWestLabelDistance=6; % mm label distance from axis
-@@ -229,6 +232,7 @@
- eYAxisEastScaleType=0; % 0=linear 1=classes 2=log10
- eYAxisEastValueFormat=-1; % n digits after decimal point,-1=auto
- % or format string of printf
-+eYAxisEastTicsVisible=1; % 0=off 1=on
- eYAxisEastValueVisible=1; % 0=off 1=on
- eYAxisEastValuePos=[0 0]; % value positions after drawing of axis
- eYAxisEastLabelDistance=6; % mm label distance from axis
---- a/m/escalelog.m
-+++ b/m/escalelog.m
-@@ -19,7 +19,7 @@
- longTicOffset=-(offset+longTicLength+space);
- moveForm=sprintf('%%1.2f %1.2f moveto\n',-offset);
- ticLineForm='0 %1.2f neg rlineto\n';
-- moveValueForm=sprintf('0 -%1.2f rmoveto\n',space+fontSize*0.72);
-+ moveValueForm=sprintf('0 -%1.2f rmoveto\n',space+fontSize);
- showForm='(%s) dup stringwidth pop dup 2 div sub neg 0 rmoveto show\n';
- showFormE='dup 2 div sub neg 0 rmoveto (%s) show\n';
- elseif side=='n'
--
octave-epstk
More information about the Pkg-octave-commit
mailing list