diff options
author | tagezi <lera.goncharuk@gmail.com> | 2015-10-26 03:39:48 +0200 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@edx.srv.br> | 2015-10-26 20:16:39 +0000 |
commit | 9e1f105bcf48f6518a3804ab14db6f5e8a3eaca4 (patch) | |
tree | d5cf546591a187af7a1d3eb13a008e6d3295b3a9 /source | |
parent | 5d7d8ae940137262e8fd575a2214bf0baf0e9c1f (diff) |
minor changes for functions IM*
ful_func.xhp
paragraphs with service information is replaced to comments;
the last mention of a complex number in the variable
func_define_complex is replaced to a number, as there can
be any a number, not just a complex number;
added the paragraph about result;
func_imcos.xhp and func_imcosh.xhp
deleted attribute locale="false" in paragraphs with examples,
as they need to be translatable;
in all func_im* files
the part of the variable with description took away;
chenged the part with "a+bi" by request Olivier;
added the link to the result;
added tag <br /> in paragraphs with examples, as examples
need to be separated from his descriptions.
Change-Id: I571415de35440ee9227d6e8bc270ed5c69c9e237
Reviewed-on: https://gerrit.libreoffice.org/19599
Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Diffstat (limited to 'source')
-rw-r--r-- | source/text/scalc/01/ful_func.xhp | 25 | ||||
-rw-r--r-- | source/text/scalc/01/func_imcos.xhp | 13 | ||||
-rw-r--r-- | source/text/scalc/01/func_imcosh.xhp | 11 | ||||
-rw-r--r-- | source/text/scalc/01/func_imcot.xhp | 9 | ||||
-rw-r--r-- | source/text/scalc/01/func_imcsc.xhp | 13 | ||||
-rw-r--r-- | source/text/scalc/01/func_imcsch.xhp | 9 | ||||
-rw-r--r-- | source/text/scalc/01/func_imsec.xhp | 9 | ||||
-rw-r--r-- | source/text/scalc/01/func_imsech.xhp | 9 | ||||
-rw-r--r-- | source/text/scalc/01/func_imsin.xhp | 9 | ||||
-rw-r--r-- | source/text/scalc/01/func_imsinh.xhp | 10 | ||||
-rw-r--r-- | source/text/scalc/01/func_imtan.xhp | 9 |
11 files changed, 59 insertions, 67 deletions
diff --git a/source/text/scalc/01/ful_func.xhp b/source/text/scalc/01/ful_func.xhp index e9c913a6d1..4835f40b4c 100644 --- a/source/text/scalc/01/ful_func.xhp +++ b/source/text/scalc/01/ful_func.xhp @@ -14,9 +14,7 @@ </topic> </meta> <body> - <paragraph id="hd_id291922889926672" role="heading" level="2" xml-lang="en-US"> - Title in descriptions of functions - </paragraph> + <comment> Title in descriptions of functions </comment> <variable id="func_head_syntax"> <paragraph id="hd_id126511265112651" role="heading" level="3" xml-lang="en-US"> Syntax @@ -27,9 +25,8 @@ Examples </paragraph> </variable> - <paragraph id="hd_id506250625062" role="heading" level="2" xml-lang="en-US"> - Notes for functions - </paragraph> + + <comment> Notes for functions </comment> <paragraph id="par_id2595283314097" role="note" xml-lang="en-US"> <variable id="func_im_comp_numb"> <emph>Complex_number</emph> is a complex number that is entered in the form "a+bi" or "a+bj", or is the result of a string operation with other functions, cell references, or expressed by concatenating (&) other strings, resulting in a string in the form "a+bi" or "a+bj". @@ -40,9 +37,8 @@ If <emph>Complex_number</emph> is actually a real number (b=0), then it can be either a string expression or a number value. </variable> </paragraph> - <paragraph id="hd_id31996493223303" role="heading" level="2" xml-lang="en-US"> - Warnings for functions - </paragraph> + + <comment>Warnings for functions </comment> <paragraph id="par_id1566939488738" role="warning" xml-lang="en-US"> <variable id="func_im_return_text"> The function always returns a string representing a complex number. @@ -53,15 +49,22 @@ If the result is a complex number with one of its parts (a or b) equal to zero, that part is not displayed. </variable> </paragraph> + + <comment> Other paragraphs </comment> <paragraph id="par_id962376762132" role="paragraph" xml-lang="en-US"> <variable id="func_define_complex"> - <emph>Complex_number</emph> - A string representing a complex number, a real number in either string or number format, or a reference to a cell containing a complex number + <emph>Complex_number</emph> - A string representing a complex number, a real number in either string or number format, or a reference to a cell containing a number </variable> </paragraph> - <paragraph id="par_id962376732432" role="paragraph" xml-lang="en-US"> + <paragraph id="par_id962376732432" role="paragraph" xml-lang="en-US"> <variable id="func_imag_zero"> The imaginary part is equal to zero, so it is not displayed in the result. </variable> </paragraph> + <variable id="func_im_des"> + <paragraph id="par_id29750345314640" role="paragraph" xml-lang="en-US"> + The result is presented in the string format and has the character "i" or "j" as an imaginary unit. + </paragraph> + </variable> </body> </helpdocument> diff --git a/source/text/scalc/01/func_imcos.xhp b/source/text/scalc/01/func_imcos.xhp index 16e4743372..9e0b22164d 100644 --- a/source/text/scalc/01/func_imcos.xhp +++ b/source/text/scalc/01/func_imcos.xhp @@ -27,15 +27,14 @@ </paragraph> <paragraph id="par_id1066273182723" role="paragraph" xml-lang="en-US"> <ahelp hid="."> - <variable id="imcos_des"> - Returns the cosine of a complex number. The cosine of a complex number "a+bi" can be expressed by: - </variable> + <variable id="imcos_des">Returns the cosine of a complex number.</variable> The cosine of a complex number can be expressed by: </ahelp> </paragraph> </section> <paragraph id="par_id12176138532237" role="code" xml-lang="en-US" localize="false"> cos(a+bi) = cos(a)cosh(b) - sin(a)sinh(b)i </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id164021484116762" role="code" xml-lang="en-US"> @@ -53,16 +52,16 @@ <embedvar href="text/scalc/01/ful_func.xhp#func_im_ignor_zero"/> </paragraph> <embedvar href="text/scalc/01/ful_func.xhp#func_head_example"/> - <paragraph id="par_id4581301219753" role="paragraph" localize="false" xml-lang="en-US"> + <paragraph id="par_id4581301219753" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcos.xhp#imcos"/>("4-3i") - </item> + </item><br /> returns -6.58066304055116-7.58155274274654i. </paragraph> - <paragraph id="par_id25412646522614" role="paragraph" localize="false" xml-lang="en-US"> + <paragraph id="par_id25412646522614" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcos.xhp#imcos"/>(2) - </item> + </item><br /> returns -0.416146836547142 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> <section id="relatedtopics"> diff --git a/source/text/scalc/01/func_imcosh.xhp b/source/text/scalc/01/func_imcosh.xhp index e2f8d43336..f93b09baae 100644 --- a/source/text/scalc/01/func_imcosh.xhp +++ b/source/text/scalc/01/func_imcosh.xhp @@ -27,15 +27,14 @@ </paragraph> <paragraph id="par_id125881258812588" role="paragraph" xml-lang="en-US"> <ahelp hid="."> - <variable id="imcosh_des"> - Returns the hyperbolic cosine of a complex number. The hyperbolic cosine of a complex number "a+bi" can be expressed by: - </variable> + <variable id="imcosh_des">Returns the hyperbolic cosine of a complex number.</variable> The the hyperbolic cosine of a complex number can be expressed by: </ahelp> </paragraph> </section> <paragraph id="par_id24939266285933" role="code" xml-lang="en-US" localize="false"> cosh(a+bi)=cosh(a)cos(b)+sinh(a)sin(b)i </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id16051131322110" role="code" xml-lang="en-US"> @@ -53,16 +52,16 @@ <embedvar href="text/scalc/01/ful_func.xhp#func_im_ignor_zero"/> </paragraph> <embedvar href="text/scalc/01/ful_func.xhp#func_head_example"/> - <paragraph id="par_id55891471962" role="paragraph" localize="false" xml-lang="en-US"> + <paragraph id="par_id55891471962" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcosh.xhp#imcosh"/>("4-3i") - </item> + </item><br/> returns -27.0349456030742-3.85115333481178i. </paragraph> <paragraph id="par_id152561887112896" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcosh.xhp#imcosh"/>(2) - </item> + </item><br/> returns 3.76219569108363 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> <section id="relatedtopics"> diff --git a/source/text/scalc/01/func_imcot.xhp b/source/text/scalc/01/func_imcot.xhp index cc0bb7f14c..79937410f6 100644 --- a/source/text/scalc/01/func_imcot.xhp +++ b/source/text/scalc/01/func_imcot.xhp @@ -27,9 +27,7 @@ </paragraph> <paragraph id="par_id764617646176461" role="paragraph" xml-lang="en-US"> <ahelp hid="."> - <variable id="imcot_des"> - Returns the cotangent of a complex number. The cotangent of a complex number "a+bi" can be expressed by: - </variable> + <variable id="imcot_des">Returns the cotangent of a complex number.</variable> The the cotangent of a complex number can be expressed by: </ahelp> </paragraph> </section> @@ -40,6 +38,7 @@ </alt> </image> </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id16051131322110" role="code" xml-lang="en-US"> @@ -60,13 +59,13 @@ <paragraph id="par_id21183436423819" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcot.xhp#imcot"/>("4-3i") - </item> + </item><br/> returns 0.00490118239430447+0.999266927805902i. </paragraph> <paragraph id="par_id18472284929530" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcot.xhp#imcot"/>(2) - </item> + </item><br/> returns -0.457657554360286 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> <section id="relatedtopics"> diff --git a/source/text/scalc/01/func_imcsc.xhp b/source/text/scalc/01/func_imcsc.xhp index e340a429a5..7285d50024 100644 --- a/source/text/scalc/01/func_imcsc.xhp +++ b/source/text/scalc/01/func_imcsc.xhp @@ -26,11 +26,9 @@ </variable> function </paragraph> <paragraph id="par_id932329323293232" role="paragraph" xml-lang="en-US"> - <variable id="imcsc_des"> - <ahelp hid="."> - Returns the cosecant of a complex number. The cosecant of a complex number "a+bi" can be expressed by: - </ahelp> - </variable> + <ahelp hid="."> + <variable id="imcsc_des">Returns the cosecant of a complex number. </variable> The the cosecant of a complex number can be expressed by: + </ahelp> </paragraph> </section> <paragraph id="par_id13510198901485" role="code" xml-lang="en-US"> @@ -40,6 +38,7 @@ </alt> </image> </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id30461169611909" role="code" xml-lang="en-US"> @@ -60,13 +59,13 @@ <paragraph id="par_id25692477525537" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcsc.xhp#imcsc"/>("4-3i") - </item> + </item><br/> returns -0.0754898329158637-0.0648774713706355i. </paragraph> <paragraph id="par_id32572967420710" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcsc.xhp#imcsc"/>(2) - </item> + </item><br/> returns 1.09975017029462 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> <section id="relatedtopics"> diff --git a/source/text/scalc/01/func_imcsch.xhp b/source/text/scalc/01/func_imcsch.xhp index b5786ac4d1..4b054a537b 100644 --- a/source/text/scalc/01/func_imcsch.xhp +++ b/source/text/scalc/01/func_imcsch.xhp @@ -27,9 +27,7 @@ </paragraph> <paragraph id="par_id979369793697936" role="paragraph" xml-lang="en-US"> <ahelp hid="."> - <variable id="imcsch_des"> - Returns the hyperbolic cosecant of a complex number. The hyperbolic cosecant of a complex number "a+bi" can be expressed by: - </variable> + <variable id="imcsch_des">Returns the hyperbolic cosecant of a complex number.</variable> The the hyperbolic cosecant of a complex number can be expressed by: </ahelp> </paragraph> </section> @@ -40,6 +38,7 @@ </alt> </image> </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id30461169611909" role="code" xml-lang="en-US"> @@ -60,13 +59,13 @@ <paragraph id="par_id16814232201137" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcsch.xhp#imcsch"/>("4-3i") - </item> + </item><br/> returns -0.036275889628626+0.0051744731840194i. </paragraph> <paragraph id="par_id2395211576789" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imcsch.xhp#imcsch"/>(2) - </item> + </item><br/> returns 0.275720564771783 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> <section id="relatedtopics"> diff --git a/source/text/scalc/01/func_imsec.xhp b/source/text/scalc/01/func_imsec.xhp index 347c5ebdac..ca9b031dd3 100644 --- a/source/text/scalc/01/func_imsec.xhp +++ b/source/text/scalc/01/func_imsec.xhp @@ -27,9 +27,7 @@ </paragraph> <paragraph id="par_id23292284928998" role="paragraph" xml-lang="en-US"> <ahelp hid="."> - <variable id="imsec_des"> - Returns the secant of a complex number. The secant of a complex number "a+bi" can be expressed by: - </variable> + <variable id="imsec_des">Returns the secant of a complex number. </variable> The the secant of a complex number can be expressed by: </ahelp> </paragraph> </section> @@ -40,6 +38,7 @@ </alt> </image> </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id66061624115094" role="code" xml-lang="en-US"> @@ -60,13 +59,13 @@ <paragraph id="par_id16814232201137" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imsec.xhp#imsec"/>("4-3i") - </item> + </item><br/> returns -0.0652940278579471+0.0752249603027732i. </paragraph> <paragraph id="par_id2395211576789" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imsec.xhp#imsec"/>(2) - </item> + </item><br/> returns -2.40299796172238 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> <section id="relatedtopics"> diff --git a/source/text/scalc/01/func_imsech.xhp b/source/text/scalc/01/func_imsech.xhp index 66aa95d348..3b8df24f94 100644 --- a/source/text/scalc/01/func_imsech.xhp +++ b/source/text/scalc/01/func_imsech.xhp @@ -27,9 +27,7 @@ </paragraph> <paragraph id="par_id116441182314950" role="paragraph" xml-lang="en-US"> <ahelp hid="."> - <variable id="imsech_des"> - Returns the hyperbolic secant of a complex number. The hyperbolic secant of a complex number "a+bi" can be expressed by: - </variable> + <variable id="imsech_des">Returns the hyperbolic secant of a complex number. </variable> The the hyperbolic secant of a complex number can be expressed by: </ahelp> </paragraph> </section> @@ -40,6 +38,7 @@ </alt> </image> </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id17253876723855" role="code" xml-lang="en-US"> @@ -60,13 +59,13 @@ <paragraph id="par_id1906826088444" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imsech.xhp#imsech"/>("4-3i") - </item> + </item><br/> returns -0.0362534969158689+0.00516434460775318i. </paragraph> <paragraph id="par_id247492030016627" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imsech.xhp#imsech"/>(2) - </item> + </item><br/> returns 0.26580222883408 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> <section id="relatedtopics"> diff --git a/source/text/scalc/01/func_imsin.xhp b/source/text/scalc/01/func_imsin.xhp index e204822d3b..54064415df 100644 --- a/source/text/scalc/01/func_imsin.xhp +++ b/source/text/scalc/01/func_imsin.xhp @@ -27,15 +27,14 @@ </paragraph> <paragraph id="par_id1955633330277" role="paragraph" xml-lang="en-US"> <ahelp hid="."> - <variable id="imsin_des"> - Returns the sine of a complex number. The sine of a complex number "a+bi" can be expressed by: - </variable> + <variable id="imsin_des">Returns the sine of a complex number. </variable> The the sine of a complex number can be expressed by: </ahelp> </paragraph> </section> <paragraph id="par_id3189460120934" role="code" xml-lang="en-US"> sin(a+bi)=sin(a)cosh(b)+cos(a)sinh(b)i </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id284611113926520" role="code" xml-lang="en-US"> @@ -56,13 +55,13 @@ <paragraph id="par_id5063188419467" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imsin.xhp#imsin"/>("4-3i") - </item> + </item><br/> returns -7.61923172032141+6.548120040911i. </paragraph> <paragraph id="par_id1527387141125" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imsin.xhp#imsin"/>(2) - </item> + </item><br/> returns 0.909297426825682 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> <section id="relatedtopics"> diff --git a/source/text/scalc/01/func_imsinh.xhp b/source/text/scalc/01/func_imsinh.xhp index 56b4b8b668..72d20e65c2 100644 --- a/source/text/scalc/01/func_imsinh.xhp +++ b/source/text/scalc/01/func_imsinh.xhp @@ -27,16 +27,14 @@ </paragraph> <paragraph id="par_id1955633330277" role="paragraph" xml-lang="en-US"> <ahelp hid="."> - <variable id="imsinh_des"> - Returns the hyperbolic sine of a complex number. The hyperbolic sine of a complex number is calculated by the following rule: - </variable> + <variable id="imsinh_des">Returns the hyperbolic sine of a complex number.</variable> The the hyperbolic sine of a complex number can be expressed by: </ahelp> </paragraph> </section> - <paragraph id="par_id3189460120934" role="code" xml-lang="en-US"> sinh(a+bi)=sinh(a)cos(b)+cosh(a)sin(b)i </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id284611113926520" role="code" xml-lang="en-US"> @@ -61,12 +59,12 @@ returns -27.0168132580039-3.85373803791938i. </paragraph> <paragraph id="par_id1527387141125" role="paragraph" xml-lang="en-US"> - <item type="input"> + <item type="input"><br/> =<embedvar href="text/scalc/01/func_imsinh.xhp#imsinh"/>(2) </item> returns 3.62686040784702 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> - <section id="relatedtopics"> + <section id="relatedtopics"><br/> <paragraph id="par_id2773214341302" role="paragraph" xml-lang="en-US"> <embedvar href="text/scalc/01/func_imsin.xhp#imsin_head"/>, <embedvar href="text/scalc/01/func_imcos.xhp#imcos_head"/>, diff --git a/source/text/scalc/01/func_imtan.xhp b/source/text/scalc/01/func_imtan.xhp index 42b42ce0e2..326fff5309 100644 --- a/source/text/scalc/01/func_imtan.xhp +++ b/source/text/scalc/01/func_imtan.xhp @@ -27,9 +27,7 @@ </paragraph> <paragraph id="par_id5700137827273" role="paragraph" xml-lang="en-US"> <ahelp hid="."> - <variable id="imtan_des"> - Returns the tangent of a complex number. The tangent of a complex number "a+bi" can be expressed by: - </variable> + <variable id="imtan_des">Returns the tangent of a complex number.</variable> The the tangent of a complex number can be expressed by: </ahelp> </paragraph> </section> @@ -40,6 +38,7 @@ </alt> </image> </paragraph> + <embedvar href="text/scalc/01/ful_func.xhp#func_im_des"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embedvar href="text/scalc/01/ful_func.xhp#func_head_syntax"/> <paragraph id="par_id23219159944377" role="code" xml-lang="en-US"> @@ -60,13 +59,13 @@ <paragraph id="par_id5063188419467" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imtan.xhp#imtan"/>("4-3i") - </item> + </item><br/> returns 0.00490825806749606-1.00070953606723i. </paragraph> <paragraph id="par_id1527387141125" role="paragraph" xml-lang="en-US"> <item type="input"> =<embedvar href="text/scalc/01/func_imtan.xhp#imtan"/>(2) - </item> + </item><br/> returns -2.18503986326152 as a string. <embedvar href="text/scalc/01/ful_func.xhp#func_imag_zero"/> </paragraph> <section id="relatedtopics"> |