source/text/scalc/01/04060102.xhp | 5
source/text/scalc/01/func_datedif.xhp | 26 ++-
source/text/scalc/01/func_datevalue.xhp | 12 +
source/text/scalc/01/func_day.xhp | 19 +-
source/text/scalc/01/func_days.xhp | 13 -
source/text/scalc/01/func_days360.xhp | 11 -
source/text/scalc/01/func_eastersunday.xhp | 11 -
source/text/scalc/01/func_edate.xhp | 2
source/text/scalc/01/func_isoweeknum.xhp | 6
source/text/scalc/01/func_month.xhp | 15 --
source/text/scalc/01/func_networkdays.intl.xhp | 20 +--
source/text/scalc/01/func_networkdays.xhp | 3
source/text/scalc/01/func_weekday.xhp | 15 +-
source/text/scalc/01/func_weeknum.xhp | 163 +++++++++++++++++++++----
source/text/scalc/01/func_weeknum_ooo.xhp | 13 -
source/text/scalc/01/func_workday.intl.xhp | 20 +--
source/text/scalc/01/func_workday.xhp | 4
source/text/scalc/01/func_yearfrac.xhp | 16 +-
18 files changed, 241 insertions(+), 133 deletions(-)
New commits:
commit 518f86fcc222c145c837f1e2e83e56128a30ed59
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Fri Aug 24 15:04:36 2018 -0300
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Aug 27 15:51:09 2018 +0200
Review date and time functions help pages
fix some formatting issues
Add note and warning on date parsing
Mute l10n in some tables with constants
Change-Id: I86b4e7651ac89e2d2c8e2e658a8bdfd8f185ab60
Reviewed-on: https://gerrit.libreoffice.org/59582
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/source/text/scalc/01/04060102.xhp
b/source/text/scalc/01/04060102.xhp
index 66cd568d5..850f0a45f 100644
--- a/source/text/scalc/01/04060102.xhp
+++ b/source/text/scalc/01/04060102.xhp
@@ -91,7 +91,12 @@
<paragraph id="hd_id757469" role="heading" level="2" xml-lang="en-US">Two
digits years</paragraph>
<paragraph id="par_id3149720" role="paragraph" xml-lang="en-US">In
<switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME -
Preferences</emph>
</caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - $[officename] -
General</emph> you find the area <emph>Year (two digits)</emph>. This sets the
period for which two-digit information applies. Note that changes made here
have an effect on some of the following functions.</paragraph>
+<section id="datenumberinfo">
<paragraph id="par_id3150654" role="note" xml-lang="en-US">When entering dates
as part of formulas, slashes or dashes used as date separators are interpreted
as arithmetic operators. Therefore, dates entered in this format are not
recognized as dates and result in erroneous calculations. To keep dates from
being interpreted as parts of formulas use the DATE function, for example,
DATE(1954;7;20), or place the date in quotation marks and use the ISO 8601
notation, for example, "1954-07-20". Avoid using locale dependent date formats
such as "07/20/54", the calculation may produce errors if the document is
loaded under different locale settings.</paragraph>
+</section>
+<section id="datenumberwarn">
+ <paragraph xml-lang="en-US" id="par_id571535118151091"
role="tip">Unambiguous conversion is possible for ISO 8601 dates and times in
their extended formats with separators. If a <emph>#VALUE!</emph> error occurs,
then unselect <emph>Generate #VALUE! error</emph> in <switchinline
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME -
Preferences</emph></caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline> <emph>- %PRODUCTNAME Calc -
Formula</emph>, button <emph>Details...</emph> in section "Detailed Calculation
Settings", <emph>Conversion from text to number</emph> list box.</paragraph>
+</section>
<paragraph id="par_idN1067A" role="heading" level="2"
xml-lang="en-US">Functions</paragraph>
<sort order="asc">
diff --git a/source/text/scalc/01/func_datedif.xhp
b/source/text/scalc/01/func_datedif.xhp
index add9419fd..0f584ead1 100644
--- a/source/text/scalc/01/func_datedif.xhp
+++ b/source/text/scalc/01/func_datedif.xhp
@@ -31,7 +31,8 @@
<emph>End date</emph> is the date until the calculation is carried out. End
date must be later, than Start date.</paragraph>
<paragraph role="paragraph" id="par_id3153183" xml-lang="en-US">
<emph>Interval</emph> is a string, accepted values are "d", "m", "y", "ym",
"md" or "yd".</paragraph>
-<paragraph xml-lang="en-US" id="par_id701534863359568" role="note">The parsing
of <emph>Start date</emph> and <emph>End date</emph> strings depends on the
<emph>Date acceptance patterns</emph> defined in <switchinline
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME -
Preferences</emph></caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - Language Settings -
Languages</emph>.</paragraph>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<table id="tbl_id1342204">
<tablerow>
<tablecell>
@@ -43,7 +44,7 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id9648731"
xml-lang="en-US">"d"</paragraph>
+<paragraph role="tablecontent" id="par_id9648731" xml-lang="en-US"
localize="false">"d"</paragraph>
</tablecell>
<tablecell>
<paragraph role="tablecontent" id="par_id908841" xml-lang="en-US">Number of
whole days between Start date and End date.</paragraph>
@@ -51,7 +52,7 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id8193914"
xml-lang="en-US">"m"</paragraph>
+ <paragraph role="tablecontent" id="par_id8193914" xml-lang="en-US"
localize="false">"m"</paragraph>
</tablecell>
<tablecell>
<paragraph role="tablecontent" id="par_id9841608" xml-lang="en-US">Number of
whole months between Start date and End date.</paragraph>
@@ -59,7 +60,7 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id2701803"
xml-lang="en-US">"y"</paragraph>
+ <paragraph role="tablecontent" id="par_id2701803" xml-lang="en-US"
localize="false">"y"</paragraph>
</tablecell>
<tablecell>
<paragraph role="tablecontent" id="par_id2136295" xml-lang="en-US">Number of
whole years between Start date and End date.</paragraph>
@@ -67,7 +68,7 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id9200109"
xml-lang="en-US">"ym"</paragraph>
+ <paragraph role="tablecontent" id="par_id9200109" xml-lang="en-US"
localize="false">"ym"</paragraph>
</tablecell>
<tablecell>
<paragraph role="tablecontent" id="par_id4186223" xml-lang="en-US">Number of
whole months when subtracting years from the difference of Start date and End
date.</paragraph>
@@ -75,7 +76,7 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id5766472"
xml-lang="en-US">"md"</paragraph>
+ <paragraph role="tablecontent" id="par_id5766472" xml-lang="en-US"
localize="false">"md"</paragraph>
</tablecell>
<tablecell>
<paragraph role="tablecontent" id="par_id1491134" xml-lang="en-US">Number of
whole days when subtracting years and months from the difference of Start date
and End date.</paragraph>
@@ -83,23 +84,26 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id5866472"
xml-lang="en-US">"yd"</paragraph>
+ <paragraph role="tablecontent" id="par_id5866472" xml-lang="en-US"
localize="false">"yd"</paragraph>
</tablecell>
<tablecell>
<paragraph role="tablecontent" id="par_id1591134" xml-lang="en-US">Number of
whole days when subtracting years from the difference of Start date and End
date.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3147477" xml-lang="en-US"
level="3">Example</paragraph>
<paragraph role="paragraph" id="par_id3152589" xml-lang="en-US">
Birthday calculation. A man was born on 1974-04-17. Today is
2012-06-13.</paragraph>
-<paragraph role="paragraph" id="par_id3252589" xml-lang="en-US">
-<item type="input">=DATEDIF("1974-04-17";"2012-06-13";"y")</item> yields 38.
<item type="input">=DATEDIF("1974-04-17";"2012-06-13";"ym")</item> yields 1.
<item type="input">=DATEDIF("1974-04-17";"2012-06-13";"md")</item> yields 27.
So he is 38 years, 1 month and 27 days old.</paragraph>
+<paragraph role="paragraph" id="par_id3252589" xml-lang="en-US"><item
type="input">=DATEDIF("1974-04-17";"2012-06-13";"y")</item> yields
38.</paragraph>
+<paragraph role="paragraph" id="par_id451535132395328" xml-lang="en-US"><item
type="input">=DATEDIF("1974-04-17";"2012-06-13";"ym")</item> yields
1.</paragraph>
+<paragraph role="paragraph" id="par_id611535132402642" xml-lang="en-US"><item
type="input">=DATEDIF("1974-04-17";"2012-06-13";"md")</item> yields
27.</paragraph>
+<paragraph role="paragraph" id="par_id511535132411940" xml-lang="en-US">So he
is 38 years, 1 month and 27 days old.</paragraph>
<paragraph role="paragraph" id="par_id3352589" xml-lang="en-US">
-<item type="input">=DATEDIF("1974-04-17";"2012-06-13";"m")</item> yields 457,
he has been living for 457 months.</paragraph>
+<item type="input">=DATEDIF(DATE(1974,4,17);"2012-06-13";"m")</item> yields
457, he has been living for 457 months.</paragraph>
<paragraph role="paragraph" id="par_id3452589" xml-lang="en-US">
<item type="input">=DATEDIF("1974-04-17";"2012-06-13";"d")</item> yields
13937, he has been living for 13937 days.</paragraph>
<paragraph role="paragraph" id="par_id3752589" xml-lang="en-US">
-<item type="input">=DATEDIF("1974-04-17";"2012-06-13";"yd")</item> yields 57,
his birthday was 57 days ago.</paragraph>
+<item type="input">=DATEDIF("1974-04-17";DATE(2012;06;13);"yd")</item> yields
57, his birthday was 57 days ago.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_datevalue.xhp
b/source/text/scalc/01/func_datevalue.xhp
index 995cd456b..7bd9df807 100644
--- a/source/text/scalc/01/func_datevalue.xhp
+++ b/source/text/scalc/01/func_datevalue.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +18,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textscalc01func_datevaluexml" indexer="include"
status="PUBLISH">
<title xml-lang="en-US" id="tit">DATEVALUE </title>
@@ -39,8 +39,10 @@
<paragraph xml-lang="en-US" id="par_id3149268"
role="code">DATEVALUE("Text")</paragraph>
<paragraph xml-lang="en-US" id="par_id3154819" role="paragraph">
<emph>Text</emph> is a valid date expression and must be entered with
quotation marks.</paragraph>
+ <embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+ <embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph xml-lang="en-US" id="hd_id3156309" role="heading"
level="3">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3155841" role="paragraph">
- <emph>=DATEVALUE("1954-07-20")</emph> yields 19925.</paragraph>
+ <item type="input">=DATEVALUE("1954-07-20")</item> yields
19925.</paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/scalc/01/func_day.xhp
b/source/text/scalc/01/func_day.xhp
index cfd64cb1b..d7cf403b0 100644
--- a/source/text/scalc/01/func_day.xhp
+++ b/source/text/scalc/01/func_day.xhp
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,9 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textscalc01func_dayxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">DAY </title>
@@ -36,11 +32,12 @@
<paragraph role="paragraph" id="par_id3147584" xml-lang="en-US"><ahelp
hid="HID_FUNC_TAG">Returns the day of given date value.</ahelp> The day is
returned as an integer between 1 and 31. You can also enter a negative
date/time value.</paragraph>
<paragraph role="heading" id="hd_id3150487" xml-lang="en-US"
level="3">Syntax</paragraph>
<paragraph role="code" id="par_id3149430"
xml-lang="en-US">DAY(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3149443" xml-lang="en-US">
-<emph>Number</emph>, as a time value, is a decimal, for which the day is to be
returned.</paragraph>
-<paragraph role="heading" id="hd_id3163809" xml-lang="en-US"
level="3">Examples </paragraph>
-<paragraph role="paragraph" id="par_id3151200" xml-lang="en-US">DAY(1) returns
31 (since $[officename] starts counting at zero from December 30,
1899)</paragraph>
-<paragraph role="paragraph" id="par_id3154130" xml-lang="en-US">DAY(NOW())
returns the current day.</paragraph>
-<paragraph role="paragraph" id="par_id3159190" xml-lang="en-US">=DAY(C4)
returns 5 if you enter 1901-08-05 in cell C4 (the date value might get
formatted differently after you press Enter).</paragraph>
+<paragraph role="paragraph" id="par_id3149443"
xml-lang="en-US"><emph>Number</emph> is the internal date number.</paragraph>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
+<paragraph role="heading" id="hd_id3163809" xml-lang="en-US"
level="3">Examples</paragraph>
+<paragraph role="paragraph" id="par_id3151200" xml-lang="en-US"><item
type="inout">=DAY(1)</item> returns 31 (since $[officename] starts counting at
zero from December 30, 1899)</paragraph>
+<paragraph role="paragraph" id="par_id3154130" xml-lang="en-US"><item
type="input">=DAY(NOW())</item> returns the current day.</paragraph>
+<paragraph role="paragraph" id="par_id3159190" xml-lang="en-US"><item
type="input">=DAY(C4)</item> returns 5 if you enter 1901-08-05 in cell C4 (the
date value might get formatted differently after you press Enter).</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_days.xhp
b/source/text/scalc/01/func_days.xhp
index 5a16aa042..a360c42ec 100644
--- a/source/text/scalc/01/func_days.xhp
+++ b/source/text/scalc/01/func_days.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textscalc01func_daysxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">DAYS </title>
@@ -38,8 +33,10 @@
<paragraph role="code" id="par_id3149578" xml-lang="en-US">DAYS(Date2;
Date1)</paragraph>
<paragraph role="paragraph" id="par_id3151376" xml-lang="en-US">
<emph>Date1</emph> is the start date, <emph>Date2</emph> is the end date. If
<emph>Date2</emph> is an earlier date than <emph>Date1</emph> the result is a
negative number.</paragraph>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph role="heading" id="hd_id3151001" xml-lang="en-US"
level="3">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3159101"
xml-lang="en-US">=DAYS("2010-01-01"; NOW()) returns the number of days from
today until January 1, 2010.</paragraph>
-<paragraph role="paragraph" id="par_id3163720"
xml-lang="en-US">=DAYS("1990-10-10";"1980-10-10") returns 3652 days.</paragraph>
+<paragraph role="paragraph" id="par_id3159101" xml-lang="en-US"><item
type="input">=DAYS("2010-01-01"; NOW())</item> returns the number of days from
today until January 1, 2010.</paragraph>
+<paragraph role="paragraph" id="par_id3163720" xml-lang="en-US"><item
type="input">=DAYS("1990-10-10";"1980-10-10")</item> returns 3652
days.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_days360.xhp
b/source/text/scalc/01/func_days360.xhp
index d99a8e0e3..972413e9d 100644
--- a/source/text/scalc/01/func_days360.xhp
+++ b/source/text/scalc/01/func_days360.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textscalc01func_days360xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">DAYS360 </title>
@@ -38,7 +33,9 @@
<paragraph role="code" id="par_id3155313" xml-lang="en-US">DAYS360("Date1";
"Date2"; Type)</paragraph>
<paragraph role="paragraph" id="par_id3145263" xml-lang="en-US">If
<emph>Date2</emph> is earlier than <emph>Date1</emph>, the function will return
a negative number.</paragraph>
<paragraph role="paragraph" id="par_id3151064" xml-lang="en-US">The optional
argument <emph>Type</emph> determines the type of difference calculation. If
Type = 0 or if the argument is missing, the US method (NASD, National
Association of Securities Dealers) is used. If Type <> 0, the European
method is used.</paragraph>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph role="heading" id="hd_id3148641" xml-lang="en-US"
level="3">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3156348"
xml-lang="en-US">=DAYS360("2000-01-01";NOW()) returns the number of interest
days from January 1, 2000 until today.</paragraph>
+<paragraph role="paragraph" id="par_id3156348" xml-lang="en-US"><item
type="input">=DAYS360("2000-01-01";NOW())</item> returns the number of interest
days from January 1, 2000 until today.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_eastersunday.xhp
b/source/text/scalc/01/func_eastersunday.xhp
index b582e1d1d..4ffc6f5d5 100644
--- a/source/text/scalc/01/func_eastersunday.xhp
+++ b/source/text/scalc/01/func_eastersunday.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textscalc01func_eastersundayxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">EASTERSUNDAY</title>
@@ -43,7 +38,7 @@
<paragraph role="paragraph" id="par_id3146072" xml-lang="en-US">Pentecost
Sunday = EASTERSUNDAY(Year) + 49</paragraph>
<paragraph role="paragraph" id="par_id3149553" xml-lang="en-US">Pentecost
Monday = EASTERSUNDAY(Year) + 50</paragraph>
<paragraph role="heading" id="hd_id3155120" xml-lang="en-US"
level="3">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3154472"
xml-lang="en-US">=EASTERSUNDAY(2000) returns 2000-04-23.</paragraph>
-<paragraph role="paragraph" id="par_id3150940"
xml-lang="en-US">EASTERSUNDAY(2000)+49 returns the internal serial number
36688. The result is 2000-06-11. Format the serial date number as a date, for
example in the format YYYY-MM-DD.</paragraph>
+<paragraph role="paragraph" id="par_id3154472" xml-lang="en-US"><item
type="input">=EASTERSUNDAY(2000)</item> returns 2000-04-23.</paragraph>
+<paragraph role="paragraph" id="par_id3150940" xml-lang="en-US"><item
type="input">=EASTERSUNDAY(2000)+49</item> returns the internal serial number
36688. The result is 2000-06-11. Format the serial date number as a date, for
example in the format YYYY-MM-DD.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_edate.xhp
b/source/text/scalc/01/func_edate.xhp
index 9a1c8e85b..4ad81b867 100644
--- a/source/text/scalc/01/func_edate.xhp
+++ b/source/text/scalc/01/func_edate.xhp
@@ -40,6 +40,8 @@
<emph>StartDate</emph> is a date.</paragraph>
<paragraph role="paragraph" id="par_id3152929" xml-lang="en-US">
<emph>Months</emph> is the number of months before (negative) or after
(positive) the start date.</paragraph>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph role="heading" id="hd_id3151289" xml-lang="en-US"
level="3">Example</paragraph>
<paragraph role="paragraph" id="par_id3155845" xml-lang="en-US">What date is
one month prior to 2001-03-31?</paragraph>
<paragraph role="paragraph" id="par_id3155999" xml-lang="en-US">
diff --git a/source/text/scalc/01/func_isoweeknum.xhp
b/source/text/scalc/01/func_isoweeknum.xhp
index e65bfa88f..6ecc8cd68 100644
--- a/source/text/scalc/01/func_isoweeknum.xhp
+++ b/source/text/scalc/01/func_isoweeknum.xhp
@@ -39,8 +39,10 @@
<paragraph role="code" id="par_id3147236"
xml-lang="en-US">ISOWEEKNUM(Number)</paragraph>
<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US">
<emph>Number</emph> is the internal date number.</paragraph>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph role="heading" id="hd_id3146948" xml-lang="en-US"
level="3">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3149792"
xml-lang="en-US">=ISOWEEKNUM(DATE(1995;1;1)) returns 52. Week 1 starts on
Monday, 1995-01-02.</paragraph>
-<paragraph role="paragraph" id="par_id3149794"
xml-lang="en-US">=ISOWEEKNUM(DATE(1999;1;1)) returns 53. Week 1 starts on
Monday, 1999-01-04.</paragraph>
+<paragraph role="paragraph" id="par_id3149792" xml-lang="en-US"><item
type="input">=ISOWEEKNUM(DATE(1995;1;1))</item> returns 52. Week 1 starts on
Monday, 1995-01-02.</paragraph>
+<paragraph role="paragraph" id="par_id3149794" xml-lang="en-US"><item
type="input">=ISOWEEKNUM(DATE(1999;1;1))</item> returns 53. Week 1 starts on
Monday, 1999-01-04.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_month.xhp
b/source/text/scalc/01/func_month.xhp
index 00ee244f9..4d23f5ba8 100644
--- a/source/text/scalc/01/func_month.xhp
+++ b/source/text/scalc/01/func_month.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textscalc01func_monthxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">MONTH </title>
@@ -37,9 +32,11 @@
<paragraph role="heading" id="hd_id3149517" xml-lang="en-US"
level="3">Syntax</paragraph>
<paragraph role="code" id="par_id3145602"
xml-lang="en-US">MONTH(Number)</paragraph>
<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US">
-<emph>Number</emph>, as a time value, is a decimal for which the month is to
be returned.</paragraph>
+ <emph>Number</emph> is the internal date number.</paragraph>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph role="heading" id="hd_id3153322" xml-lang="en-US"
level="3">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3149244" xml-lang="en-US">=MONTH(NOW())
returns the current month.</paragraph>
-<paragraph role="paragraph" id="par_id3154790" xml-lang="en-US">=MONTH(C4)
returns 7 if you enter 2000-07-07 to cell C4 (that date value might get
formatted differently after you press Enter).</paragraph>
+<paragraph role="paragraph" id="par_id3149244" xml-lang="en-US"><item
type="input">=MONTH(NOW())</item> returns the current month.</paragraph>
+<paragraph role="paragraph" id="par_id3154790" xml-lang="en-US"><item
type="input">=MONTH(C4)</item> returns 7 if you enter 2000-07-07 to cell C4
(that date value might get formatted differently after you press
Enter).</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_networkdays.intl.xhp
b/source/text/scalc/01/func_networkdays.intl.xhp
index 69cff76c8..77f272f51 100644
--- a/source/text/scalc/01/func_networkdays.intl.xhp
+++ b/source/text/scalc/01/func_networkdays.intl.xhp
@@ -26,34 +26,29 @@
</meta>
<body>
-
-
<section id="networkdaysintl_function">
<bookmark xml-lang="en-US" branch="index" id="bm_id231020162321219565">
<bookmark_value>NETWORKDAYS.INTL function</bookmark_value>
</bookmark>
-
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_NETWORKDAYS_MS"
id="bm_id231020162214032558" localize="false"/>
-
<paragraph id="hd_id231020162211573602" role="heading" level="1"
xml-lang="en-US"><variable id="networkdaysintl"><link
href="text/scalc/01/func_networkdays.intl.xhp">NETWORKDAYS.INTL</link></variable></paragraph>
<paragraph id="par_id231020162213393086" role="paragraph"
xml-lang="en-US"><ahelp hid=".">Returns the number of workdays between a start
date and an end date. There are options to define weekend days and holidays.
The optional weekend parameter (or a string) can be used to define the weekend
days (or the non-working days in each week). Also, optionally, the user can
define a holiday list. The weekend days and user-defined holidays are not
counted as working days.</ahelp></paragraph>
</section>
-
<paragraph id="par_id231020162213395472" role="heading" level="3"
xml-lang="en-US">Syntax</paragraph>
-<paragraph id="par_id231020162249539143" role="paragraph"
xml-lang="en-US"><item type="literal">NETWORKDAYS.INTL(StartDate; EndDate;
Weekend; Holidays)</item></paragraph>
+<paragraph id="par_id231020162249539143" role="code"
xml-lang="en-US">NETWORKDAYS.INTL(StartDate; EndDate; Weekend;
Holidays)</paragraph>
<paragraph id="par_id231020162249533010" role="paragraph"
xml-lang="en-US"><emph>StartDate</emph> is the date from when the calculation
is carried out. If the start date is a workday, the day is included in the
calculation.</paragraph>
<paragraph id="par_id231020162249536398" role="paragraph"
xml-lang="en-US"><emph>EndDate</emph> is the date up until when the calculation
is carried out. If the end date is a workday, the day is included in the
calculation.</paragraph>
<embed href="text/scalc/01/common_func_workdaysintl.xhp#embed_workdays_intl"/>
-
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph id="hd_id231020162249551873" role="heading" level="3"
xml-lang="en-US">Example</paragraph>
<paragraph id="par_id231020162249554032" role="paragraph" xml-lang="en-US">How
many workdays fall between December 15, 2016 and January 14, 2017? Let the
start date be located in C3 and the end date in D3. Cells F3 to J3 contain five
(5) holidays for Christmas and New Year in date format: December 24, 2016;
December 25, 2016; December 26, 2016; December 31, 2016; and January 1,
2017.</paragraph>
-<paragraph id="par_id231020162249551234" role="paragraph"
xml-lang="en-US"><item type="literal">=NETWORKDAYS.INTL(C3;D3;;F3:J3)</item>
returns 21 workdays with default for weekend days.</paragraph>
-<paragraph id="par_id231020162249553109" role="paragraph"
xml-lang="en-US"><item type="literal">=NETWORKDAYS.INTL(C3;D3;11;F3:J3)</item>
returns 24 workdays with Sunday only weekends.</paragraph>
+<paragraph id="par_id231020162249551234" role="paragraph"
xml-lang="en-US"><item type="input">=NETWORKDAYS.INTL(C3;D3;;F3:J3)</item>
returns 21 workdays with default for weekend days.</paragraph>
+<paragraph id="par_id231020162249553109" role="paragraph"
xml-lang="en-US"><item type="input">=NETWORKDAYS.INTL(C3;D3;11;F3:J3)</item>
returns 24 workdays with Sunday only weekends.</paragraph>
<paragraph id="par_id231020162249557786" role="paragraph"
xml-lang="en-US">Alternatively, use the weekend string “0000001” to define
Sunday as the non-working day of every week.</paragraph>
-<paragraph id="par_id231020162249553409" role="paragraph"
xml-lang="en-US"><item
type="literal">=NETWORKDAYS.INTL(C3;D3;“0000001”;F3:J3)</item> returns 24
workdays with Sunday only weekend.</paragraph>
+<paragraph id="par_id231020162249553409" role="paragraph"
xml-lang="en-US"><item
type="input">=NETWORKDAYS.INTL(C3;D3;“0000001”;F3:J3)</item> returns 24
workdays with Sunday only weekend.</paragraph>
<paragraph id="par_id231020162249556946" role="paragraph" xml-lang="en-US">The
function can be used without the two optional parameters – weekday and holidays
– by leaving them out:</paragraph>
-<paragraph id="par_id23102016224955931" role="paragraph"
xml-lang="en-US"><item type="literal">=NETWORKDAYS.INTL(C3;D3)</item> gives 22
working days.</paragraph>
-
+<paragraph id="par_id23102016224955931" role="paragraph"
xml-lang="en-US"><item type="input">=NETWORKDAYS.INTL(C3;D3)</item> gives 22
working days.</paragraph>
<section id="relatedtopics">
<paragraph id="par_id231020162253594361" role="paragraph"
xml-lang="en-US"><link
href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></paragraph>
<paragraph id="par_id241020160012187036" role="paragraph"
xml-lang="en-US"><link
href="text/scalc/01/func_workdays.intl.xhp">WORKDAY.INTL</link></paragraph>
@@ -61,5 +56,4 @@
<paragraph id="par_id23102016225717242" role="paragraph"
xml-lang="en-US"><link href="text/scalc/01/04060102.xhp">Date
functions</link></paragraph>
</section>
</body>
-
</helpdocument>
diff --git a/source/text/scalc/01/func_networkdays.xhp
b/source/text/scalc/01/func_networkdays.xhp
index b87f796fe..3490b00a8 100644
--- a/source/text/scalc/01/func_networkdays.xhp
+++ b/source/text/scalc/01/func_networkdays.xhp
@@ -42,7 +42,8 @@
<paragraph id="par_id3151110" role="paragraph"
xml-lang="en-US"><emph>EndDate</emph> is the date up until when the calculation
is carried out. If the end date is a workday, the day is included in the
calculation.</paragraph>
<paragraph id="par_id3154115" role="paragraph"
xml-lang="en-US"><emph>Holidays</emph> is an optional list of holidays. These
are non-working days. Enter a cell range in which the holidays are listed
individually.</paragraph>
<paragraph id="par_id160920161749585013" role="paragraph"
xml-lang="en-US"><emph>Workdays</emph> is an optional list of number values
defining standard work week. This list starts by Sunday, workdays are indicated
by zero and non-working days by non-zero value.</paragraph>
-
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph id="hd_id3146902" role="heading" level="3"
xml-lang="en-US">Examples</paragraph>
<paragraph id="par_id3154661" role="paragraph" xml-lang="en-US">How many
workdays fall between 2001-12-15 and 2002-01-15? The start date is located in
C3 and the end date in D3. Cells F3 to J3 contain the following Christmas and
New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31",
"2002-01-01".</paragraph>
<paragraph id="par_id3147328" role="paragraph" xml-lang="en-US"><item
type="input">=NETWORKDAYS(C3;D3;F3:J3)</item> returns 17 workdays.</paragraph>
diff --git a/source/text/scalc/01/func_weekday.xhp
b/source/text/scalc/01/func_weekday.xhp
index 30012968c..c9046cdae 100644
--- a/source/text/scalc/01/func_weekday.xhp
+++ b/source/text/scalc/01/func_weekday.xhp
@@ -134,14 +134,15 @@
<paragraph id="par_id3156188" role="note" xml-lang="en-US">These values apply
only to the standard date format that you select under <switchinline
select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME -
Preferences</item>
</caseinline><defaultinline><item type="menuitem">Tools -
Options</item></defaultinline></switchinline><item type="menuitem">-
%PRODUCTNAME Calc - Calculate</item>.</paragraph>
-
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph id="hd_id3153836" role="heading" level="3"
xml-lang="en-US">Examples</paragraph>
-<paragraph id="par_id3150317" role="paragraph" xml-lang="en-US"><item
type="literal">=WEEKDAY("2000-06-14")</item> returns 4 (the Type parameter is
missing, therefore the standard count is used. The standard count starts with
Sunday as day number 1. June 14, 2000 was a Wednesday and therefore day number
4).</paragraph>
-<paragraph id="par_id3153174" role="paragraph" xml-lang="en-US"><item
type="literal">=WEEKDAY("1996-07-24";2)</item> returns 3 (the Type parameter is
2, therefore Monday is day number 1. July 24, 1996 was a Wednesday and
therefore day number 3).</paragraph>
-<paragraph id="par_id3153525" role="paragraph" xml-lang="en-US"><item
type="literal">=WEEKDAY("1996-07-24";1)</item> returns 4 (the Type parameter is
1, therefore Sunday is day number 1. July 24, 1996 was a Wednesday and
therefore day number 4).</paragraph>
-<paragraph id="par_id050220170616006699" role="paragraph"
xml-lang="en-US"><item type="literal">=WEEKDAY("2017-05-02";14)</item> returns
6 (the Type parameter is 14, therefore Thursday is day number 1. May 2, 2017
was a Tuesday and therefore day number 6)</paragraph>
-<paragraph id="par_id3150575" role="paragraph" xml-lang="en-US"><item
type="literal">=WEEKDAY(NOW())</item> returns the number of the current
day.</paragraph>
-<paragraph id="par_id3150588" role="tip" xml-lang="en-US">To obtain a function
indicating whether a day in A1 is a business day, use the IF and WEEKDAY
functions as follows: <br/><item type="literal">IF(WEEKDAY(A1;2)<6;"Business
day";"Weekend")</item></paragraph>
+<paragraph id="par_id3150317" role="paragraph" xml-lang="en-US"><item
type="input">=WEEKDAY("2000-06-14")</item> returns 4 (the Type parameter is
missing, therefore the standard count is used. The standard count starts with
Sunday as day number 1. June 14, 2000 was a Wednesday and therefore day number
4).</paragraph>
+<paragraph id="par_id3153174" role="paragraph" xml-lang="en-US"><item
type="input">=WEEKDAY("1996-07-24";2)</item> returns 3 (the Type parameter is
2, therefore Monday is day number 1. July 24, 1996 was a Wednesday and
therefore day number 3).</paragraph>
+<paragraph id="par_id3153525" role="paragraph" xml-lang="en-US"><item
type="input">=WEEKDAY("1996-07-24";1)</item> returns 4 (the Type parameter is
1, therefore Sunday is day number 1. July 24, 1996 was a Wednesday and
therefore day number 4).</paragraph>
+<paragraph id="par_id050220170616006699" role="paragraph"
xml-lang="en-US"><item type="input">=WEEKDAY("2017-05-02";14)</item> returns 6
(the Type parameter is 14, therefore Thursday is day number 1. May 2, 2017 was
a Tuesday and therefore day number 6)</paragraph>
+<paragraph id="par_id3150575" role="paragraph" xml-lang="en-US"><item
type="input">=WEEKDAY(NOW())</item> returns the number of the current
day.</paragraph>
+<paragraph id="par_id3150588" role="tip" xml-lang="en-US">To obtain a function
indicating whether a day in A1 is a business day, use the IF and WEEKDAY
functions as follows: <br/><item type="input">IF(WEEKDAY(A1;2)<6;"Business
day";"Weekend")</item></paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_weeknum.xhp
b/source/text/scalc/01/func_weeknum.xhp
index 76ff5ac2c..35b56ff2d 100644
--- a/source/text/scalc/01/func_weeknum.xhp
+++ b/source/text/scalc/01/func_weeknum.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textscalc01func_weeknumxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">WEEKNUM</title>
@@ -35,29 +30,151 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149770" xml-lang="en-US"><ahelp
hid="HID_FUNC_KALENDERWOCHE">WEEKNUM calculates the week number of the year for
the internal date value as defined in ODF OpenFormula and compatible with other
spreadsheet applications.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147220" xml-lang="en-US">Supported are
two week numbering systems:</paragraph>
-<paragraph role="paragraph" id="par_id3147221" xml-lang="en-US">System 1: The
week containing January 1 is the first week of the year, and is numbered week
1.</paragraph>
-<paragraph role="paragraph" id="par_id3147222" xml-lang="en-US">System 2: The
week containing the first Thursday of the year is the first week of the year,
and is numbered week 1. That means that week number 1 of any year is the week
that contains January 4th. ISO 8601 defines this system and that the week
starts on Monday.</paragraph>
+<table id="tab_id481535122363435">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id851535122363435" role="tablehead"
xml-lang="en-US">System</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id901535122363436" role="tablehead"
xml-lang="en-US" localize="false">Description</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id691535122363437" role="tablecontent"
xml-lang="en-US">System 1</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3147221" role="tablecontent"
xml-lang="en-US">The week containing January 1 is the first week of the year,
and is numbered week 1.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id741535122455285" role="tablecontent"
xml-lang="en-US" >System 2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph role="tablecontent" id="par_id3147222"
xml-lang="en-US">The week containing the first Thursday of the year is the
first week of the year, and is numbered week 1. That means that week number 1
of any year is the week that contains January 4th. ISO 8601 defines this system
and that the week starts on Monday.</paragraph>
+ </tablecell>
+ </tablerow>
+</table>
<paragraph role="heading" id="hd_id3153055" xml-lang="en-US"
level="3">Syntax</paragraph>
<paragraph role="code" id="par_id3147236" xml-lang="en-US">WEEKNUM(Number [;
Mode])</paragraph>
<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US">
<emph>Number</emph> is the internal date number.</paragraph>
<paragraph role="paragraph" id="par_id3154269" xml-lang="en-US">
<emph>Mode</emph> sets the start of the week and the week numbering system.
This parameter is optional, if omitted the default value is 1.</paragraph>
-<paragraph role="paragraph" id="par_id3148930" xml-lang="en-US">1 = Sunday,
system 1</paragraph>
-<paragraph role="paragraph" id="par_id3154280" xml-lang="en-US">2 = Monday,
system 1</paragraph>
-<paragraph role="paragraph" id="par_id3154281" xml-lang="en-US">11 = Monday,
system 1</paragraph>
-<paragraph role="paragraph" id="par_id3154282" xml-lang="en-US">12 = Tuesday,
system 1</paragraph>
-<paragraph role="paragraph" id="par_id3154283" xml-lang="en-US">13 =
Wednesday, system 1</paragraph>
-<paragraph role="paragraph" id="par_id3154284" xml-lang="en-US">14 = Thursday,
system 1</paragraph>
-<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US">15 = Friday,
system 1</paragraph>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US">16 = Saturday,
system 1</paragraph>
-<paragraph role="paragraph" id="par_id3154287" xml-lang="en-US">17 = Sunday,
system 1</paragraph>
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US">21 = Monday,
system 2 (ISO 8601)</paragraph>
-<paragraph role="paragraph" id="par_id3154289" xml-lang="en-US">150 = Monday,
system 2 (ISO 8601, for interoperability with Gnumeric)</paragraph>
+<table id="tab_id491535122633826">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id961535122993923" role="tablehead"
xml-lang="en-US" >System</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id151535122633826" role="tablehead"
xml-lang="en-US">Mode</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id231535122633827" role="tablehead"
xml-lang="en-US">Day of the week</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell rowspan="9">
+ <paragraph id="par_id531535124180000" role="tablecontents"
xml-lang="en-US" >System 1</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id931535122633827" role="tablecontent"
xml-lang="en-US" localize="false">1</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id351535122633828" role="tablecontent"
xml-lang="en-US">Sunday</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id441535122735565" role="tablecontents"
xml-lang="en-US" localize="false">2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id591535122756686" role="tablecontents"
xml-lang="en-US" >Monday</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id541535122798459" role="tablecontents"
xml-lang="en-US" localize="false">11</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id881535122835126" role="tablecontents"
xml-lang="en-US" >Monday</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id941535122866815" role="tablecontent"
xml-lang="en-US" localize="false">12</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id241535122903569" role="tablecontents"
xml-lang="en-US" >Tuesday</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id271535124253476" role="tablecontents"
xml-lang="en-US" localize="false">13</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id31535124277973" role="tablecontents"
xml-lang="en-US" >Wednesday</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id281535124290548" role="tablecontents"
xml-lang="en-US" localize="false">14</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id21535124310462" role="tablecontents"
xml-lang="en-US" >Thursday</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id721535124338290" role="tablecontents"
xml-lang="en-US" localize="false">15</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id921535124365435" role="tablecontents"
xml-lang="en-US" >Friday</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id781535124380237" role="tablecontents"
xml-lang="en-US" localize="false">16</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id211535124416253" role="tablecontents"
xml-lang="en-US" >Saturday</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id601535124440320" role="tablecontents"
xml-lang="en-US" localize="false" >17</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id461535124473824" role="tablecontents"
xml-lang="en-US" >Sunday</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell rowspan="2">
+ <paragraph id="par_id471535124489997" role="tablecontents"
xml-lang="en-US" >System 2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id431535124539573" role="tablecontents"
xml-lang="en-US" localize="false">21</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id391535124564520" role="tablecontents"
xml-lang="en-US" >Monday (ISO 8601)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id971535124578111" role="tablecontents"
xml-lang="en-US" localize="false">150</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id661535124640643" role="tablecontents"
xml-lang="en-US" >(ISO 8601, for interoperability with Gnumeric)</paragraph>
+ </tablecell>
+</tablerow>
+</table>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph role="heading" id="hd_id3146948" xml-lang="en-US"
level="3">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3150704"
xml-lang="en-US">=WEEKNUM(DATE(1995;1;1);1) returns 1</paragraph>
-<paragraph role="paragraph" id="par_id3149792"
xml-lang="en-US">=WEEKNUM(DATE(1995;1;1);2) returns 52. If the week starts on
Monday, Sunday belongs to the last week of the previous year.</paragraph>
-<paragraph role="paragraph" id="par_id3149793"
xml-lang="en-US">=WEEKNUM(DATE(1995;1;1);21) returns 52. Week 1 starts on
Monday, 1995-01-02.</paragraph>
-<paragraph role="paragraph" id="par_id3149794"
xml-lang="en-US">=WEEKNUM(DATE(1999;1;1);21) returns 53. Week 1 starts on
Monday, 1999-01-04.</paragraph>
+<paragraph role="paragraph" id="par_id3150704" xml-lang="en-US"><item
type="input">=WEEKNUM(DATE(1995;1;1);1)</item> returns 1</paragraph>
+<paragraph role="paragraph" id="par_id3149792" xml-lang="en-US"><item
type="input">=WEEKNUM(DATE(1995;1;1);2)</item> returns 52. If the week starts
on Monday, Sunday belongs to the last week of the previous year.</paragraph>
+<paragraph role="paragraph" id="par_id3149793" xml-lang="en-US"><item
type="input">=WEEKNUM(DATE(1995;1;1);21)</item> returns 52. Week 1 starts on
Monday, 1995-01-02.</paragraph>
+<paragraph role="paragraph" id="par_id3149794" xml-lang="en-US"><item
type="input">=WEEKNUM(DATE(1999;1;1);21)</item> returns 53. Week 1 starts on
Monday, 1999-01-04.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_weeknum_ooo.xhp
b/source/text/scalc/01/func_weeknum_ooo.xhp
index 8beea9ca9..4c02c7d1f 100644
--- a/source/text/scalc/01/func_weeknum_ooo.xhp
+++ b/source/text/scalc/01/func_weeknum_ooo.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textscalc01func_weeknum_oooxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">WEEKNUM_OOO</title>
@@ -44,8 +39,10 @@
<paragraph role="paragraph" id="par_id3148930" xml-lang="en-US">1 =
Sunday</paragraph>
<paragraph role="paragraph" id="par_id3154280" xml-lang="en-US">2 = Monday
(ISO 8601)</paragraph>
<paragraph role="paragraph" id="par_id3154281" xml-lang="en-US">any other
value = Monday (ISO 8601)</paragraph>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph role="heading" id="hd_id3146948" xml-lang="en-US"
level="3">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3150704"
xml-lang="en-US">=WEEKNUM_OOO(DATE(1995;1;1);1) returns 1</paragraph>
-<paragraph role="paragraph" id="par_id3149792"
xml-lang="en-US">=WEEKNUM_OOO(DATE(1995;1;1);2) returns 52. Week 1 starts on
Monday, 1995-01-02.</paragraph>
+<paragraph role="paragraph" id="par_id3150704" xml-lang="en-US"><item
type="input">=WEEKNUM_OOO(DATE(1995;1;1);1)</item> returns 1</paragraph>
+<paragraph role="paragraph" id="par_id3149792" xml-lang="en-US"><item
type="input">=WEEKNUM_OOO(DATE(1995;1;1);2)</item> returns 52. Week 1 starts
on Monday, 1995-01-02.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_workday.intl.xhp
b/source/text/scalc/01/func_workday.intl.xhp
index 635dc3479..63451fe5a 100644
--- a/source/text/scalc/01/func_workday.intl.xhp
+++ b/source/text/scalc/01/func_workday.intl.xhp
@@ -24,10 +24,7 @@
<filename>/text/scalc/01/func_workday.intl.xhp</filename>
</topic>
</meta>
-
<body>
-
-
<section id="workdays">
<bookmark xml-lang="en-US" branch="index" id="bm_id231020162341219565">
<bookmark_value>WORKDAY.INTL function</bookmark_value>
@@ -40,25 +37,25 @@
</section>
<paragraph id="hd_id241020160008306802" role="heading" level="3"
xml-lang="en-US">Syntax</paragraph>
-<paragraph id="par_id241020160008306838" role="paragraph"
xml-lang="en-US"><item type="literal">WORKDAY.INTL(StartDate; Days; Weekend;
Holidays)</item></paragraph>
+<paragraph id="par_id241020160008306838" role="code"
xml-lang="en-US">WORKDAY.INTL(StartDate; Days; Weekend; Holidays)</paragraph>
<paragraph id="par_id241020160008308885" role="paragraph"
xml-lang="en-US"><emph>StartDate</emph> is the date from when the calculation
is carried out. If the start date is a workday, the day is included in the
calculation. This is required.</paragraph>
<paragraph id="par_id241020160008305329" role="paragraph"
xml-lang="en-US"><emph>Days</emph> is the number of workdays. Positive value
for a result after the start date, negative value for a result before the start
date.</paragraph>
<embed href="text/scalc/01/common_func_workdaysintl.xhp#embed_workdays_intl"/>
-
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph id="hd_id241020160012172138" role="heading" level="3"
xml-lang="en-US">Example</paragraph>
<paragraph id="par_id241020160012177196" role="paragraph"
xml-lang="en-US">What date comes 20 workdays after December 13, 2016? Enter the
start date in C3 and the number of workdays in D3.</paragraph>
<paragraph id="par_id241020160012178429" role="paragraph" xml-lang="en-US">The
weekend parameter (number) may be left blank or defined as 1 for default
weekend (non-working days) – Saturday and Sunday.</paragraph>
<paragraph id="par_id241020160012172125" role="paragraph"
xml-lang="en-US">Cells F3 to J3 contain five (5) holidays for Christmas and New
Year in date format: December 24, 2016; December 25, 2016; December 26, 2016;
December 31, 2016; and January 1, 2017.</paragraph>
-<paragraph id="par_id241020160012177923" role="paragraph"
xml-lang="en-US"><item type="literal">=WORKDAY.INTL(C3;D3;;F3:J3)</item>
returns January 11, 2017 in the result cell, say D6 (use date format for the
cell).</paragraph>
+<paragraph id="par_id241020160012177923" role="paragraph"
xml-lang="en-US"><item type="input">=WORKDAY.INTL(C3;D3;;F3:J3)</item> returns
January 11, 2017 in the result cell, say D6 (use date format for the
cell).</paragraph>
<paragraph id="par_id24102016001217206" role="paragraph" xml-lang="en-US">To
define Friday and Saturday as weekend days, use the weekend parameter
7.</paragraph>
-<paragraph id="par_id241020160012178562" role="paragraph"
xml-lang="en-US"><item type="literal">=WORKDAY.INTL(C3;D3;7;F3:J3)</item>
returns January 15, 2017 with weekend parameter 7.</paragraph>
+<paragraph id="par_id241020160012178562" role="paragraph"
xml-lang="en-US"><item type="input">=WORKDAY.INTL(C3;D3;7;F3:J3)</item> returns
January 15, 2017 with weekend parameter 7.</paragraph>
<paragraph id="par_id241020160012176149" role="paragraph" xml-lang="en-US">To
define Sunday only the weekend day, use the weekend parameter 11.</paragraph>
-<paragraph id="par_id241020160012181455" role="paragraph"
xml-lang="en-US"><item type="literal">=WORKDAY.INTL(C3;D3;11;F3:J3)</item>
returns January 9, 2017.</paragraph>
+<paragraph id="par_id241020160012181455" role="paragraph"
xml-lang="en-US"><item type="input">=WORKDAY.INTL(C3;D3;11;F3:J3)</item>
returns January 9, 2017.</paragraph>
<paragraph id="par_id24102016001218469" role="paragraph"
xml-lang="en-US">Alternatively, use the weekend string "0000001" for Sunday
only weekend.</paragraph>
-<paragraph id="par_id241020160012183680" role="paragraph"
xml-lang="en-US"><item
type="literal">=WORKDAY.INTL(C3;D3;"0000001";F3:J3)</item> returns January 9,
2017.</paragraph>
+<paragraph id="par_id241020160012183680" role="paragraph"
xml-lang="en-US"><item type="input">=WORKDAY.INTL(C3;D3;"0000001";F3:J3)</item>
returns January 9, 2017.</paragraph>
<paragraph id="par_id241020160012181870" role="paragraph" xml-lang="en-US">The
function can be used without the two optional parameters – Weekday and Holidays
– by leaving them out:</paragraph>
-<paragraph id="par_id241020160012182048" role="paragraph"
xml-lang="en-US"><item type="literal">=WORKDAY.INTL(C3;D3)</item> gives the
result: January 10, 2017.</paragraph>
-
+<paragraph id="par_id241020160012182048" role="paragraph"
xml-lang="en-US"><item type="input">=WORKDAY.INTL(C3;D3)</item> gives the
result: January 10, 2017.</paragraph>
<section id="relatedtopics">
<paragraph id="par_id231020162253594361" role="paragraph"
xml-lang="en-US"><link
href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></paragraph>
<paragraph id="par_id241020160012187036" role="paragraph"
xml-lang="en-US"><link
href="text/scalc/01/func_networkdays.intl.xhp">NETWORKDAYS.INTL</link></paragraph>
@@ -66,5 +63,4 @@
<paragraph id="par_id23102016225717242" role="paragraph"
xml-lang="en-US"><link href="text/scalc/01/04060102.xhp">Date
functions</link></paragraph>
</section>
</body>
-
</helpdocument>
diff --git a/source/text/scalc/01/func_workday.xhp
b/source/text/scalc/01/func_workday.xhp
index e8dc7e2d2..a6038fa11 100644
--- a/source/text/scalc/01/func_workday.xhp
+++ b/source/text/scalc/01/func_workday.xhp
@@ -42,9 +42,11 @@
<emph>Days</emph> is the number of workdays. Positive value for a result after
the start date, negative value for a result before the start date.</paragraph>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US">
<emph>Holidays</emph> is a list of optional holidays. These are non-working
days. Enter a cell range in which the holidays are listed
individually.</paragraph>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph role="heading" id="hd_id3150141" xml-lang="en-US"
level="3">Example</paragraph>
<paragraph role="paragraph" id="par_id3152782" xml-lang="en-US">What date came
17 workdays after 1 December 2001? Enter the start date "2001-12-01" in C3 and
the number of workdays in D3. Cells F3 to J3 contain the following Christmas
and New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31",
"2002-01-01".</paragraph>
-<paragraph role="paragraph" id="par_id3146142"
xml-lang="en-US">=WORKDAY(C3;D3;F3:J3) returns 2001-12-28. Format the serial
date number as a date, for example in the format YYYY-MM-DD.<comment>UFI: fixed
#i30213#</comment></paragraph>
+<paragraph role="paragraph" id="par_id3146142" xml-lang="en-US"><item
type="input">=WORKDAY(C3;D3;F3:J3)</item> returns 2001-12-28. Format the
serial date number as a date, for example in the format
YYYY-MM-DD.<comment>UFI: fixed #i30213#</comment></paragraph>
<section id="relatedtopics">
<paragraph id="par_id231020162253594361" role="paragraph"
xml-lang="en-US"><link
href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></paragraph>
<paragraph id="par_id241020160012187036" role="paragraph"
xml-lang="en-US"><link
href="text/scalc/01/func_networkdays.intl.xhp">NETWORKDAYS.INTL</link></paragraph>
diff --git a/source/text/scalc/01/func_yearfrac.xhp
b/source/text/scalc/01/func_yearfrac.xhp
index fc84af494..8fd42e02d 100644
--- a/source/text/scalc/01/func_yearfrac.xhp
+++ b/source/text/scalc/01/func_yearfrac.xhp
@@ -43,7 +43,7 @@
<emph>Basis</emph> (optional) is chosen from a list of options and indicates
how the year is to be calculated.</paragraph>
<table id="tbl_id3145590">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3146847"
xml-lang="en-US">Basis</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -52,7 +52,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154502" xml-lang="en-US">0 or
missing</paragraph>
+<paragraph role="tablecontent" id="par_id3154502" xml-lang="en-US"
localize="false">0 or missing</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149877" xml-lang="en-US">US method
(NASD), 12 months of 30 days each</paragraph>
@@ -60,7 +60,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148766"
xml-lang="en-US">1</paragraph>
+ <paragraph role="tablecontent" id="par_id3148766" xml-lang="en-US"
localize="false">1</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3154326" xml-lang="en-US">Exact
number of days in months, exact number of days in year</paragraph>
@@ -68,7 +68,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145245"
xml-lang="en-US">2</paragraph>
+ <paragraph role="tablecontent" id="par_id3145245" xml-lang="en-US"
localize="false">2</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3155620" xml-lang="en-US">Exact
number of days in month, year has 360 days</paragraph>
@@ -76,7 +76,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145297"
xml-lang="en-US">3</paragraph>
+ <paragraph role="tablecontent" id="par_id3145297" xml-lang="en-US"
localize="false">3</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3148394" xml-lang="en-US">Exact
number of days in month, year has 365 days</paragraph>
@@ -84,7 +84,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151022"
xml-lang="en-US">4</paragraph>
+ <paragraph role="tablecontent" id="par_id3151022" xml-lang="en-US"
localize="false">4</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150931" xml-lang="en-US">European
method, 12 months of 30 days each</paragraph>
@@ -92,8 +92,10 @@
</tablerow>
</table>
</section>
+<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
+<embed href="text/scalc/01/04060102.xhp#datenumberwarn"/>
<paragraph role="heading" id="hd_id3145626" xml-lang="en-US"
level="3">Example</paragraph>
<paragraph role="paragraph" id="par_id3149007" xml-lang="en-US">What fraction
of the year 2008 lies between 2008-01-01 and 2008-07-01?</paragraph>
-<paragraph role="code" id="par_id3154632"
xml-lang="en-US">=YEARFRAC("2008-01-01"; "2008-07-01";0) returns
0.50.</paragraph>
+<paragraph role="paragraph" id="par_id3154632" xml-lang="en-US"><item
type="input">=YEARFRAC("2008-01-01"; "2008-07-01";0)</item> returns
0.50.</paragraph>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
