summaryrefslogtreecommitdiff
path: root/source/text/shared/01/05020301.xhp
diff options
context:
space:
mode:
authorSophia Schröder <sophia.schroeder@libreoffice.org>2018-06-01 10:10:04 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2018-06-30 02:19:01 +0200
commit02fdfc49125c2059e0153fc9f97da4ed71ae0b2c (patch)
treeae0d8384e62028854db60c47fafdc1433ecd5864 /source/text/shared/01/05020301.xhp
parentb845484d0c4660211c3dc941bddf8c4275164720 (diff)
Further cleanups and improvements
in /shared/01/0502*.xhp files Change-Id: I2219cf60b095eda0c76819287a5c60645527b6db Reviewed-on: https://gerrit.libreoffice.org/55168 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'source/text/shared/01/05020301.xhp')
-rw-r--r--source/text/shared/01/05020301.xhp35
1 files changed, 15 insertions, 20 deletions
diff --git a/source/text/shared/01/05020301.xhp b/source/text/shared/01/05020301.xhp
index 5c965c8eb7..c8aa2a0072 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -47,7 +47,7 @@
<comment>mw made "time formats" a two level entry and deleted 2x "formats;"</comment>
<paragraph id="hd_id3153514" role="heading" level="1" xml-lang="en-US"><variable id="zahlenformatcodes"><link href="text/shared/01/05020301.xhp" name="Number Format Codes">Number Format Codes</link> </variable></paragraph>
-<paragraph id="par_id3150467" role="paragraph" xml-lang="en-US">Number format codes can consist of up to four sections separated by a semicolon (;).</paragraph>
+<paragraph id="par_id3150467" role="paragraph" xml-lang="en-US">Number format codes can consist of up to four sections separated by a semicolon (<emph>;</emph>).</paragraph>
<list type="ordered">
<listitem>
@@ -60,13 +60,13 @@
<paragraph id="par_id3155069" role="listitem" xml-lang="en-US">You can also assign conditions to the three sections, so that the format is only applied if a condition is met.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3155070" role="listitem" xml-lang="en-US">Fourth section applies if the content is not a value, but some text. Content is represented by an at sign (@).</paragraph>
+ <paragraph id="par_id3155070" role="listitem" xml-lang="en-US">Fourth section applies if the content is not a value, but some text. Content is represented by an at sign (<emph>@</emph>).</paragraph>
</listitem>
</list>
<paragraph id="hd_id3151262" role="heading" level="2" xml-lang="en-US">Decimal Places and Significant Digits</paragraph>
-<paragraph id="par_id3153624" role="paragraph" xml-lang="en-US">Use zero (0), the number sign (#) or the question mark (?) as placeholders in your number format code to represent numbers. The (#) only displays significant digits, while the (0) displays zeroes if there are fewer digits in the number than in the number format. The (?) works as the (#) but adds a space character to keep decimal alignment if there is a hidden non-significant zero.</paragraph>
-<paragraph id="par_id3153323" role="paragraph" xml-lang="en-US">Use question marks (?), zeroes (0) or number signs (#) to represent the number of digits to include in the numerator and the denominator of a fraction. Fractions that do not fit the pattern that you define are displayed as floating point numbers.</paragraph>
+ <paragraph id="par_id3153624" role="paragraph" xml-lang="en-US">Use zero (<emph>0</emph>), the number sign (<emph>#</emph>) or the question mark (<emph>?</emph>) as placeholders in your number format code to represent numbers. The <emph>#</emph> only displays significant digits, while the <emph>0</emph> displays zeroes if there are fewer digits in the number than in the number format. The <emph>?</emph> works as the <emph>#</emph> but adds a space character to keep decimal alignment if there is a hidden non-significant zero.</paragraph>
+ <paragraph id="par_id3153323" role="paragraph" xml-lang="en-US">Use question marks (<emph>?</emph>), zeroes (<emph>0</emph>) or number signs (<emph>#</emph>) to represent the number of digits to include in the numerator and the denominator of a fraction. Fractions that do not fit the pattern that you define are displayed as floating point numbers.</paragraph>
<paragraph id="par_id3148440" role="paragraph" xml-lang="en-US">If a number contains more digits to the right of the decimal delimiter than there are placeholders in the format, the number is rounded accordingly. If a number contains more digits to the left of the decimal delimiter than there are placeholders in the format, the entire number is displayed. Use the following list as a guide for using placeholders when you create a number format code:</paragraph>
<table id="tbl_id3149760">
@@ -207,10 +207,10 @@
<paragraph id="par_id3153338" role="paragraph" xml-lang="en-US">To include text in a number format that is applied to a cell that might contain text, enclose the text by double quotation marks (" "), and then add an at sign (@). For example, enter <emph>"Total for "@</emph> to display "Total for December".</paragraph>
<paragraph id="hd_id3154330" role="heading" level="3" xml-lang="en-US">Spaces</paragraph>
-<paragraph id="par_id3156294" role="paragraph" xml-lang="en-US">To use a character to define the width of a space in a number format, type an underscore ( _ ) followed by the character. The width of the space varies according to the width of the character that you choose. For example, <emph>_M</emph> creates a wider space than <emph>_i</emph>.</paragraph>
-<paragraph id="par_id3156295" role="paragraph" xml-lang="en-US">To fill free space with a given character, use an asterisk (*) followed by this character. For instance:</paragraph>
+<paragraph id="par_id3156294" role="paragraph" xml-lang="en-US">To use a character to define the width of a space in a number format, type an underscore (<emph>_</emph>) followed by the character. The width of the space varies according to the width of the character that you choose. For example, <emph>_M</emph> creates a wider space than <emph>_i</emph>.</paragraph>
+<paragraph id="par_id3156295" role="paragraph" xml-lang="en-US">To fill free space with a given character, use an asterisk (<emph>*</emph>) followed by this character. For instance:</paragraph>
<paragraph id="par_id3156296" role="code" localize="false" xml-lang="en-US">*\0</paragraph>
-<paragraph id="par_id3156297" role="paragraph" xml-lang="en-US">will display integer value (0) preceded by as many as needed backslash characters (\) to fill column width. For accounting representation, you may left align currency symbol with a format similar to:</paragraph>
+<paragraph id="par_id3156297" role="paragraph" xml-lang="en-US">will display integer value (0) preceded by as many as needed backslash characters (<emph>\</emph>) to fill column width. For accounting representation, you may left align currency symbol with a format similar to:</paragraph>
<paragraph id="par_id3156298" role="code" localize="false" xml-lang="en-US">$_-* 0.--;$-* 0.--;$_-* -</paragraph>
<paragraph id="hd_id3155994" role="heading" level="2" xml-lang="en-US">Color</paragraph>
@@ -268,7 +268,7 @@
<paragraph id="hd_id3149260" role="heading" level="2" xml-lang="en-US">Percentages, Scientific Notation and Fraction Representation</paragraph>
<paragraph id="hd_id3147218" role="heading" level="3" xml-lang="en-US">Percentages</paragraph>
-<paragraph id="par_id3151168" role="paragraph" xml-lang="en-US">To display numbers as percentages, add the percent sign (%) to the number format.</paragraph>
+<paragraph id="par_id3151168" role="paragraph" xml-lang="en-US">To display numbers as percentages, add the percent sign (<emph>%</emph>) to the number format.</paragraph>
<paragraph id="hd_id3156005" role="heading" level="3" xml-lang="en-US">Scientific Notation</paragraph>
<paragraph id="par_id3146923" role="paragraph" xml-lang="en-US">Scientific notation lets you write very large numbers or very small fractions in a compact form. For example, in scientific notation, 650000 is written as 6.5 x 10<sup>5</sup>, and 0.000065 as 6.5 x 10<sup>-5</sup>. <comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment>In <item type="productname">%PRODUCTNAME</item>, these numbers are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that displays numbers using scientific notation, enter a # or 0, and then one of the following codes E-, E+, e- or e+. If sign is omitted after E or e, it won't appear for positive value of exponent. To get engineering notation, enter 3 digits (0 or #) in the integer part: <emph>###.##E+00</emph> for instance.</paragraph>
@@ -470,7 +470,7 @@
</tablerow>
</table>
-<paragraph id="par_id1002200811423518" role="paragraph" xml-lang="en-US">The above listed formatting codes work with your language version of %PRODUCTNAME. However, when you need to switch the locale of %PRODUCTNAME to another locale, you need to know the formatting codes used in that other locale. </paragraph>
+<paragraph id="par_id1002200811423518" role="paragraph" xml-lang="en-US">The above listed formatting codes work with your language version of %PRODUCTNAME. However, when you need to switch the locale of %PRODUCTNAME to another locale, you need to know the formatting codes used in that other locale.</paragraph>
<paragraph id="par_id1002200811423556" role="paragraph" xml-lang="en-US">For example, if your software is set to an English locale, and you want to format a year with four digits, you enter YYYY as a formatting code. When you switch to a German locale, you must use JJJJ instead. The following table lists only the localized differences.</paragraph>
<table id="tbl_id1002200811465915">
@@ -718,8 +718,7 @@
<paragraph id="hd_id3149929" role="heading" level="3" xml-lang="en-US">Entering Dates</paragraph>
<paragraph id="par_id3148397" role="paragraph" xml-lang="en-US">To enter a date in a cell, use the Gregorian calendar format. For example, in an English locale, enter 1/2/2002 for Jan 2, 2002.</paragraph>
-<paragraph id="par_id3153274" role="paragraph" xml-lang="en-US">All date formats are dependent on the locale that is set in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
-</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
+<paragraph id="par_id3153274" role="paragraph" xml-lang="en-US">All date formats are dependent on the locale that is set in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
<paragraph id="par_id3153795" role="paragraph" xml-lang="en-US">To specify a calendar format that is independent of the locale, add a modifier in front of the date format. For example, to display a date using the Jewish calendar format in a non-Hebrew locale, enter: [~jewish]DD/MM/YYYY.</paragraph>
<paragraph id="par_id231020161240096930" role="paragraph" xml-lang="en-US">The specified calendar is exported to Microsoft Excel using extended LCID. Extended LCID can also be used in the format string. It will be converted to a calendar modifier if it is supported. See <link href="text/shared/01/05020301.xhp#ExtendedLCID">Extended LCID</link> section below.</paragraph>
@@ -790,8 +789,7 @@
</tablerow>
</table>
-<paragraph id="par_id3152419" role="paragraph" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">If you perform a calculation that involves one or more cells using a date format, the result is formatted according to the following mappings:
-</caseinline></switchinline></paragraph>
+<paragraph id="par_id3152419" role="paragraph" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">If you perform a calculation that involves one or more cells using a date format, the result is formatted according to the following mappings:</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC">
@@ -888,8 +886,7 @@
</case>
</switch>
-<paragraph id="par_id3149174" role="paragraph" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">The Date&amp;Time format displays the date and time that an entry was made to a cell with this format.
-</caseinline></switchinline></paragraph>
+<paragraph id="par_id3149174" role="paragraph" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">The <emph>Date &amp; Time</emph> format displays the date and time that an entry was made to a cell with this format.</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC">
<embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
@@ -898,7 +895,7 @@
</switch>
<paragraph id="hd_id3155870" role="heading" level="3" xml-lang="en-US">Time Formats</paragraph>
-<paragraph id="par_id3150108" role="paragraph" xml-lang="en-US">To display hours, minutes and seconds use the following number format codes.</paragraph>
+<paragraph id="par_id3150108" role="paragraph" xml-lang="en-US">To display hours, minutes and seconds use the following number format codes:</paragraph>
<table id="tbl_id3154830">
<tablerow>
@@ -990,7 +987,7 @@
<paragraph id="hd_id3158404" role="heading" level="2" xml-lang="en-US">Displaying Numbers Using Native Characters</paragraph>
<paragraph id="hd_id231020161309289931" role="heading" level="2" xml-lang="en-US">NatNum modifiers</paragraph>
-<paragraph id="par_id3149998" role="paragraph" xml-lang="en-US">To display numbers using native number characters, use a [NatNum1], [NatNum2], ... [NatNum11] modifier at the beginning of a number format codes.</paragraph>
+<paragraph id="par_id3149998" role="paragraph" xml-lang="en-US">To display numbers using native number characters, use a [NatNum1], [NatNum2], ..., [NatNum11] modifier at the beginning of a number format codes.</paragraph><comment>this will be extended with the libnumbertext work</comment>
<paragraph id="par_id3154600" role="paragraph" xml-lang="en-US">The [NatNum1] modifier always uses a one to one character mapping to convert numbers to a string that matches the native number format code of the corresponding locale. The other modifiers produce different results if they are used with different locales. A locale can be the language and the territory for which the format code is defined, or a modifier such as [$-yyy] that follows the native number modifier. In this case, yyy is the hexadecimal MS-LCID that is also used in currency format codes. For example, to display a number using Japanese short Kanji characters in an English US locale, use the following number format code:</paragraph>
<paragraph id="par_id3152546" role="example" localize="false" xml-lang="en-US">[NatNum1][$-411]0</paragraph>
<paragraph id="par_id3147269" role="paragraph" xml-lang="en-US">In the following list, the Microsoft Excel [DBNumX] modifier that corresponds to <item type="productname">%PRODUCTNAME</item> [NatNum] modifier is shown. If you want, you can use a [DBNumX] modifier instead of [NatNum] modifier for your locale. Whenever possible, <item type="productname">%PRODUCTNAME</item> internally maps [DBNumX] modifiers to [NatNumN] modifiers.</paragraph>
@@ -2458,8 +2455,6 @@
</tablecell>
</tablerow>
</table>
-
</section>
</body>
-
-</helpdocument> \ No newline at end of file
+</helpdocument>