[locale.moneypunct] - C++17 → C++20

Files changed (1) hide show

tmp/tmpr471erkq/{from.md → to.md} +49 -28

tmp/tmpr471erkq/{from.md → to.md} RENAMED Viewed

@@ -45,11 +45,11 @@ namespace std {
 ```
 The `moneypunct<>` facet defines monetary formatting parameters used by
 `money_get<>` and `money_put<>`. A monetary format is a sequence of four
 components, specified by a `pattern` value `p`, such that the `part`
-value `static_cast<part>(p.field[i])` determines the `i`th component of
 the format[^21] In the `field` member of a `pattern` object, each value
 `symbol`, `sign`, `value`, and either `space` or `none` appears exactly
 once. The value `none`, if present, is not first; the value `space`, if
 present, is neither first nor last.
@@ -65,44 +65,57 @@ required. Any remaining characters of the sign sequence are required
 after all other format components. Where `value` appears, the absolute
 numeric monetary value is required.
 The format of the numeric monetary value is a decimal number:
-``` cpp
-value ::= units [ decimal-point [ digits ]] |
     decimal-point digits
 ```
 if `frac_digits()` returns a positive value, or
-``` cpp
-value ::= units
 ```
-otherwise. The symbol `decimal-point` indicates the character returned
-by `decimal_point()`. The other symbols are defined as follows:
-``` cpp
-units ::= digits [ thousands-sep units ]
-digits ::= adigit [ digits ]
 ```
-In the syntax specification, the symbol `adigit` is any of the values
-`ct.widen(c)` for `c` in the range `'0'` through `'9'`, inclusive, and
 `ct` is a reference of type `const ctype<charT>&` obtained as described
-in the definitions of `money_get<>` and `money_put<>`. The symbol
-`thousands-sep` is the character returned by `thousands_sep()`. The
-space character used is the value `ct.widen(' ')`. White space
-characters are those characters `c` for which `ci.is(space, c)` returns
-`true`. The number of digits required after the decimal point (if any)
-is exactly the value returned by `frac_digits()`.
 The placement of thousands-separator characters (if any) is determined
 by the value returned by `grouping()`, defined identically as the member
 `numpunct<>::do_grouping()`.
-##### `moneypunct` members <a id="locale.moneypunct.members">[[locale.moneypunct.members]]</a>
 ``` cpp
 charT        decimal_point() const;
 charT        thousands_sep() const;
 string       grouping()      const;
@@ -115,11 +128,11 @@ pattern      neg_format()    const;
 ```
 Each of these functions `F` returns the result of calling the
 corresponding virtual member function `do_F()`.
-##### `moneypunct` virtual functions <a id="locale.moneypunct.virtuals">[[locale.moneypunct.virtuals]]</a>
 ``` cpp
 charT do_decimal_point() const;
 ```
@@ -142,35 +155,43 @@ to, the result of `numpunct<charT>::do_grouping()`.[^24]
 ``` cpp
 string_type do_curr_symbol() const;
 ```
-*Returns:* A string to use as the currency identifier symbol.[^25]
 ``` cpp
 string_type do_positive_sign() const;
 string_type do_negative_sign() const;
 ```
 *Returns:* `do_positive_sign()` returns the string to use to indicate a
-positive monetary value;[^26] `do_negative_sign()` returns the string to
 use to indicate a negative value.
 ``` cpp
 int do_frac_digits() const;
 ```
 *Returns:* The number of digits after the decimal radix separator, if
-any.[^27]
 ``` cpp
 pattern do_pos_format() const;
 pattern do_neg_format() const;
 ```
 *Returns:* The specializations required in
-Table  [[tab:localization.required.specializations]] ([[locale.category]]),
-namely `moneypunct<char>`, `moneypunct<wchar_t>`,
-`moneypunct<char, true>`, and `moneypunct<wchar_t, true>`, return an
-object of type `pattern` initialized to
-`{ symbol, sign, none, value }`.[^28]

 ```
 The `moneypunct<>` facet defines monetary formatting parameters used by
 `money_get<>` and `money_put<>`. A monetary format is a sequence of four
 components, specified by a `pattern` value `p`, such that the `part`
+value `static_cast<part>(p.field[i])` determines the `i`ᵗʰ component of
 the format[^21] In the `field` member of a `pattern` object, each value
 `symbol`, `sign`, `value`, and either `space` or `none` appears exactly
 once. The value `none`, if present, is not first; the value `space`, if
 present, is neither first nor last.
 after all other format components. Where `value` appears, the absolute
 numeric monetary value is required.
 The format of the numeric monetary value is a decimal number:
+``` bnf
+value:
+    units fractionalₒₚₜ
     decimal-point digits
 ```
+``` bnf
+fractional:
+    decimal-point digitsₒₚₜ
+```
 if `frac_digits()` returns a positive value, or
+``` bnf
+value:
+    units
 ```
+otherwise. The symbol indicates the character returned by
+`decimal_point()`. The other symbols are defined as follows:
+``` bnf
+units:
+ digits
+    digits thousands-sep units
 ```
+``` bnf
+digits:
+    adigit digitsₒₚₜ
+```
+In the syntax specification, the symbol is any of the values
+`ct.widen(c)` for `c` in the range `'0'` through `'9'` (inclusive) and
 `ct` is a reference of type `const ctype<charT>&` obtained as described
+in the definitions of `money_get<>` and `money_put<>`. The symbol is the
+character returned by `thousands_sep()`. The space character used is the
+value `ct.widen(' ')`. White space characters are those characters `c`
+for which `ci.is(space, c)` returns `true`. The number of digits
+required after the decimal point (if any) is exactly the value returned
+by `frac_digits()`.
 The placement of thousands-separator characters (if any) is determined
 by the value returned by `grouping()`, defined identically as the member
 `numpunct<>::do_grouping()`.
+##### Members <a id="locale.moneypunct.members">[[locale.moneypunct.members]]</a>
 ``` cpp
 charT        decimal_point() const;
 charT        thousands_sep() const;
 string       grouping()      const;
 ```
 Each of these functions `F` returns the result of calling the
 corresponding virtual member function `do_F()`.
+##### Virtual functions <a id="locale.moneypunct.virtuals">[[locale.moneypunct.virtuals]]</a>
 ``` cpp
 charT do_decimal_point() const;
 ```
 ``` cpp
 string_type do_curr_symbol() const;
 ```
+*Returns:* A string to use as the currency identifier symbol.
+[*Note 1*: For specializations where the second template parameter is
+`true`, this is typically four characters long: a three-letter code as
+specified by ISO 4217 followed by a space. — *end note*]
 ``` cpp
 string_type do_positive_sign() const;
 string_type do_negative_sign() const;
 ```
 *Returns:* `do_positive_sign()` returns the string to use to indicate a
+positive monetary value;[^25] `do_negative_sign()` returns the string to
 use to indicate a negative value.
 ``` cpp
 int do_frac_digits() const;
 ```
 *Returns:* The number of digits after the decimal radix separator, if
+any.[^26]
 ``` cpp
 pattern do_pos_format() const;
 pattern do_neg_format() const;
 ```
 *Returns:* The specializations required in
+[[locale.spec]][[locale.category]], namely
+- `moneypunct<char>`,
+- `moneypunct<wchar_t>`,
+- `moneypunct<char, true>`, and
+- `moneypunct<wchar_t, true>`,
+return an object of type `pattern` initialized to
+`{ symbol, sign, none, value }`.[^27]

Diff to HTML by rtfpessoa