summaryrefslogtreecommitdiffstats
path: root/scilab/modules/helptools
diff options
context:
space:
mode:
authorClément David <clement.david@esi-group.com>2021-07-15 15:50:48 +0200
committerClément David <clement.david@esi-group.com>2021-07-15 15:50:48 +0200
commit81a9cc049332de0c712cf56da585fcd25c8e59e3 (patch)
treef365c25a05c1782a16b2985bf7481116c106952d /scilab/modules/helptools
parentb0937f19e4b8ddf416ca9a9a433bcbbd3f4ef2c0 (diff)
parent90b4ecb9b57ac6ad4e00d4a99b0d8bd1a6424403 (diff)
downloadscilab-master.zip
scilab-master.tar.gz
Merge remote-tracking branch 'origin/6.1'HEADmaster
Change-Id: I5d26fc380a28efe0bb6d0096fe9684b274b55bfe
Diffstat (limited to 'scilab/modules/helptools')
-rw-r--r--scilab/modules/helptools/Makefile.in2
-rw-r--r--scilab/modules/helptools/data/configuration/scilab_macros.txt1
-rw-r--r--scilab/modules/helptools/data/external2scilab_equiv.csv257
-rw-r--r--scilab/modules/helptools/etc/images_md5.txt98
-rw-r--r--scilab/modules/helptools/images/EXPRESSION.zcos.pngbin0 -> 20650 bytes
-rw-r--r--scilab/modules/helptools/images/MAXMIN.pngbin5942 -> 5667 bytes
-rw-r--r--scilab/modules/helptools/images/OpAmp.pngbin3722 -> 2703 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_INTEGRAL_m.xml_1.pngbin0 -> 1353 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_beta.xml_1.pngbin0 -> 2551 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_binomial.xml_1.pngbin0 -> 1960 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_bsplin3val.xml_1.pngbin0 -> 2468 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_cumsum.xml_1.pngbin999 -> 977 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_cumsum.xml_2.pngbin1067 -> 1100 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_cumsum.xml_3.pngbin1210 -> 1285 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_cumsum.xml_4.pngbin1093 -> 1136 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_cumsum.xml_5.pngbin1304 -> 1310 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_cumsum.xml_6.pngbin1633 -> 1642 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_dlgamma.xml_1.pngbin0 -> 1058 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_gamma.xml_1.pngbin0 -> 1563 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_gamma.xml_2.pngbin0 -> 1920 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_gamma.xml_3.pngbin0 -> 2200 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_gamma.xml_4.pngbin0 -> 2359 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_gamma.xml_5.pngbin0 -> 2298 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_gamma.xml_6.pngbin0 -> 1214 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_1.pngbin385 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_10.pngbin1300 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_11.pngbin385 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_12.pngbin757 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_13.pngbin773 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_14.pngbin482 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_15.pngbin410 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_16.pngbin940 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_17.pngbin1002 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_18.pngbin1165 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_19.pngbin1194 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_2.pngbin385 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_20.pngbin1606 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_3.pngbin556 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_4.pngbin435 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_5.pngbin1113 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_6.pngbin1123 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_7.pngbin1110 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_8.pngbin1325 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_interp.xml_9.pngbin1315 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_legendre.xml_1.pngbin0 -> 1810 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_legendre.xml_2.pngbin0 -> 3629 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_lsq_splin.xml_1.pngbin0 -> 2724 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_splin.xml_1.pngbin0 -> 1230 bytes
-rw-r--r--scilab/modules/helptools/images/_LaTeX_splin2d.xml_1.pngbin0 -> 2612 bytes
-rw-r--r--scilab/modules/helptools/images/beta_equation1.mml.pngbin1587 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/binomial_equation_1_en_US.mml.pngbin1826 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/binomial_equation_1_ru_RU.mml.pngbin1753 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/bode_en_US_3.pngbin15600 -> 11288 bytes
-rw-r--r--scilab/modules/helptools/images/bode_fr_FR_3.pngbin15600 -> 10837 bytes
-rw-r--r--scilab/modules/helptools/images/bode_ja_JP_3.pngbin15600 -> 11689 bytes
-rw-r--r--scilab/modules/helptools/images/bode_pt_BR_3.pngbin15600 -> 11113 bytes
-rw-r--r--scilab/modules/helptools/images/bode_ru_RU_3.pngbin15600 -> 11011 bytes
-rw-r--r--scilab/modules/helptools/images/bsplin3val_equation1.mml.pngbin1320 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/colormap_1.pngbin69941 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/colormap_en_US_1.pngbin0 -> 25128 bytes
-rw-r--r--scilab/modules/helptools/images/colormap_fr_FR_1.pngbin0 -> 25128 bytes
-rw-r--r--scilab/modules/helptools/images/colormap_ja_JP_1.pngbin0 -> 25128 bytes
-rw-r--r--scilab/modules/helptools/images/colormap_pt_BR_1.pngbin0 -> 25128 bytes
-rw-r--r--scilab/modules/helptools/images/colormap_ru_RU_1.pngbin0 -> 25128 bytes
-rw-r--r--scilab/modules/helptools/images/dlgamma_equation1.mml.pngbin1029 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/gamma_1.pngbin14068 -> 13679 bytes
-rw-r--r--scilab/modules/helptools/images/gamma_2.pngbin0 -> 149326 bytes
-rw-r--r--scilab/modules/helptools/images/gamma_3.pngbin0 -> 159755 bytes
-rw-r--r--scilab/modules/helptools/images/gamma_equation1.mml.pngbin1016 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/getcolor.pngbin0 -> 6483 bytes
-rw-r--r--scilab/modules/helptools/images/integral_m.mml.pngbin924 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/legendre_equation1.mml.pngbin1187 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/legendre_equation2.mml.pngbin2185 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/linear_interpn_equation1.mml.pngbin1233 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/linear_interpn_equation2.mml.pngbin2949 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/linear_interpn_equation3.mml.pngbin1510 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/loglog_1.pngbin0 -> 9624 bytes
-rw-r--r--scilab/modules/helptools/images/lsq_splin_equation1.mml.pngbin1616 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/mapsound_1.pngbin5863 -> 14104 bytes
-rw-r--r--scilab/modules/helptools/images/mapsound_2.pngbin0 -> 14618 bytes
-rw-r--r--scilab/modules/helptools/images/mapsound_3.pngbin0 -> 47644 bytes
-rw-r--r--scilab/modules/helptools/images/mapsound_4.pngbin0 -> 28316 bytes
-rw-r--r--scilab/modules/helptools/images/mapsound_5.pngbin0 -> 59856 bytes
-rw-r--r--scilab/modules/helptools/images/plot_10.pngbin16275 -> 23701 bytes
-rw-r--r--scilab/modules/helptools/images/plot_11.pngbin0 -> 16275 bytes
-rw-r--r--scilab/modules/helptools/images/plot_5.pngbin17169 -> 19200 bytes
-rw-r--r--scilab/modules/helptools/images/plot_6.pngbin21032 -> 16900 bytes
-rw-r--r--scilab/modules/helptools/images/plot_7.pngbin18273 -> 21032 bytes
-rw-r--r--scilab/modules/helptools/images/plot_8.pngbin29523 -> 18273 bytes
-rw-r--r--scilab/modules/helptools/images/plot_9.pngbin23701 -> 29523 bytes
-rw-r--r--scilab/modules/helptools/images/polyline_properties_1.pngbin2905 -> 2919 bytes
-rw-r--r--scilab/modules/helptools/images/scatter3d_1.pngbin40263 -> 60375 bytes
-rw-r--r--scilab/modules/helptools/images/scatter3d_2.pngbin39183 -> 56944 bytes
-rw-r--r--scilab/modules/helptools/images/scatter3d_3.pngbin45296 -> 52025 bytes
-rw-r--r--scilab/modules/helptools/images/scatter3d_4.pngbin43307 -> 48401 bytes
-rw-r--r--scilab/modules/helptools/images/scatter3d_5.pngbin38035 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/scatter3d_6.pngbin48066 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/scatter3d_7.pngbin70876 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/scatter3d_8.pngbin39183 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/scatter3d_9.pngbin41225 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/scatter_1.pngbin14717 -> 73482 bytes
-rw-r--r--scilab/modules/helptools/images/scatter_2.pngbin12110 -> 36714 bytes
-rw-r--r--scilab/modules/helptools/images/scatter_3.pngbin18049 -> 24354 bytes
-rw-r--r--scilab/modules/helptools/images/scatter_4.pngbin18612 -> 36616 bytes
-rw-r--r--scilab/modules/helptools/images/scatter_5.pngbin10000 -> 26814 bytes
-rw-r--r--scilab/modules/helptools/images/scatter_6.pngbin20072 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/scatter_7.pngbin12887 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/scatter_8.pngbin10073 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/scatter_9.pngbin20405 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/semilogx_1.pngbin0 -> 8792 bytes
-rw-r--r--scilab/modules/helptools/images/semilogy_1.pngbin0 -> 7833 bytes
-rw-r--r--scilab/modules/helptools/images/sgolay_1.pngbin0 -> 19132 bytes
-rw-r--r--scilab/modules/helptools/images/sgolay_2.pngbin0 -> 27481 bytes
-rw-r--r--scilab/modules/helptools/images/sgolaydiff_1.pngbin0 -> 24368 bytes
-rw-r--r--scilab/modules/helptools/images/sgolayfilt_1.pngbin0 -> 19063 bytes
-rw-r--r--scilab/modules/helptools/images/splin2d_equation_1.mml.pngbin1706 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/splin3d_equation1.mml.pngbin1225 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/splin3d_pt_BR_1.pngbin0 -> 37286 bytes
-rw-r--r--scilab/modules/helptools/images/splin_equation1.mml.pngbin1217 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/splin_equation2.mml.pngbin954 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/splin_equation3.mml.pngbin677 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/splin_equation4.mml.pngbin776 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/splin_equation5.mml.pngbin1851 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/syslin_equation_1.mml.pngbin1291 -> 0 bytes
-rw-r--r--scilab/modules/helptools/images/uigetcolor_1.pngbin0 -> 10944 bytes
-rw-r--r--scilab/modules/helptools/images/uigetcolor_RGB.pngbin0 -> 15650 bytes
-rw-r--r--scilab/modules/helptools/images/x_matrix_booleans.pngbin0 -> 4139 bytes
-rw-r--r--scilab/modules/helptools/images/x_matrix_complex.pngbin0 -> 7592 bytes
-rw-r--r--scilab/modules/helptools/images/x_matrix_header_scrollbars.pngbin0 -> 8061 bytes
-rw-r--r--scilab/modules/helptools/images/x_matrix_integers.pngbin0 -> 5218 bytes
-rw-r--r--scilab/modules/helptools/images/x_matrix_reals.pngbin0 -> 6417 bytes
-rw-r--r--scilab/modules/helptools/images/x_matrix_text.pngbin0 -> 6660 bytes
-rw-r--r--scilab/modules/helptools/macros/add_help_chapter.sci9
-rw-r--r--scilab/modules/helptools/macros/help.sci85
-rw-r--r--scilab/modules/helptools/macros/helpbrowser_menus_cb.sci11
-rw-r--r--scilab/modules/helptools/macros/helpbrowser_update.sci45
-rw-r--r--scilab/modules/helptools/src/java/jflex/c.jflex4
-rw-r--r--scilab/modules/helptools/src/java/jflex/function.jflex3
-rw-r--r--scilab/modules/helptools/src/java/jflex/java.jflex5
-rw-r--r--scilab/modules/helptools/src/java/jflex/scilab.jflex2
-rw-r--r--scilab/modules/helptools/src/java/jflex/xml.jflex2
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java1272
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java2181
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/c/CLexer.java8870
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/java/JavaLexer.java2244
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/scilab/ScilabLexer.java8642
-rw-r--r--scilab/modules/helptools/tests/nonreg_tests/bug_10455.tst91
147 files changed, 5585 insertions, 18239 deletions
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index cc914f6..4688890 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -443,9 +443,11 @@ NMEDIT = @NMEDIT@
443OBJDUMP = @OBJDUMP@ 443OBJDUMP = @OBJDUMP@
444OBJEXT = @OBJEXT@ 444OBJEXT = @OBJEXT@
445OCAMLC = @OCAMLC@ 445OCAMLC = @OCAMLC@
446OCAMLCFLAGS = @OCAMLCFLAGS@
446OCAMLDEP = @OCAMLDEP@ 447OCAMLDEP = @OCAMLDEP@
447OCAMLLEX = @OCAMLLEX@ 448OCAMLLEX = @OCAMLLEX@
448OCAMLOPT = @OCAMLOPT@ 449OCAMLOPT = @OCAMLOPT@
450OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
449OCAMLYACC = @OCAMLYACC@ 451OCAMLYACC = @OCAMLYACC@
450OPENMPI_CC = @OPENMPI_CC@ 452OPENMPI_CC = @OPENMPI_CC@
451OPENMPI_CFLAGS = @OPENMPI_CFLAGS@ 453OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
diff --git a/scilab/modules/helptools/data/configuration/scilab_macros.txt b/scilab/modules/helptools/data/configuration/scilab_macros.txt
index 382907c..6534624 100644
--- a/scilab/modules/helptools/data/configuration/scilab_macros.txt
+++ b/scilab/modules/helptools/data/configuration/scilab_macros.txt
@@ -571,6 +571,7 @@ pfactors
571pol2des 571pol2des
572pol2str 572pol2str
573polfact 573polfact
574polyint
574rowcompr 575rowcompr
575sylm 576sylm
576systmat 577systmat
diff --git a/scilab/modules/helptools/data/external2scilab_equiv.csv b/scilab/modules/helptools/data/external2scilab_equiv.csv
new file mode 100644
index 0000000..10562a8
--- /dev/null
+++ b/scilab/modules/helptools/data/external2scilab_equiv.csv
@@ -0,0 +1,257 @@
1all;and;
2angle;atan;
3any;or;
4argv;sciargs;// Octave
5arrayfun;feval;
6atan2;atan;
7axes;newaxes;
8axis;replot;
9balance;balanc;
10bicg;conjgrad;
11bicgstab;conjgrad;
12blkdiag;blockdiag;
13box;gca;
14caxis;colorbar;
15celldisp;disp;
16cgs;conjgrad;
17charpoly;poly;
18chebwin;window;
19cla;delete;
20class;typeof;
21clear global;clearglobal;
22closereq;xdel;
23colormap;jetcolormap;
24columns;size;// Octave
25commandhistory;browsehistory;
26compan;companion;
27completion_matches;completion;// Octave
28computer;getos;
29contains;grep;
30contourc;contour2di;
31contour3;contour;
32cot;cotg;
33copyobj;copy;
34cputime;timer;
35csvread;csvRead;
36dbclear;debug;
37dbcont;resume;
38dbquit;abort;
39dbstack;where;
40dbstatus;debug;
41dbstop;debug;
42dbup;return;
43deal;brackets;
44deblank;stripblanks;
45demo;demo_gui;
46dlmwrite;fprintfMat;
47echo;mode;
48eig;eigs;
49ellipj;amell;
50ellipke;percentk;
51endsWith;grep;
52eps;percenteps;
53erase;strsubst;
54errorbar;errbar;
55errordlg;messagebox;
56exist;exists;
57extractAfter;regexp;
58extractBefore;regexp;
59false;percentf;
60fclose;mclose;
61feof;meof;
62fftn;fft;
63fgetl;mgetl;
64fgets;mgetl;
65fill;xfpolys;
66flintmax;number_properties;
67flip;flipdim;
68flipud;flipdim;
69fliplr;flipdim;
70fopen;mopen;
71fplot;plot;
72fputs;mputstr;// Octave
73fread;mget;
74frewind;mseek;
75func2str;macr2tree;
76fwrite;mput;
77fzero;fsolve;
78gallery;testmatrix;
79gammainc;cdfgam;
80get_home_directory;home;// Octave
81getpref;xmlGetValues;
82ginput;locate;
83grid;xgrid;
84gtext;legends;
85help;uman;// Octave
86helpdlg;messagebox;
87helpwin;help;
88hggroup;glue;
89hgload;load;
90hgsave;save;
91hist;histplot;
92histcounts;histc;
93hold;axes_properties;
94housh;householder;// Octave
95horzcat;cat;
96i;percenti;
97ifft2;ifft;
98ifftn;ifft;
99image;Matplot;
100imagesc;Matplot1;
101index;strindex;// Octave
102inf;percentinf;
103int2str;string;
104intmin;int8;
105intmax;int8;
106invfeqz;frfit;
107is_absolute_filename;is_absolute_path;// Octave
108isa;m2sci_isa;
109isalnum;isalphanum;// Octave
110iscell;typeof;
111iscellstr;typeof;
112isfolder;isdir;
113isgraphics;is_handle_valid;// Octave
114isguirunning;getscilabmode;// Octave
115ishghandle;is_handle_valid;
116isinteger;type;
117isjava;typeof;
118iskeyword;getscilabkeywords;
119ismac;getos;
120ismember;members;
121ispc;getos;
122isunix;getos;
123is_valid_file_id;file;// Octave
124j;percenti;
125join;strcat;
126kaiser;window;
127keyboard;pause;
128listdlg;x_choose;
129loglog;plot;
130lookfor;apropos;
131lower;convstr;
132lstat;fileinfo;// Octave
133magic;testmatrix;
134mat2str;sci2exp;
135matlabroot;SCI;
136msgbox;messagebox;
137mfilename;get_absolute_file_path;
138mod;pmodulo;
139more;lines;
140nan;percentnan;
141nanmin;min;
142nanmax;max;
143nargin;argn;
144nargout;argn;
145newline;ascii;
146nonzeros;spget;
147num2str;string;
148numel;size;
149OCTAVE_HOME;SCIHOME;// Octave
150ode23;ode;
151ode45;ode;
152ode113;ode;
153ode15s;ode;
154odeget;odeoptions;
155openvar;editvar;
156paddarray;resize_matrix;
157patch;xfpolys;
158pcg;conjgrad;
159pi;percentpi;
160pkg;atoms;// Octave
161planerot;givens;
162plot3;param3d;
163plottools;ged;
164polar;polarplot;
165polyarea;polygonmetrics;
166polyder;derivat;
167polygcd;gcd;// Octave
168polyval;horner;
169prctile;perctl;
170printdlg;toprint;
171psi;dlgamma;
172puts;mprintf;
173questdlg;messagebox;
174quiver;champ;
175rande;grand;// Octave
176randg;grand;
177randi;grand;
178randn;rand;
179randp;grand;// Octave
180randperm;grand;
181range;strange;
182residue;pfss;
183rbbox;rubberbox;
184realmax;number_properties;
185realmin;number_properties;
186regexprep;strsubst;
187rem;modulo;
188replace;strsubst;
189reshape;matrix;
190reverse;strrev;
191rmfield;null;
192rot90;flipdim;
193rows;size;// Octave
194run;exec;
195semilogx;plot;
196semilogy;plot;
197shg;show_window;
198skrewness;cmoment;// Octave
199sort;gsort;
200sortrows;gsort;
201source;exec;// Octave
202spalloc;spzeros;
203spdiags;diag;
204splitlines;strsplit;
205sprandn;sprand;
206sprandsym;sprand;
207spy;PlotSparse;
208stairs;plot2d2;
209startsWith;grep;
210stat;fileinfo;// Octave
211std;stdev;
212stdin;percentio;// Octave
213stdout;percentio;// Octave
214stderr;percentio;// Octave
215stem;plot2d3;
216str2func;execstr;
217strfind;strindex;
218strings;emptystr;
219strjoin;strcat;
220strjust;justify;
221strlength;length;
222strread;msscanf;
223strrep;strsubst;
224strtrim;stripblanks;
225strtrunc;strncpy;// Octave
226surf2patch;genfac3d;
227switch;select;
228tempdir;TMPDIR;
229terminal_size;lines;// Octave
230texlabel;math_rendering_features_in_graphic;
231text;xstring;
232textscan;msprintf;
233time;getdate;// Octave
234tolower;convstr;// Octave
235toupper;convstr;// Octave
236trapz;inttrap;
237true;percentt;
238tukeywin;window;
239typeinfo;typeof;// Octave
240uisetcolor;uigetcolor;
241uitable;uicontrol;
242unix;unix_g;
243upper;convstr;
244urlread;getURL;
245var;variance;
246version;getversion;
247vertcat;cat;
248waitforbuttonpress;xclick;
249warndlg;messagebox;
250webread;getURL;
251which;get_function_path;
252whos -file;listvarinfile;
253xlim;axes_properties;
254ylim;axes_properties;
255yyaxis;newaxes;
256zlim;axes_properties;
257zoom;zoom_rect;
diff --git a/scilab/modules/helptools/etc/images_md5.txt b/scilab/modules/helptools/etc/images_md5.txt
index 674e87c..23bd37b 100644
--- a/scilab/modules/helptools/etc/images_md5.txt
+++ b/scilab/modules/helptools/etc/images_md5.txt
@@ -39,7 +39,7 @@ DERIV_1.png=c9f8cd048fb9c2d0f875e7cc783767cb
39DLATCH_1.png=7ec2ce7f1b895e38e22af86c75810c7b 39DLATCH_1.png=7ec2ce7f1b895e38e22af86c75810c7b
40DLATCH_fr_FR_1.png=01fb9aa73f5b67deb46db79159a36bc1 40DLATCH_fr_FR_1.png=01fb9aa73f5b67deb46db79159a36bc1
41DOLLAR_f_1.png=0b10b9eb56f4f302b40722fc37f90152 41DOLLAR_f_1.png=0b10b9eb56f4f302b40722fc37f90152
42EXPRESSION_1.png=f63c889d3d4602b03a883497318fda61 42EXPRESSION_1.png=d29bf3b5d25b1e2250c459aaed1a7774
43GENSIN_f_1.png=e4e9107e33977bc2ec15c56eda72b817 43GENSIN_f_1.png=e4e9107e33977bc2ec15c56eda72b817
44GENSQR_f_1.png=5d1882efbb97cbba3134b38ece4a3669 44GENSQR_f_1.png=5d1882efbb97cbba3134b38ece4a3669
45Graphics_1.png=27c8486b418fbb7c6824eed71d033448 45Graphics_1.png=27c8486b418fbb7c6824eed71d033448
@@ -232,6 +232,7 @@ _LaTeX_FROMWSB.xml_5.png=12ceba0046931ee8cf25df2f71f06a57
232_LaTeX_FROMWSB.xml_6.png=edd38b21f4afb3b9bd3022d6594bc04d 232_LaTeX_FROMWSB.xml_6.png=edd38b21f4afb3b9bd3022d6594bc04d
233_LaTeX_GENSIN_f.xml_1.png=df7110d93d01f93f0b54d9aa298e9635 233_LaTeX_GENSIN_f.xml_1.png=df7110d93d01f93f0b54d9aa298e9635
234_LaTeX_GENSQR_f.xml_1.png=746f663ac5f83b108763d9273b5f0e21 234_LaTeX_GENSQR_f.xml_1.png=746f663ac5f83b108763d9273b5f0e21
235_LaTeX_INTEGRAL_m.xml_1.png=a5506c60abcfda2944a96cba27140390
235_LaTeX_INTRP2BLK_f.xml_1.png=205995f88b807b2f5268f7ef4053f049 236_LaTeX_INTRP2BLK_f.xml_1.png=205995f88b807b2f5268f7ef4053f049
236_LaTeX_Inductor.xml_1.png=4e69417e6e0001a48e9abb40adf4be71 237_LaTeX_Inductor.xml_1.png=4e69417e6e0001a48e9abb40adf4be71
237_LaTeX_PerteDP.xml_1.png=0aaa66cecfcbc25a73e52eb804020799 238_LaTeX_PerteDP.xml_1.png=0aaa66cecfcbc25a73e52eb804020799
@@ -251,7 +252,10 @@ _LaTeX_assert_computedigits.xml_2.png=27dba5ee1401d31d2106736651e99140
251_LaTeX_bessel.xml_1.png=75b18324986d95f0ce739c723eff803f 252_LaTeX_bessel.xml_1.png=75b18324986d95f0ce739c723eff803f
252_LaTeX_bessel.xml_2.png=91604506c2c5f30b0fab1ef9da180a89 253_LaTeX_bessel.xml_2.png=91604506c2c5f30b0fab1ef9da180a89
253_LaTeX_bessel.xml_3.png=5e4298e19e224d62ecbd7b6db2a80a31 254_LaTeX_bessel.xml_3.png=5e4298e19e224d62ecbd7b6db2a80a31
255_LaTeX_beta.xml_1.png=985c0d6227e43f606488047fc5cd7ed0
256_LaTeX_binomial.xml_1.png=9f650a3f2c46ae011aa0d0e88f6f7ea4
254_LaTeX_blockdiag.xml_1.png=26bcad469ac051064707c071f102456c 257_LaTeX_blockdiag.xml_1.png=26bcad469ac051064707c071f102456c
258_LaTeX_bsplin3val.xml_1.png=53180456233c6fead6c34e6f97a34b22
255_LaTeX_bvode.xml_1.png=7d919bf8f33698749d88e30e99c33d7c 259_LaTeX_bvode.xml_1.png=7d919bf8f33698749d88e30e99c33d7c
256_LaTeX_bvode.xml_2.png=417a5301693b60807fa658e5ef9f9535 260_LaTeX_bvode.xml_2.png=417a5301693b60807fa658e5ef9f9535
257_LaTeX_bvode.xml_3.png=7e3c241c2dec821bd6c6fbd314fe4762 261_LaTeX_bvode.xml_3.png=7e3c241c2dec821bd6c6fbd314fe4762
@@ -269,12 +273,12 @@ _LaTeX_cumprod.xml_2.png=dce716c26ba9ee77970d59e48cbec6ea
269_LaTeX_cumprod.xml_3.png=dac1eef2ec85e26d497e63441494fb62 273_LaTeX_cumprod.xml_3.png=dac1eef2ec85e26d497e63441494fb62
270_LaTeX_cumprod.xml_4.png=d82dfaf597c37928175acc260e516802 274_LaTeX_cumprod.xml_4.png=d82dfaf597c37928175acc260e516802
271_LaTeX_cumprod.xml_5.png=2557e0856332b1a8e4a4328a56e057fd 275_LaTeX_cumprod.xml_5.png=2557e0856332b1a8e4a4328a56e057fd
272_LaTeX_cumsum.xml_1.png=d3b46046b899184c069d6938b393faa2 276_LaTeX_cumsum.xml_1.png=b0966bf1a1dea7a67a6a346d5a1045d9
273_LaTeX_cumsum.xml_2.png=23dfe1e8f3cffd55bfcdf54e31c7c1cc 277_LaTeX_cumsum.xml_2.png=9928dd8560ed99c6d4a7f2501c251e35
274_LaTeX_cumsum.xml_3.png=4c76951440e86518a6c419fb7c536c05 278_LaTeX_cumsum.xml_3.png=ad4fc68bed991d7c2d850b7ecc164300
275_LaTeX_cumsum.xml_4.png=c9333b61aa171fd3a354f95f095d39eb 279_LaTeX_cumsum.xml_4.png=92be80ef3cdebe4f217c931d0a1771aa
276_LaTeX_cumsum.xml_5.png=83945d3c6a18056a1fcd585d40e11705 280_LaTeX_cumsum.xml_5.png=c55efc7002f61d96caaea8aa5f3fc70f
277_LaTeX_cumsum.xml_6.png=1e00ceeb4652920c0f75ee7c5ee7f525 281_LaTeX_cumsum.xml_6.png=57c2893ef8abd65bd2d1e2820541b66c
278_LaTeX_dawson.xml_1.png=c1e5e33f1a6dda99e99cc1c174d39da3 282_LaTeX_dawson.xml_1.png=c1e5e33f1a6dda99e99cc1c174d39da3
279_LaTeX_dct.xml_1.png=2ab8327da7f356aa24836048a42c8d6a 283_LaTeX_dct.xml_1.png=2ab8327da7f356aa24836048a42c8d6a
280_LaTeX_dct.xml_2.png=6003d73578178d83c8a456a7a75cd0cc 284_LaTeX_dct.xml_2.png=6003d73578178d83c8a456a7a75cd0cc
@@ -287,6 +291,7 @@ _LaTeX_dct.xml_8.png=f28152d5910cdadab309239834b072b3
287_LaTeX_delip.xml_1.png=37cb84bfae9d9238643106ec09d43388 291_LaTeX_delip.xml_1.png=37cb84bfae9d9238643106ec09d43388
288_LaTeX_derivat.xml_1.png=884753c7c6265a65bb3803b66a0fec59 292_LaTeX_derivat.xml_1.png=884753c7c6265a65bb3803b66a0fec59
289_LaTeX_derivat.xml_2.png=1f26913a320e0f43588894e762729d16 293_LaTeX_derivat.xml_2.png=1f26913a320e0f43588894e762729d16
294_LaTeX_dlgamma.xml_1.png=0ea9c92ae3d7b2b814d8a4f769773cd8
290_LaTeX_dst.xml_1.png=9cd22909f8eca591c252c206124e482f 295_LaTeX_dst.xml_1.png=9cd22909f8eca591c252c206124e482f
291_LaTeX_dst.xml_2.png=d35f934540a4804eb1475655fa5bd72b 296_LaTeX_dst.xml_2.png=d35f934540a4804eb1475655fa5bd72b
292_LaTeX_dst.xml_3.png=caa2ed7797bbc39b3a28cb86ce6ce771 297_LaTeX_dst.xml_3.png=caa2ed7797bbc39b3a28cb86ce6ce771
@@ -303,6 +308,12 @@ _LaTeX_fft.xml_1.png=b16d8d250dade64a45e1e557c4673442
303_LaTeX_fft.xml_2.png=fa418662faf728120edcfff2a838bc8e 308_LaTeX_fft.xml_2.png=fa418662faf728120edcfff2a838bc8e
304_LaTeX_filter.xml_1.png=f5eab130f2e7fd10b80a402952421a05 309_LaTeX_filter.xml_1.png=f5eab130f2e7fd10b80a402952421a05
305_LaTeX_floor.xml_ru_RU_1.png=1d5ba78bbbafd3226f371146bc348363 310_LaTeX_floor.xml_ru_RU_1.png=1d5ba78bbbafd3226f371146bc348363
311_LaTeX_gamma.xml_1.png=b5b5605d75f6d03d1d4dc6a8d817f78f
312_LaTeX_gamma.xml_2.png=3c98a6fd836c18394e05939979158ebf
313_LaTeX_gamma.xml_3.png=7aeff606c2524edc54dd085a53d673af
314_LaTeX_gamma.xml_4.png=92502c47ca464eaea97178b3a176595d
315_LaTeX_gamma.xml_5.png=073a5bfe2552bdd14720b09e0ba75ff3
316_LaTeX_gamma.xml_6.png=328f28d7f22c29a647b1b93c6843b443
306_LaTeX_grand.xml_1.png=dd59088e24bed7a6af5a6ccd16e58616 317_LaTeX_grand.xml_1.png=dd59088e24bed7a6af5a6ccd16e58616
307_LaTeX_grand.xml_2.png=4065036eed5d60beaa7f246c013cbff0 318_LaTeX_grand.xml_2.png=4065036eed5d60beaa7f246c013cbff0
308_LaTeX_hank.xml_1.png=fc6c604bc8c86af20a8f0673047332db 319_LaTeX_hank.xml_1.png=fc6c604bc8c86af20a8f0673047332db
@@ -341,6 +352,8 @@ _LaTeX_lattn.xml_1.png=7ba64bdfad2c53fb336f12443f4926c6
341_LaTeX_lattn.xml_2.png=9b7ed107c9acb432bc04c8505b9d96ce 352_LaTeX_lattn.xml_2.png=9b7ed107c9acb432bc04c8505b9d96ce
342_LaTeX_lattp.xml_1.png=7ba64bdfad2c53fb336f12443f4926c6 353_LaTeX_lattp.xml_1.png=7ba64bdfad2c53fb336f12443f4926c6
343_LaTeX_leastsq.xml_1.png=3d52f8613fe5a2330979b844cd60da0b 354_LaTeX_leastsq.xml_1.png=3d52f8613fe5a2330979b844cd60da0b
355_LaTeX_legendre.xml_1.png=901934bfc7bb9f760c29ed2d475cd9e4
356_LaTeX_legendre.xml_2.png=7fb916ea1d3380604237466209a0e2f4
344_LaTeX_levin.xml_1.png=7ba64bdfad2c53fb336f12443f4926c6 357_LaTeX_levin.xml_1.png=7ba64bdfad2c53fb336f12443f4926c6
345_LaTeX_levin.xml_2.png=f524fdf11d769933d7138962185e2606 358_LaTeX_levin.xml_2.png=f524fdf11d769933d7138962185e2606
346_LaTeX_lft.xml_1.png=dc31caa4ca7b8e599933934a98dc2262 359_LaTeX_lft.xml_1.png=dc31caa4ca7b8e599933934a98dc2262
@@ -389,6 +402,7 @@ _LaTeX_lqr.xml_6.png=4f6dd247e1f511ea66298c4c2a76bb94
389_LaTeX_lqr.xml_7.png=c5cd7e3f5ea453e798ef0d5e0cbe734c 402_LaTeX_lqr.xml_7.png=c5cd7e3f5ea453e798ef0d5e0cbe734c
390_LaTeX_lqr.xml_8.png=1645328711c5c5406c0bff794c3afd40 403_LaTeX_lqr.xml_8.png=1645328711c5c5406c0bff794c3afd40
391_LaTeX_lqr.xml_9.png=c76c57d5a1f43cdcb78069c14fac2e48 404_LaTeX_lqr.xml_9.png=c76c57d5a1f43cdcb78069c14fac2e48
405_LaTeX_lsq_splin.xml_1.png=2397b9dd603fb440564750130da26127
392_LaTeX_nchoosek.xml_1.png=135b3c20a094e91dbe86ffaf4db0ffcc 406_LaTeX_nchoosek.xml_1.png=135b3c20a094e91dbe86ffaf4db0ffcc
393_LaTeX_nchoosek.xml_2.png=5070bc471485a78578069bb4405225b4 407_LaTeX_nchoosek.xml_2.png=5070bc471485a78578069bb4405225b4
394_LaTeX_number_properties.xml_1.png=e44429416209c43ee6736fc6e4fb475e 408_LaTeX_number_properties.xml_1.png=e44429416209c43ee6736fc6e4fb475e
@@ -421,6 +435,8 @@ _LaTeX_semidef.xml_1.png=69da8dee51aab98296232a5bc939053a
421_LaTeX_semidef.xml_2.png=9852782930e4e21c7115f35f70ab0966 435_LaTeX_semidef.xml_2.png=9852782930e4e21c7115f35f70ab0966
422_LaTeX_semidef.xml_3.png=2098b9e5e447ece7cd838247adcb262b 436_LaTeX_semidef.xml_3.png=2098b9e5e447ece7cd838247adcb262b
423_LaTeX_semidef.xml_4.png=44e43279e4a6173003d2e27d996c92e5 437_LaTeX_semidef.xml_4.png=44e43279e4a6173003d2e27d996c92e5
438_LaTeX_splin.xml_1.png=af0a8f6474a7254de0fc7ea25a388f66
439_LaTeX_splin2d.xml_1.png=d8560d407972da202ab8e2e081ed5e7b
424_LaTeX_ss2zp.xml_1.png=b03e0f26548784f834e2978d640ded24 440_LaTeX_ss2zp.xml_1.png=b03e0f26548784f834e2978d640ded24
425_LaTeX_sum.xml_1.png=ef9aafe044823d17d08371770fa73e9f 441_LaTeX_sum.xml_1.png=ef9aafe044823d17d08371770fa73e9f
426_LaTeX_sum.xml_2.png=b4f505fff21a34a842c50a707dd320ee 442_LaTeX_sum.xml_2.png=b4f505fff21a34a842c50a707dd320ee
@@ -547,19 +563,19 @@ bode_asymp_ru_RU_3.png=13240a8758ff7620cbb83db8f7b3d708
547bode_asymp_ru_RU_4.png=3abb4ef99eec204ffed235288afcf022 563bode_asymp_ru_RU_4.png=3abb4ef99eec204ffed235288afcf022
548bode_en_US_1.png=5d7c38b094cee911ec2cc42dd7050176 564bode_en_US_1.png=5d7c38b094cee911ec2cc42dd7050176
549bode_en_US_2.png=3a40a98fd3fb7a58e9f8282a4b515f71 565bode_en_US_2.png=3a40a98fd3fb7a58e9f8282a4b515f71
550bode_en_US_3.png=29f4cadff9611f6dab32471429e7bdf7 566bode_en_US_3.png=54e2e49410f3da1d8f49577b573bc289
551bode_fr_FR_1.png=5d7c38b094cee911ec2cc42dd7050176 567bode_fr_FR_1.png=5d7c38b094cee911ec2cc42dd7050176
552bode_fr_FR_2.png=3a40a98fd3fb7a58e9f8282a4b515f71 568bode_fr_FR_2.png=3a40a98fd3fb7a58e9f8282a4b515f71
553bode_fr_FR_3.png=29f4cadff9611f6dab32471429e7bdf7 569bode_fr_FR_3.png=54e2e49410f3da1d8f49577b573bc289
554bode_ja_JP_1.png=87ec396c51a7cc6aafb148e1aa5f9256 570bode_ja_JP_1.png=87ec396c51a7cc6aafb148e1aa5f9256
555bode_ja_JP_2.png=95d29219903b7e027aef6a1618855bc0 571bode_ja_JP_2.png=95d29219903b7e027aef6a1618855bc0
556bode_ja_JP_3.png=29f4cadff9611f6dab32471429e7bdf7 572bode_ja_JP_3.png=54e2e49410f3da1d8f49577b573bc289
557bode_pt_BR_1.png=5d7c38b094cee911ec2cc42dd7050176 573bode_pt_BR_1.png=5d7c38b094cee911ec2cc42dd7050176
558bode_pt_BR_2.png=3a40a98fd3fb7a58e9f8282a4b515f71 574bode_pt_BR_2.png=3a40a98fd3fb7a58e9f8282a4b515f71
559bode_pt_BR_3.png=29f4cadff9611f6dab32471429e7bdf7 575bode_pt_BR_3.png=54e2e49410f3da1d8f49577b573bc289
560bode_ru_RU_1.png=5d7c38b094cee911ec2cc42dd7050176 576bode_ru_RU_1.png=5d7c38b094cee911ec2cc42dd7050176
561bode_ru_RU_2.png=3a40a98fd3fb7a58e9f8282a4b515f71 577bode_ru_RU_2.png=3a40a98fd3fb7a58e9f8282a4b515f71
562bode_ru_RU_3.png=29f4cadff9611f6dab32471429e7bdf7 578bode_ru_RU_3.png=54e2e49410f3da1d8f49577b573bc289
563bonecolormap_1.png=92247210e578a35b3770d67e94bae718 579bonecolormap_1.png=92247210e578a35b3770d67e94bae718
564buttmag_1.png=9fff0bd432661a67efdde3c0c3a34465 580buttmag_1.png=9fff0bd432661a67efdde3c0c3a34465
565bvode_en_US_1.png=f5839719400ab9f8ae4004c3c7bad4ff 581bvode_en_US_1.png=f5839719400ab9f8ae4004c3c7bad4ff
@@ -600,7 +616,11 @@ colorbar_6.png=f45bccb9441fd558c25f8ff3e2a84d3b
600colordef_1.png=b862d25fe3199de144cb45c810a43085 616colordef_1.png=b862d25fe3199de144cb45c810a43085
601colordef_2.png=8dffacb993e0972367eaabb29383154f 617colordef_2.png=8dffacb993e0972367eaabb29383154f
602colordef_3.png=d2d2bbfdf2fa2104f8c2fae819d48c49 618colordef_3.png=d2d2bbfdf2fa2104f8c2fae819d48c49
603colormap_1.png=34ff30f6dc35ee879709c132e444cf23 619colormap_en_US_1.png=663f40455aa64c1e47b478a0f5a3ec69
620colormap_fr_FR_1.png=663f40455aa64c1e47b478a0f5a3ec69
621colormap_ja_JP_1.png=663f40455aa64c1e47b478a0f5a3ec69
622colormap_pt_BR_1.png=663f40455aa64c1e47b478a0f5a3ec69
623colormap_ru_RU_1.png=663f40455aa64c1e47b478a0f5a3ec69
604contour2d_1.png=ca9b620f09fbcc77799e2286b6730e2d 624contour2d_1.png=ca9b620f09fbcc77799e2286b6730e2d
605contour2d_2.png=e618038e4b44d84ce4b6ae2fe5420951 625contour2d_2.png=e618038e4b44d84ce4b6ae2fe5420951
606contour2d_en_US_3.png=b210ca5f70b33677912b389f9712db1a 626contour2d_en_US_3.png=b210ca5f70b33677912b389f9712db1a
@@ -715,7 +735,9 @@ gainplot_fr_FR_1.png=d213684f7b1a3ed02b63da2b67d4ac33
715gainplot_ja_JP_1.png=d213684f7b1a3ed02b63da2b67d4ac33 735gainplot_ja_JP_1.png=d213684f7b1a3ed02b63da2b67d4ac33
716gainplot_pt_BR_1.png=d213684f7b1a3ed02b63da2b67d4ac33 736gainplot_pt_BR_1.png=d213684f7b1a3ed02b63da2b67d4ac33
717gainplot_ru_RU_1.png=d213684f7b1a3ed02b63da2b67d4ac33 737gainplot_ru_RU_1.png=d213684f7b1a3ed02b63da2b67d4ac33
718gamma_1.png=edb640abc2cbb2d381e6e59a3add4992 738gamma_1.png=f394755ab046e37f0c580b182a669f46
739gamma_2.png=1ada3c5257f5a417f2b68ae90a54bd30
740gamma_3.png=f7217206a73638c2fe8e5cfd96fb6cee
719genfac3d_1.png=82ced89cadf20315ddd7c7d026c81443 741genfac3d_1.png=82ced89cadf20315ddd7c7d026c81443
720geom3d_1.png=4bd6a5c64616f25637e575edfe070cd9 742geom3d_1.png=4bd6a5c64616f25637e575edfe070cd9
721geom3d_2.png=0896ca44de9f622ef3a366a18b4bea53 743geom3d_2.png=0896ca44de9f622ef3a366a18b4bea53
@@ -840,12 +862,17 @@ lighting_3.png=4db104cec73db5309f073b24c2d740e1
840linear_interpn_1.png=6097d912048862430be0c7efc1cb5715 862linear_interpn_1.png=6097d912048862430be0c7efc1cb5715
841linear_interpn_2.png=babfba25d7f0743ed8a6f6618379fba9 863linear_interpn_2.png=babfba25d7f0743ed8a6f6618379fba9
842locate_1.png=12b128890d9e8e2336d8db9d64d8dfcb 864locate_1.png=12b128890d9e8e2336d8db9d64d8dfcb
865loglog_1.png=9e23c974da76a0bce5dac20746f5b3fb
843lqe_1.png=39cd8f90954e2b934b4926badcd56f7b 866lqe_1.png=39cd8f90954e2b934b4926badcd56f7b
844lqg_1.png=3e8627090476b38335a391eb831767a6 867lqg_1.png=3e8627090476b38335a391eb831767a6
845lqg_2.png=d0a7523f9ddee9c5f11c06682ff1b0c6 868lqg_2.png=d0a7523f9ddee9c5f11c06682ff1b0c6
846lqr_1.png=269d7421a9d109d37259c9739612dd21 869lqr_1.png=269d7421a9d109d37259c9739612dd21
847lsq_splin_1.png=35722a6a58a3c9afd427b0bb23f1382a 870lsq_splin_1.png=35722a6a58a3c9afd427b0bb23f1382a
848mapsound_1.png=a1d2da99607861bfe926b66b3fc145b2 871mapsound_1.png=775cb5d77a6f98c880e27960c4e39514
872mapsound_2.png=ea66eb5ccd62fd3d034df457c68d86ab
873mapsound_3.png=ae8b5e54d534fb6a64de9659665d5afa
874mapsound_4.png=572ed70b9c0491be98d7bc9a3c1cc83f
875mapsound_5.png=98d28e5f40d5579d1e6807aa87f31f9e
849math_rendering_features_in_graphic_1.png=b1259d51258d72193bd32a47c8f96ca4 876math_rendering_features_in_graphic_1.png=b1259d51258d72193bd32a47c8f96ca4
850math_rendering_features_in_graphic_2.png=c93a1a79cbe217871185826f83fdd7bb 877math_rendering_features_in_graphic_2.png=c93a1a79cbe217871185826f83fdd7bb
851mese_1.png=c4ce712eded4fbbd49bb86b02e14afe9 878mese_1.png=c4ce712eded4fbbd49bb86b02e14afe9
@@ -955,15 +982,16 @@ plot3d_7.png=b106077ec3b360ba717fef4579da3f55
955plot3d_8.png=d7ca9d9d5dd993d30bc6423a0528ff8e 982plot3d_8.png=d7ca9d9d5dd993d30bc6423a0528ff8e
956plot3d_9.png=c0f93d84e3ccdc76486bd41209b1f76b 983plot3d_9.png=c0f93d84e3ccdc76486bd41209b1f76b
957plot_1.png=df8aeb1d865adef40f0e9a2068d9d527 984plot_1.png=df8aeb1d865adef40f0e9a2068d9d527
958plot_10.png=bead04d3923168e8291932e665abffa0 985plot_10.png=7892b92465386a710d20d0a30cf46304
986plot_11.png=bead04d3923168e8291932e665abffa0
959plot_2.png=ad242947214d2866107c147f5384e0a9 987plot_2.png=ad242947214d2866107c147f5384e0a9
960plot_3.png=6549659743df2155be3061577f86c428 988plot_3.png=6549659743df2155be3061577f86c428
961plot_4.png=05411294e38970b93bd2e96047171bdd 989plot_4.png=05411294e38970b93bd2e96047171bdd
962plot_5.png=f2a02f303bf4578fe0c029abc8f084dd 990plot_5.png=409a923b00065c83b6e42ed1cbfa4c29
963plot_6.png=25b0dc1bfdba78e499055bedf79020dc 991plot_6.png=f2a02f303bf4578fe0c029abc8f084dd
964plot_7.png=6530b1526ca007d68c095bb76295eade 992plot_7.png=25b0dc1bfdba78e499055bedf79020dc
965plot_8.png=df9a6a6decb537fae8a8adde2304a85a 993plot_8.png=6530b1526ca007d68c095bb76295eade
966plot_9.png=7892b92465386a710d20d0a30cf46304 994plot_9.png=df9a6a6decb537fae8a8adde2304a85a
967plot_multiscaled_1.png=139dc4c6fd62728b6f08e4529fc775fa 995plot_multiscaled_1.png=139dc4c6fd62728b6f08e4529fc775fa
968plot_multiscaled_2.png=8ea6f9394968a8d02d09e1a66064c718 996plot_multiscaled_2.png=8ea6f9394968a8d02d09e1a66064c718
969plot_multiscaled_3.png=97b20f253d676c6d66fe322172b960ac 997plot_multiscaled_3.png=97b20f253d676c6d66fe322172b960ac
@@ -976,7 +1004,7 @@ polarplot_1.png=92b1189dd351372e587b472bad213e09
976polarplot_2.png=7a5f1cd3ef07687170c0de62231a2b5c 1004polarplot_2.png=7a5f1cd3ef07687170c0de62231a2b5c
977polarplot_3.png=f11a25552a72c4454001c29b97073379 1005polarplot_3.png=f11a25552a72c4454001c29b97073379
978polarplot_4.png=a4df61be3e5a6aa65eb22ab44e9dc5d3 1006polarplot_4.png=a4df61be3e5a6aa65eb22ab44e9dc5d3
979polyline_properties_1.png=97b2785c2aba9ceec1c15af7aef25423 1007polyline_properties_1.png=eabc301b4b96a55a248196b46490df7a
980polyline_properties_2.png=5458d2f7efc2756fbb364a80e066588f 1008polyline_properties_2.png=5458d2f7efc2756fbb364a80e066588f
981polyline_properties_3.png=3349e39fe563e09fc488e9ed03c6e4ae 1009polyline_properties_3.png=3349e39fe563e09fc488e9ed03c6e4ae
982prbs_a_1.png=4e8551544fa2d2085e74ddfe799ec579 1010prbs_a_1.png=4e8551544fa2d2085e74ddfe799ec579
@@ -1001,20 +1029,20 @@ scatter3_6.png=1208c36176ce151609a9e8a028e2efec
1001scatter3_7.png=7b4166df26aa032d619e763b5e3d5ffb 1029scatter3_7.png=7b4166df26aa032d619e763b5e3d5ffb
1002scatter3_8.png=78c1739441d452b32803d9afe828b9a0 1030scatter3_8.png=78c1739441d452b32803d9afe828b9a0
1003scatter3_9.png=19492ab5f75f0fb62c39fcff53985cca 1031scatter3_9.png=19492ab5f75f0fb62c39fcff53985cca
1004scatter3d_1.png=773a66a41a14bbf889268db7a844147b 1032scatter3d_1.png=cbbdea1f404044cfe78f1117b80de4a4
1005scatter3d_2.png=d9e4519a4d98e2eb8645e0537dbc19e8 1033scatter3d_2.png=21d465cbdd78f8f77340374be02c90ee
1006scatter3d_3.png=24be254e2671c45fda9e40ed4b041288 1034scatter3d_3.png=a9ba1468450ff0ffc2e2fd8d6431f8b7
1007scatter3d_4.png=f8e9ae6d215b75563d29ff932023fbc4 1035scatter3d_4.png=28d8d38163017d090d297fb2e4db5729
1008scatter3d_5.png=19ee44a74c0965e982ad68330c679ca0 1036scatter3d_5.png=19ee44a74c0965e982ad68330c679ca0
1009scatter3d_6.png=108bf9fbffe8fb6027a5a8e4aa50c50b 1037scatter3d_6.png=108bf9fbffe8fb6027a5a8e4aa50c50b
1010scatter3d_7.png=0972a23cc58462fbf97d7d77d1113b98 1038scatter3d_7.png=0972a23cc58462fbf97d7d77d1113b98
1011scatter3d_8.png=4d67a4e5eafdfbe53b1ca3c6390f6c0f 1039scatter3d_8.png=4d67a4e5eafdfbe53b1ca3c6390f6c0f
1012scatter3d_9.png=9fbc405d1cafead8558db57db93e0f9d 1040scatter3d_9.png=9fbc405d1cafead8558db57db93e0f9d
1013scatter_1.png=4f9bcfe033f3f679978a95d46a1d1668 1041scatter_1.png=58444c8064eb8a1e525b5f86ff1a752f
1014scatter_2.png=237636079259daa7a0193f047c9b36f7 1042scatter_2.png=83266e7cf79dd2348cc156f758034c30
1015scatter_3.png=f76e8578dcbe18c3b40ed66382632f10 1043scatter_3.png=69656bd429e50cb1f1e8fb215f96a89e
1016scatter_4.png=671bbf57009b525a69d0584db6bf9b36 1044scatter_4.png=bc8b9d73f5a7ee31f4350b557ec2b740
1017scatter_5.png=8851ea383bf3c8fbb108599bca6e29da 1045scatter_5.png=79aeb185f9626209bd196b3d7753d650
1018scatter_6.png=38ce1594a221f1817c355adcf1e35cf5 1046scatter_6.png=38ce1594a221f1817c355adcf1e35cf5
1019scatter_7.png=9e2bdcf2579bbbc0515268dcc7ebd4d1 1047scatter_7.png=9e2bdcf2579bbbc0515268dcc7ebd4d1
1020scatter_8.png=b7a40a8bbd7cf29b62b771e3be59b988 1048scatter_8.png=b7a40a8bbd7cf29b62b771e3be59b988
@@ -1022,6 +1050,12 @@ scatter_9.png=9f987520c26d42c41f2ee6d3ec930529
1022scifunc_block_m_1.png=a26368cd2a69c472967105b9d8deb5ed 1050scifunc_block_m_1.png=a26368cd2a69c472967105b9d8deb5ed
1023sec_1.png=4eff2516ae7932bb126b6e2fa133f046 1051sec_1.png=4eff2516ae7932bb126b6e2fa133f046
1024sech_1.png=62b827923764aaaf8ce355b0256bef3b 1052sech_1.png=62b827923764aaaf8ce355b0256bef3b
1053semilogx_1.png=b5d0ccb773bc68cab682b85e9299840c
1054semilogy_1.png=22736d35bd7a6dff1a92af7a203cd81e
1055sgolay_1.png=a68d1b4aa9bbf7ccfcd38dfd6158cf01
1056sgolay_2.png=9ec7d521df8c827f7ef37e2997613bd6
1057sgolaydiff_1.png=68aacc1223db752ac39fbede1935ac75
1058sgolayfilt_1.png=e6c2afd9293c4a59cddb04e2a4dd8ce5
1025sgrid_1.png=a5e9d0fb3e290982e4c01a50b800b8ff 1059sgrid_1.png=a5e9d0fb3e290982e4c01a50b800b8ff
1026sgrid_2.png=260f87be847f70d84df4d1013bd9113b 1060sgrid_2.png=260f87be847f70d84df4d1013bd9113b
1027sgrid_3.png=b26fd988424a754a724bd483a4f26e0f 1061sgrid_3.png=b26fd988424a754a724bd483a4f26e0f
@@ -1046,7 +1080,7 @@ sinh_1.png=a6d9cd67d383e2b737257c4a18317abe
1046smooth_1.png=ebef37585006626b34e13b95a3667e9d 1080smooth_1.png=ebef37585006626b34e13b95a3667e9d
1047splin2d_1.png=6e186e7bcf5d848fd9d8f354282f6489 1081splin2d_1.png=6e186e7bcf5d848fd9d8f354282f6489
1048splin2d_2.png=f36065c49f29e782c8b49e2958ad75c0 1082splin2d_2.png=f36065c49f29e782c8b49e2958ad75c0
1049splin3d_en_US_1.png=13b170241470ca4af84f26b2b0faf91c 1083splin3d_en_US_1.png=924b5de4c3968e33949dd67fbeac437d
1050splin3d_fr_FR_1.png=13b170241470ca4af84f26b2b0faf91c 1084splin3d_fr_FR_1.png=13b170241470ca4af84f26b2b0faf91c
1051splin3d_ja_JP_1.png=13b170241470ca4af84f26b2b0faf91c 1085splin3d_ja_JP_1.png=13b170241470ca4af84f26b2b0faf91c
1052splin3d_pt_BR_1.png=13b170241470ca4af84f26b2b0faf91c 1086splin3d_pt_BR_1.png=13b170241470ca4af84f26b2b0faf91c
diff --git a/scilab/modules/helptools/images/EXPRESSION.zcos.png b/scilab/modules/helptools/images/EXPRESSION.zcos.png
new file mode 100644
index 0000000..98ecb12
--- /dev/null
+++ b/scilab/modules/helptools/images/EXPRESSION.zcos.png
Binary files differ
diff --git a/scilab/modules/helptools/images/MAXMIN.png b/scilab/modules/helptools/images/MAXMIN.png
index 191b264..34f764d 100644
--- a/scilab/modules/helptools/images/MAXMIN.png
+++ b/scilab/modules/helptools/images/MAXMIN.png
Binary files differ
diff --git a/scilab/modules/helptools/images/OpAmp.png b/scilab/modules/helptools/images/OpAmp.png
index b76f65a..b4158a2 100644
--- a/scilab/modules/helptools/images/OpAmp.png
+++ b/scilab/modules/helptools/images/OpAmp.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_INTEGRAL_m.xml_1.png b/scilab/modules/helptools/images/_LaTeX_INTEGRAL_m.xml_1.png
new file mode 100644
index 0000000..0dcc06f
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_INTEGRAL_m.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_beta.xml_1.png b/scilab/modules/helptools/images/_LaTeX_beta.xml_1.png
new file mode 100644
index 0000000..5f5f8dc
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_beta.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_binomial.xml_1.png b/scilab/modules/helptools/images/_LaTeX_binomial.xml_1.png
new file mode 100644
index 0000000..e597c03
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_binomial.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_bsplin3val.xml_1.png b/scilab/modules/helptools/images/_LaTeX_bsplin3val.xml_1.png
new file mode 100644
index 0000000..7897616
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_bsplin3val.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_1.png b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_1.png
index a91957f..79ebe1d 100644
--- a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_1.png
+++ b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_2.png b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_2.png
index 319cb13..a7419f1 100644
--- a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_2.png
+++ b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_2.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_3.png b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_3.png
index 594600a..f856e6c 100644
--- a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_3.png
+++ b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_4.png b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_4.png
index c52fa14..f028855 100644
--- a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_4.png
+++ b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_4.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_5.png b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_5.png
index a3b3854..5a6a689 100644
--- a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_5.png
+++ b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_5.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_6.png b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_6.png
index 16c4df5..9b3d769 100644
--- a/scilab/modules/helptools/images/_LaTeX_cumsum.xml_6.png
+++ b/scilab/modules/helptools/images/_LaTeX_cumsum.xml_6.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_dlgamma.xml_1.png b/scilab/modules/helptools/images/_LaTeX_dlgamma.xml_1.png
new file mode 100644
index 0000000..84af1e7
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_dlgamma.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_gamma.xml_1.png b/scilab/modules/helptools/images/_LaTeX_gamma.xml_1.png
new file mode 100644
index 0000000..9a3ecaa
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_gamma.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_gamma.xml_2.png b/scilab/modules/helptools/images/_LaTeX_gamma.xml_2.png
new file mode 100644
index 0000000..f584ed6
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_gamma.xml_2.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_gamma.xml_3.png b/scilab/modules/helptools/images/_LaTeX_gamma.xml_3.png
new file mode 100644
index 0000000..bcf5ebe
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_gamma.xml_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_gamma.xml_4.png b/scilab/modules/helptools/images/_LaTeX_gamma.xml_4.png
new file mode 100644
index 0000000..4ce1b06
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_gamma.xml_4.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_gamma.xml_5.png b/scilab/modules/helptools/images/_LaTeX_gamma.xml_5.png
new file mode 100644
index 0000000..f437f7e
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_gamma.xml_5.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_gamma.xml_6.png b/scilab/modules/helptools/images/_LaTeX_gamma.xml_6.png
new file mode 100644
index 0000000..018d241
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_gamma.xml_6.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_1.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_1.png
deleted file mode 100644
index 821fc07..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_1.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_10.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_10.png
deleted file mode 100644
index bcfa62c..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_10.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_11.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_11.png
deleted file mode 100644
index 821fc07..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_11.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_12.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_12.png
deleted file mode 100644
index 8249c9d..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_12.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_13.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_13.png
deleted file mode 100644
index adc12d2..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_13.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_14.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_14.png
deleted file mode 100644
index 45d8b77..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_14.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_15.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_15.png
deleted file mode 100644
index 764a626..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_15.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_16.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_16.png
deleted file mode 100644
index 9d403dc..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_16.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_17.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_17.png
deleted file mode 100644
index 2781cf7..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_17.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_18.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_18.png
deleted file mode 100644
index c1ed2ee..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_18.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_19.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_19.png
deleted file mode 100644
index 7651aef..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_19.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_2.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_2.png
deleted file mode 100644
index 821fc07..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_2.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_20.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_20.png
deleted file mode 100644
index 3922dfb..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_20.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_3.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_3.png
deleted file mode 100644
index 8b7e2fa..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_3.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_4.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_4.png
deleted file mode 100644
index add2d2f..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_4.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_5.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_5.png
deleted file mode 100644
index 5776d58..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_5.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_6.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_6.png
deleted file mode 100644
index 9df245f..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_6.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_7.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_7.png
deleted file mode 100644
index 27d470a..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_7.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_8.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_8.png
deleted file mode 100644
index d1cbc11..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_8.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_interp.xml_9.png b/scilab/modules/helptools/images/_LaTeX_interp.xml_9.png
deleted file mode 100644
index 0d53561..0000000
--- a/scilab/modules/helptools/images/_LaTeX_interp.xml_9.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_legendre.xml_1.png b/scilab/modules/helptools/images/_LaTeX_legendre.xml_1.png
new file mode 100644
index 0000000..7dc5332
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_legendre.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_legendre.xml_2.png b/scilab/modules/helptools/images/_LaTeX_legendre.xml_2.png
new file mode 100644
index 0000000..348c693
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_legendre.xml_2.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_lsq_splin.xml_1.png b/scilab/modules/helptools/images/_LaTeX_lsq_splin.xml_1.png
new file mode 100644
index 0000000..26c9c2e
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_lsq_splin.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_splin.xml_1.png b/scilab/modules/helptools/images/_LaTeX_splin.xml_1.png
new file mode 100644
index 0000000..66de6f1
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_splin.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/_LaTeX_splin2d.xml_1.png b/scilab/modules/helptools/images/_LaTeX_splin2d.xml_1.png
new file mode 100644
index 0000000..085a505
--- /dev/null
+++ b/scilab/modules/helptools/images/_LaTeX_splin2d.xml_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/beta_equation1.mml.png b/scilab/modules/helptools/images/beta_equation1.mml.png
deleted file mode 100644
index 324ad8a..0000000
--- a/scilab/modules/helptools/images/beta_equation1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/binomial_equation_1_en_US.mml.png b/scilab/modules/helptools/images/binomial_equation_1_en_US.mml.png
deleted file mode 100644
index 5df9d52..0000000
--- a/scilab/modules/helptools/images/binomial_equation_1_en_US.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/binomial_equation_1_ru_RU.mml.png b/scilab/modules/helptools/images/binomial_equation_1_ru_RU.mml.png
deleted file mode 100644
index 269d670..0000000
--- a/scilab/modules/helptools/images/binomial_equation_1_ru_RU.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/bode_en_US_3.png b/scilab/modules/helptools/images/bode_en_US_3.png
index 91bf3b1..2de62db 100644
--- a/scilab/modules/helptools/images/bode_en_US_3.png
+++ b/scilab/modules/helptools/images/bode_en_US_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/bode_fr_FR_3.png b/scilab/modules/helptools/images/bode_fr_FR_3.png
index 91bf3b1..8dbdeed 100644
--- a/scilab/modules/helptools/images/bode_fr_FR_3.png
+++ b/scilab/modules/helptools/images/bode_fr_FR_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/bode_ja_JP_3.png b/scilab/modules/helptools/images/bode_ja_JP_3.png
index 91bf3b1..1140dbf 100644
--- a/scilab/modules/helptools/images/bode_ja_JP_3.png
+++ b/scilab/modules/helptools/images/bode_ja_JP_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/bode_pt_BR_3.png b/scilab/modules/helptools/images/bode_pt_BR_3.png
index 91bf3b1..ab5fda8 100644
--- a/scilab/modules/helptools/images/bode_pt_BR_3.png
+++ b/scilab/modules/helptools/images/bode_pt_BR_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/bode_ru_RU_3.png b/scilab/modules/helptools/images/bode_ru_RU_3.png
index 91bf3b1..19ba7a5 100644
--- a/scilab/modules/helptools/images/bode_ru_RU_3.png
+++ b/scilab/modules/helptools/images/bode_ru_RU_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/bsplin3val_equation1.mml.png b/scilab/modules/helptools/images/bsplin3val_equation1.mml.png
deleted file mode 100644
index 0e97c8a..0000000
--- a/scilab/modules/helptools/images/bsplin3val_equation1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/colormap_1.png b/scilab/modules/helptools/images/colormap_1.png
deleted file mode 100644
index febf194..0000000
--- a/scilab/modules/helptools/images/colormap_1.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/colormap_en_US_1.png b/scilab/modules/helptools/images/colormap_en_US_1.png
new file mode 100644
index 0000000..f4c5370
--- /dev/null
+++ b/scilab/modules/helptools/images/colormap_en_US_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/colormap_fr_FR_1.png b/scilab/modules/helptools/images/colormap_fr_FR_1.png
new file mode 100644
index 0000000..f4c5370
--- /dev/null
+++ b/scilab/modules/helptools/images/colormap_fr_FR_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/colormap_ja_JP_1.png b/scilab/modules/helptools/images/colormap_ja_JP_1.png
new file mode 100644
index 0000000..f4c5370
--- /dev/null
+++ b/scilab/modules/helptools/images/colormap_ja_JP_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/colormap_pt_BR_1.png b/scilab/modules/helptools/images/colormap_pt_BR_1.png
new file mode 100644
index 0000000..f4c5370
--- /dev/null
+++ b/scilab/modules/helptools/images/colormap_pt_BR_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/colormap_ru_RU_1.png b/scilab/modules/helptools/images/colormap_ru_RU_1.png
new file mode 100644
index 0000000..f4c5370
--- /dev/null
+++ b/scilab/modules/helptools/images/colormap_ru_RU_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/dlgamma_equation1.mml.png b/scilab/modules/helptools/images/dlgamma_equation1.mml.png
deleted file mode 100644
index 63e760d..0000000
--- a/scilab/modules/helptools/images/dlgamma_equation1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/gamma_1.png b/scilab/modules/helptools/images/gamma_1.png
index f8ecd29..7153a0b 100644
--- a/scilab/modules/helptools/images/gamma_1.png
+++ b/scilab/modules/helptools/images/gamma_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/gamma_2.png b/scilab/modules/helptools/images/gamma_2.png
new file mode 100644
index 0000000..297cc8d
--- /dev/null
+++ b/scilab/modules/helptools/images/gamma_2.png
Binary files differ
diff --git a/scilab/modules/helptools/images/gamma_3.png b/scilab/modules/helptools/images/gamma_3.png
new file mode 100644
index 0000000..43555cf
--- /dev/null
+++ b/scilab/modules/helptools/images/gamma_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/gamma_equation1.mml.png b/scilab/modules/helptools/images/gamma_equation1.mml.png
deleted file mode 100644
index 8f0b231..0000000
--- a/scilab/modules/helptools/images/gamma_equation1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/getcolor.png b/scilab/modules/helptools/images/getcolor.png
new file mode 100644
index 0000000..51b82ef
--- /dev/null
+++ b/scilab/modules/helptools/images/getcolor.png
Binary files differ
diff --git a/scilab/modules/helptools/images/integral_m.mml.png b/scilab/modules/helptools/images/integral_m.mml.png
deleted file mode 100644
index 459c456..0000000
--- a/scilab/modules/helptools/images/integral_m.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/legendre_equation1.mml.png b/scilab/modules/helptools/images/legendre_equation1.mml.png
deleted file mode 100644
index b910602..0000000
--- a/scilab/modules/helptools/images/legendre_equation1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/legendre_equation2.mml.png b/scilab/modules/helptools/images/legendre_equation2.mml.png
deleted file mode 100644
index ec805a2..0000000
--- a/scilab/modules/helptools/images/legendre_equation2.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/linear_interpn_equation1.mml.png b/scilab/modules/helptools/images/linear_interpn_equation1.mml.png
deleted file mode 100644
index 271b699..0000000
--- a/scilab/modules/helptools/images/linear_interpn_equation1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/linear_interpn_equation2.mml.png b/scilab/modules/helptools/images/linear_interpn_equation2.mml.png
deleted file mode 100644
index 5a0f7e6..0000000
--- a/scilab/modules/helptools/images/linear_interpn_equation2.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/linear_interpn_equation3.mml.png b/scilab/modules/helptools/images/linear_interpn_equation3.mml.png
deleted file mode 100644
index 9b383d8..0000000
--- a/scilab/modules/helptools/images/linear_interpn_equation3.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/loglog_1.png b/scilab/modules/helptools/images/loglog_1.png
new file mode 100644
index 0000000..d2312a9
--- /dev/null
+++ b/scilab/modules/helptools/images/loglog_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/lsq_splin_equation1.mml.png b/scilab/modules/helptools/images/lsq_splin_equation1.mml.png
deleted file mode 100644
index 6089046..0000000
--- a/scilab/modules/helptools/images/lsq_splin_equation1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/mapsound_1.png b/scilab/modules/helptools/images/mapsound_1.png
index 8309962..633ba6e 100644
--- a/scilab/modules/helptools/images/mapsound_1.png
+++ b/scilab/modules/helptools/images/mapsound_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/mapsound_2.png b/scilab/modules/helptools/images/mapsound_2.png
new file mode 100644
index 0000000..f7b5ad1
--- /dev/null
+++ b/scilab/modules/helptools/images/mapsound_2.png
Binary files differ
diff --git a/scilab/modules/helptools/images/mapsound_3.png b/scilab/modules/helptools/images/mapsound_3.png
new file mode 100644
index 0000000..83cbb2e
--- /dev/null
+++ b/scilab/modules/helptools/images/mapsound_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/mapsound_4.png b/scilab/modules/helptools/images/mapsound_4.png
new file mode 100644
index 0000000..afdcd9d
--- /dev/null
+++ b/scilab/modules/helptools/images/mapsound_4.png
Binary files differ
diff --git a/scilab/modules/helptools/images/mapsound_5.png b/scilab/modules/helptools/images/mapsound_5.png
new file mode 100644
index 0000000..ed0cc89
--- /dev/null
+++ b/scilab/modules/helptools/images/mapsound_5.png
Binary files differ
diff --git a/scilab/modules/helptools/images/plot_10.png b/scilab/modules/helptools/images/plot_10.png
index f1ca950..ae1db5c 100644
--- a/scilab/modules/helptools/images/plot_10.png
+++ b/scilab/modules/helptools/images/plot_10.png
Binary files differ
diff --git a/scilab/modules/helptools/images/plot_11.png b/scilab/modules/helptools/images/plot_11.png
new file mode 100644
index 0000000..f1ca950
--- /dev/null
+++ b/scilab/modules/helptools/images/plot_11.png
Binary files differ
diff --git a/scilab/modules/helptools/images/plot_5.png b/scilab/modules/helptools/images/plot_5.png
index 873c4a9..50517dc 100644
--- a/scilab/modules/helptools/images/plot_5.png
+++ b/scilab/modules/helptools/images/plot_5.png
Binary files differ
diff --git a/scilab/modules/helptools/images/plot_6.png b/scilab/modules/helptools/images/plot_6.png
index a7a2301..d14e3d8 100644
--- a/scilab/modules/helptools/images/plot_6.png
+++ b/scilab/modules/helptools/images/plot_6.png
Binary files differ
diff --git a/scilab/modules/helptools/images/plot_7.png b/scilab/modules/helptools/images/plot_7.png
index a536017..a7a2301 100644
--- a/scilab/modules/helptools/images/plot_7.png
+++ b/scilab/modules/helptools/images/plot_7.png
Binary files differ
diff --git a/scilab/modules/helptools/images/plot_8.png b/scilab/modules/helptools/images/plot_8.png
index 25d6b2b..a536017 100644
--- a/scilab/modules/helptools/images/plot_8.png
+++ b/scilab/modules/helptools/images/plot_8.png
Binary files differ
diff --git a/scilab/modules/helptools/images/plot_9.png b/scilab/modules/helptools/images/plot_9.png
index ae1db5c..25d6b2b 100644
--- a/scilab/modules/helptools/images/plot_9.png
+++ b/scilab/modules/helptools/images/plot_9.png
Binary files differ
diff --git a/scilab/modules/helptools/images/polyline_properties_1.png b/scilab/modules/helptools/images/polyline_properties_1.png
index 2982af2..8fc6b06 100644
--- a/scilab/modules/helptools/images/polyline_properties_1.png
+++ b/scilab/modules/helptools/images/polyline_properties_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter3d_1.png b/scilab/modules/helptools/images/scatter3d_1.png
index 53694d4..0613a89 100644
--- a/scilab/modules/helptools/images/scatter3d_1.png
+++ b/scilab/modules/helptools/images/scatter3d_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter3d_2.png b/scilab/modules/helptools/images/scatter3d_2.png
index 40b1d7b..539473d 100644
--- a/scilab/modules/helptools/images/scatter3d_2.png
+++ b/scilab/modules/helptools/images/scatter3d_2.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter3d_3.png b/scilab/modules/helptools/images/scatter3d_3.png
index 02c912b..0522263 100644
--- a/scilab/modules/helptools/images/scatter3d_3.png
+++ b/scilab/modules/helptools/images/scatter3d_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter3d_4.png b/scilab/modules/helptools/images/scatter3d_4.png
index 6a78e33..3988725 100644
--- a/scilab/modules/helptools/images/scatter3d_4.png
+++ b/scilab/modules/helptools/images/scatter3d_4.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter3d_5.png b/scilab/modules/helptools/images/scatter3d_5.png
deleted file mode 100644
index f211da4..0000000
--- a/scilab/modules/helptools/images/scatter3d_5.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter3d_6.png b/scilab/modules/helptools/images/scatter3d_6.png
deleted file mode 100644
index 4527fdf..0000000
--- a/scilab/modules/helptools/images/scatter3d_6.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter3d_7.png b/scilab/modules/helptools/images/scatter3d_7.png
deleted file mode 100644
index fd33f72..0000000
--- a/scilab/modules/helptools/images/scatter3d_7.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter3d_8.png b/scilab/modules/helptools/images/scatter3d_8.png
deleted file mode 100644
index 40b1d7b..0000000
--- a/scilab/modules/helptools/images/scatter3d_8.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter3d_9.png b/scilab/modules/helptools/images/scatter3d_9.png
deleted file mode 100644
index bf25210..0000000
--- a/scilab/modules/helptools/images/scatter3d_9.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter_1.png b/scilab/modules/helptools/images/scatter_1.png
index f50dfac..61e505f 100644
--- a/scilab/modules/helptools/images/scatter_1.png
+++ b/scilab/modules/helptools/images/scatter_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter_2.png b/scilab/modules/helptools/images/scatter_2.png
index 4a926a1..8e7abef 100644
--- a/scilab/modules/helptools/images/scatter_2.png
+++ b/scilab/modules/helptools/images/scatter_2.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter_3.png b/scilab/modules/helptools/images/scatter_3.png
index da0feca..bb80aa4 100644
--- a/scilab/modules/helptools/images/scatter_3.png
+++ b/scilab/modules/helptools/images/scatter_3.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter_4.png b/scilab/modules/helptools/images/scatter_4.png
index 8c70a21..96bf0c7 100644
--- a/scilab/modules/helptools/images/scatter_4.png
+++ b/scilab/modules/helptools/images/scatter_4.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter_5.png b/scilab/modules/helptools/images/scatter_5.png
index ffe493d..fcb4710 100644
--- a/scilab/modules/helptools/images/scatter_5.png
+++ b/scilab/modules/helptools/images/scatter_5.png
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter_6.png b/scilab/modules/helptools/images/scatter_6.png
deleted file mode 100644
index c4f4b3c..0000000
--- a/scilab/modules/helptools/images/scatter_6.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter_7.png b/scilab/modules/helptools/images/scatter_7.png
deleted file mode 100644
index 78d0f56..0000000
--- a/scilab/modules/helptools/images/scatter_7.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter_8.png b/scilab/modules/helptools/images/scatter_8.png
deleted file mode 100644
index 04d7014..0000000
--- a/scilab/modules/helptools/images/scatter_8.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/scatter_9.png b/scilab/modules/helptools/images/scatter_9.png
deleted file mode 100644
index 45e0369..0000000
--- a/scilab/modules/helptools/images/scatter_9.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/semilogx_1.png b/scilab/modules/helptools/images/semilogx_1.png
new file mode 100644
index 0000000..e4fbed7
--- /dev/null
+++ b/scilab/modules/helptools/images/semilogx_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/semilogy_1.png b/scilab/modules/helptools/images/semilogy_1.png
new file mode 100644
index 0000000..467517d
--- /dev/null
+++ b/scilab/modules/helptools/images/semilogy_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/sgolay_1.png b/scilab/modules/helptools/images/sgolay_1.png
new file mode 100644
index 0000000..1fb6b91
--- /dev/null
+++ b/scilab/modules/helptools/images/sgolay_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/sgolay_2.png b/scilab/modules/helptools/images/sgolay_2.png
new file mode 100644
index 0000000..3b7e5f5
--- /dev/null
+++ b/scilab/modules/helptools/images/sgolay_2.png
Binary files differ
diff --git a/scilab/modules/helptools/images/sgolaydiff_1.png b/scilab/modules/helptools/images/sgolaydiff_1.png
new file mode 100644
index 0000000..23e02e3
--- /dev/null
+++ b/scilab/modules/helptools/images/sgolaydiff_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/sgolayfilt_1.png b/scilab/modules/helptools/images/sgolayfilt_1.png
new file mode 100644
index 0000000..012a785
--- /dev/null
+++ b/scilab/modules/helptools/images/sgolayfilt_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/splin2d_equation_1.mml.png b/scilab/modules/helptools/images/splin2d_equation_1.mml.png
deleted file mode 100644
index f84e14a..0000000
--- a/scilab/modules/helptools/images/splin2d_equation_1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/splin3d_equation1.mml.png b/scilab/modules/helptools/images/splin3d_equation1.mml.png
deleted file mode 100644
index 285d2f4..0000000
--- a/scilab/modules/helptools/images/splin3d_equation1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/splin3d_pt_BR_1.png b/scilab/modules/helptools/images/splin3d_pt_BR_1.png
new file mode 100644
index 0000000..e0989fc
--- /dev/null
+++ b/scilab/modules/helptools/images/splin3d_pt_BR_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/splin_equation1.mml.png b/scilab/modules/helptools/images/splin_equation1.mml.png
deleted file mode 100644
index c69235e..0000000
--- a/scilab/modules/helptools/images/splin_equation1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/splin_equation2.mml.png b/scilab/modules/helptools/images/splin_equation2.mml.png
deleted file mode 100644
index 595f295..0000000
--- a/scilab/modules/helptools/images/splin_equation2.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/splin_equation3.mml.png b/scilab/modules/helptools/images/splin_equation3.mml.png
deleted file mode 100644
index e5c0f8a..0000000
--- a/scilab/modules/helptools/images/splin_equation3.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/splin_equation4.mml.png b/scilab/modules/helptools/images/splin_equation4.mml.png
deleted file mode 100644
index ca96e6b..0000000
--- a/scilab/modules/helptools/images/splin_equation4.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/splin_equation5.mml.png b/scilab/modules/helptools/images/splin_equation5.mml.png
deleted file mode 100644
index cb75d03..0000000
--- a/scilab/modules/helptools/images/splin_equation5.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/syslin_equation_1.mml.png b/scilab/modules/helptools/images/syslin_equation_1.mml.png
deleted file mode 100644
index 09acda8..0000000
--- a/scilab/modules/helptools/images/syslin_equation_1.mml.png
+++ /dev/null
Binary files differ
diff --git a/scilab/modules/helptools/images/uigetcolor_1.png b/scilab/modules/helptools/images/uigetcolor_1.png
new file mode 100644
index 0000000..b660018
--- /dev/null
+++ b/scilab/modules/helptools/images/uigetcolor_1.png
Binary files differ
diff --git a/scilab/modules/helptools/images/uigetcolor_RGB.png b/scilab/modules/helptools/images/uigetcolor_RGB.png
new file mode 100644
index 0000000..6693870
--- /dev/null
+++ b/scilab/modules/helptools/images/uigetcolor_RGB.png
Binary files differ
diff --git a/scilab/modules/helptools/images/x_matrix_booleans.png b/scilab/modules/helptools/images/x_matrix_booleans.png
new file mode 100644
index 0000000..477daf5
--- /dev/null
+++ b/scilab/modules/helptools/images/x_matrix_booleans.png
Binary files differ
diff --git a/scilab/modules/helptools/images/x_matrix_complex.png b/scilab/modules/helptools/images/x_matrix_complex.png
new file mode 100644
index 0000000..1c1f6d4
--- /dev/null
+++ b/scilab/modules/helptools/images/x_matrix_complex.png
Binary files differ
diff --git a/scilab/modules/helptools/images/x_matrix_header_scrollbars.png b/scilab/modules/helptools/images/x_matrix_header_scrollbars.png
new file mode 100644
index 0000000..9bb4d30
--- /dev/null
+++ b/scilab/modules/helptools/images/x_matrix_header_scrollbars.png
Binary files differ
diff --git a/scilab/modules/helptools/images/x_matrix_integers.png b/scilab/modules/helptools/images/x_matrix_integers.png
new file mode 100644
index 0000000..9e7635a
--- /dev/null
+++ b/scilab/modules/helptools/images/x_matrix_integers.png
Binary files differ
diff --git a/scilab/modules/helptools/images/x_matrix_reals.png b/scilab/modules/helptools/images/x_matrix_reals.png
new file mode 100644
index 0000000..3ec7f5e
--- /dev/null
+++ b/scilab/modules/helptools/images/x_matrix_reals.png
Binary files differ
diff --git a/scilab/modules/helptools/images/x_matrix_text.png b/scilab/modules/helptools/images/x_matrix_text.png
new file mode 100644
index 0000000..69cce23
--- /dev/null
+++ b/scilab/modules/helptools/images/x_matrix_text.png
Binary files differ
diff --git a/scilab/modules/helptools/macros/add_help_chapter.sci b/scilab/modules/helptools/macros/add_help_chapter.sci
index 24829e4..5adbf04 100644
--- a/scilab/modules/helptools/macros/add_help_chapter.sci
+++ b/scilab/modules/helptools/macros/add_help_chapter.sci
@@ -134,4 +134,13 @@ function ok = add_help_chapter(helptitle,path,modulemode)
134 %helps = this_help; 134 %helps = this_help;
135 end 135 end
136 136
137 // Update the help browser (if open)
138 // =========================================================================
139 [?, w] = where()
140 if grep(w, "atomsAutoload") == []
141 helpbrowser_update()
142 // otherwise: We update the browser from scilab.start AFTER atomsAutoload().
143 // to not make the browser blinking.
144 end
145
137endfunction 146endfunction
diff --git a/scilab/modules/helptools/macros/help.sci b/scilab/modules/helptools/macros/help.sci
index efd7068..961ab1d 100644
--- a/scilab/modules/helptools/macros/help.sci
+++ b/scilab/modules/helptools/macros/help.sci
@@ -1,7 +1,7 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2008 - INRIA - Vincent COUVERT 2// Copyright (C) 2008 - INRIA - Vincent COUVERT
3//
4// Copyright (C) 2012 - 2016 - Scilab Enterprises 3// Copyright (C) 2012 - 2016 - Scilab Enterprises
4// Copyright (C) 2020 - 2021 - Samuel GOUGEON
5// 5//
6// This file is hereby licensed under the terms of the GNU GPL v2.0, 6// This file is hereby licensed under the terms of the GNU GPL v2.0,
7// pursuant to article 5.3.4 of the CeCILL v.2.1. 7// pursuant to article 5.3.4 of the CeCILL v.2.1.
@@ -12,53 +12,68 @@
12 12
13function help(varargin) 13function help(varargin)
14 14
15 [lhs,rhs]=argn(0); 15 if findfiles("SCI/modules/helptools/jar","*_help.jar") == [] then
16 error(msprintf(gettext("%s: help file(.jar) is not installed.\n"), "help"));
17 end
18 if getscilabmode() == "NWNI" then
19 error(msprintf(gettext("%s: The help browser is disabled in %s mode.\n"), "help", getscilabmode()));
20 end
16 21
17 if rhs >= 1 then 22 if argn(2) >= 1 then
18 key = varargin(1); 23 key = varargin(1);
24 if type(key) <> 10 then
25 error(msprintf(_("%s: Wrong type for input argument #%d: string expected.\n"),"help",1));
26 end
19 else 27 else
20 key = ""; 28 key = "";
21 end 29 end
22 30
23 if (findfiles("SCI/modules/helptools/jar","*_help.jar") <> []) then 31 global %helps
24 32 // Retrieving the browser language and former page:
25 if getscilabmode() <> "NWNI" then 33 filename = SCIHOME + filesep() + "configuration.xml"
26 34 res = xmlGetValues("//Setting/Profile/HelpBrowser", ["index" "lang"], filename);
27 // No input argument: launch help browser 35 if key == "" then
28 if argn(2)==0 then 36 key = res(1)
29 global %helps 37 end
30 helpbrowser(%helps(:,1), getlanguage()); 38 if res(2) == ""
31 return 39 lang = getlanguage()
32 end 40 else
41 lang = res(2)
42 end
33 43
34 if type(key) <> 10 then 44 key = stripblanks(key)
35 error(msprintf(_("%s: Wrong type for input argument #%d: string expected.\n"),"help",1));
36 end
37 45
38 // Search a function name 46 symbols = strsplit("()[]{}%''"":*/\.<>&^|~+-")';
39 key=stripblanks(key) 47 exceptions = ["%t" "%T" "%f" "%F" "%onprompt"]; // http://bugzilla.scilab.org/15356
48 if or(part(key,1)==symbols) & exists(key)==0 & and(key~=exceptions) then
49 key = "symbols";
50 end
40 51
41 global %helps 52 // Treat "$" apart because contrarily to the previous symbols, "$" is an existing variable in Scilab
42 symbols = strsplit("()[]{}%''"":*/\.<>&^|~+-")'; 53 if part(key,1)=="$" & (exists(key)==0 | length(key)==1) then
43 exceptions = ["%t" "%T" "%f" "%F" "%onprompt"]; // http://bugzilla.scilab.org/15356 54 key = "symbols";
44 if or(part(key,1)==symbols) & exists(key)==0 & and(key~=exceptions) then 55 end
45 key="symbols"; 56 // Possible key redirection to Scilab's closest equivalent
46 end 57 key = helpRedirectExternal2Scilab(key)
47 58
48 // Treat "$" apart because contrarily to the previous symbols, "$" is an existing variable in Scilab 59 // Calling the browser
49 if part(key,1)=="$" & (exists(key)==0 | length(key)==1) then 60 helpbrowser(%helps(:,1), key, lang, %f);
50 key="symbols"; 61 // If the key is not a xml:id, then full-text search is done (See Java code)
51 end
52 62
53 helpbrowser(%helps(:,1), key, getlanguage(), %f); 63endfunction
54 64
55 // If the function name does not exist, then full-text search is done (See Java code) 65// ============================================================================
56 66
57 else 67function sciterm = helpRedirectExternal2Scilab(exterm)
58 error(msprintf(gettext("%s: The help browser is disabled in %s mode.\n"), "help", getscilabmode())); 68 sciterm = exterm
69 filename = SCIHOME + filesep() + "XConfiguration.xml"
70 res = xmlGetValues("//general/documentation/body/help", "redirectMatlab2Scilab", filename);
71 if res=="checked" then
72 filename = SCI + "/modules/helptools/data/external2scilab_equiv.csv"
73 tmp = csvRead(filename,";",[],"string",[]);
74 k = find(tmp(:,1)==exterm)
75 if k <> []
76 sciterm = tmp(k(1),2)
59 end 77 end
60 else
61 error(msprintf(gettext("%s: help file(.jar) is not installed.\n"), "help"));
62 end 78 end
63
64endfunction 79endfunction
diff --git a/scilab/modules/helptools/macros/helpbrowser_menus_cb.sci b/scilab/modules/helptools/macros/helpbrowser_menus_cb.sci
index 7df4e3b..e0e4eba 100644
--- a/scilab/modules/helptools/macros/helpbrowser_menus_cb.sci
+++ b/scilab/modules/helptools/macros/helpbrowser_menus_cb.sci
@@ -16,6 +16,9 @@ function helpbrowser_menus_cb(action, param)
16 url = hb.getCurrentURL() 16 url = hb.getCurrentURL()
17 [?,?,?, currentLang] = regexp(url, "/scilab_(.+?)_help.jar/") 17 [?,?,?, currentLang] = regexp(url, "/scilab_(.+?)_help.jar/")
18 id = hb.getCurrentID() 18 id = hb.getCurrentID()
19 if id==[] then
20 id = basename(url)
21 end
19 isSection = grep(id, "/^section_/", "r") <> [] 22 isSection = grep(id, "/^section_/", "r") <> []
20 tmp = msprintf("#^jar:file:/%s/modules/helptools/jar#", SCI) 23 tmp = msprintf("#^jar:file:/%s/modules/helptools/jar#", SCI)
21 isExternal = grep(url, tmp, "r") == [] 24 isExternal = grep(url, tmp, "r") == []
@@ -27,6 +30,13 @@ function helpbrowser_menus_cb(action, param)
27 else 30 else
28 global %helps 31 global %helps
29 helpbrowser(%helps(:,1), id, param, %f); 32 helpbrowser(%helps(:,1), id, param, %f);
33
34 // Recording the new lang in user's profile
35 filename = SCIHOME + filesep() + "configuration.xml"
36 doc = xmlRead(filename)
37 xmlSetValues("//Setting/Profile/HelpBrowser", ["lang" ; param], doc)
38 xmlWrite(doc, filename);
39 xmlDelete(doc)
30 end 40 end
31 case "online" 41 case "online"
32 if isExternal 42 if isExternal
@@ -48,6 +58,7 @@ function helpbrowser_menus_cb(action, param)
48 end 58 end
49 url = "https://help.scilab.org/docs/%s/%s/%s.html" 59 url = "https://help.scilab.org/docs/%s/%s/%s.html"
50 url = msprintf(url, v, currentLang, id) 60 url = msprintf(url, v, currentLang, id)
61
51 openURL(url) 62 openURL(url)
52 63
53 case "bugs" 64 case "bugs"
diff --git a/scilab/modules/helptools/macros/helpbrowser_update.sci b/scilab/modules/helptools/macros/helpbrowser_update.sci
new file mode 100644
index 0000000..e05f206
--- /dev/null
+++ b/scilab/modules/helptools/macros/helpbrowser_update.sci
@@ -0,0 +1,45 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2//
3// Copyright (C) 2020 - Samuel GOUGEON
4//
5// This file is hereby licensed under the terms of the GNU GPL v2.0,
6// pursuant to article 5.3.4 of the CeCILL v.2.1.
7// This file was originally licensed under the terms of the CeCILL v2.1,
8// and continues to be available under such terms.
9// For more information, see the COPYING file which you should have received
10// along with this program.
11
12function helpbrowser_update(startup)
13 // Internal called by add_help_chapter() and atomsLoad()
14
15 if or(getscilabmode()==["STD" "NW"])
16 jimport org.scilab.modules.gui.helpbrowser.ScilabHelpBrowser
17 hb = ScilabHelpBrowser.getHelpBrowserWithoutCreation()
18 global %helps
19 if ~isempty(hb)
20 if isdef("startup", "l")
21 // for scilab.start
22 id = xmlGetValues("//Setting/Profile/HelpBrowser","index",SCIHOME+"/configuration.xml")
23 // No way to retrieve as well the helpbrowser language, if it's
24 // different from the session's one.
25 help(id)
26 else
27 // for atomsLoad and add_help_chapter
28 id = hb.getCurrentID()
29 // Get the current language of the browser
30 jar = hb.getCurrentURL()
31 [?,?,?,lang] = regexp(jar, "/scilab_([a-z]{2}_[A-Z]{2})_help\.jar/", "o")
32 if lang=="en_US" // it may be a default external page in en_US,
33 // despite the browser is in another language
34 help("ones") // We are sure this page is translated
35 jar = hb.getCurrentURL();
36 [?,?,?,lang] = regexp(jar, "/scilab_([a-z]{2}_[A-Z]{2})_help\.jar/", "o")
37 end
38 // Update the browser
39 helpbrowser(%helps(:,1), id, lang, %f)
40 end
41 end
42 jremove hb ScilabHelpBrowser
43 end
44
45endfunction
diff --git a/scilab/modules/helptools/src/java/jflex/c.jflex b/scilab/modules/helptools/src/java/jflex/c.jflex
index 1a8ad00..e914051 100644
--- a/scilab/modules/helptools/src/java/jflex/c.jflex
+++ b/scilab/modules/helptools/src/java/jflex/c.jflex
@@ -7,7 +7,6 @@ import java.io.StringReader;
7import java.io.IOException; 7import java.io.IOException;
8 8
9@javax.annotation.Generated("JFlex") 9@javax.annotation.Generated("JFlex")
10@SuppressWarnings("fallthrough")
11%% 10%%
12 11
13%public 12%public
@@ -16,7 +15,6 @@ import java.io.IOException;
16%unicode 15%unicode
17%char 16%char
18%type void 17%type void
19%switch
20 18
21%{ 19%{
22 20
@@ -108,7 +106,7 @@ preprocessor = "#define" | "#elif" | "#else" | "#endif" | "#error" | "#if" | "#i
108 106
109openclose = [(){}\[\]] 107openclose = [(){}\[\]]
110 108
111operator = [=;,.><!~?:+-*/%&|\^] | ">>" | "<<" | "and" | "and_eq" | "bitand" | "bitor" | "compl" | "not" | "not_eq" | "operator" | "or" | "or_eq" | "typeid" | "xor" | "xor_eq" 109operator = [!%&*+,-./:;<=>?~|\^] | ">>" | "<<" | "and" | "and_eq" | "bitand" | "bitor" | "compl" | "not" | "not_eq" | "operator" | "or" | "or_eq" | "typeid" | "xor" | "xor_eq"
112 110
113%% 111%%
114 112
diff --git a/scilab/modules/helptools/src/java/jflex/function.jflex b/scilab/modules/helptools/src/java/jflex/function.jflex
index 2e0552a..7c5a536 100644
--- a/scilab/modules/helptools/src/java/jflex/function.jflex
+++ b/scilab/modules/helptools/src/java/jflex/function.jflex
@@ -6,7 +6,6 @@ import java.io.IOException;
6import java.io.StringReader; 6import java.io.StringReader;
7 7
8@javax.annotation.Generated("JFlex") 8@javax.annotation.Generated("JFlex")
9@SuppressWarnings("fallthrough")
10%% 9%%
11 10
12%public 11%public
@@ -16,8 +15,6 @@ import java.io.StringReader;
16%char 15%char
17%type void 16%type void
18 17
19%switch
20
21%{ 18%{
22 private static String currentName; 19 private static String currentName;
23 private static StringBuilder htmlBuffer = new StringBuilder(512); 20 private static StringBuilder htmlBuffer = new StringBuilder(512);
diff --git a/scilab/modules/helptools/src/java/jflex/java.jflex b/scilab/modules/helptools/src/java/jflex/java.jflex
index 4bb3231..8d36b7b 100644
--- a/scilab/modules/helptools/src/java/jflex/java.jflex
+++ b/scilab/modules/helptools/src/java/jflex/java.jflex
@@ -8,8 +8,7 @@ import java.io.IOException;
8 8
9import org.scilab.modules.helptools.c.AbstractCCodeHandler; 9import org.scilab.modules.helptools.c.AbstractCCodeHandler;
10 10
11@javax.annotation.Generated("JFlex") 11@javax.annotation.Generated("JFlex"))
12@SuppressWarnings("fallthrough")
13%% 12%%
14 13
15%public 14%public
@@ -108,7 +107,7 @@ modifier = "abstract" | "final" | "private" | "protected" | "public" | "static"
108 107
109openclose = [(){}\[\]] 108openclose = [(){}\[\]]
110 109
111operator = [=;,.><!~?:+-*/%&|\^] | ">>" | "<<" | ">>>" 110operator = [!%&*+,-./:;<=>?~|\^] | ">>" | "<<" | ">>>"
112 111
113%% 112%%
114 113
diff --git a/scilab/modules/helptools/src/java/jflex/scilab.jflex b/scilab/modules/helptools/src/java/jflex/scilab.jflex
index 70dbe59..6a4c5cd 100644
--- a/scilab/modules/helptools/src/java/jflex/scilab.jflex
+++ b/scilab/modules/helptools/src/java/jflex/scilab.jflex
@@ -16,7 +16,6 @@ import java.io.StringReader;
16import java.io.IOException; 16import java.io.IOException;
17 17
18@javax.annotation.Generated("JFlex") 18@javax.annotation.Generated("JFlex")
19@SuppressWarnings("fallthrough")
20%% 19%%
21 20
22%public 21%public
@@ -25,7 +24,6 @@ import java.io.IOException;
25%unicode 24%unicode
26%char 25%char
27%type void 26%type void
28%switch
29 27
30%{ 28%{
31 private static Set<String> commands; 29 private static Set<String> commands;
diff --git a/scilab/modules/helptools/src/java/jflex/xml.jflex b/scilab/modules/helptools/src/java/jflex/xml.jflex
index a76de8b..8527fab 100644
--- a/scilab/modules/helptools/src/java/jflex/xml.jflex
+++ b/scilab/modules/helptools/src/java/jflex/xml.jflex
@@ -7,7 +7,6 @@ import java.io.StringReader;
7import java.io.IOException; 7import java.io.IOException;
8 8
9@javax.annotation.Generated("JFlex") 9@javax.annotation.Generated("JFlex")
10@SuppressWarnings("fallthrough")
11%% 10%%
12 11
13%public 12%public
@@ -16,7 +15,6 @@ import java.io.IOException;
16%unicode 15%unicode
17%char 16%char
18%type void 17%type void
19%switch
20 18
21%{ 19%{
22 20
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java
index 0212e77..265f2fe 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java
@@ -1,4 +1,6 @@
1/* The following code was generated by JFlex 1.4.3 on 23/05/12 15:21 */ 1// DO NOT EDIT
2// Generated by JFlex 1.8.2 http://jflex.de/
3// source: jflex/function.jflex
2 4
3//CHECKSTYLE:OFF 5//CHECKSTYLE:OFF
4 6
@@ -8,141 +10,284 @@ import java.io.IOException;
8import java.io.StringReader; 10import java.io.StringReader;
9 11
10@javax.annotation.Generated("JFlex") 12@javax.annotation.Generated("JFlex")
11@SuppressWarnings("fallthrough") 13
12 14// See https://github.com/jflex-de/jflex/issues/222
13/** 15@SuppressWarnings("FallThrough")
14 * This class is a scanner generated by
15 * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
16 * on 23/05/12 15:21 from the specification file
17 * <tt>./jflex/function.jflex</tt>
18 */
19public final class SynopsisLexer { 16public final class SynopsisLexer {
20 17
21 /** This character denotes the end of file */ 18 /** This character denotes the end of file. */
22 public static final int YYEOF = -1; 19 public static final int YYEOF = -1;
23 20
24 /** initial size of the lookahead buffer */ 21 /** Initial size of the lookahead buffer. */
25 private static final int ZZ_BUFFERSIZE = 16384; 22 private static final int ZZ_BUFFERSIZE = 16384;
26 23
27 /** lexical states */ 24 // Lexical states.
28 public static final int YYINITIAL = 0; 25 public static final int YYINITIAL = 0;
29 26
30 /** 27 /**
31 * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l 28 * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
32 * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l 29 * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
33 * at the beginning of a line 30 * at the beginning of a line
34 * l is of the form l = 2*k, k a non negative integer 31 * l is of the form l = 2*k, k a non negative integer
35 */ 32 */
36 private static final int ZZ_LEXSTATE[] = { 33 private static final int ZZ_LEXSTATE[] = {
37 0, 0 34 0, 0
38 }; 35 };
39 36
40 /** 37 /**
41 * Translates characters to character classes 38 * Top-level table for translating characters to character classes
42 */ 39 */
43 private static final String ZZ_CMAP_PACKED = 40 private static final int [] ZZ_CMAP_TOP = zzUnpackcmap_top();
44 "\11\0\1\1\1\3\2\0\1\2\22\0\1\1\1\6\1\12\1\6" + 41
45 "\1\7\1\4\1\11\1\13\7\0\1\10\12\5\2\0\1\14\1\0" + 42 private static final String ZZ_CMAP_TOP_PACKED_0 =
46 "\1\15\1\6\1\0\32\6\4\0\1\6\1\0\32\6\uff85\0"; 43 "\1\0\u10ff\u0100";
47 44
48 /** 45 private static int [] zzUnpackcmap_top() {
49 * Translates characters to character classes 46 int [] result = new int[4352];
50 */ 47 int offset = 0;
51 private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); 48 offset = zzUnpackcmap_top(ZZ_CMAP_TOP_PACKED_0, offset, result);
52 49 return result;
53 /** 50 }
54 * Translates DFA states to action switch labels. 51
55 */ 52 private static int zzUnpackcmap_top(String packed, int offset, int [] result) {
56 private static final int [] ZZ_ACTION = zzUnpackAction(); 53 int i = 0; /* index in packed string */
57 54 int j = offset; /* index in unpacked array */
58 private static final String ZZ_ACTION_PACKED_0 = 55 int l = packed.length();
59 "\1\0\1\1\1\2\2\3\1\4\2\1\1\5\1\6" + 56 while (i < l) {
60 "\1\7\1\10\1\11\1\4\1\12"; 57 int count = packed.charAt(i++);
61 58 int value = packed.charAt(i++);
62 private static int [] zzUnpackAction() { 59 do result[j++] = value; while (--count > 0);
63 int [] result = new int[15];
64 int offset = 0;
65 offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
66 return result;
67 } 60 }
68 61 return j;
69 private static int zzUnpackAction(String packed, int offset, int [] result) { 62 }
70 int i = 0; /* index in packed string */ 63
71 int j = offset; /* index in unpacked array */ 64
72 int l = packed.length(); 65 /**
73 while (i < l) { 66 * Second-level tables for translating characters to character classes
74 int count = packed.charAt(i++); 67 */
75 int value = packed.charAt(i++); 68 private static final int [] ZZ_CMAP_BLOCKS = zzUnpackcmap_blocks();
76 do { 69
77 result[j++] = value; 70 private static final String ZZ_CMAP_BLOCKS_PACKED_0 =
78 } while (--count > 0); 71 "\11\0\1\1\1\2\2\0\1\3\22\0\1\1\1\4"+
79 } 72 "\1\5\1\4\1\6\1\7\1\10\1\11\7\0\1\12"+
80 return j; 73 "\12\13\2\0\1\14\1\0\1\15\1\4\1\0\32\4"+
74 "\4\0\1\4\1\0\32\4\u0185\0";
75
76 private static int [] zzUnpackcmap_blocks() {
77 int [] result = new int[512];
78 int offset = 0;
79 offset = zzUnpackcmap_blocks(ZZ_CMAP_BLOCKS_PACKED_0, offset, result);
80 return result;
81 }
82
83 private static int zzUnpackcmap_blocks(String packed, int offset, int [] result) {
84 int i = 0; /* index in packed string */
85 int j = offset; /* index in unpacked array */
86 int l = packed.length();
87 while (i < l) {
88 int count = packed.charAt(i++);
89 int value = packed.charAt(i++);
90 do result[j++] = value; while (--count > 0);
81 } 91 }
92 return j;
93 }
94
95 /**
96 * Translates DFA states to action switch labels.
97 */
98 private static final int [] ZZ_ACTION = zzUnpackAction();
99
100 private static final String ZZ_ACTION_PACKED_0 =
101 "\1\0\1\1\1\2\2\3\1\4\1\5\1\1\1\6"+
102 "\1\7\1\1\1\10\1\11\1\4\1\12";
103
104 private static int [] zzUnpackAction() {
105 int [] result = new int[15];
106 int offset = 0;
107 offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
108 return result;
109 }
110
111 private static int zzUnpackAction(String packed, int offset, int [] result) {
112 int i = 0; /* index in packed string */
113 int j = offset; /* index in unpacked array */
114 int l = packed.length();
115 while (i < l) {
116 int count = packed.charAt(i++);
117 int value = packed.charAt(i++);
118 do result[j++] = value; while (--count > 0);
119 }
120 return j;
121 }
122
123
124 /**
125 * Translates a state to a row index in the transition table
126 */
127 private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
128
129 private static final String ZZ_ROWMAP_PACKED_0 =
130 "\0\0\0\16\0\34\0\52\0\70\0\106\0\124\0\142"+
131 "\0\124\0\124\0\160\0\124\0\124\0\142\0\176";
132
133 private static int [] zzUnpackRowMap() {
134 int [] result = new int[15];
135 int offset = 0;
136 offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
137 return result;
138 }
139
140 private static int zzUnpackRowMap(String packed, int offset, int [] result) {
141 int i = 0; /* index in packed string */
142 int j = offset; /* index in unpacked array */
143 int l = packed.length();
144 while (i < l) {
145 int high = packed.charAt(i++) << 16;
146 result[j++] = high | packed.charAt(i++);
147 }
148 return j;
149 }
150
151 /**
152 * The transition table of the DFA
153 */
154 private static final int [] ZZ_TRANS = zzUnpackTrans();
155
156 private static final String ZZ_TRANS_PACKED_0 =
157 "\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\6"+
158 "\1\11\1\12\1\13\1\2\1\14\1\15\2\2\4\0"+
159 "\1\2\4\0\1\2\2\0\1\2\1\3\4\0\1\2"+
160 "\4\0\1\2\3\0\1\4\15\0\2\4\17\0\1\6"+
161 "\1\0\1\6\4\0\1\6\20\0\2\2\2\0\1\6"+
162 "\1\0\1\16\4\0\1\16\14\0\1\17\3\0\2\17"+
163 "\2\0\12\17";
164
165 private static int [] zzUnpackTrans() {
166 int [] result = new int[140];
167 int offset = 0;
168 offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
169 return result;
170 }
171
172 private static int zzUnpackTrans(String packed, int offset, int [] result) {
173 int i = 0; /* index in packed string */
174 int j = offset; /* index in unpacked array */
175 int l = packed.length();
176 while (i < l) {
177 int count = packed.charAt(i++);
178 int value = packed.charAt(i++);
179 value--;
180 do result[j++] = value; while (--count > 0);
181 }
182 return j;
183 }
184
185
186 /** Error code for "Unknown internal scanner error". */
187 private static final int ZZ_UNKNOWN_ERROR = 0;
188 /** Error code for "could not match input". */
189 private static final int ZZ_NO_MATCH = 1;
190 /** Error code for "pushback value was too large". */
191 private static final int ZZ_PUSHBACK_2BIG = 2;
192
193 /**
194 * Error messages for {@link #ZZ_UNKNOWN_ERROR}, {@link #ZZ_NO_MATCH}, and
195 * {@link #ZZ_PUSHBACK_2BIG} respectively.
196 */
197 private static final String ZZ_ERROR_MSG[] = {
198 "Unknown internal scanner error",
199 "Error: could not match input",
200 "Error: pushback value was too large"
201 };
202
203 /**
204 * ZZ_ATTRIBUTE[aState] contains the attributes of state {@code aState}
205 */
206 private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
207
208 private static final String ZZ_ATTRIBUTE_PACKED_0 =
209 "\1\0\5\1\1\11\1\1\2\11\1\1\2\11\2\1";
210
211 private static int [] zzUnpackAttribute() {
212 int [] result = new int[15];
213 int offset = 0;
214 offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
215 return result;
216 }
217
218 private static int zzUnpackAttribute(String packed, int offset, int [] result) {
219 int i = 0; /* index in packed string */
220 int j = offset; /* index in unpacked array */
221 int l = packed.length();
222 while (i < l) {
223 int count = packed.charAt(i++);
224 int value = packed.charAt(i++);
225 do result[j++] = value; while (--count > 0);
226 }
227 return j;
228 }
82 229
230 /** Input device. */
231 private java.io.Reader zzReader;
83 232
84 /* error codes */ 233 /** Current state of the DFA. */
85 private static final int ZZ_UNKNOWN_ERROR = 0; 234 private int zzState;
86 private static final int ZZ_NO_MATCH = 1;
87 private static final int ZZ_PUSHBACK_2BIG = 2;
88
89 /* error messages for the codes above */
90 private static final String ZZ_ERROR_MSG[] = {
91 "Unkown internal scanner error",
92 "Error: could not match input",
93 "Error: pushback value was too large"
94 };
95
96 /** the input device */
97 private java.io.Reader zzReader;
98 235
99 /** the current state of the DFA */ 236 /** Current lexical state. */
100 private int zzState; 237 private int zzLexicalState = YYINITIAL;
101 238
102 /** the current lexical state */ 239 /**
103 private int zzLexicalState = YYINITIAL; 240 * This buffer contains the current text to be matched and is the source of the {@link #yytext()}
241 * string.
242 */
243 private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
104 244
105 /** this buffer contains the current text to be matched and is 245 /** Text position at the last accepting state. */
106 the source of the yytext() string */ 246 private int zzMarkedPos;
107 private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
108 247
109 /** the textposition at the last accepting state */ 248 /** Current text position in the buffer. */
110 private int zzMarkedPos; 249 private int zzCurrentPos;
111 250
112 /** the current text position in the buffer */ 251 /** Marks the beginning of the {@link #yytext()} string in the buffer. */
113 private int zzCurrentPos; 252 private int zzStartRead;
114 253
115 /** startRead marks the beginning of the yytext() string in the buffer */ 254 /** Marks the last character in the buffer, that has been read from input. */
116 private int zzStartRead; 255 private int zzEndRead;
117 256
118 /** endRead marks the last character in the buffer, that has been read 257 /**
119 from input */ 258 * Whether the scanner is at the end of file.
120 private int zzEndRead; 259 * @see #yyatEOF
260 */
261 private boolean zzAtEOF;
121 262
122 /** number of newlines encountered up to the start of the matched text */ 263 /**
123 private int yyline; 264 * The number of occupied positions in {@link #zzBuffer} beyond {@link #zzEndRead}.
265 *
266 * <p>When a lead/high surrogate has been read from the input stream into the final
267 * {@link #zzBuffer} position, this will have a value of 1; otherwise, it will have a value of 0.
268 */
269 private int zzFinalHighSurrogate = 0;
124 270
125 /** the number of characters up to the start of the matched text */ 271 /** Number of newlines encountered up to the start of the matched text. */
126 private int yychar; 272 @SuppressWarnings("unused")
273 private int yyline;
127 274
128 /** 275 /** Number of characters from the last newline up to the start of the matched text. */
129 * the number of characters from the last newline up to the start of the 276 @SuppressWarnings("unused")
130 * matched text 277 private int yycolumn;
131 */
132 private int yycolumn;
133 278
134 /** 279 /** Number of characters up to the start of the matched text. */
135 * zzAtBOL == true <=> the scanner is currently at the beginning of a line 280 private long yychar;
136 */
137 private boolean zzAtBOL = true;
138 281
139 /** zzAtEOF == true <=> the scanner is at the EOF */ 282 /** Whether the scanner is currently at the beginning of a line. */
140 private boolean zzAtEOF; 283 @SuppressWarnings("unused")
284 private boolean zzAtBOL = true;
141 285
142 /** denotes if the user-EOF-code has already been executed */ 286 /** Whether the user-EOF-code has already been executed. */
143 private boolean zzEOFDone; 287 @SuppressWarnings("unused")
288 private boolean zzEOFDone;
144 289
145 /* user code: */ 290 /* user code: */
146 private static String currentName; 291 private static String currentName;
147 private static StringBuilder htmlBuffer = new StringBuilder(512); 292 private static StringBuilder htmlBuffer = new StringBuilder(512);
148 private static SynopsisLexer lexer = new SynopsisLexer(); 293 private static SynopsisLexer lexer = new SynopsisLexer();
@@ -153,11 +298,11 @@ public final class SynopsisLexer {
153 currentName = name; 298 currentName = name;
154 try { 299 try {
155 lexer.yyreset(new StringReader(str.trim())); 300 lexer.yyreset(new StringReader(str.trim()));
156 lexer.yybegin(YYINITIAL); 301 lexer.yybegin(YYINITIAL);
157 htmlBuffer.setLength(0); 302 htmlBuffer.setLength(0);
158 lexer.yylex(); 303 lexer.yylex();
159 304
160 return htmlBuffer.toString(); 305 return htmlBuffer.toString();
161 } catch (IOException e) { 306 } catch (IOException e) {
162 return null; 307 return null;
163 } 308 }
@@ -165,562 +310,411 @@ public final class SynopsisLexer {
165 310
166 311
167 312
168 /** 313 /**
169 * Creates a new scanner 314 * Creates a new scanner
170 * There is also a java.io.InputStream version of this constructor. 315 *
171 * 316 * @param in the java.io.Reader to read input from.
172 * @param in the java.io.Reader to read input from. 317 */
173 */ 318 public SynopsisLexer(java.io.Reader in) {
174 public SynopsisLexer(java.io.Reader in) { 319 this.zzReader = in;
175 this.zzReader = in; 320 }
321
322 /**
323 * Translates raw input code points to DFA table row
324 */
325 private static int zzCMap(int input) {
326 int offset = input & 255;
327 return offset == input ? ZZ_CMAP_BLOCKS[offset] : ZZ_CMAP_BLOCKS[ZZ_CMAP_TOP[input >> 8] | offset];
328 }
329
330 /**
331 * Refills the input buffer.
332 *
333 * @return {@code false} iff there was new input.
334 * @exception java.io.IOException if any I/O-Error occurs
335 */
336 private boolean zzRefill() throws java.io.IOException {
337
338 /* first: make room (if you can) */
339 if (zzStartRead > 0) {
340 zzEndRead += zzFinalHighSurrogate;
341 zzFinalHighSurrogate = 0;
342 System.arraycopy(zzBuffer, zzStartRead,
343 zzBuffer, 0,
344 zzEndRead - zzStartRead);
345
346 /* translate stored positions */
347 zzEndRead -= zzStartRead;
348 zzCurrentPos -= zzStartRead;
349 zzMarkedPos -= zzStartRead;
350 zzStartRead = 0;
176 } 351 }
177 352
178 /** 353 /* is the buffer big enough? */
179 * Creates a new scanner. 354 if (zzCurrentPos >= zzBuffer.length - zzFinalHighSurrogate) {
180 * There is also java.io.Reader version of this constructor. 355 /* if not: blow it up */
181 * 356 char newBuffer[] = new char[zzBuffer.length * 2];
182 * @param in the java.io.Inputstream to read input from. 357 System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
183 */ 358 zzBuffer = newBuffer;
184 public SynopsisLexer(java.io.InputStream in) { 359 zzEndRead += zzFinalHighSurrogate;
185 this(new java.io.InputStreamReader(in)); 360 zzFinalHighSurrogate = 0;
186 }
187
188 /**
189 * Unpacks the compressed character translation table.
190 *
191 * @param packed the packed character translation table
192 * @return the unpacked character translation table
193 */
194 private static char [] zzUnpackCMap(String packed) {
195 char [] map = new char[0x10000];
196 int i = 0; /* index in packed string */
197 int j = 0; /* index in unpacked array */
198 while (i < 58) {
199 int count = packed.charAt(i++);
200 char value = packed.charAt(i++);
201 do {
202 map[j++] = value;
203 } while (--count > 0);
204 }
205 return map;
206 } 361 }
207 362
363 /* fill the buffer with new input */
364 int requested = zzBuffer.length - zzEndRead;
365 int numRead = zzReader.read(zzBuffer, zzEndRead, requested);
208 366
209 /** 367 /* not supposed to occur according to specification of java.io.Reader */
210 * Refills the input buffer. 368 if (numRead == 0) {
211 * 369 throw new java.io.IOException(
212 * @return <code>false</code>, iff there was new input. 370 "Reader returned 0 characters. See JFlex examples/zero-reader for a workaround.");
213 *
214 * @exception java.io.IOException if any I/O-Error occurs
215 */
216 private boolean zzRefill() throws java.io.IOException {
217
218 /* first: make room (if you can) */
219 if (zzStartRead > 0) {
220 System.arraycopy(zzBuffer, zzStartRead,
221 zzBuffer, 0,
222 zzEndRead - zzStartRead);
223
224 /* translate stored positions */
225 zzEndRead -= zzStartRead;
226 zzCurrentPos -= zzStartRead;
227 zzMarkedPos -= zzStartRead;
228 zzStartRead = 0;
229 }
230
231 /* is the buffer big enough? */
232 if (zzCurrentPos >= zzBuffer.length) {
233 /* if not: blow it up */
234 char newBuffer[] = new char[zzCurrentPos * 2];
235 System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
236 zzBuffer = newBuffer;
237 }
238
239 /* finally: fill the buffer with new input */
240 int numRead = zzReader.read(zzBuffer, zzEndRead,
241 zzBuffer.length - zzEndRead);
242
243 if (numRead > 0) {
244 zzEndRead += numRead;
245 return false;
246 }
247 // unlikely but not impossible: read 0 characters, but not at end of stream
248 if (numRead == 0) {
249 int c = zzReader.read();
250 if (c == -1) {
251 return true;
252 } else {
253 zzBuffer[zzEndRead++] = (char) c;
254 return false;
255 }
256 }
257
258 // numRead < 0
259 return true;
260 } 371 }
261 372 if (numRead > 0) {
262 373 zzEndRead += numRead;
263 /** 374 if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
264 * Closes the input stream. 375 if (numRead == requested) { // We requested too few chars to encode a full Unicode character
265 */ 376 --zzEndRead;
266 public final void yyclose() throws java.io.IOException { 377 zzFinalHighSurrogate = 1;
267 zzAtEOF = true; /* indicate end of file */ 378 } else { // There is room in the buffer for at least one more char
268 zzEndRead = zzStartRead; /* invalidate buffer */ 379 int c = zzReader.read(); // Expecting to read a paired low surrogate char
269 380 if (c == -1) {
270 if (zzReader != null) { 381 return true;
271 zzReader.close(); 382 } else {
383 zzBuffer[zzEndRead++] = (char)c;
384 }
272 } 385 }
386 }
387 /* potentially more input available */
388 return false;
273 } 389 }
274 390
391 /* numRead < 0 ==> end of stream */
392 return true;
393 }
275 394
276 /**
277 * Resets the scanner to read from a new input stream.
278 * Does not close the old reader.
279 *
280 * All internal variables are reset, the old input stream
281 * <b>cannot</b> be reused (internal buffer is discarded and lost).
282 * Lexical state is set to <tt>ZZ_INITIAL</tt>.
283 *
284 * @param reader the new input stream
285 */
286 public final void yyreset(java.io.Reader reader) {
287 zzReader = reader;
288 zzAtBOL = true;
289 zzAtEOF = false;
290 zzEOFDone = false;
291 zzEndRead = zzStartRead = 0;
292 zzCurrentPos = zzMarkedPos = 0;
293 yyline = yychar = yycolumn = 0;
294 zzLexicalState = YYINITIAL;
295 }
296 395
396 /**
397 * Closes the input reader.
398 *
399 * @throws java.io.IOException if the reader could not be closed.
400 */
401 public final void yyclose() throws java.io.IOException {
402 zzAtEOF = true; // indicate end of file
403 zzEndRead = zzStartRead; // invalidate buffer
297 404
298 /** 405 if (zzReader != null) {
299 * Returns the current lexical state. 406 zzReader.close();
300 */
301 public final int yystate() {
302 return zzLexicalState;
303 } 407 }
304 408 }
305 409
306 /** 410
307 * Enters a new lexical state 411 /**
308 * 412 * Resets the scanner to read from a new input stream.
309 * @param newState the new lexical state 413 *
310 */ 414 * <p>Does not close the old reader.
311 public final void yybegin(int newState) { 415 *
312 zzLexicalState = newState; 416 * <p>All internal variables are reset, the old input stream <b>cannot</b> be reused (internal
417 * buffer is discarded and lost). Lexical state is set to {@code ZZ_INITIAL}.
418 *
419 * <p>Internal scan buffer is resized down to its initial length, if it has grown.
420 *
421 * @param reader The new input stream.
422 */
423 public final void yyreset(java.io.Reader reader) {
424 zzReader = reader;
425 zzEOFDone = false;
426 yyResetPosition();
427 zzLexicalState = YYINITIAL;
428 if (zzBuffer.length > ZZ_BUFFERSIZE) {
429 zzBuffer = new char[ZZ_BUFFERSIZE];
430 }
431 }
432
433 /**
434 * Resets the input position.
435 */
436 private final void yyResetPosition() {
437 zzAtBOL = true;
438 zzAtEOF = false;
439 zzCurrentPos = 0;
440 zzMarkedPos = 0;
441 zzStartRead = 0;
442 zzEndRead = 0;
443 zzFinalHighSurrogate = 0;
444 yyline = 0;
445 yycolumn = 0;
446 yychar = 0L;
447 }
448
449
450 /**
451 * Returns whether the scanner has reached the end of the reader it reads from.
452 *
453 * @return whether the scanner has reached EOF.
454 */
455 public final boolean yyatEOF() {
456 return zzAtEOF;
457 }
458
459
460 /**
461 * Returns the current lexical state.
462 *
463 * @return the current lexical state.
464 */
465 public final int yystate() {
466 return zzLexicalState;
467 }
468
469
470 /**
471 * Enters a new lexical state.
472 *
473 * @param newState the new lexical state
474 */
475 public final void yybegin(int newState) {
476 zzLexicalState = newState;
477 }
478
479
480 /**
481 * Returns the text matched by the current regular expression.
482 *
483 * @return the matched text.
484 */
485 public final String yytext() {
486 return new String(zzBuffer, zzStartRead, zzMarkedPos-zzStartRead);
487 }
488
489
490 /**
491 * Returns the character at the given position from the matched text.
492 *
493 * <p>It is equivalent to {@code yytext().charAt(pos)}, but faster.
494 *
495 * @param position the position of the character to fetch. A value from 0 to {@code yylength()-1}.
496 *
497 * @return the character at {@code position}.
498 */
499 public final char yycharat(int position) {
500 return zzBuffer[zzStartRead + position];
501 }
502
503
504 /**
505 * How many characters were matched.
506 *
507 * @return the length of the matched text region.
508 */
509 public final int yylength() {
510 return zzMarkedPos-zzStartRead;
511 }
512
513
514 /**
515 * Reports an error that occurred while scanning.
516 *
517 * <p>In a well-formed scanner (no or only correct usage of {@code yypushback(int)} and a
518 * match-all fallback rule) this method will only be called with things that
519 * "Can't Possibly Happen".
520 *
521 * <p>If this method is called, something is seriously wrong (e.g. a JFlex bug producing a faulty
522 * scanner etc.).
523 *
524 * <p>Usual syntax/scanner level error handling should be done in error fallback rules.
525 *
526 * @param errorCode the code of the error message to display.
527 */
528 private static void zzScanError(int errorCode) {
529 String message;
530 try {
531 message = ZZ_ERROR_MSG[errorCode];
532 } catch (ArrayIndexOutOfBoundsException e) {
533 message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
313 } 534 }
314 535
536 throw new Error(message);
537 }
315 538
316 /**
317 * Returns the text matched by the current regular expression.
318 */
319 public final String yytext() {
320 return new String( zzBuffer, zzStartRead, zzMarkedPos - zzStartRead );
321 }
322 539
540 /**
541 * Pushes the specified amount of characters back into the input stream.
542 *
543 * <p>They will be read again by then next call of the scanning method.
544 *
545 * @param number the number of characters to be read again. This number must not be greater than
546 * {@link #yylength()}.
547 */
548 public void yypushback(int number) {
549 if ( number > yylength() )
550 zzScanError(ZZ_PUSHBACK_2BIG);
323 551
324 /** 552 zzMarkedPos -= number;
325 * Returns the character at position <tt>pos</tt> from the 553 }
326 * matched text.
327 *
328 * It is equivalent to yytext().charAt(pos), but faster
329 *
330 * @param pos the position of the character to fetch.
331 * A value from 0 to yylength()-1.
332 *
333 * @return the character at position pos
334 */
335 public final char yycharat(int pos) {
336 return zzBuffer[zzStartRead + pos];
337 }
338 554
339 555
340 /**
341 * Returns the length of the matched text region.
342 */
343 public final int yylength() {
344 return zzMarkedPos - zzStartRead;
345 }
346 556
347 557
348 /** 558 /**
349 * Reports an error that occurred while scanning. 559 * Resumes scanning until the next regular expression is matched, the end of input is encountered
350 * 560 * or an I/O-Error occurs.
351 * In a wellformed scanner (no or only correct usage of 561 *
352 * yypushback(int) and a match-all fallback rule) this method 562 * @return the next token.
353 * will only be called with things that "Can't Possibly Happen". 563 * @exception java.io.IOException if any I/O-Error occurs.
354 * If this method is called, something is seriously wrong 564 */
355 * (e.g. a JFlex bug producing a faulty scanner etc.). 565 public void yylex() throws java.io.IOException {
356 * 566 int zzInput;
357 * Usual syntax/scanner level error handling should be done 567 int zzAction;
358 * in error fallback rules.
359 *
360 * @param errorCode the code of the errormessage to display
361 */
362 private void zzScanError(int errorCode) {
363 String message;
364 try {
365 message = ZZ_ERROR_MSG[errorCode];
366 } catch (ArrayIndexOutOfBoundsException e) {
367 message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
368 }
369 568
370 throw new Error(message); 569 // cached fields:
371 } 570 int zzCurrentPosL;
571 int zzMarkedPosL;
572 int zzEndReadL = zzEndRead;
573 char[] zzBufferL = zzBuffer;
372 574
575 int [] zzTransL = ZZ_TRANS;
576 int [] zzRowMapL = ZZ_ROWMAP;
577 int [] zzAttrL = ZZ_ATTRIBUTE;
373 578
374 /** 579 while (true) {
375 * Pushes the specified amount of characters back into the input stream. 580 zzMarkedPosL = zzMarkedPos;
376 *
377 * They will be read again by then next call of the scanning method
378 *
379 * @param number the number of characters to be read again.
380 * This number must not be greater than yylength()!
381 */
382 public void yypushback(int number) {
383 if ( number > yylength() ) {
384 zzScanError(ZZ_PUSHBACK_2BIG);
385 }
386 581
387 zzMarkedPos -= number; 582 yychar+= zzMarkedPosL-zzStartRead;
388 } 583
584 zzAction = -1;
389 585
586 zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
390 587
391 /** 588 zzState = ZZ_LEXSTATE[zzLexicalState];
392 * Resumes scanning until the next regular expression is matched,
393 * the end of input is encountered or an I/O-Error occurs.
394 *
395 * @return the next token
396 * @exception java.io.IOException if any I/O-Error occurs
397 */
398 public void yylex() throws java.io.IOException {
399 int zzInput;
400 int zzAction;
401 589
402 // cached fields: 590 // set up zzAction for empty match case:
403 int zzCurrentPosL; 591 int zzAttributes = zzAttrL[zzState];
404 int zzMarkedPosL; 592 if ( (zzAttributes & 1) == 1 ) {
405 int zzEndReadL = zzEndRead; 593 zzAction = zzState;
406 char [] zzBufferL = zzBuffer; 594 }
407 char [] zzCMapL = ZZ_CMAP;
408 595
409 596
597 zzForAction: {
410 while (true) { 598 while (true) {
411 zzMarkedPosL = zzMarkedPos; 599
412 600 if (zzCurrentPosL < zzEndReadL) {
413 yychar += zzMarkedPosL - zzStartRead; 601 zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
414 602 zzCurrentPosL += Character.charCount(zzInput);
415 zzAction = -1; 603 }
416 604 else if (zzAtEOF) {
417 zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; 605 zzInput = YYEOF;
418 606 break zzForAction;
419 zzState = ZZ_LEXSTATE[zzLexicalState]; 607 }
420 608 else {
421 609 // store back cached positions
422 zzForAction: { 610 zzCurrentPos = zzCurrentPosL;
423 while (true) { 611 zzMarkedPos = zzMarkedPosL;
424 612 boolean eof = zzRefill();
425 if (zzCurrentPosL < zzEndReadL) { 613 // get translated positions and possibly new buffer
426 zzInput = zzBufferL[zzCurrentPosL++]; 614 zzCurrentPosL = zzCurrentPos;
427 } else if (zzAtEOF) { 615 zzMarkedPosL = zzMarkedPos;
428 zzInput = YYEOF; 616 zzBufferL = zzBuffer;
429 break zzForAction; 617 zzEndReadL = zzEndRead;
430 } else { 618 if (eof) {
431 // store back cached positions 619 zzInput = YYEOF;
432 zzCurrentPos = zzCurrentPosL; 620 break zzForAction;
433 zzMarkedPos = zzMarkedPosL; 621 }
434 boolean eof = zzRefill(); 622 else {
435 // get translated positions and possibly new buffer 623 zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
436 zzCurrentPosL = zzCurrentPos; 624 zzCurrentPosL += Character.charCount(zzInput);
437 zzMarkedPosL = zzMarkedPos;
438 zzBufferL = zzBuffer;
439 zzEndReadL = zzEndRead;
440 if (eof) {
441 zzInput = YYEOF;
442 break zzForAction;
443 } else {
444 zzInput = zzBufferL[zzCurrentPosL++];
445 }
446 }
447 zzInput = zzCMapL[zzInput];
448
449 boolean zzIsFinal = false;
450 boolean zzNoLookAhead = false;
451
452 zzForNext: {
453 switch (zzState) {
454 case 0:
455 switch (zzInput) {
456 case 1:
457 zzIsFinal = true;
458 zzState = 2;
459 break zzForNext;
460 case 2:
461 zzIsFinal = true;
462 zzState = 3;
463 break zzForNext;
464 case 3:
465 zzIsFinal = true;
466 zzState = 4;
467 break zzForNext;
468 case 4:
469 case 6:
470 zzIsFinal = true;
471 zzState = 5;
472 break zzForNext;
473 case 7:
474 zzIsFinal = true;
475 zzState = 6;
476 break zzForNext;
477 case 8:
478 zzIsFinal = true;
479 zzState = 7;
480 break zzForNext;
481 case 9:
482 zzIsFinal = true;
483 zzNoLookAhead = true;
484 zzState = 8;
485 break zzForNext;
486 case 10:
487 zzIsFinal = true;
488 zzNoLookAhead = true;
489 zzState = 9;
490 break zzForNext;
491 case 11:
492 zzIsFinal = true;
493 zzNoLookAhead = true;
494 zzState = 10;
495 break zzForNext;
496 case 12:
497 zzIsFinal = true;
498 zzNoLookAhead = true;
499 zzState = 11;
500 break zzForNext;
501 case 13:
502 zzIsFinal = true;
503 zzNoLookAhead = true;
504 zzState = 12;
505 break zzForNext;
506 default:
507 zzIsFinal = true;
508 zzState = 1;
509 break zzForNext;
510 }
511
512 case 1:
513 switch (zzInput) {
514 case 0:
515 case 1:
516 case 5:
517 case 7:
518 zzIsFinal = true;
519 break zzForNext;
520 default:
521 break zzForAction;
522 }
523
524 case 2:
525 switch (zzInput) {
526 case 0:
527 case 5:
528 case 7:
529 zzIsFinal = true;
530 zzState = 1;
531 break zzForNext;
532 case 1:
533 zzIsFinal = true;
534 break zzForNext;
535 default:
536 break zzForAction;
537 }
538
539 case 3:
540 switch (zzInput) {
541 case 1:
542 case 3:
543 zzIsFinal = true;
544 zzState = 4;
545 break zzForNext;
546 default:
547 break zzForAction;
548 }
549
550 case 4:
551 switch (zzInput) {
552 case 1:
553 zzIsFinal = true;
554 break zzForNext;
555 default:
556 break zzForAction;
557 }
558
559 case 5:
560 switch (zzInput) {
561 case 5:
562 case 6:
563 case 7:
564 zzIsFinal = true;
565 break zzForNext;
566 default:
567 break zzForAction;
568 }
569
570 case 6:
571 switch (zzInput) {
572 case 0:
573 case 1:
574 zzIsFinal = true;
575 zzState = 1;
576 break zzForNext;
577 case 6:
578 zzIsFinal = true;
579 zzState = 5;
580 break zzForNext;
581 case 5:
582 case 7:
583 zzIsFinal = true;
584 zzState = 13;
585 break zzForNext;
586 default:
587 break zzForAction;
588 }
589
590 case 7:
591 switch (zzInput) {
592 case 8:
593 zzIsFinal = true;
594 zzState = 14;
595 break zzForNext;
596 default:
597 break zzForAction;
598 }
599
600 case 13:
601 switch (zzInput) {
602 case 0:
603 case 1:
604 zzIsFinal = true;
605 zzState = 1;
606 break zzForNext;
607 case 6:
608 zzIsFinal = true;
609 zzState = 5;
610 break zzForNext;
611 case 5:
612 case 7:
613 zzIsFinal = true;
614 break zzForNext;
615 default:
616 break zzForAction;
617 }
618
619 case 14:
620 switch (zzInput) {
621 case 2:
622 case 3:
623 break zzForAction;
624 default:
625 zzIsFinal = true;
626 break zzForNext;
627 }
628
629 default:
630 // if this is ever reached, there is a serious bug in JFlex
631 zzScanError(ZZ_UNKNOWN_ERROR);
632 break;
633 }
634 }
635
636 if ( zzIsFinal ) {
637 zzAction = zzState;
638 zzMarkedPosL = zzCurrentPosL;
639 if ( zzNoLookAhead ) {
640 break zzForAction;
641 }
642 }
643
644 }
645 } 625 }
626 }
627 int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMap(zzInput) ];
628 if (zzNext == -1) break zzForAction;
629 zzState = zzNext;
630
631 zzAttributes = zzAttrL[zzState];
632 if ( (zzAttributes & 1) == 1 ) {
633 zzAction = zzState;
634 zzMarkedPosL = zzCurrentPosL;
635 if ( (zzAttributes & 8) == 8 ) break zzForAction;
636 }
646 637
647 // store back cached position 638 }
648 zzMarkedPos = zzMarkedPosL; 639 }
649 640
650 switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { 641 // store back cached position
651 case 10 : { 642 zzMarkedPos = zzMarkedPosL;
652 htmlBuffer.append("<span class=\"comment\">"); 643
653 htmlBuffer.append(yytext()); 644 if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
654 htmlBuffer.append("</span>"); 645 zzAtEOF = true;
655 } 646 { return;
656 case 11: 647 }
657 break; 648 }
658 case 9: { 649 else {
659 htmlBuffer.append("&gt;"); 650 switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
660 } 651 case 1:
661 case 12: 652 { htmlBuffer.append("<span class=\"default\">");
662 break; 653 htmlBuffer.append(yytext());
663 case 2: { 654 htmlBuffer.append("</span>");
664 htmlBuffer.append(" "); 655 }
665 } 656 // fall through
666 case 13: 657 case 11: break;
667 break; 658 case 2:
668 case 3: { 659 { htmlBuffer.append(" ");
669 htmlBuffer.append("\n"); 660 }
670 } 661 // fall through
671 case 14: 662 case 12: break;
672 break; 663 case 3:
673 case 6: { 664 { htmlBuffer.append("\n");
674 htmlBuffer.append("&#0034;"); 665 }
675 } 666 // fall through
676 case 15: 667 case 13: break;
677 break; 668 case 4:
678 case 5: { 669 { String str = yytext();
679 htmlBuffer.append("&amp;"); 670 if (str.equals(currentName)) {
680 } 671 htmlBuffer.append("<span class=\"functionid\">");
681 case 16: 672 } else {
682 break; 673 htmlBuffer.append("<span class=\"default\">");
683 case 4: { 674 }
684 String str = yytext(); 675 htmlBuffer.append(str);
685 if (str.equals(currentName)) { 676 htmlBuffer.append("</span>");
686 htmlBuffer.append("<span class=\"functionid\">"); 677 }
687 } else { 678 // fall through
688 htmlBuffer.append("<span class=\"default\">"); 679 case 14: break;
689 } 680 case 5:
690 htmlBuffer.append(str); 681 { htmlBuffer.append("&#0034;");
691 htmlBuffer.append("</span>"); 682 }
692 } 683 // fall through
693 case 17: 684 case 15: break;
694 break; 685 case 6:
695 case 8: { 686 { htmlBuffer.append("&amp;");
696 htmlBuffer.append("&lt;"); 687 }
697 } 688 // fall through
698 case 18: 689 case 16: break;
699 break; 690 case 7:
700 case 1: { 691 { htmlBuffer.append("&#0039;");
701 htmlBuffer.append("<span class=\"default\">"); 692 }
702 htmlBuffer.append(yytext()); 693 // fall through
703 htmlBuffer.append("</span>"); 694 case 17: break;
704 } 695 case 8:
705 case 19: 696 { htmlBuffer.append("&lt;");
706 break; 697 }
707 case 7: { 698 // fall through
708 htmlBuffer.append("&#0039;"); 699 case 18: break;
709 } 700 case 9:
710 case 20: 701 { htmlBuffer.append("&gt;");
711 break; 702 }
712 default: 703 // fall through
713 if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { 704 case 19: break;
714 zzAtEOF = true; 705 case 10:
715 { 706 { htmlBuffer.append("<span class=\"comment\">");
716 return; 707 htmlBuffer.append(yytext());
717 } 708 htmlBuffer.append("</span>");
718 } else {
719 zzScanError(ZZ_NO_MATCH);
720 }
721 } 709 }
710 // fall through
711 case 20: break;
712 default:
713 zzScanError(ZZ_NO_MATCH);
722 } 714 }
715 }
723 } 716 }
717 }
724 718
725 719
726} 720}
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java
index 4880e71..4f4eaa0 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java
@@ -1,4 +1,6 @@
1/* The following code was generated by JFlex 1.4.3 on 23/05/12 15:21 */ 1// DO NOT EDIT
2// Generated by JFlex 1.8.2 http://jflex.de/
3// source: jflex/xml.jflex
2 4
3//CHECKSTYLE:OFF 5//CHECKSTYLE:OFF
4 6
@@ -9,155 +11,335 @@ import java.io.StringReader;
9import java.io.IOException; 11import java.io.IOException;
10 12
11@javax.annotation.Generated("JFlex") 13@javax.annotation.Generated("JFlex")
12@SuppressWarnings("fallthrough") 14
13 15// See https://github.com/jflex-de/jflex/issues/222
14/** 16@SuppressWarnings("FallThrough")
15 * This class is a scanner generated by
16 * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
17 * on 23/05/12 15:21 from the specification file
18 * <tt>./jflex/xml.jflex</tt>
19 */
20public final class XMLLexer { 17public final class XMLLexer {
21 18
22 /** This character denotes the end of file */ 19 /** This character denotes the end of file. */
23 public static final int YYEOF = -1; 20 public static final int YYEOF = -1;
24 21
25 /** initial size of the lookahead buffer */ 22 /** Initial size of the lookahead buffer. */
26 private static final int ZZ_BUFFERSIZE = 16384; 23 private static final int ZZ_BUFFERSIZE = 16384;
27 24
28 /** lexical states */ 25 // Lexical states.
29 public static final int CLEANFIRST = 12; 26 public static final int YYINITIAL = 0;
30 public static final int CLEAN = 10; 27 public static final int COMMENT = 2;
31 public static final int YYINITIAL = 0; 28 public static final int CDATA = 4;
32 public static final int COMMENT = 2; 29 public static final int TAG = 6;
33 public static final int CDATA = 4; 30 public static final int PI = 8;
34 public static final int TAG = 6; 31 public static final int CLEAN = 10;
35 public static final int PI = 8; 32 public static final int CLEANFIRST = 12;
36 33
37 /** 34 /**
38 * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l 35 * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
39 * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l 36 * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
40 * at the beginning of a line 37 * at the beginning of a line
41 * l is of the form l = 2*k, k a non negative integer 38 * l is of the form l = 2*k, k a non negative integer
42 */ 39 */
43 private static final int ZZ_LEXSTATE[] = { 40 private static final int ZZ_LEXSTATE[] = {
44 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6 41 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6
45 }; 42 };
46 43
47 /** 44 /**
48 * Translates characters to character classes 45 * Top-level table for translating characters to character classes
49 */ 46 */
50 private static final String ZZ_CMAP_PACKED = 47 private static final int [] ZZ_CMAP_TOP = zzUnpackcmap_top();
51 "\11\0\1\1\1\15\2\0\1\15\22\0\1\1\1\13\1\27\1\3" + 48
52 "\2\0\1\2\1\30\5\0\1\7\1\10\1\25\12\11\1\5\1\4" + 49 private static final String ZZ_CMAP_TOP_PACKED_0 =
53 "\1\12\1\26\1\14\1\24\1\0\1\21\1\6\1\17\1\20\1\6" + 50 "\1\0\2\u0100\1\u0200\34\u0300\1\u0400\1\u0500\12\u0600\3\u0700"+
54 "\16\6\1\22\6\6\1\16\1\10\1\23\1\10\1\5\1\10\32\6" + 51 "\1\u0800\1\u0900\247\u0a00\10\u0b00\31\u0600\4\u0c00\1\u0d00\1\u0e00"+
55 "\74\10\1\10\10\10\27\5\1\10\37\5\1\10\u0208\5\160\10\16\5" + 52 "\1\u0f00\u1000\u0600";
56 "\1\10\u1c81\5\14\10\2\5\63\10\57\0\u0120\5\u0a70\0\u03f0\5\21\0" + 53
57 "\ua7ff\5\u2100\0\u04d0\5\40\0\u020e\5\2\0"; 54 private static int [] zzUnpackcmap_top() {
58 55 int [] result = new int[4352];
59 /** 56 int offset = 0;
60 * Translates characters to character classes 57 offset = zzUnpackcmap_top(ZZ_CMAP_TOP_PACKED_0, offset, result);
61 */ 58 return result;
62 private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); 59 }
63 60
64 /** 61 private static int zzUnpackcmap_top(String packed, int offset, int [] result) {
65 * Translates DFA states to action switch labels. 62 int i = 0; /* index in packed string */
66 */ 63 int j = offset; /* index in unpacked array */
67 private static final int [] ZZ_ACTION = zzUnpackAction(); 64 int l = packed.length();
68 65 while (i < l) {
69 private static final String ZZ_ACTION_PACKED_0 = 66 int count = packed.charAt(i++);
70 "\1\1\1\2\1\3\4\0\2\1\1\0\1\4\1\2" + 67 int value = packed.charAt(i++);
71 "\1\0\1\5\1\3\1\6\1\0\1\7\1\10\1\7" + 68 do result[j++] = value; while (--count > 0);
72 "\1\11\1\12\3\7\1\13\1\7\1\14\1\15\1\16" +
73 "\1\17\1\20\1\7\1\21\1\22\10\0\1\23\1\24" +
74 "\1\0\1\25\1\0\1\26\2\0\1\27\2\0\1\30" +
75 "\1\0\1\31\1\32\2\0\1\33\4\0\1\34";
76
77 private static int [] zzUnpackAction() {
78 int [] result = new int[66];
79 int offset = 0;
80 offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
81 return result;
82 } 69 }
83 70 return j;
84 private static int zzUnpackAction(String packed, int offset, int [] result) { 71 }
85 int i = 0; /* index in packed string */ 72
86 int j = offset; /* index in unpacked array */ 73
87 int l = packed.length(); 74 /**
88 while (i < l) { 75 * Second-level tables for translating characters to character classes
89 int count = packed.charAt(i++); 76 */
90 int value = packed.charAt(i++); 77 private static final int [] ZZ_CMAP_BLOCKS = zzUnpackcmap_blocks();
91 do { 78
92 result[j++] = value; 79 private static final String ZZ_CMAP_BLOCKS_PACKED_0 =
93 } while (--count > 0); 80 "\11\0\1\1\1\2\2\3\1\2\22\0\1\1\1\4"+
94 } 81 "\1\5\1\6\2\0\1\7\1\10\5\0\1\11\1\12"+
95 return j; 82 "\1\13\12\14\1\15\1\16\1\17\1\20\1\21\1\22"+
83 "\1\0\1\23\1\24\1\25\1\26\17\24\1\27\6\24"+
84 "\1\30\1\12\1\31\1\12\1\15\1\12\32\24\12\12"+
85 "\1\32\72\12\27\15\1\12\37\15\1\12\u0108\15\160\12"+
86 "\16\15\1\12\u0181\15\14\12\2\15\32\12\2\32\27\12"+
87 "\57\0\u0120\15\u0170\0\u01f0\15\21\0\u01ff\15\u0100\3\u01d0\15"+
88 "\40\0\u020e\15\2\0";
89
90 private static int [] zzUnpackcmap_blocks() {
91 int [] result = new int[4096];
92 int offset = 0;
93 offset = zzUnpackcmap_blocks(ZZ_CMAP_BLOCKS_PACKED_0, offset, result);
94 return result;
95 }
96
97 private static int zzUnpackcmap_blocks(String packed, int offset, int [] result) {
98 int i = 0; /* index in packed string */
99 int j = offset; /* index in unpacked array */
100 int l = packed.length();
101 while (i < l) {
102 int count = packed.charAt(i++);
103 int value = packed.charAt(i++);
104 do result[j++] = value; while (--count > 0);
96 } 105 }
106 return j;
107 }
108
109 /**
110 * Translates DFA states to action switch labels.
111 */
112 private static final int [] ZZ_ACTION = zzUnpackAction();
113
114 private static final String ZZ_ACTION_PACKED_0 =
115 "\1\1\1\2\1\3\4\0\1\1\1\4\1\1\1\0"+
116 "\1\2\1\5\1\0\1\3\1\6\1\0\1\7\1\10"+
117 "\1\11\4\7\1\12\1\13\1\7\1\14\1\15\1\16"+
118 "\1\17\1\20\1\7\1\21\2\0\1\22\6\0\1\23"+
119 "\1\0\1\24\1\0\1\25\1\26\3\0\1\27\1\0"+
120 "\1\30\1\0\1\31\1\32\2\0\1\33\4\0\1\34";
121
122 private static int [] zzUnpackAction() {
123 int [] result = new int[66];
124 int offset = 0;
125 offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
126 return result;
127 }
128
129 private static int zzUnpackAction(String packed, int offset, int [] result) {
130 int i = 0; /* index in packed string */
131 int j = offset; /* index in unpacked array */
132 int l = packed.length();
133 while (i < l) {
134 int count = packed.charAt(i++);
135 int value = packed.charAt(i++);
136 do result[j++] = value; while (--count > 0);
137 }
138 return j;
139 }
140
141
142 /**
143 * Translates a state to a row index in the transition table
144 */
145 private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
146
147 private static final String ZZ_ROWMAP_PACKED_0 =
148 "\0\0\0\33\0\66\0\121\0\154\0\207\0\242\0\275"+
149 "\0\330\0\363\0\u010e\0\u0129\0\u0144\0\u015f\0\u017a\0\u0195"+
150 "\0\u01b0\0\u01cb\0\u01e6\0\u0201\0\u021c\0\u0237\0\u0252\0\u026d"+
151 "\0\u01cb\0\u0288\0\u02a3\0\u01cb\0\u02be\0\u02d9\0\u01cb\0\u02f4"+
152 "\0\u030f\0\275\0\u032a\0\u0345\0\u0360\0\u037b\0\u0396\0\u03b1"+
153 "\0\u03cc\0\u03e7\0\u021c\0\u01cb\0\u0237\0\u01cb\0\u026d\0\u01cb"+
154 "\0\u01cb\0\u0402\0\u041d\0\u0438\0\u0453\0\u046e\0\u01cb\0\u0489"+
155 "\0\u01cb\0\u01cb\0\u04a4\0\u04bf\0\u01cb\0\u04da\0\u04f5\0\u0510"+
156 "\0\u052b\0\u01cb";
157
158 private static int [] zzUnpackRowMap() {
159 int [] result = new int[66];
160 int offset = 0;
161 offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
162 return result;
163 }
164
165 private static int zzUnpackRowMap(String packed, int offset, int [] result) {
166 int i = 0; /* index in packed string */
167 int j = offset; /* index in unpacked array */
168 int l = packed.length();
169 while (i < l) {
170 int high = packed.charAt(i++) << 16;
171 result[j++] = high | packed.charAt(i++);
172 }
173 return j;
174 }
175
176 /**
177 * The transition table of the DFA
178 */
179 private static final int [] ZZ_TRANS = zzUnpackTrans();
180
181 private static final String ZZ_TRANS_PACKED_0 =
182 "\2\10\1\11\4\10\1\12\7\10\1\13\13\10\2\14"+
183 "\1\15\6\14\1\16\21\14\2\17\1\20\26\17\1\21"+
184 "\1\17\1\22\1\23\1\24\1\0\1\22\1\25\2\22"+
185 "\1\26\2\22\1\27\1\22\1\30\3\22\1\31\1\22"+
186 "\5\30\2\22\1\0\1\22\1\23\1\32\1\0\1\22"+
187 "\1\25\2\22\1\26\4\22\1\30\4\22\1\33\5\30"+
188 "\2\22\1\0\1\34\1\35\1\36\1\0\26\34\1\0"+
189 "\1\37\1\40\1\41\1\0\26\37\1\0\2\10\1\0"+
190 "\14\10\1\0\13\10\2\0\1\11\30\0\2\10\1\0"+
191 "\3\10\1\12\5\10\1\12\1\10\1\42\1\0\3\10"+
192 "\5\12\3\10\4\0\1\43\6\0\1\44\1\0\1\45"+
193 "\4\0\1\46\5\45\3\0\2\14\1\0\6\14\1\47"+
194 "\21\14\2\0\1\15\30\0\2\14\1\0\6\14\1\50"+
195 "\21\14\2\17\1\0\26\17\1\51\1\17\2\0\1\20"+
196 "\30\0\2\17\1\0\26\17\1\52\1\17\34\0\1\23"+
197 "\33\0\1\24\30\0\2\53\1\0\2\53\1\54\25\53"+
198 "\2\55\1\0\5\55\1\54\22\55\21\0\1\56\22\0"+
199 "\2\57\1\0\2\57\2\0\1\60\2\0\10\57\2\0"+
200 "\1\32\51\0\1\61\12\0\1\35\33\0\1\36\31\0"+
201 "\1\40\1\41\32\0\1\41\41\0\1\62\16\0\1\63"+
202 "\17\0\1\64\5\0\5\64\14\0\2\45\1\0\2\45"+
203 "\5\0\10\45\15\0\1\65\5\0\5\65\3\0\2\14"+
204 "\1\0\6\14\1\66\23\14\1\0\16\14\1\67\11\14"+
205 "\2\17\1\0\26\17\1\70\3\17\1\0\16\17\1\71"+
206 "\11\17\11\0\1\72\46\0\1\73\6\0\1\74\7\0"+
207 "\2\64\1\0\2\64\3\0\1\75\1\0\10\64\11\0"+
208 "\2\65\1\0\2\65\5\0\10\65\2\14\1\0\16\14"+
209 "\1\0\11\14\2\17\1\0\16\17\1\0\11\17\26\0"+
210 "\1\76\5\0\1\74\17\0\1\75\34\0\1\77\36\0"+
211 "\1\100\26\0\1\101\37\0\1\102\2\0";
212
213 private static int [] zzUnpackTrans() {
214 int [] result = new int[1350];
215 int offset = 0;
216 offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
217 return result;
218 }
219
220 private static int zzUnpackTrans(String packed, int offset, int [] result) {
221 int i = 0; /* index in packed string */
222 int j = offset; /* index in unpacked array */
223 int l = packed.length();
224 while (i < l) {
225 int count = packed.charAt(i++);
226 int value = packed.charAt(i++);
227 value--;
228 do result[j++] = value; while (--count > 0);
229 }
230 return j;
231 }
232
233
234 /** Error code for "Unknown internal scanner error". */
235 private static final int ZZ_UNKNOWN_ERROR = 0;
236 /** Error code for "could not match input". */
237 private static final int ZZ_NO_MATCH = 1;
238 /** Error code for "pushback value was too large". */
239 private static final int ZZ_PUSHBACK_2BIG = 2;
240
241 /**
242 * Error messages for {@link #ZZ_UNKNOWN_ERROR}, {@link #ZZ_NO_MATCH}, and
243 * {@link #ZZ_PUSHBACK_2BIG} respectively.
244 */
245 private static final String ZZ_ERROR_MSG[] = {
246 "Unknown internal scanner error",
247 "Error: could not match input",
248 "Error: pushback value was too large"
249 };
250
251 /**
252 * ZZ_ATTRIBUTE[aState] contains the attributes of state {@code aState}
253 */
254 private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
255
256 private static final String ZZ_ATTRIBUTE_PACKED_0 =
257 "\3\1\4\0\3\1\1\0\2\1\1\0\2\1\1\0"+
258 "\1\11\6\1\1\11\2\1\1\11\2\1\1\11\3\1"+
259 "\2\0\1\1\6\0\1\11\1\0\1\11\1\0\2\11"+
260 "\3\0\1\1\1\0\1\11\1\0\2\11\2\0\1\11"+
261 "\4\0\1\11";
262
263 private static int [] zzUnpackAttribute() {
264 int [] result = new int[66];
265 int offset = 0;
266 offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
267 return result;
268 }
269
270 private static int zzUnpackAttribute(String packed, int offset, int [] result) {
271 int i = 0; /* index in packed string */
272 int j = offset; /* index in unpacked array */
273 int l = packed.length();
274 while (i < l) {
275 int count = packed.charAt(i++);
276 int value = packed.charAt(i++);
277 do result[j++] = value; while (--count > 0);
278 }
279 return j;
280 }
97 281
282 /** Input device. */
283 private java.io.Reader zzReader;
98 284
99 /* error codes */ 285 /** Current state of the DFA. */
100 private static final int ZZ_UNKNOWN_ERROR = 0; 286 private int zzState;
101 private static final int ZZ_NO_MATCH = 1;
102 private static final int ZZ_PUSHBACK_2BIG = 2;
103
104 /* error messages for the codes above */
105 private static final String ZZ_ERROR_MSG[] = {
106 "Unkown internal scanner error",
107 "Error: could not match input",
108 "Error: pushback value was too large"
109 };
110
111 /** the input device */
112 private java.io.Reader zzReader;
113 287
114 /** the current state of the DFA */ 288 /** Current lexical state. */
115 private int zzState; 289 private int zzLexicalState = YYINITIAL;
116 290
117 /** the current lexical state */ 291 /**
118 private int zzLexicalState = YYINITIAL; 292 * This buffer contains the current text to be matched and is the source of the {@link #yytext()}
293 * string.
294 */
295 private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
119 296
120 /** this buffer contains the current text to be matched and is 297 /** Text position at the last accepting state. */
121 the source of the yytext() string */ 298 private int zzMarkedPos;
122 private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
123 299
124 /** the textposition at the last accepting state */ 300 /** Current text position in the buffer. */
125 private int zzMarkedPos; 301 private int zzCurrentPos;
126 302
127 /** the current text position in the buffer */ 303 /** Marks the beginning of the {@link #yytext()} string in the buffer. */
128 private int zzCurrentPos; 304 private int zzStartRead;
129 305
130 /** startRead marks the beginning of the yytext() string in the buffer */ 306 /** Marks the last character in the buffer, that has been read from input. */
131 private int zzStartRead; 307 private int zzEndRead;
132 308
133 /** endRead marks the last character in the buffer, that has been read 309 /**
134 from input */ 310 * Whether the scanner is at the end of file.
135 private int zzEndRead; 311 * @see #yyatEOF
312 */
313 private boolean zzAtEOF;
136 314
137 /** number of newlines encountered up to the start of the matched text */ 315 /**
138 private int yyline; 316 * The number of occupied positions in {@link #zzBuffer} beyond {@link #zzEndRead}.
317 *
318 * <p>When a lead/high surrogate has been read from the input stream into the final
319 * {@link #zzBuffer} position, this will have a value of 1; otherwise, it will have a value of 0.
320 */
321 private int zzFinalHighSurrogate = 0;
139 322
140 /** the number of characters up to the start of the matched text */ 323 /** Number of newlines encountered up to the start of the matched text. */
141 private int yychar; 324 @SuppressWarnings("unused")
325 private int yyline;
142 326
143 /** 327 /** Number of characters from the last newline up to the start of the matched text. */
144 * the number of characters from the last newline up to the start of the 328 @SuppressWarnings("unused")
145 * matched text 329 private int yycolumn;
146 */
147 private int yycolumn;
148 330
149 /** 331 /** Number of characters up to the start of the matched text. */
150 * zzAtBOL == true <=> the scanner is currently at the beginning of a line 332 private long yychar;
151 */
152 private boolean zzAtBOL = true;
153 333
154 /** zzAtEOF == true <=> the scanner is at the EOF */ 334 /** Whether the scanner is currently at the beginning of a line. */
155 private boolean zzAtEOF; 335 @SuppressWarnings("unused")
336 private boolean zzAtBOL = true;
156 337
157 /** denotes if the user-EOF-code has already been executed */ 338 /** Whether the user-EOF-code has already been executed. */
158 private boolean zzEOFDone; 339 @SuppressWarnings("unused")
340 private boolean zzEOFDone;
159 341
160 /* user code: */ 342 /* user code: */
161 343
162 private int whitesOnFirstLine; 344 private int whitesOnFirstLine;
163 private int saveLexState; 345 private int saveLexState;
@@ -169,13 +351,13 @@ public final class XMLLexer {
169 int end = str.length() - 1; 351 int end = str.length() - 1;
170 int i = end; 352 int i = end;
171 for (; i >= 0; i--) { 353 for (; i >= 0; i--) {
172 char c = str.charAt(i); 354 char c = str.charAt(i);
173 if (c != ' ' && c != '\t' && c != '\r' && c != '\n') { 355 if (c != ' ' && c != '\t' && c != '\r' && c != '\n') {
174 break; 356 break;
175 } 357 }
176 } 358 }
177 if (i != end) { 359 if (i != end) {
178 return str.substring(0, i + 1); 360 return str.substring(0, i + 1);
179 } 361 }
180 362
181 return str; 363 return str;
@@ -185,7 +367,7 @@ public final class XMLLexer {
185 Reader reader = new StringReader(trimEnd(code)); 367 Reader reader = new StringReader(trimEnd(code));
186 String str = convert(h, reader, true); 368 String str = convert(h, reader, true);
187 try { 369 try {
188 reader.close(); 370 reader.close();
189 } catch (IOException e) { } 371 } catch (IOException e) { }
190 372
191 return str; 373 return str;
@@ -193,1280 +375,543 @@ public final class XMLLexer {
193 375
194 public String convert(AbstractXMLCodeHandler h, Reader code, boolean ret) { 376 public String convert(AbstractXMLCodeHandler h, Reader code, boolean ret) {
195 if (code == null) { 377 if (code == null) {
196 return null; 378 return null;
197 } else { 379 } else {
198 handler = h; 380 handler = h;
199 whitesOnFirstLine = 0; 381 whitesOnFirstLine = 0;
200 yyreset(code); 382 yyreset(code);
201 yybegin(CLEANFIRST); 383 yybegin(CLEANFIRST);
202 try { 384 try {
203 yylex(); 385 yylex();
204 } catch (IOException e) { 386 } catch (IOException e) {
205 return null; 387 return null;
206 } 388 }
207 if (ret) { 389 if (ret) {
208 return h.toString(); 390 return h.toString();
209 } 391 }
210 return ""; 392 return "";
211 } 393 }
212 } 394 }
213 395
214 396
215 /** 397 /**
216 * Creates a new scanner 398 * Creates a new scanner
217 * There is also a java.io.InputStream version of this constructor. 399 *
218 * 400 * @param in the java.io.Reader to read input from.
219 * @param in the java.io.Reader to read input from. 401 */
220 */ 402 public XMLLexer(java.io.Reader in) {
221 public XMLLexer(java.io.Reader in) { 403 this.zzReader = in;
222 this.zzReader = in; 404 }
405
406 /**
407 * Translates raw input code points to DFA table row
408 */
409 private static int zzCMap(int input) {
410 int offset = input & 255;
411 return offset == input ? ZZ_CMAP_BLOCKS[offset] : ZZ_CMAP_BLOCKS[ZZ_CMAP_TOP[input >> 8] | offset];
412 }
413
414 /**
415 * Refills the input buffer.
416 *
417 * @return {@code false} iff there was new input.
418 * @exception java.io.IOException if any I/O-Error occurs
419 */
420 private boolean zzRefill() throws java.io.IOException {
421
422 /* first: make room (if you can) */
423 if (zzStartRead > 0) {
424 zzEndRead += zzFinalHighSurrogate;
425 zzFinalHighSurrogate = 0;
426 System.arraycopy(zzBuffer, zzStartRead,
427 zzBuffer, 0,
428 zzEndRead - zzStartRead);
429
430 /* translate stored positions */
431 zzEndRead -= zzStartRead;
432 zzCurrentPos -= zzStartRead;
433 zzMarkedPos -= zzStartRead;
434 zzStartRead = 0;
223 } 435 }
224 436
225 /** 437 /* is the buffer big enough? */
226 * Creates a new scanner. 438 if (zzCurrentPos >= zzBuffer.length - zzFinalHighSurrogate) {
227 * There is also java.io.Reader version of this constructor. 439 /* if not: blow it up */
228 * 440 char newBuffer[] = new char[zzBuffer.length * 2];
229 * @param in the java.io.Inputstream to read input from. 441 System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
230 */ 442 zzBuffer = newBuffer;
231 public XMLLexer(java.io.InputStream in) { 443 zzEndRead += zzFinalHighSurrogate;
232 this(new java.io.InputStreamReader(in)); 444 zzFinalHighSurrogate = 0;
233 } 445 }
234 446
235 /** 447 /* fill the buffer with new input */
236 * Unpacks the compressed character translation table. 448 int requested = zzBuffer.length - zzEndRead;
237 * 449 int numRead = zzReader.read(zzBuffer, zzEndRead, requested);
238 * @param packed the packed character translation table
239 * @return the unpacked character translation table
240 */
241 private static char [] zzUnpackCMap(String packed) {
242 char [] map = new char[0x10000];
243 int i = 0; /* index in packed string */
244 int j = 0; /* index in unpacked array */
245 while (i < 132) {
246 int count = packed.charAt(i++);
247 char value = packed.charAt(i++);
248 do {
249 map[j++] = value;
250 } while (--count > 0);
251 }
252 return map;
253 }
254 450
255 451 /* not supposed to occur according to specification of java.io.Reader */
256 /** 452 if (numRead == 0) {
257 * Refills the input buffer. 453 throw new java.io.IOException(
258 * 454 "Reader returned 0 characters. See JFlex examples/zero-reader for a workaround.");
259 * @return <code>false</code>, iff there was new input.
260 *
261 * @exception java.io.IOException if any I/O-Error occurs
262 */
263 private boolean zzRefill() throws java.io.IOException {
264
265 /* first: make room (if you can) */
266 if (zzStartRead > 0) {
267 System.arraycopy(zzBuffer, zzStartRead,
268 zzBuffer, 0,
269 zzEndRead - zzStartRead);
270
271 /* translate stored positions */
272 zzEndRead -= zzStartRead;
273 zzCurrentPos -= zzStartRead;
274 zzMarkedPos -= zzStartRead;
275 zzStartRead = 0;
276 }
277
278 /* is the buffer big enough? */
279 if (zzCurrentPos >= zzBuffer.length) {
280 /* if not: blow it up */
281 char newBuffer[] = new char[zzCurrentPos * 2];
282 System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
283 zzBuffer = newBuffer;
284 }
285
286 /* finally: fill the buffer with new input */
287 int numRead = zzReader.read(zzBuffer, zzEndRead,
288 zzBuffer.length - zzEndRead);
289
290 if (numRead > 0) {
291 zzEndRead += numRead;
292 return false;
293 }
294 // unlikely but not impossible: read 0 characters, but not at end of stream
295 if (numRead == 0) {
296 int c = zzReader.read();
297 if (c == -1) {
298 return true;
299 } else {
300 zzBuffer[zzEndRead++] = (char) c;
301 return false;
302 }
303 }
304
305 // numRead < 0
306 return true;
307 } 455 }
308 456 if (numRead > 0) {
309 457 zzEndRead += numRead;
310 /** 458 if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
311 * Closes the input stream. 459 if (numRead == requested) { // We requested too few chars to encode a full Unicode character
312 */ 460 --zzEndRead;
313 public final void yyclose() throws java.io.IOException { 461 zzFinalHighSurrogate = 1;
314 zzAtEOF = true; /* indicate end of file */ 462 } else { // There is room in the buffer for at least one more char
315 zzEndRead = zzStartRead; /* invalidate buffer */ 463 int c = zzReader.read(); // Expecting to read a paired low surrogate char
316 464 if (c == -1) {
317 if (zzReader != null) { 465 return true;
318 zzReader.close(); 466 } else {
467 zzBuffer[zzEndRead++] = (char)c;
468 }
319 } 469 }
470 }
471 /* potentially more input available */
472 return false;
320 } 473 }
321 474
475 /* numRead < 0 ==> end of stream */
476 return true;
477 }
322 478
323 /**
324 * Resets the scanner to read from a new input stream.
325 * Does not close the old reader.
326 *
327 * All internal variables are reset, the old input stream
328 * <b>cannot</b> be reused (internal buffer is discarded and lost).
329 * Lexical state is set to <tt>ZZ_INITIAL</tt>.
330 *
331 * @param reader the new input stream
332 */
333 public final void yyreset(java.io.Reader reader) {
334 zzReader = reader;
335 zzAtBOL = true;
336 zzAtEOF = false;
337 zzEOFDone = false;
338 zzEndRead = zzStartRead = 0;
339 zzCurrentPos = zzMarkedPos = 0;
340 yyline = yychar = yycolumn = 0;
341 zzLexicalState = YYINITIAL;
342 }
343 479
480 /**
481 * Closes the input reader.
482 *
483 * @throws java.io.IOException if the reader could not be closed.
484 */
485 public final void yyclose() throws java.io.IOException {
486 zzAtEOF = true; // indicate end of file
487 zzEndRead = zzStartRead; // invalidate buffer
344 488
345 /** 489 if (zzReader != null) {
346 * Returns the current lexical state. 490 zzReader.close();
347 */
348 public final int yystate() {