source/text/scalc/01/func_ceiling.xhp | 42 +++++++++++++++++++---------------
source/text/scalc/01/func_floor.xhp | 26 +++++++++++++--------
2 files changed, 41 insertions(+), 27 deletions(-)
New commits:
commit f8cd9798934f2cb336b09990c6d2f84a6cadcc36
Author: Steve Fanning <stevemfanning...@gmail.com>
AuthorDate: Sun Apr 12 22:34:19 2020 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Apr 13 03:41:29 2020 +0200
tdf#131960 Clarification of FLOOR/CEILING functions
Change-Id: Ifb90e95d632f0305d15562e9732dac7e3dc6d6ca
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92097
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/scalc/01/func_ceiling.xhp
b/source/text/scalc/01/func_ceiling.xhp
index 65c28d868..206ea0244 100644
--- a/source/text/scalc/01/func_ceiling.xhp
+++ b/source/text/scalc/01/func_ceiling.xhp
@@ -8,7 +8,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
-->
-
<meta>
<topic id="scalcceilingfunction" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Ceiling functions</title>
@@ -17,18 +16,17 @@
</meta>
<body>
<h1 id="hd_id971586216771519">Ceiling functions</h1>
- <section id="Section31">
+ <section id="ceiling">
<bookmark xml-lang="en-US" branch="index" id="bm_id3152518">
<bookmark_value>CEILING function</bookmark_value>
<bookmark_value>rounding;up to multiples of significance</bookmark_value>
</bookmark>
<comment>mw added one entry</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_OBERGRENZE"
id="bm_id3152530" localize="false"/>
-
- <h2 id="hd_id3152518">CEILING</h2>
- <paragraph id="par_id3153422" role="paragraph" xml-lang="en-US"><ahelp
hid="HID_FUNC_OBERGRENZE">Rounds a number up to the nearest multiple of
Significance.</ahelp></paragraph>
-
+ <h2 id="hd_id3152518"><variable id="CEILINGh1"><link
href="text/scalc/01/func_ceiling.xhp#ceiling"
name="CEILING">CEILING</link></variable></h2>
+ <paragraph id="par_id3153422" role="paragraph" xml-lang="en-US"><ahelp
hid="HID_FUNC_OBERGRENZE">Rounds a number up to the nearest multiple of s
significance value.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id601586207136514">For a positive
number and a positive significance value, the function rounds up (away from
zero). For a negative number and a negative significance value, the direction
of rounding is determined by the value of a mode parameter. The function
returns an error if the number and significance values have opposite
signs.</paragraph>
+ <warning id="par_id3163792">If the spreadsheet is exported to
Microsoft Excel, the CEILING function is exported as the equivalent
CEILING.MATH function that exists since Excel 2013. If you plan to use the
spreadsheet with earlier Excel versions, use either CEILING.PRECISE that exists
since Excel 2010, or CEILING.XCL that is exported as the CEILING function
compatible with all Excel versions. Note that CEILING.XCL always rounds away
from zero.</warning>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3153454" role="code"
xml-lang="en-US">CEILING(Number[; Significance[; Mode]])</paragraph>
<section id="argnumber">
@@ -36,8 +34,6 @@
</section>
<paragraph id="par_id3155000" role="paragraph"
xml-lang="en-US"><emph>Significance</emph> (optional) is the value, or a
reference to a cell containing the value, to whose multiple <emph>Number</emph>
is to be rounded. It defaults to +1 or -1 depending on the sign of
<emph>Number</emph>.</paragraph>
<paragraph id="par_id3155020" role="paragraph"
xml-lang="en-US"><emph>Mode</emph> (optional) is a number, or a reference to a
cell containing a number. The function only uses <emph>Mode</emph> if both
<emph>Number</emph> and <emph>Significance</emph> are negative. Then if
<emph>Mode</emph> is given and not equal to zero, numbers are rounded down
(away from zero); if <emph>Mode</emph> is equal to zero or not given, negative
numbers are rounded up (towards zero).</paragraph>
- <warning id="par_id3163792">If the spreadsheet is exported to
Microsoft Excel, the CEILING function is exported as the equivalent
CEILING.MATH function that exists since Excel 2013. If you plan to use the
spreadsheet with earlier Excel versions, use either CEILING.PRECISE that exists
since Excel 2010, or CEILING.XCL that is exported as the CEILING function
compatible with all Excel versions. Note that CEILING.XCL always rounds away
from zero.</warning>
-
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph role="paragraph"
id="par_id281586208138400"><input>=CEILING(3.45)</input> returns 4.</paragraph>
<paragraph role="paragraph"
id="par_id921586208142416"><input>=CEILING(3.45, 3)</input> returns
6.</paragraph>
@@ -47,15 +43,17 @@
<comment>see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND,
ROUNDDOWN, ROUNDUP</comment>
</section>
- <section id="Section31.1">
+ <section id="ceilingprecise">
<bookmark xml-lang="en-US" branch="index" id="bm_id2952518">
<bookmark_value>CEILING.PRECISE function</bookmark_value>
<bookmark_value>rounding;up to multiples of significance</bookmark_value>
</bookmark>
<comment>mw added one entry</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_CEIL_MS"
id="bm_id2952530" localize="false"/>
- <h2 id="hd_id2952518">CEILING.PRECISE</h2>
+ <h2 id="hd_id2952518"><variable id="CEILING.PRECISEh1"><link
href="text/scalc/01/func_ceiling.xhp#ceilingprecise"
name="CEILING.PRECISE">CEILING.PRECISE</link></variable></h2>
<paragraph id="par_id2953422" role="paragraph" xml-lang="en-US"><ahelp
hid="HID_FUNC_CEIL_MS">Rounds a number up to the nearest multiple of a
significance value.</ahelp></paragraph>
+ <paragraph role="paragraph" id="par_id151586642494759">For a positive
number the function rounds up (away from zero). For a negative number, the
function rounds up (towards zero). The sign of the significance value is
ignored.</paragraph>
+ <note id="par_id631586642933797">This function calculates identical
results to the <link href="#Section312" name="isoceiling">ISO.CEILING</link>
function.</note>
<embed href="text/scalc/00/avail_release.xhp#4.3"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id2953454" role="code"
xml-lang="en-US">CEILING.PRECISE(Number[; Significance])</paragraph>
@@ -68,13 +66,15 @@
<comment>see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND,
ROUNDDOWN, ROUNDUP</comment>
</section>
- <section id="Section 31.3">
+ <section id="ceilingmath">
<bookmark xml-lang="en-US" branch="index" id="bm_id911516997198644">
<bookmark_value>CEILING.MATH function</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_CEIL_MATH"
id="bm_id511516997249645" localize="false"/>
- <h2 id="hd_id91516997330445">CEILING.MATH</h2>
+ <h2 id="hd_id91516997330445"><variable id="CEILING.MATHh1"><link
href="text/scalc/01/func_ceiling.xhp#ceilingmath"
name="CEILING.MATH">CEILING.MATH</link></variable></h2>
<paragraph role="paragraph" id="par_id81516997342088"
xml-lang="en-US"><ahelp hid="HID_FUNC_CEIL_MATH">Rounds a number to the nearest
multiple of a significance value.</ahelp></paragraph>
+ <paragraph role="paragraph" id="par_id911586642319078">For a positive
number the function rounds up (away from zero). For a negative number, the
direction of rounding is determined by the value of a mode parameter. The sign
of the significance value is ignored.</paragraph>
+ <embed href="text/scalc/00/avail_release.xhp#5.0"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph role="code" id="par_id841516997669932"
xml-lang="en-US">CEILING.MATH(Number[; Significance[; Mode]])</paragraph>
<embed href="text/scalc/01/func_ceiling.xhp#argnumber"/>
@@ -88,15 +88,15 @@
<paragraph role="paragraph"
id="par_id151586208604536"><input>=CEILING.MATH(-45.67,-2,0)</input> returns
-44.</paragraph>
<paragraph role="paragraph"
id="par_id971586208611345"><input>=CEILING.MATH(-45.67,+2, 1)</input> returns
-46.</paragraph>
</section>
- <section id="Section 31.4">
+ <section id="ceilingxcl">
<bookmark xml-lang="en-US" branch="index" id="bm_id921516998608939">
<bookmark_value>CEILING.XCL function</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_CEIL_MS"
id="bm_id221516998652517" localize="false"/>
- <h2 id="hd_id411516998838823">CEILING.XCL</h2>
+ <h2 id="hd_id411516998838823"><variable id="CEILING.XCLh1"><link
href="text/scalc/01/func_ceiling.xhp#ceilingxcl"
name="CEILING.XCL">CEILING.XCL</link></variable></h2>
<paragraph role="paragraph" id="par_id811516998845826"
xml-lang="en-US"><ahelp hid="HID_FUNC_CEIL_MS">Rounds a number to the nearest
multiple of a significance value.</ahelp></paragraph>
- <embed href="text/scalc/00/avail_release.xhp#5.0"/>
<paragraph role="paragraph" id="par_id361586213828675">For a positive
number and a positive significance value, the function rounds up (away from
zero). For a negative number and a positive significance value, the function
rounds up (towards zero). For a negative number and a negative significance
value, the function rounds down (away from zero). The function returns an error
if the number is positive and the significance value is negative.</paragraph>
+ <embed href="text/scalc/00/avail_release.xhp#5.0"/>
<warning id="par_id881586213934118">This function exists for
interoperability with Microsoft Excel 2007 or older. If a Calc spreadsheet is
exported to Microsoft Excel, references to Calc’s CEILING.XCL function are
exported as references to Excel’s CEILING function, which is compatible with
all Excel versions. If a Microsoft Excel spreadsheet is imported into Calc,
references to Excel’s CEILING function are imported as references to Calc’s
CEILING.XCL function.</warning>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph role="code" id="par_id251516998856873"
xml-lang="en-US">CEILING.XCL(Number; Significance)</paragraph>
@@ -107,7 +107,7 @@
<paragraph role="paragraph"
id="par_id651586214132234"><input>=CEILING.XCL(-45.67,2)</input> returns
-44.</paragraph>
<paragraph role="paragraph"
id="par_id811586214136666"><input>=CEILING.XCL(-45.67,-2)</input> returns
-46.</paragraph>
</section>
- <section id="Section31.2">
+ <section id="isoceiling">
<bookmark xml-lang="en-US" branch="index" id="bm_id8952518">
<bookmark_value>ISO.CEILING function</bookmark_value>
<bookmark_value>rounding;up to multiples of significance</bookmark_value>
@@ -115,10 +115,10 @@
<comment>mw added one entry</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_CEIL_ISO"
id="bm_id8952530" localize="false"/>
- <h2 id="hd_id8952518">ISO.CEILING</h2>
+ <h2 id="hd_id8952518"><variable id="ISO.CEILINGh1"><link
href="text/scalc/01/func_ceiling.xhp#isoceiling"
name="ISO.CEILING">ISO.CEILING</link></variable></h2>
<paragraph id="par_id8953422" role="paragraph" xml-lang="en-US"><ahelp
hid="HID_FUNC_CEIL_ISO">Rounds a number up to the nearest multiple of a
significance value.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id101586214229587">For a positive
number the function rounds up (away from zero). For a negative number, the
function rounds up (towards zero). The sign of the significance value is
ignored.</paragraph>
- <note id="par_id821586214265060">This function calculates identical
results to the CEILING.PRECISE function</note>
+ <note id="par_id821586214265060">This function calculates identical
results to the <link href="#Section311"
name="ceilingprecise">CEILING.PRECISE</link> function.</note>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id8953454" role="code"
xml-lang="en-US">ISO.CEILING(Number[; Significance])</paragraph>
<embed href="text/scalc/01/func_ceiling.xhp#argnumber"/>
@@ -128,5 +128,11 @@
<paragraph role="paragraph"
id="par_id181586214438808"><input>=ISO.CEILING(-45.67,2)</input> returns
44.</paragraph>
<comment>see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND,
ROUNDDOWN, ROUNDUP</comment>
</section>
+ <section id="relatedtopics">
+ <embed href="text/scalc/01/func_floor.xhp#FLOORh1"/>
+ <embed href="text/scalc/01/func_floor.xhp#FLOOR.XCLh1"/>
+ <embed href="text/scalc/01/func_floor.xhp#FLOOR.PRECISEh1"/>
+ <embed href="text/scalc/01/func_floor.xhp#FLOOR.MATHh1"/>
+ </section>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_floor.xhp
b/source/text/scalc/01/func_floor.xhp
index e56c0598b..3d7e738e5 100644
--- a/source/text/scalc/01/func_floor.xhp
+++ b/source/text/scalc/01/func_floor.xhp
@@ -8,7 +8,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
-->
-
<meta>
<topic id="scalcfloorfunctions" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">FLOOR Functions</title>
@@ -17,15 +16,14 @@
</meta>
<body>
<h1 id="hd_id391586285373874">FLOOR Functions</h1>
-
- <section id="Section9">
+ <section id="floor">
<bookmark xml-lang="en-US" branch="index" id="bm_id3157404">
<bookmark_value>FLOOR function</bookmark_value>
<bookmark_value>rounding;down to nearest multiple of
significance</bookmark_value>
</bookmark>
<comment>mw added one entry</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_UNTERGRENZE"
id="bm_id3157415" localize="false"/>
- <h2 id="hd_id3157404">FLOOR</h2>
+ <h2 id="hd_id3157404"><variable id="FLOORh1"><link
href="text/scalc/01/func_floor.xhp#floor"
name="FLOOR">FLOOR</link></variable></h2>
<paragraph id="par_id3157432" role="paragraph" xml-lang="en-US"><ahelp
hid="HID_FUNC_UNTERGRENZE">Rounds a number to the nearest multiple of a
significance value.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id661586285977707">For a positive
number and a positive significance value, the function rounds down (towards
zero). For a negative number and a negative significance value, the direction
of rounding is determined by the value of a mode parameter. The function
returns an error if the number and significance values have opposite
signs.</paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
@@ -52,15 +50,16 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id811586290952465">
<bookmark_value>FLOOR.MATH function</bookmark_value>
</bookmark>
- <h2 id="hd_id1001586287279297">FLOOR.MATH</h2>
+<h2 id="hd_id1001586287279297"><variable id="FLOOR.MATHh1"><link
href="text/scalc/01/func_floor.xhp#floormath"
name="FLOOR.MATH">FLOOR.MATH</link></variable></h2>
<paragraph role="paragraph" id="par_id721586287302689">Rounds a number
to the nearest multiple of a significance value.</paragraph>
<paragraph role="paragraph" id="par_id311586287323417">For a positive
number the function rounds down (towards zero). For a negative number, the
direction of rounding is determined by the value of a mode parameter. The sign
of the significance value is ignored.</paragraph>
+ <embed href="text/scalc/00/avail_release.xhp#5.0"/>
+ <warning id="par_id851586287535879">This function exists for
interoperability with Microsoft Excel 2013 or newer.</warning>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph role="code" id="par_id161586287421523">FLOOR.MATH(Number[;
Significance[; Mode]])</paragraph>
<embed href="text/scalc/01/func_floor.xhp#argnumber"/>
<paragraph role="paragraph"
id="par_id231586287448716"><emph>Significance</emph> (optional) is the value,
or a reference to a cell containing the value, to whose multiple
<emph>Number</emph> is to be rounded. It defaults to 1.</paragraph>
<paragraph role="paragraph"
id="par_id261586287494401"><emph>Mode</emph> (optional) is a number, or a
reference to a cell containing a number. If <emph>Mode</emph> is given and not
equal to zero, a negative <emph>Number</emph> is rounded up (towards zero). If
<emph>Mode</emph> is equal to zero or is not given, a negative
<emph>Number</emph> is rounded down (away from zero).</paragraph>
- <warning id="par_id851586287535879">This function exists for
interoperability with Microsoft Excel 2013 or newer.</warning>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph role="paragraph"
id="par_id101586287621816"><input>=FLOOR.MATH(3.45)</input> returns
3.</paragraph>
<paragraph role="paragraph"
id="par_id771586287627784"><input>=FLOOR.MATH(3.45,-3)</input> returns
3.</paragraph>
@@ -69,7 +68,7 @@
<paragraph role="paragraph"
id="par_id371586287641888"><input>=FLOOR.MATH(-45.67,+2, 1)</input> returns
-44.</paragraph>
</section>
- <section id="Section9.1">
+ <section id="floorprecise">
<bookmark xml-lang="en-US" branch="index" id="bm_id2957404">
<bookmark_value>FLOOR.PRECISE function</bookmark_value>
<bookmark_value>rounding;down to nearest multiple of
significance</bookmark_value>
@@ -78,8 +77,9 @@
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_FLOOR_MS"
id="bm_id2957415" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_FLOOR_PRECISE"
id="bm_id2957215" localize="false"/>
- <h2 id="hd_id2957404">FLOOR.PRECISE</h2>
+ <h2 id="hd_id2957404"><variable id="FLOOR.PRECISEh1"><link
href="text/scalc/01/func_floor.xhp#floorprecise"
name="FLOOR.PRECISE">FLOOR.PRECISE</link></variable></h2>
<paragraph id="par_id2957432" role="paragraph" xml-lang="en-US"><ahelp
hid="HID_FUNC_FLOOR_MS">Rounds a number down to the nearest multiple of a
significance value.</ahelp></paragraph>
+ <paragraph role="paragraph" id="par_id261586641501175">For a positive
number the function rounds down (towards zero). For a negative number, the
function rounds down (away form zero). The sign of the significance value is
ignored.</paragraph>
<embed href="text/scalc/00/avail_release.xhp#4.3"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id2957464" role="code"
xml-lang="en-US">FLOOR.PRECISE(Number[; Significance])</paragraph>
@@ -96,9 +96,10 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id171586291849333">
<bookmark_value>FLOOR.XCL function</bookmark_value>
</bookmark>
- <h2 id="hd_id791586291468176">FLOOR.XCL</h2>
+<h2 id="hd_id791586291468176"><variable id="FLOOR.XCLh1"><link
href="text/scalc/01/func_floor.xhp#floorxcl"
name="FLOOR.XCL">FLOOR.XCL</link></variable></h2>
<paragraph role="paragraph" id="par_id521586291476023">Rounds a number
to the nearest multiple of a significance value.</paragraph>
<paragraph role="paragraph" id="par_id401586291488768">For a positive
number and a positive significance value, the function rounds down (towards
zero). For a negative number and a positive significance value, the function
rounds down (away from zero). For a negative number and a negative significance
value, the function rounds up (towards zero). The function returns an error if
the number is positive and the significance value is negative.</paragraph>
+ <embed href="text/scalc/00/avail_release.xhp#5.0"/>
<warning id="par_id231586291503319">This function exists for
interoperability with Microsoft Excel 2007 or older. If a Calc spreadsheet is
exported to Microsoft Excel, references to Calc’s FLOOR.XCL function are
exported as references to Excel’s FLOOR function, which is compatible with all
Excel versions. If a Microsoft Excel spreadsheet is imported into Calc,
references to Excel’s FLOOR function are imported as references to Calc’s
FLOOR.XCL function.</warning>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph role="code" id="par_id491586291532177">FLOOR.XCL(Number;
Significance)</paragraph>
@@ -109,5 +110,12 @@
<paragraph role="paragraph"
id="par_id361586291628003"><input>=FLOOR.XCL(-45.67,2)</input> returns
-46.</paragraph>
<paragraph role="paragraph"
id="par_id801586291641099"><input>=FLOOR.XCL(-45.67,-2)</input> returns
-44.</paragraph>
</section>
+ <section id="relatedtopics">
+ <embed href="text/scalc/01/func_ceiling.xhp#CEILINGh1"/>
+ <embed href="text/scalc/01/func_ceiling.xhp#CEILING.MATHh1"/>
+ <embed href="text/scalc/01/func_ceiling.xhp#CEILING.PRECISEh1"/>
+ <embed href="text/scalc/01/func_ceiling.xhp#CEILING.XCLh1"/>
+ <embed href="text/scalc/01/func_ceiling.xhp#ISO.CEILINGh1"/>
+ </section>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
