Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/octave/files: octave-3.6.4-texinfo.patch
Date: Wed, 22 May 2013 04:27:17
Message-Id: 20130522042711.C23982171D@flycatcher.gentoo.org
1 bicatali 13/05/22 04:27:11
2
3 Added: octave-3.6.4-texinfo.patch
4 Log:
5 Fixed texinfo build thanks Denis Duchier (bug #465536)
6
7 (Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
8
9 Revision Changes Path
10 1.1 sci-mathematics/octave/files/octave-3.6.4-texinfo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch?rev=1.1&content-type=text/plain
14
15 Index: octave-3.6.4-texinfo.patch
16 ===================================================================
17 diff -ur octave-3.6.4-orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpreter/audio.texi
18 --- octave-3.6.4-orig/doc/interpreter/audio.texi 2013-02-21 21:37:50.000000000 +0100
19 +++ octave-3.6.4/doc/interpreter/audio.texi 2013-05-01 23:23:21.338665377 +0200
20 @@ -146,18 +146,18 @@
21 Load the RIFF/WAVE sound file @var{filename}, and return the samples
22 in vector @var{y}. If the file contains multichannel data, then
23 @var{y} is a matrix with the channels represented as columns.
24 -
25 -@deftypefnx {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
26 +@end deftypefn
27 +@deftypefn {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
28 Additionally return the sample rate (@var{fs}) in Hz and the number of bits
29 per sample (@var{bps}).
30 -
31 -@deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
32 +@end deftypefn
33 +@deftypefn {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
34 Read only the first @var{n} samples from each channel.
35 -
36 -@deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
37 +@end deftypefn
38 +@deftypefn {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
39 Read only samples @var{n1} through @var{n2} from each channel.
40 -
41 -@deftypefnx {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
42 +@end deftypefn
43 +@deftypefn {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
44 Return the number of samples (@var{n}) and channels (@var{ch})
45 instead of the audio data.
46 @seealso{@ref{doc-wavwrite,,wavwrite}}
47 diff -ur octave-3.6.4-orig/doc/interpreter/io.texi octave-3.6.4/doc/interpreter/io.texi
48 --- octave-3.6.4-orig/doc/interpreter/io.texi 2013-02-21 21:37:51.000000000 +0100
49 +++ octave-3.6.4/doc/interpreter/io.texi 2013-05-01 22:59:08.537582265 +0200
50 @@ -1391,22 +1391,22 @@
51 for the file. Valid values for @var{arch} are:
52
53 @table @asis
54 -@samp{native}
55 +@item @samp{native}
56 The format of the current machine (this is the default).
57
58 -@samp{ieee-be}
59 +@item @samp{ieee-be}
60 IEEE big endian format.
61
62 -@samp{ieee-le}
63 +@item @samp{ieee-le}
64 IEEE little endian format.
65
66 -@samp{vaxd}
67 +@item @samp{vaxd}
68 VAX D floating format.
69
70 -@samp{vaxg}
71 +@item @samp{vaxg}
72 VAX G floating format.
73
74 -@samp{cray}
75 +@item @samp{cray}
76 Cray floating format.
77 @end table
78
79 diff -ur octave-3.6.4-orig/doc/interpreter/octave.texi octave-3.6.4/doc/interpreter/octave.texi
80 --- octave-3.6.4-orig/doc/interpreter/octave.texi 2013-02-21 21:19:23.000000000 +0100
81 +++ octave-3.6.4/doc/interpreter/octave.texi 2013-05-01 22:58:26.561420772 +0200
82 @@ -129,7 +129,9 @@
83 @sp 2
84 @multitable @columnfractions 0.4 0.025 0.65
85 @item
86 -@flushright @image{octave_logo,2.1in} @end flushright
87 +@flushright
88 +@image{octave_logo,2.1in}
89 +@end flushright
90 @tab
91 @c this is a spacer column
92 @tab
93 diff -ur octave-3.6.4-orig/doc/interpreter/plot.texi octave-3.6.4/doc/interpreter/plot.texi
94 --- octave-3.6.4-orig/doc/interpreter/plot.texi 2013-02-21 21:37:52.000000000 +0100
95 +++ octave-3.6.4/doc/interpreter/plot.texi 2013-05-01 23:07:36.586442176 +0200
96 @@ -2707,21 +2707,20 @@
97 Set the data aspect ratio of the current axes. The aspect ratio is
98 a normalized 3-element vector representing the span of the x, y, and
99 z-axes limits.
100 -
101 -@deftypefnx {Function File} {@var{data_aspect_ratio} =} daspect ( )
102 +@end deftypefn
103 +@deftypefn {Function File} {@var{data_aspect_ratio} =} daspect ( )
104 Return the data aspect ratio of the current axes.
105 -
106 -@deftypefnx {Function File} {} daspect (@var{mode})
107 +@end deftypefn
108 +@deftypefn {Function File} {} daspect (@var{mode})
109 Set the data aspect ratio mode of the current axes.
110 -
111 -@deftypefnx {Function File} {@var{data_aspect_ratio_mode} =} daspect ("mode")
112 +@end deftypefn
113 +@deftypefn {Function File} {@var{data_aspect_ratio_mode} =} daspect ("mode")
114 Return the data aspect ratio mode of the current axes.
115 -
116 -@deftypefnx {Function File} {} daspect (@var{hax}, @dots{})
117 +@end deftypefn
118 +@deftypefn {Function File} {} daspect (@var{hax}, @dots{})
119 Use the axes, with handle @var{hax}, instead of the current axes.
120 -
121 -@seealso{@ref{doc-axis,,axis}, @ref{doc-pbaspect,,pbaspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
122 @end deftypefn
123 +@seealso{@ref{doc-axis,,axis}, @ref{doc-pbaspect,,pbaspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
124
125
126 @c pbaspect scripts/plot/pbaspect.m
127 @@ -2730,21 +2729,20 @@
128 Set the plot box aspect ratio of the current axes. The aspect ratio
129 is a normalized 3-element vector representing the rendered lengths of
130 the x, y, and z-axes.
131 -
132 -@deftypefnx {Function File} {@var{plot_box_aspect_ratio} =} pbaspect ( )
133 +@end deftypefn
134 +@deftypefn {Function File} {@var{plot_box_aspect_ratio} =} pbaspect ( )
135 Return the plot box aspect ratio of the current axes.
136 -
137 -@deftypefnx {Function File} {} pbaspect (@var{mode})
138 +@end deftypefn
139 +@deftypefn {Function File} {} pbaspect (@var{mode})
140 Set the plot box aspect ratio mode of the current axes.
141 -
142 -@deftypefnx {Function File} {@var{plot_box_aspect_ratio_mode} =} pbaspect ("mode")
143 +@end deftypefn
144 +@deftypefn {Function File} {@var{plot_box_aspect_ratio_mode} =} pbaspect ("mode")
145 Return the plot box aspect ratio mode of the current axes.
146 -
147 -@deftypefnx {Function File} {} pbaspect (@var{hax}, @dots{})
148 +@end deftypefn
149 +@deftypefn {Function File} {} pbaspect (@var{hax}, @dots{})
150 Use the axes, with handle @var{hax}, instead of the current axes.
151 -
152 -@seealso{@ref{doc-axis,,axis}, @ref{doc-daspect,,daspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
153 @end deftypefn
154 +@seealso{@ref{doc-axis,,axis}, @ref{doc-daspect,,daspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
155
156
157 @node Three-dimensional Function Plotting
158 @@ -3147,7 +3145,7 @@
159 @item "hide"
160 Hide legend on the plot
161
162 -@itemx "toggle"
163 +@item "toggle"
164 Toggles between "hide" and "show"
165
166 @item "boxon"
167 @@ -3162,7 +3160,7 @@
168 @item "right"
169 Place text to the right of the keys
170
171 -@itemx "off"
172 +@item "off"
173 Delete the legend object
174 @end table
175 @end deftypefn
176 @@ -4139,11 +4137,11 @@
177 is sent to a file the size is determined by the plot box defined by
178 the figure's "paperposition" property.
179
180 -@itemx -append
181 +@item -append
182 Appends the PS, or PDF output to a pre-existing file of the
183 same type.
184
185 -@itemx -r@var{NUM}
186 +@item -r@var{NUM}
187 Resolution of bitmaps in pixels per inch. For both metafiles and
188 SVG the default is the screen resolution, for other it is 150 dpi.
189 To specify screen resolution, use "-r0".
190 @@ -6296,15 +6294,15 @@
191 A character indicating a plot marker to be place at each data point, or
192 @code{"none"}, meaning no markers should be displayed.
193
194 -@itemx markeredgecolor
195 +@item markeredgecolor
196 The color of the edge around the marker, or @code{"auto"}, meaning that
197 the edge color is the same as the face color. @xref{Colors}.
198
199 -@itemx markerfacecolor
200 +@item markerfacecolor
201 The color of the marker, or @code{"none"} to indicate that the marker
202 should not be filled. @xref{Colors}.
203
204 -@itemx markersize
205 +@item markersize
206 A number specifying the size of the marker. The default is 1. A value
207 of 2 is twice as large as the default, etc.
208 @end table
209 @@ -6442,7 +6440,8 @@
210 @deftypefn {Function File} {@var{value} =} getappdata (@var{h}, @var{name})
211 Return the @var{value} for named application data for the object(s) with
212 handle(s) @var{h}.
213 -@deftypefnx {Function File} {@var{appdata} =} getappdata (@var{h})
214 +@end deftypefn
215 +@deftypefn {Function File} {@var{appdata} =} getappdata (@var{h})
216 Return a structure, @var{appdata}, whose fields correspond to the appdata
217 properties.
218 @end deftypefn
219 diff -ur octave-3.6.4-orig/doc/interpreter/poly.texi octave-3.6.4/doc/interpreter/poly.texi
220 --- octave-3.6.4-orig/doc/interpreter/poly.texi 2013-02-21 21:37:52.000000000 +0100
221 +++ octave-3.6.4/doc/interpreter/poly.texi 2013-05-01 23:28:59.515000917 +0200
222 @@ -82,8 +82,8 @@
223 (@var{x}-@var{mu}(1))/@var{mu}(2).
224 If @var{x} is a vector or matrix, the polynomial is evaluated for each of
225 the elements of @var{x}.
226 -
227 -@deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
228 +@end deftypefn
229 +@deftypefn {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
230 @deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s}, @var{mu})
231 In addition to evaluating the polynomial, the second output
232 represents the prediction interval, @var{y} +/- @var{dy}, which
233 diff -ur octave-3.6.4-orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter/set.texi
234 --- octave-3.6.4-orig/doc/interpreter/set.texi 2013-02-21 21:37:52.000000000 +0100
235 +++ octave-3.6.4/doc/interpreter/set.texi 2013-05-01 23:30:00.161810855 +0200
236 @@ -150,8 +150,9 @@
237 3 4
238 @end group
239 @end example
240 +@end deftypefn
241
242 -@deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
243 +@deftypefn {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
244
245 Return index vectors @var{ia} and @var{ib} such that @code{a(ia)} and
246 @code{b(ib)} are disjoint sets whose union is @var{c}.
247 diff -ur octave-3.6.4-orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpreter/signal.texi
248 --- octave-3.6.4-orig/doc/interpreter/signal.texi 2013-02-21 21:37:52.000000000 +0100
249 +++ octave-3.6.4/doc/interpreter/signal.texi 2013-05-01 23:31:41.111833440 +0200
250 @@ -454,17 +454,17 @@
251
252 For fastest computation, @var{n} should factor into a small number of
253 small primes.
254 -
255 -@deftypefnx {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
256 +@end deftypefn
257 +@deftypefn {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
258 Evaluate the response at the specific frequencies in the vector @var{w}.
259 The values for @var{w} are measured in radians.
260 -
261 -@deftypefnx {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
262 +@end deftypefn
263 +@deftypefn {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
264 Return frequencies in Hz instead of radians assuming a sampling rate
265 @var{Fs}. If you are evaluating the response at specific frequencies
266 @var{w}, those frequencies should be requested in Hz rather than radians.
267 -
268 -@deftypefnx {Function File} {} freqz (@dots{})
269 +@end deftypefn
270 +@deftypefn {Function File} {} freqz (@dots{})
271 Plot the pass band, stop band and phase response of @var{h} rather
272 than returning them.
273 @end deftypefn
274 diff -ur octave-3.6.4-orig/doc/interpreter/strings.texi octave-3.6.4/doc/interpreter/strings.texi
275 --- octave-3.6.4-orig/doc/interpreter/strings.texi 2013-02-21 21:37:52.000000000 +0100
276 +++ octave-3.6.4/doc/interpreter/strings.texi 2013-05-01 22:27:29.646311770 +0200
277 @@ -1136,7 +1136,7 @@
278 @item %s
279 The word is parsed as a string.
280
281 -@itemx %f
282 +@item %f
283 @itemx %n
284 The word is parsed as a number and converted to double.
285
286 diff -ur octave-3.6.4-orig/doc/interpreter/system.texi octave-3.6.4/doc/interpreter/system.texi
287 --- octave-3.6.4-orig/doc/interpreter/system.texi 2013-02-21 21:37:52.000000000 +0100
288 +++ octave-3.6.4/doc/interpreter/system.texi 2013-05-01 23:45:09.981978551 +0200
289 @@ -839,7 +839,7 @@
290 @deftypefnx {Function File} {} datetick (@var{axis}, @var{form})
291 @deftypefnx {Function File} {} datetick (@dots{}, "keeplimits")
292 @deftypefnx {Function File} {} datetick (@dots{}, "keepticks")
293 -@deftypefnx {Function File} {} datetick (@dots{ax}, @dots{})
294 +@comment @deftypefnx {Function File} {} datetick (@dots{ax}, @dots{})
295 Add date formatted tick labels to an axis. The axis the apply the
296 ticks to is determined by @var{axis} that can take the values "x",
297 "y" or "z". The default value is "x". The formatting of the labels is
298 @@ -1261,9 +1261,10 @@
299 interpreted as filename globbing patterns (as they are used by Unix shells).
300 Within a pattern
301 @table @code
302 -@itemx *
303 +
304 +@item *
305 matches any string, including the null string,
306 -@itemx ?
307 +@item ?
308 matches any single character, and
309
310 @item [@dots{}]
311 @@ -2789,8 +2790,8 @@
312 Display a header containing the current Octave version number, license
313 string and operating system, followed by the installed package names,
314 versions, and installation directories.
315 -
316 -@deftypefnx {Function File} {v =} ver ()
317 +@end deftypefn
318 +@deftypefn {Function File} {v =} ver ()
319 Return a vector of structures, respecting Octave and each installed package.
320 The structure includes the following fields.
321
322 @@ -2807,11 +2808,11 @@
323 @item Date
324 Date respecting the version/revision.
325 @end table
326 -
327 -@deftypefnx {Function File} {v =} ver ("Octave")
328 +@end deftypefn
329 +@deftypefn {Function File} {v =} ver ("Octave")
330 Return version information for Octave only.
331 -
332 -@deftypefnx {Function File} {v =} ver (@var{package})
333 +@end deftypefn
334 +@deftypefn {Function File} {v =} ver (@var{package})
335 Return version information for @var{package}.
336
337 @seealso{@ref{doc-version,,version}, @ref{doc-octave_config_info,,octave_config_info}}
338 @@ -2878,19 +2879,19 @@
339 @anchor{doc-license}
340 @deftypefn {Function File} {} license
341 Display the license of Octave.
342 -
343 -@deftypefnx {Function File} {} license ("inuse")
344 +@end deftypefn
345 +@deftypefn {Function File} {} license ("inuse")
346 Display a list of packages currently being used.
347 -
348 -@deftypefnx {Function File} {@var{retval} =} license ("inuse")
349 +@end deftypefn
350 +@deftypefn {Function File} {@var{retval} =} license ("inuse")
351 Return a structure containing the fields @code{feature} and @code{user}.
352 -
353 -@deftypefnx {Function File} {@var{retval} =} license ("test", @var{feature})
354 +@end deftypefn
355 +@deftypefn {Function File} {@var{retval} =} license ("test", @var{feature})
356 Return 1 if a license exists for the product identified by the string
357 @var{feature} and 0 otherwise. The argument @var{feature} is case
358 insensitive and only the first 27 characters are checked.
359 -
360 -@deftypefnx {Function File} {} license ("test", @var{feature}, @var{toggle})
361 +@end deftypefn
362 +@deftypefn {Function File} {} license ("test", @var{feature}, @var{toggle})
363 Enable or disable license testing for @var{feature}, depending on
364 @var{toggle}, which may be one of:
365
366 @@ -2902,8 +2903,8 @@
367 @item "disable"
368 Future tests for the specified license of @var{feature} return 0.
369 @end table
370 -
371 -@deftypefnx {Function File} {@var{retval} =} license ("checkout", @var{feature})
372 +@end deftypefn
373 +@deftypefn {Function File} {@var{retval} =} license ("checkout", @var{feature})
374 Check out a license for @var{feature}, returning 1 on success and 0
375 on failure.