Merge remote-tracking branch 'origin/5.4'

Conflicts:
	scilab/modules/helptools/images/Equation_LaTeX_126.png
	scilab/modules/helptools/images/Equation_LaTeX_135.png
	scilab/modules/helptools/images/Equation_LaTeX_138.png
	scilab/modules/helptools/images/Equation_LaTeX_139.png
	scilab/modules/helptools/images/Equation_LaTeX_149.png
	scilab/modules/helptools/images/Equation_LaTeX_152.png
	scilab/modules/helptools/images/Equation_LaTeX_153.png
	scilab/modules/helptools/images/Equation_LaTeX_155.png
	scilab/modules/helptools/images/Equation_LaTeX_245.png
	scilab/modules/helptools/images/Equation_LaTeX_249.png
	scilab/modules/helptools/images/Equation_LaTeX_250.png
	scilab/modules/helptools/images/Equation_LaTeX_251.png
	scilab/modules/helptools/images/Equation_MathML_0.png
	scilab/modules/helptools/images/Equation_MathML_1.png
	scilab/modules/helptools/images/Equation_MathML_10.png
	scilab/modules/helptools/images/Equation_MathML_11.png
	scilab/modules/helptools/images/Equation_MathML_14.png
	scilab/modules/helptools/images/Equation_MathML_15.png
	scilab/modules/helptools/images/Equation_MathML_17.png
	scilab/modules/helptools/images/Equation_MathML_2.png
	scilab/modules/helptools/images/Equation_MathML_22.png
	scilab/modules/helptools/images/Equation_MathML_23.png
	scilab/modules/helptools/images/Equation_MathML_24.png
	scilab/modules/helptools/images/Equation_MathML_5.png
	scilab/modules/helptools/images/Equation_MathML_6.png
	scilab/modules/helptools/images/Equation_MathML_7.png
	scilab/modules/helptools/images/Equation_MathML_8.png
	scilab/modules/helptools/images/Equation_MathML_9.png
	scilab/modules/helptools/images/_LaTeX_karmarkar.xml_4.png
	scilab/modules/helptools/images/_LaTeX_karmarkar.xml_5.png
	scilab/modules/helptools/images/nicholschart_1.png
	scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java

Change-Id: I5075d15398d08f0d79cac4e336353860e7f19c6e

diff --cc scilab/CHANGES_5.4.X
Simple merge

diff --cc scilab/modules/helptools/images/_LaTeX_0-LSodar.xml_1.png
index f192ffa,76d19a6..f192ffa
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_1-CVode.xml_1.png
index 422d957,76d19a6..422d957
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_1-CVode.xml_2.png
index 47c6ee1,3175f68..47c6ee1
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_1-CVode.xml_3.png
index 47c6ee1,b9e487d..47c6ee1
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_1-CVode.xml_4.png
index 3ae80de,de853ee..3ae80de
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_1-CVode.xml_5.png
index f972b8d,a89a475..f972b8d
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_1-CVode.xml_6.png
index 0c2117e,7f52158..0c2117e
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_2-Runge-Kutta.xml_1.png
index b6dd4ba,76d19a6..b6dd4ba
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_3-Dormand-Prince.xml_1.png
index be14009,76d19a6..be14009
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_4-ImplicitRK.xml_1.png
index 47c6ee1,76d19a6..47c6ee1
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_7-IDA.xml_1.png
index 47c6ee1,3a3fe5d..47c6ee1
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_7-IDA.xml_2.png
index 47c6ee1,11a45b8..47c6ee1
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_7-IDA.xml_3.png
index 6b740ee,445e2be..6b740ee
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_7-IDA.xml_4.png
index ea2f08c,06a63fb..ea2f08c
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_7-IDA.xml_5.png
index 0ce343e,b76a9f2..0ce343e
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_BITCLEAR.xml_1.png
index f9db195,2730b6d..f9db195
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_BITSET.xml_1.png
index d36a0be,3a30f61..d36a0be
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_CLSS.xml_1.png
index db5d3c3,b16b577..db5d3c3
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_CLSS.xml_2.png
index d118325,8bae97e..d118325
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_CLSS.xml_4.png
index 943c8dd,18bc1af..943c8dd
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_CLSS.xml_5.png
index 5e79459,fb52c42..5e79459
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DEADBAND.xml_2.png
index 4cc07d0,7056f6d..4cc07d0
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DEADBAND.xml_3.png
index fcad425,8f5e69f..fcad425
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DELAY_f.xml_1.png
index c1fe7dc,c9c1f39..c1fe7dc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_1.png
index 9473b91,fdc911d..9473b91
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_10.png
index c2d4ea7,15c06ea..c2d4ea7
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_11.png
index 763cf8f,4a4ac02..763cf8f
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_12.png
index d0b33e8,7b88df8..d0b33e8
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_13.png
index 32917cd,9a6b48d..32917cd
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_14.png
index b33aee5,9a6b48d..b33aee5
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_15.png
index f32b2fc,7b88df8..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_16.png
index f9979ad,4a4ac02..f9979ad
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_17.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_18.png
index b33aee5,7b88df8..b33aee5
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_19.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_2.png
index 98b213b,aae75e7..98b213b
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_21.png
index b33aee5,019f3f8..b33aee5
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_22.png
index 0aeff63,019f3f8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_24.png
index c2d4ea7,15c06ea..c2d4ea7
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_3.png
index e1c64da,e7dd23d..e1c64da
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_4.png
index 8739ca5,c035c13..8739ca5
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_5.png
index e2b1720,54bdd4f..e2b1720
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_7.png
index 0aeff63,9a6b48d..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_8.png
index f32b2fc,019f3f8..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_9.png
index c2d4ea7,f0dc29c..c2d4ea7
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_1.png
index f9979ad,289b502..f9979ad
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_10.png
index 763cf8f,9a6b48d..763cf8f
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_11.png
index d0b33e8,9a6b48d..d0b33e8
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_12.png
index f9979ad,7b88df8..f9979ad
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_14.png
index f32b2fc,7b88df8..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_15.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_2.png
index d0b33e8,e7dd23d..d0b33e8
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_3.png
index 1c4f7f2,c035c13..1c4f7f2
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_4.png
index e2b1720,54bdd4f..e2b1720
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_5.png
index 0aeff63,9a6b48d..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_6.png
index 32917cd,019f3f8..32917cd
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_8.png
index c2d4ea7,15c06ea..c2d4ea7
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_DLATCH.xml_9.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_EXPRESSION.xml_1.png
index b59277e,38a4374..b59277e
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_EXTRACTBITS.xml_1.png
index 0aeff63,2730b6d..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_GENSIN_f.xml_1.png
index 330cf0f,0e40f3d..330cf0f
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_GENSQR_f.xml_2.png
index 536c088,6784bbc..536c088
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_GENSQR_f.xml_3.png
index 1542e10,fe6d735..1542e10
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_GENSQR_f.xml_4.png
index 8b3b42a,6784bbc..8b3b42a
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_INTRPLBLK_f.xml_1.png
index 330cf0f,d2b4831..330cf0f
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_10.png
index d0b33e8,7b88df8..d0b33e8
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_11.png
index 763cf8f,9a6b48d..763cf8f
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_12.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_13.png
index f32b2fc,7b88df8..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_14.png
index 32917cd,9a6b48d..32917cd
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_15.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_16.png
index f9979ad,9a6b48d..f9979ad
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_17.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_18.png
index f32b2fc,7b88df8..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_19.png
index f32b2fc,15c06ea..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_2.png
index 9473b91,a55b251..9473b91
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_3.png
index 785e012,c035c13..785e012
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_4.png
index 4721695,54bdd4f..4721695
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_5.png
index f32b2fc,9a6b48d..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_7.png
index 0aeff63,f0dc29c..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_8.png
index 0aeff63,15c06ea..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_9.png
index f32b2fc,9a6b48d..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_LOGIC.xml_1.png
index d0b33e8,9f7c0f5..d0b33e8
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_1.png
index f9979ad,58c25ba..f9979ad
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_10.png
index 8868e7b,7b88df8..8868e7b
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_11.png
index 763cf8f,9a6b48d..763cf8f
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_12.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_13.png
index f32b2fc,7b88df8..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_14.png
index 32917cd,9a6b48d..32917cd
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_15.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_16.png
index 0973557,9a6b48d..0973557
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_17.png
index 0aeff63,7b88df8..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_18.png
index f32b2fc,7b88df8..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_19.png
index 0aeff63,7610dbd..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_2.png
index bc3bfc5,12f9f0c..bc3bfc5
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_20.png
index 0aeff63,7610dbd..0aeff63
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_3.png
index 1dea00e,c035c13..1dea00e
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_4.png
index d2a8dcf,54bdd4f..d2a8dcf
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_5.png
index f32b2fc,9a6b48d..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_8.png
index f32b2fc,aaf6ccf..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_9.png
index f32b2fc,9a6b48d..f32b2fc
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_10.png
index 1fd3ae6,b19348c..1fd3ae6
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_11.png
index f3bc306,c25305b..f3bc306
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_12.png
index b59277e,dc8c39c..b59277e
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_13.png
index 1fd3ae6,11c64b2..1fd3ae6
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_14.png
index 139915c,b19348c..139915c
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_15.png
index 139915c,c25305b..139915c
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_16.png
index 139915c,11c64b2..139915c
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_17.png
index b59277e,dc8c39c..b59277e
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_18.png
index f3bc306,b19348c..f3bc306
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_19.png
index f3bc306,c25305b..f3bc306
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_2.png
index a6e6e3f,630dc2c..a6e6e3f
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_3.png
index c37121a,630dc2c..c37121a
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_4.png
index 1fd3ae6,630dc2c..1fd3ae6
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_5.png
index 1fd3ae6,630dc2c..1fd3ae6
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_6.png
index f192ffa,11c64b2..f192ffa
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_7.png
index 139915c,b19348c..139915c
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_8.png
index b59277e,11c64b2..b59277e
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_9.png
index f192ffa,dc8c39c..f192ffa
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_VARIABLE_DELAY.xml_1.png
index ae15127,08366b3..ae15127
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_assert_computedigits.xml_1.png
index 995e86d,2cecf87..995e86d
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_assert_computedigits.xml_2.png
index 711a821,1757d19..711a821
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_cdfgam.xml_1.png
index ab2a5f6,5745d6d..ab2a5f6
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_cdfnor.xml_1.png
index 079445a,60c32ee..079445a
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_cumprod.xml_3.png
index b5f7327,c7873a6..b5f7327
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_dct.xml_4.png
index 30fbf1e,f841fe6..30fbf1e
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_dct.xml_6.png
index bc8231b,795eb33..bc8231b
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_grand.xml_2.png
index d095852,b9f50a9..d095852
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_grand.xml_3.png
index ed07d4a,8d22873..ed07d4a
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_grand.xml_4.png
index 72c8168,9c63ba7..72c8168
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_grand.xml_5.png
index ea5c18c,8e6dcbf..ea5c18c
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_grand.xml_6.png
index b3e0cf4,88f3d97..b3e0cf4
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_histplot.xml_1.png
index 4875091,37de8fd..4875091
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_karmarkar.xml_1.png
index 491dbd3,610c930..491dbd3
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_karmarkar.xml_2.png
index 28fd084,de8422e..28fd084
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_karmarkar.xml_3.png
index 623162f,6d64c02..623162f
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_karmarkar.xml_6.png
index de70c64,bef5276..de70c64
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_leastsq.xml_1.png
index 7ee2d4a,74ff928..7ee2d4a
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_ode.xml_1.png
index 0f4e849,246c60f..0f4e849
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_semidef.xml_1.png
index 478947b,a4a7d5f..478947b
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_semidef.xml_2.png
index 28fd084,26078f1..28fd084
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_xcov.xml_10.png
index 5d17c3b,142d65d..5d17c3b
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_xcov.xml_11.png
index 7c5e170,e20c48a..7c5e170
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_xcov.xml_6.png
index 7723275,2078623..7723275
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_xcov.xml_7.png
index 9179eba,e20c48a..9179eba
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_xcov.xml_8.png
index 213c5ed,e20c48a..213c5ed
Binary files differ

diff --cc scilab/modules/helptools/images/_LaTeX_xcov.xml_9.png
index b83f016,e20c48a..b83f016
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_bvode.xml_13.png
index 4ccf93c,f8b96c6..4ccf93c
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_bvode.xml_14.png
index 2e7264f,987846f..2e7264f
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_bvode.xml_17.png
index 7e9541b,acff53b..7e9541b
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_bvode.xml_4.png
index 9d4b92d,5b539e8..9d4b92d
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_bvode.xml_5.png
index 742dbd7,50fabce..742dbd7
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_bvode.xml_ru_RU_10.png
index f1ebe8d,16c276a..f1ebe8d
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_bvode.xml_ru_RU_7.png
index 2f634ce,6d07141..2f634ce
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_convol.xml_1.png
index 9be0381,d7b78c0..9be0381
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_levin.xml_1.png
index 7faffa2,58aa868..7faffa2
Binary files differ

diff --cc scilab/modules/helptools/images/_MathML_levin.xml_2.png
index bd0ea4e,7db6f8d..bd0ea4e
Binary files differ

diff --cc scilab/modules/helptools/src/java/org/scilab/modules/helptools/DocbookTagConverter.java
Simple merge

diff --cc scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java
index 09140ab,a3d8617..8e9b42a
--- 1/scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java
--- 2/scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java
@@@ -97,8 -104,12 +104,12 @@@ public class JavaHelpDocbookTagConverte
              writerIndex.close();
              outIndex.flush();
              outIndex.close();
+ 
+             if (!isToolbox) {
+                 ImageConverter.saveMD5s(ScilabConstants.SCI.getPath() + "/modules/helptools/etc");
+             }
          } catch (IOException e) {
 -            fatalExceptionOccured(e);
 +            fatalExceptionOccurred(e);
          }
      }
  

diff --cc scilab/modules/spreadsheet/Makefile.in
Simple merge

diff --cc scilab/modules/umfpack/Makefile.in
Simple merge