[category.monetary] - C++20 → C++23

Files changed (1) hide show

tmp/tmpkbxglmaq/{from.md → to.md} +23 -15

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

@@ -1,7 +1,9 @@
 ### The monetary category <a id="category.monetary">[[category.monetary]]</a>
 These templates handle monetary formats. A template parameter indicates
 whether local or international monetary formats are to be used.
 All specifications of member functions for `money_put` and `money_get`
 in the subclauses of  [[category.monetary]] only apply to the
@@ -118,11 +120,11 @@ the result is given a positive sign.
 Digits in the numeric monetary component are extracted and placed in
 `digits`, or into a character buffer `buf1` for conversion to produce a
 value for `units`, in the order in which they appear, preceded by a
 minus sign if and only if the result is negative. The value `units` is
-produced as if by[^20]
 ``` cpp
 for (int i = 0; i < n; ++i)
   buf2[i] = src[find(atoms, atoms+sizeof(src), buf1[i]) - atoms];
 buf2[n] = 0;
@@ -209,10 +211,13 @@ minus sign) in `digits` or `buf2`. In `digits`, only the optional
 leading minus sign and the immediately subsequent digit characters (as
 classified according to `ct`) are used; any trailing characters
 (including digits appearing after a non-digit character) are ignored.
 Calls `str.width(0)`.
 *Remarks:* The currency symbol is generated if and only if
 `(str.flags() & str.showbase)` is nonzero. If the number of characters
 generated for the specified format is less than the value returned by
 `str.width()` on entry to the function, then copies of `fill` are
 inserted as necessary to pad to the specified width. For the value `af`
@@ -224,15 +229,14 @@ before the other characters.
 [*Note 1*: It is possible, with some combinations of format patterns
 and flag values, to produce output that cannot be parsed using
 `num_get<>::get`. — *end note*]
-*Returns:* An iterator pointing immediately after the last character
-produced.
 #### Class template `moneypunct` <a id="locale.moneypunct">[[locale.moneypunct]]</a>
 ``` cpp
 namespace std {
   class money_base {
   public:
     enum part { none, space, symbol, sign, value };
@@ -277,14 +281,16 @@ 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`ᵗʰ 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.
 Where `none` or `space` appears, whitespace is permitted in the format,
 except where `none` appears at the end, in which case no whitespace is
 permitted. The value `space` indicates that at least one space is
 required at that position. Where `symbol` appears, the sequence of
@@ -366,25 +372,25 @@ corresponding virtual member function `do_F()`.
 ``` cpp
 charT do_decimal_point() const;
 ```
 *Returns:* The radix separator to use in case `do_frac_digits()` is
-greater than zero.[^22]
 ``` cpp
 charT do_thousands_sep() const;
 ```
 *Returns:* The digit group separator to use in case `do_grouping()`
-specifies a digit grouping pattern.[^23]
 ``` cpp
 string do_grouping() const;
 ```
 *Returns:* A pattern defined identically as, but not necessarily equal
-to, the result of `numpunct<charT>::do_grouping()`.[^24]
 ``` cpp
 string_type do_curr_symbol() const;
 ```
@@ -398,19 +404,21 @@ specified by ISO 4217 followed by a space. — *end note*]
 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;
 ```
@@ -422,11 +430,11 @@ pattern do_neg_format() const;
 - `moneypunct<wchar_t>`,
 - `moneypunct<char, true>`, and
 - `moneypunct<wchar_t, true>`,
 return an object of type `pattern` initialized to
-`{ symbol, sign, none, value }`.[^27]
 #### Class template `moneypunct_byname` <a id="locale.moneypunct.byname">[[locale.moneypunct.byname]]</a>
 ``` cpp
 namespace std {

 ### The monetary category <a id="category.monetary">[[category.monetary]]</a>
+#### General <a id="category.monetary.general">[[category.monetary.general]]</a>
 These templates handle monetary formats. A template parameter indicates
 whether local or international monetary formats are to be used.
 All specifications of member functions for `money_put` and `money_get`
 in the subclauses of  [[category.monetary]] only apply to the
 Digits in the numeric monetary component are extracted and placed in
 `digits`, or into a character buffer `buf1` for conversion to produce a
 value for `units`, in the order in which they appear, preceded by a
 minus sign if and only if the result is negative. The value `units` is
+produced as if by[^18]
 ``` cpp
 for (int i = 0; i < n; ++i)
   buf2[i] = src[find(atoms, atoms+sizeof(src), buf1[i]) - atoms];
 buf2[n] = 0;
 leading minus sign and the immediately subsequent digit characters (as
 classified according to `ct`) are used; any trailing characters
 (including digits appearing after a non-digit character) are ignored.
 Calls `str.width(0)`.
+*Returns:* An iterator pointing immediately after the last character
+produced.
 *Remarks:* The currency symbol is generated if and only if
 `(str.flags() & str.showbase)` is nonzero. If the number of characters
 generated for the specified format is less than the value returned by
 `str.width()` on entry to the function, then copies of `fill` are
 inserted as necessary to pad to the specified width. For the value `af`
 [*Note 1*: It is possible, with some combinations of format patterns
 and flag values, to produce output that cannot be parsed using
 `num_get<>::get`. — *end note*]
 #### Class template `moneypunct` <a id="locale.moneypunct">[[locale.moneypunct]]</a>
+##### General <a id="locale.moneypunct.general">[[locale.moneypunct.general]]</a>
 ``` cpp
 namespace std {
   class money_base {
   public:
     enum part { none, space, symbol, sign, value };
 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[^19]
+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.
 Where `none` or `space` appears, whitespace is permitted in the format,
 except where `none` appears at the end, in which case no whitespace is
 permitted. The value `space` indicates that at least one space is
 required at that position. Where `symbol` appears, the sequence of
 ``` cpp
 charT do_decimal_point() const;
 ```
 *Returns:* The radix separator to use in case `do_frac_digits()` is
+greater than zero.[^20]
 ``` cpp
 charT do_thousands_sep() const;
 ```
 *Returns:* The digit group separator to use in case `do_grouping()`
+specifies a digit grouping pattern.[^21]
 ``` cpp
 string do_grouping() const;
 ```
 *Returns:* A pattern defined identically as, but not necessarily equal
+to, the result of `numpunct<charT>::do_grouping()`.[^22]
 ``` cpp
 string_type do_curr_symbol() const;
 ```
 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;[^23]
+`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.[^24]
 ``` cpp
 pattern do_pos_format() const;
 pattern do_neg_format() const;
 ```
 - `moneypunct<wchar_t>`,
 - `moneypunct<char, true>`, and
 - `moneypunct<wchar_t, true>`,
 return an object of type `pattern` initialized to
+`{ symbol, sign, none, value }`.[^25]
 #### Class template `moneypunct_byname` <a id="locale.moneypunct.byname">[[locale.moneypunct.byname]]</a>
 ``` cpp
 namespace std {

Diff to HTML by rtfpessoa