From 9481e226ad271cffdaac018dd969d8318b6ab387 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 31 Jul 2013 11:01:32 +0200 Subject: [PATCH] * Bug #12774 fixed - Fix various typos. Change-Id: Ic409a36619526eb4fb41b35d8829139b9366b7e7 --- scilab/CHANGES_5.5.X | 2 ++ scilab/modules/cacsd/help/en_US/krac2.xml | 2 +- scilab/modules/core/src/c/parse.c | 2 +- scilab/modules/core/src/c/run.c | 4 ++-- .../examples/dynamic_link_c_and_fortran/ext11c.sce | 2 +- .../dynamic_link/tests/unit_tests/links.dia.ref | 2 +- .../dynamic_link/tests/unit_tests/links.tst | 2 +- .../help/en_US/axes_operations/rotate_axes.xml | 2 +- .../help/en_US/axes_operations/zoom_rect.xml | 2 +- .../modules/graphics/sci_gateway/c/sci_plot2d1.c | 6 +++--- scilab/modules/helptools/etc/images_md5.txt | 2 +- .../modules/helptools/images/_LaTeX_CLSS.xml_1.png | Bin 1241 -> 1235 bytes .../m2sci/tests/nonreg_tests/bug_1636.dia.ref | 2 +- .../modules/m2sci/tests/nonreg_tests/bug_1636.tst | 2 +- scilab/modules/overloading/macros/%lss_v_lss.sci | 2 +- .../scicos_scicos/do_compile_superblock42.sci | 2 +- .../src/modelica_compiler/squareSparseMatrix.mli | 2 +- scilab/modules/signal_processing/macros/group.sci | 2 +- .../help/en_US/palettes/Continuous_pal/CLSS.xml | 2 +- .../help/fr_FR/palettes/Continuous_pal/CLSS.xml | 2 +- 20 files changed, 23 insertions(+), 21 deletions(-) diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X index fec9864..a4893ad 100644 --- a/scilab/CHANGES_5.5.X +++ b/scilab/CHANGES_5.5.X @@ -505,3 +505,5 @@ Bug fixes * Bug #12747 fixed - legendre() now accepts the -1 and 1 values for the third argument. * Bug #12772 fixed - eigs() failed when trying to solve a sparse matrix eigen value problem. + +* Bug #12774 fixed - Fix various typos. diff --git a/scilab/modules/cacsd/help/en_US/krac2.xml b/scilab/modules/cacsd/help/en_US/krac2.xml index 11e6bce..22c9da3 100644 --- a/scilab/modules/cacsd/help/en_US/krac2.xml +++ b/scilab/modules/cacsd/help/en_US/krac2.xml @@ -40,7 +40,7 @@ Description krac2(sys) computes the gains g such that the system - sys fedback by g (sys/.g) has 2 real equal poles. + sys feedback by g (sys/.g) has 2 real equal poles. diff --git a/scilab/modules/core/src/c/parse.c b/scilab/modules/core/src/c/parse.c index 2bda76f..a03f575 100644 --- a/scilab/modules/core/src/c/parse.c +++ b/scilab/modules/core/src/c/parse.c @@ -1183,7 +1183,7 @@ L77: int curline; for (kmac = 0; kmac < C2F(dbg).nmacs; kmac++) /* loop on table of functions containing breakpoints */ { - /* does the name of the current funtion fit the registered name*/ + /* does the name of the current function fit the registered name*/ if (C2F(eqid)(&(C2F(vstk).idstk[kfin * nsiz]), &(C2F(dbg).macnms[kmac * nsiz]))) /* yes */ { /* test if there is a registered breakpoint at the current line*/ diff --git a/scilab/modules/core/src/c/run.c b/scilab/modules/core/src/c/run.c index 346f90a..fab4840 100644 --- a/scilab/modules/core/src/c/run.c +++ b/scilab/modules/core/src/c/run.c @@ -1112,7 +1112,7 @@ L105: int kmac; for (kmac = 0; kmac < C2F(dbg).nmacs; kmac++) /* loop on table of functions containing breakpoints */ { - /* does the name of the current funtion fit the registered name*/ + /* does the name of the current function fit the registered name*/ if (C2F(eqid)(&(C2F(vstk).idstk[kfin * nsiz]), &(C2F(dbg).macnms[kmac * nsiz]))) /* yes */ { /* test if there is a registered breakpoint at the current line*/ @@ -1309,7 +1309,7 @@ L210: /* character string vector */ if (C2F(errgst).err1 <= 0) { - n = *istk(1 + lc) * *istk(2 + lc); + n = *istk(1 + lc) **istk(2 + lc); nc = *istk(lc + 4 + n) - 1; ++Top; il = Lstk[Top] + Lstk[Top] - 1; diff --git a/scilab/modules/dynamic_link/examples/dynamic_link_c_and_fortran/ext11c.sce b/scilab/modules/dynamic_link/examples/dynamic_link_c_and_fortran/ext11c.sce index ed010cc..3995d2b 100644 --- a/scilab/modules/dynamic_link/examples/dynamic_link_c_and_fortran/ext11c.sce +++ b/scilab/modules/dynamic_link/examples/dynamic_link_c_and_fortran/ext11c.sce @@ -26,7 +26,7 @@ ilib_for_link(link_name,files,libs,flag); exec loader.sce; // test new function through the ode function -// Passing a parameter to argument funtion of ode +// Passing a parameter to argument function of ode param=[0.04,10000,3d+7]; y=ode([1;0;0],0,[0.4,4],"ext11c") diff --git a/scilab/modules/dynamic_link/tests/unit_tests/links.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/links.dia.ref index 0f0e869..3c81635 100644 --- a/scilab/modules/dynamic_link/tests/unit_tests/links.dia.ref +++ b/scilab/modules/dynamic_link/tests/unit_tests/links.dia.ref @@ -89,7 +89,7 @@ if norm(y-yref) > 10000*%eps then bugmes();quit;end //=========================================================== //Example #10 //=========================================================== -//Passing a parameter to argument funtion of ode +//Passing a parameter to argument function of ode param=[0.04,10000,3d+7]; y=ode([1;0;0],0,[0.4,4],'ext10f'); //param must be defined as a scilab variable upon calling ode diff --git a/scilab/modules/dynamic_link/tests/unit_tests/links.tst b/scilab/modules/dynamic_link/tests/unit_tests/links.tst index cd48e15..d802cea 100644 --- a/scilab/modules/dynamic_link/tests/unit_tests/links.tst +++ b/scilab/modules/dynamic_link/tests/unit_tests/links.tst @@ -103,7 +103,7 @@ if norm(y-yref) > 10000*%eps then pause,end //=========================================================== //Example #10 //=========================================================== -//Passing a parameter to argument funtion of ode +//Passing a parameter to argument function of ode param=[0.04,10000,3d+7]; y=ode([1;0;0],0,[0.4,4],'ext10f'); //param must be defined as a scilab variable upon calling ode diff --git a/scilab/modules/graphics/help/en_US/axes_operations/rotate_axes.xml b/scilab/modules/graphics/help/en_US/axes_operations/rotate_axes.xml index 0ada033..2def6ef 100644 --- a/scilab/modules/graphics/help/en_US/axes_operations/rotate_axes.xml +++ b/scilab/modules/graphics/help/en_US/axes_operations/rotate_axes.xml @@ -35,7 +35,7 @@ Description - rotate_axes funtion is used to perform an interactive rotation of an Axes object. + rotate_axes function is used to perform an interactive rotation of an Axes object. When the function is called, the user is requested to click twice on the graphic window. The first click initializes the rotation and the second ends it. diff --git a/scilab/modules/graphics/help/en_US/axes_operations/zoom_rect.xml b/scilab/modules/graphics/help/en_US/axes_operations/zoom_rect.xml index ebd874c..bede6c6 100644 --- a/scilab/modules/graphics/help/en_US/axes_operations/zoom_rect.xml +++ b/scilab/modules/graphics/help/en_US/axes_operations/zoom_rect.xml @@ -49,7 +49,7 @@ Description - zoom_rect funtion is used to perform a zoom inside a set of Axes Objects. + zoom_rect function is used to perform a zoom inside a set of Axes Objects. The h input argument specifies on which Axes the zoom will apply. diff --git a/scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c b/scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c index d405400..5792cee 100644 --- a/scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c +++ b/scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c @@ -86,7 +86,7 @@ int sci_plot2d1_G(char * fname, int ptype, unsigned long fname_len) if (nbInputArgument(pvApiCtx) <= 0) { - /* lauch the default routines depending on the name of the calling funtion */ + /* lauch the default routines depending on the name of the calling function */ sci_demo(fname, fname_len); return 0; } @@ -113,7 +113,7 @@ int sci_plot2d1_G(char * fname, int ptype, unsigned long fname_len) if (FirstOpt() <= nbInputArgument(pvApiCtx)) { Scierror(999, _("%s: Misplaced optional argument: #%d must be at position %d.\n"), fname, 1, 3 + iskip); - return(0); + return (0); } sciErr = getVarAddressFromPosition(pvApiCtx, 1 + iskip, &piAddrl2); @@ -165,7 +165,7 @@ int sci_plot2d1_G(char * fname, int ptype, unsigned long fname_len) { Scierror(999, _("%s: Misplaced optional argument: #%d must be at position %d.\n"), fname, 1, 3 + iskip); - return(0); + return (0); } diff --git a/scilab/modules/helptools/etc/images_md5.txt b/scilab/modules/helptools/etc/images_md5.txt index 10e0940..1809a92 100644 --- a/scilab/modules/helptools/etc/images_md5.txt +++ b/scilab/modules/helptools/etc/images_md5.txt @@ -210,7 +210,7 @@ _LaTeX_BITCLEAR.xml_1.png=b97ed20387467efe4809952c888e36a8 _LaTeX_BITCLEAR.xml_fr_FR_1.png=ff1bb557dff0583158de44fc29c54874 _LaTeX_BITSET.xml_1.png=2ad868695d0f0e2a7f7033f8c47190 _LaTeX_BITSET.xml_fr_FR_1.png=621e13adf345efdb45c083751a051f93 -_LaTeX_CLSS.xml_1.png=d221baf1a1fc1b13b7036efeb42c1939 +_LaTeX_CLSS.xml_1.png=8392c4dff7f5f80b1f7d1d2c89a0aa82 _LaTeX_CLSS.xml_2.png=944e22433464f50dd883ec1b8fadea37 _LaTeX_CLSS.xml_3.png=7903ebcafc1cfe1683893d926193ce4b _LaTeX_CLSS.xml_4.png=ddfaf0bfb39cf7978750a26a0eb22cb6 diff --git a/scilab/modules/helptools/images/_LaTeX_CLSS.xml_1.png b/scilab/modules/helptools/images/_LaTeX_CLSS.xml_1.png index 55c325336edf13430afc63b46c2d8d48b3557924..472da1f68acbde0c16a65209ac4742ef4470b87f 100644 GIT binary patch delta 1215 zcmV;w1VH=Q3DXIXB!8MoL_t(|+U=Wbh!#~G#*e$0nWj`?BH`u@7Y%QyDUz<45Y^ZYF}DkmXliAJ8VQkKynHhHP+mZxbWzJ2>K9W~`k+34=6T&| zI`i(lXJ+1a-}V2%4|dP&%$)zZpE=JOqf)67Iox{|R9n*bfW2w=idwJ$Yy)FJ z71#xa<+1RFGk*`FBVa=-h|9G?`|`elzO+&{*aP5khj?BEivm;P5H^tiXdz!F+6mTk zd_M-phCEyrO`n1qQIl_?p9(csE61RqHr;=hE6_5%e$L>7S2Y z0=rp|pMy~j&rd3@Tq?8|XaIk5x~L=XGL9d(uzzt?30MAAZA!8+UJgD6E5QnG$}Bc)%k&hAbX|&#W9~(A-pG{scGG74~L7$N8i;eg3KHrLC zJ%5qUaoa<#$rRTy{ciS)wxA=lmqzown}+2;S&h7sWB zl;0~YS&o0Q9TfL8ZifVM?I*4kTF(2*L$1rg_fg04iey2NK;<+dXl-~0Yz=vE6800B zqi%7*lZN8jPh2asno~%a4lzHuDzXK|Z+~rQ@TJRvaGEyCfh@4;E&N?+mN_md`$>}4 zlW&Y?unv2V*i&C~h$$xvO3>OMRt>Q>Jdt9B_G5uf&hj_Uap<=xZTpF94?Sm^or^)q zx#%BR@|>6jC1`D^;EPSnAvc@-L^9XJq0y#}#{0L7xN^0hxKwC=-ZRK@O>CXwHGdu% zBbG=OluVF*Yr|*8JK;}T(mPLDMgkd{mKyg%jsZ=VJ dN~OxP?gDZXCd!aG`}+U@002ovPDHLkV1n?pO`-q* delta 1221 zcmV;$1UmcE3E2sdB!8euL_t(|+U=WLh*eb_#@EbX=A{uYsDw1uI5>==j$|g0j+Y_= z9WTt_B}Y(EQACq2Rz{2&&w1^__j)hYwg!5wgl=$FnK%rFB(iHVYlad~+@89`O zZnt}%*=Oy&&zUp+Klp)X?b&;;>wm4a*QYTml}e>jsZ=UYy?+BPfDT#C#{n=fhwE_) z_y+s~8bB@i0{jSuW-23N!MZG0MindKl{U~Yo!K}xS^zG4q;CMfg8auJLKK4a;69ks z2J$n8ovWwCy?elJkMt#c=2MSDgRTa>!40so4dkbSmEX(a-Ya0CM|v|j9QUYL3KoN1 zU=*kU--7ZCR)5}b=0S8C)VG0h**0h~?<;ep6|ln|0evjW^9ES%ni7YygFK{Ve3_^T zY+`&r177lZxGb7J1=|BKCO~HMxnL-8^y2*?8`P#;Q8nmXa2w13)7g=lSZ5tA$})t4BEL+`WJM-5EJcQchTLrdLhi?)yT?lKUPK)x zopMFdpnpZY$7>(GhMlX2ML7n!wn3x8IsSWaGI0`ztzlScaO}U9WMFhkkFE4buMDwW zh_YNZ4O+vITs!Jptw?6UQ@AGVvnV%GK0T%gH;P-X@Enzxht* zd^8yxWJP`sUa)w6ROL#iL7xG2;1^C8tH?(z$A5QR*w`wcEB_ku8s};0pxulrkYrnM z3v|({P^nZZl}e>jsZ^?1lr0O2Y>eLnTfhh4eQwH=2i}D_Qh(JZajGI8BjnR)Ek8DV z1->_#J&ycO*|4C<7mrgW@pZ?kt|oEXaUu&16UKTXCr4hN{^Zl$HPF93M}%qMI(W|K z`hNY(^(V|Pdp)_!8!pryR8)aSY!e79KES0D?D6jV+l+}4H< z!A_qCM`1saIqDu4JaH(j{lvCG7jg>m(|<|kCtU@$pg64!b&hm75RTJES;h*hZsqR^ zQp|Bt*-xUhp6oRVgSFp##GX3aqD*O7P~6rAv1*95p|)PC~j**1z&7JhTK&4lRWNsm-$@p#659X+1gKR8nlG>41e;t zCbmxT8jlE3mOvJiWFei_hR;mmggZhC}di89Ce z%rFXMK`~q`G;q$G$FMOqL)!zH1!XitoMAk^X5#e|kTOBV@R^Q00000NkvXXu0mjfz9dse diff --git a/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref b/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref index a575e95..01118e8 100644 --- a/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref +++ b/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref @@ -5,7 +5,7 @@ // // <-- Short Description --> // When processing an m-file with multiple continuation lines in the -// initial funtion statement, i.e the first line, I received an index +// initial function statement, i.e the first line, I received an index // error in line 181 of m2sci_syntax. On investigation, I found the index // k was zero and traced this to lines 141 and 171 which set k=k-1 after // appending line k to line k-1. I have produced a modified diff --git a/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.tst b/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.tst index 5f9a6bd..e6a1dbd 100644 --- a/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.tst +++ b/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.tst @@ -15,7 +15,7 @@ // // <-- Short Description --> // When processing an m-file with multiple continuation lines in the -// initial funtion statement, i.e the first line, I received an index +// initial function statement, i.e the first line, I received an index // error in line 181 of m2sci_syntax. On investigation, I found the index // k was zero and traced this to lines 141 and 171 which set k=k-1 after // appending line k to line k-1. I have produced a modified diff --git a/scilab/modules/overloading/macros/%lss_v_lss.sci b/scilab/modules/overloading/macros/%lss_v_lss.sci index c953dac..2f52e01 100644 --- a/scilab/modules/overloading/macros/%lss_v_lss.sci +++ b/scilab/modules/overloading/macros/%lss_v_lss.sci @@ -8,7 +8,7 @@ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt function [s]=%lss_v_lss(s1,s2) - //s=%lss_v_lss(s1,s2) <=> s = s1 "fedback" with s2 + //s=%lss_v_lss(s1,s2) <=> s = s1 "feedback" with s2 // <=> s=s1/.s2 (in state-space) //! [s1,s2]=sysconv(s1,s2) diff --git a/scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci b/scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci index 13f8f7f..0f07df5 100644 --- a/scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci +++ b/scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci @@ -1798,7 +1798,7 @@ function [ok,XX,alreadyran,flgcdgen,szclkINTemp,freof] = do_compile_superblock4 // Scilab and C files generation //*********************************** - //** generate scilab interfacing funtion + //** generate scilab interfacing function // of the generated scicos block ok=gen_gui42(); diff --git a/scilab/modules/scicos/src/modelica_compiler/squareSparseMatrix.mli b/scilab/modules/scicos/src/modelica_compiler/squareSparseMatrix.mli index d01501e..bf584cc 100644 --- a/scilab/modules/scicos/src/modelica_compiler/squareSparseMatrix.mli +++ b/scilab/modules/scicos/src/modelica_compiler/squareSparseMatrix.mli @@ -23,7 +23,7 @@ (** This module implements a sparse representation of square matrices using list associations. The retrieval of an element takes O(m) where m is the number of elements on the current row that are not equal to the default -element (in the sense of the compare funtion provided by a module +element (in the sense of the compare function provided by a module furnishing matrix elements). *) (* Functorial interface *) diff --git a/scilab/modules/signal_processing/macros/group.sci b/scilab/modules/signal_processing/macros/group.sci index 0a0cbfd..42cb2f6 100644 --- a/scilab/modules/signal_processing/macros/group.sci +++ b/scilab/modules/signal_processing/macros/group.sci @@ -24,7 +24,7 @@ function [tg,fr]=group(npts,a1i,a2i,b1i,b2i) // tg :Values of group delay evaluated on the grid fr // fr :Grid of frequency values where group delay is evaluated // - //In the coefficient polynomial form the tranfer funtion is + //In the coefficient polynomial form the tranfer function is //formulated by the following expression: // // h(z)=prod(a1i+a2i*z+z**2)/prod(b1i+b2i*z+z^2) diff --git a/scilab/modules/xcos/help/en_US/palettes/Continuous_pal/CLSS.xml b/scilab/modules/xcos/help/en_US/palettes/Continuous_pal/CLSS.xml index e90aaeb..e930625 100644 --- a/scilab/modules/xcos/help/en_US/palettes/Continuous_pal/CLSS.xml +++ b/scilab/modules/xcos/help/en_US/palettes/Continuous_pal/CLSS.xml @@ -112,7 +112,7 @@ \begin{matrix} \dot{x} = A \cdot x + B \cdot u \\ - \dot{y} = C \cdot x + D \cdot u + y = C \cdot x + D \cdot u \end{matrix} diff --git a/scilab/modules/xcos/help/fr_FR/palettes/Continuous_pal/CLSS.xml b/scilab/modules/xcos/help/fr_FR/palettes/Continuous_pal/CLSS.xml index 8d19aba..c72fe1c 100644 --- a/scilab/modules/xcos/help/fr_FR/palettes/Continuous_pal/CLSS.xml +++ b/scilab/modules/xcos/help/fr_FR/palettes/Continuous_pal/CLSS.xml @@ -93,7 +93,7 @@ \begin{matrix} \dot{x} = A \cdot x + B \cdot u \\ - \dot{y} = C \cdot x + D \cdot u + y = C \cdot x + D \cdot u \end{matrix} -- 1.7.9.5