summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2016-11-10 05:54:29 +0200
committerArnold D. Robbins <arnold@skeeve.com>2016-11-10 05:54:29 +0200
commitb28fa0c81b861b184f3d0f78d8e115cc674fa09c (patch)
tree9be51b50ec3d58d848ab1359c0c9481ab85029ff
parent4538f9e94a19484f102cb71cafc3eef7fad887ca (diff)
parent86068375ed660f898ed5969641c9aa630f9adfd8 (diff)
downloadgawk-feature/fixtype.tar.gz
Merge branch 'master' into feature/fixtypefeature/fixtype
-rw-r--r--doc/ChangeLog6
-rw-r--r--doc/gawk.info414
-rw-r--r--doc/gawk.texi6
-rw-r--r--doc/gawktexi.in6
4 files changed, 222 insertions, 210 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 26286875..2e3eef12 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawktexi.in: Fix example use of dcngegttext.
+ Thanks to Sergey Tselikh <stselikh@gmail.com>
+ for the report.
+
2016-11-08 Arnold D. Robbins <arnold@skeeve.com>
* gawktexi.in, wordlist: Typo fix. ECBDIC --> EBCDIC.
diff --git a/doc/gawk.info b/doc/gawk.info
index 06c2bf73..264b7054 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -20694,10 +20694,12 @@ File: gawk.info, Node: Programmer i18n, Next: Translator i18n, Prev: Explaini
if (groggy)
message = dcngettext("%d customer disturbing me\n",
- "%d customers disturbing me\n", "adminprog")
+ "%d customers disturbing me\n",
+ ncustomers, "adminprog")
else
message = dcngettext("enjoying %d customer\n",
- "enjoying %d customers\n", "adminprog")
+ "enjoying %d customers\n",
+ ncustomers, "adminprog")
printf(message, ncustomers)
4. During development, you might want to put the '.gmo' file in a
@@ -33999,7 +34001,7 @@ Index
* LC_CTYPE locale category: Explaining gettext. (line 98)
* LC_MESSAGES locale category: Explaining gettext. (line 88)
* LC_MESSAGES locale category, bindtextdomain() function (gawk): Programmer i18n.
- (line 101)
+ (line 103)
* LC_MONETARY locale category: Explaining gettext. (line 104)
* LC_NUMERIC locale category: Explaining gettext. (line 108)
* LC_TIME locale category: Explaining gettext. (line 112)
@@ -35574,208 +35576,208 @@ Node: Explaining gettext831114
Ref: Explaining gettext-Footnote-1837006
Ref: Explaining gettext-Footnote-2837191
Node: Programmer i18n837356
-Ref: Programmer i18n-Footnote-1842211
-Node: Translator i18n842260
-Node: String Extraction843054
-Ref: String Extraction-Footnote-1844186
-Node: Printf Ordering844272
-Ref: Printf Ordering-Footnote-1847058
-Node: I18N Portability847122
-Ref: I18N Portability-Footnote-1849578
-Node: I18N Example849641
-Ref: I18N Example-Footnote-1852447
-Node: Gawk I18N852520
-Node: I18N Summary853165
-Node: Debugger854506
-Node: Debugging855528
-Node: Debugging Concepts855969
-Node: Debugging Terms857778
-Node: Awk Debugging860353
-Node: Sample Debugging Session861259
-Node: Debugger Invocation861793
-Node: Finding The Bug863179
-Node: List of Debugger Commands869657
-Node: Breakpoint Control870990
-Node: Debugger Execution Control874684
-Node: Viewing And Changing Data878046
-Node: Execution Stack881420
-Node: Debugger Info883057
-Node: Miscellaneous Debugger Commands887128
-Node: Readline Support892216
-Node: Limitations893112
-Ref: Limitations-Footnote-1897343
-Node: Debugging Summary897394
-Node: Arbitrary Precision Arithmetic898673
-Node: Computer Arithmetic900089
-Ref: table-numeric-ranges903680
-Ref: Computer Arithmetic-Footnote-1904402
-Node: Math Definitions904459
-Ref: table-ieee-formats907773
-Ref: Math Definitions-Footnote-1908376
-Node: MPFR features908481
-Node: FP Math Caution910198
-Ref: FP Math Caution-Footnote-1911270
-Node: Inexactness of computations911639
-Node: Inexact representation912599
-Node: Comparing FP Values913959
-Node: Errors accumulate915041
-Node: Getting Accuracy916474
-Node: Try To Round919184
-Node: Setting precision920083
-Ref: table-predefined-precision-strings920780
-Node: Setting the rounding mode922610
-Ref: table-gawk-rounding-modes922984
-Ref: Setting the rounding mode-Footnote-1926392
-Node: Arbitrary Precision Integers926571
-Ref: Arbitrary Precision Integers-Footnote-1931488
-Node: POSIX Floating Point Problems931637
-Ref: POSIX Floating Point Problems-Footnote-1935519
-Node: Floating point summary935557
-Node: Dynamic Extensions937747
-Node: Extension Intro939300
-Node: Plugin License940566
-Node: Extension Mechanism Outline941363
-Ref: figure-load-extension941802
-Ref: figure-register-new-function943367
-Ref: figure-call-new-function944459
-Node: Extension API Description946521
-Node: Extension API Functions Introduction948053
-Node: General Data Types952912
-Ref: General Data Types-Footnote-1958867
-Node: Memory Allocation Functions959166
-Ref: Memory Allocation Functions-Footnote-1962011
-Node: Constructor Functions962110
-Node: Registration Functions963855
-Node: Extension Functions964540
-Node: Exit Callback Functions967163
-Node: Extension Version String968413
-Node: Input Parsers969076
-Node: Output Wrappers978958
-Node: Two-way processors983470
-Node: Printing Messages985735
-Ref: Printing Messages-Footnote-1986906
-Node: Updating ERRNO987059
-Node: Requesting Values987798
-Ref: table-value-types-returned988535
-Node: Accessing Parameters989418
-Node: Symbol Table Access990653
-Node: Symbol table by name991165
-Node: Symbol table by cookie993186
-Ref: Symbol table by cookie-Footnote-1997338
-Node: Cached values997402
-Ref: Cached values-Footnote-11000909
-Node: Array Manipulation1001000
-Ref: Array Manipulation-Footnote-11002091
-Node: Array Data Types1002128
-Ref: Array Data Types-Footnote-11004786
-Node: Array Functions1004878
-Node: Flattening Arrays1008736
-Node: Creating Arrays1015644
-Node: Redirection API1020413
-Node: Extension API Variables1023244
-Node: Extension Versioning1023877
-Ref: gawk-api-version1024314
-Node: Extension API Informational Variables1026070
-Node: Extension API Boilerplate1027134
-Node: Finding Extensions1030948
-Node: Extension Example1031507
-Node: Internal File Description1032305
-Node: Internal File Ops1036385
-Ref: Internal File Ops-Footnote-11048147
-Node: Using Internal File Ops1048287
-Ref: Using Internal File Ops-Footnote-11050670
-Node: Extension Samples1050944
-Node: Extension Sample File Functions1052473
-Node: Extension Sample Fnmatch1060122
-Node: Extension Sample Fork1061609
-Node: Extension Sample Inplace1062827
-Node: Extension Sample Ord1066037
-Node: Extension Sample Readdir1066873
-Ref: table-readdir-file-types1067762
-Node: Extension Sample Revout1068567
-Node: Extension Sample Rev2way1069156
-Node: Extension Sample Read write array1069896
-Node: Extension Sample Readfile1071838
-Node: Extension Sample Time1072933
-Node: Extension Sample API Tests1074281
-Node: gawkextlib1074773
-Node: Extension summary1077220
-Node: Extension Exercises1080922
-Node: Language History1082420
-Node: V7/SVR3.11084076
-Node: SVR41086228
-Node: POSIX1087662
-Node: BTL1089041
-Node: POSIX/GNU1089770
-Node: Feature History1095632
-Node: Common Extensions1110002
-Node: Ranges and Locales1111285
-Ref: Ranges and Locales-Footnote-11115901
-Ref: Ranges and Locales-Footnote-21115928
-Ref: Ranges and Locales-Footnote-31116163
-Node: Contributors1116384
-Node: History summary1121944
-Node: Installation1123324
-Node: Gawk Distribution1124268
-Node: Getting1124752
-Node: Extracting1125713
-Node: Distribution contents1127351
-Node: Unix Installation1133436
-Node: Quick Installation1134118
-Node: Shell Startup Files1136532
-Node: Additional Configuration Options1137610
-Node: Configuration Philosophy1139415
-Node: Non-Unix Installation1141784
-Node: PC Installation1142244
-Node: PC Binary Installation1143082
-Node: PC Compiling1143517
-Node: PC Using1144634
-Node: Cygwin1147679
-Node: MSYS1148449
-Node: VMS Installation1148950
-Node: VMS Compilation1149741
-Ref: VMS Compilation-Footnote-11150970
-Node: VMS Dynamic Extensions1151028
-Node: VMS Installation Details1152713
-Node: VMS Running1154966
-Node: VMS GNV1159245
-Node: VMS Old Gawk1159980
-Node: Bugs1160451
-Node: Bug address1161114
-Node: Usenet1163511
-Node: Maintainers1164286
-Node: Other Versions1165662
-Node: Installation summary1172246
-Node: Notes1173281
-Node: Compatibility Mode1174146
-Node: Additions1174928
-Node: Accessing The Source1175853
-Node: Adding Code1177288
-Node: New Ports1183507
-Node: Derived Files1187995
-Ref: Derived Files-Footnote-11193480
-Ref: Derived Files-Footnote-21193515
-Ref: Derived Files-Footnote-31194113
-Node: Future Extensions1194227
-Node: Implementation Limitations1194885
-Node: Extension Design1196068
-Node: Old Extension Problems1197222
-Ref: Old Extension Problems-Footnote-11198740
-Node: Extension New Mechanism Goals1198797
-Ref: Extension New Mechanism Goals-Footnote-11202161
-Node: Extension Other Design Decisions1202350
-Node: Extension Future Growth1204463
-Node: Old Extension Mechanism1205299
-Node: Notes summary1207062
-Node: Basic Concepts1208244
-Node: Basic High Level1208925
-Ref: figure-general-flow1209207
-Ref: figure-process-flow1209892
-Ref: Basic High Level-Footnote-11213193
-Node: Basic Data Typing1213378
-Node: Glossary1216706
-Node: Copying1248653
-Node: GNU Free Documentation License1286192
-Node: Index1311310
+Ref: Programmer i18n-Footnote-1842305
+Node: Translator i18n842354
+Node: String Extraction843148
+Ref: String Extraction-Footnote-1844280
+Node: Printf Ordering844366
+Ref: Printf Ordering-Footnote-1847152
+Node: I18N Portability847216
+Ref: I18N Portability-Footnote-1849672
+Node: I18N Example849735
+Ref: I18N Example-Footnote-1852541
+Node: Gawk I18N852614
+Node: I18N Summary853259
+Node: Debugger854600
+Node: Debugging855622
+Node: Debugging Concepts856063
+Node: Debugging Terms857872
+Node: Awk Debugging860447
+Node: Sample Debugging Session861353
+Node: Debugger Invocation861887
+Node: Finding The Bug863273
+Node: List of Debugger Commands869751
+Node: Breakpoint Control871084
+Node: Debugger Execution Control874778
+Node: Viewing And Changing Data878140
+Node: Execution Stack881514
+Node: Debugger Info883151
+Node: Miscellaneous Debugger Commands887222
+Node: Readline Support892310
+Node: Limitations893206
+Ref: Limitations-Footnote-1897437
+Node: Debugging Summary897488
+Node: Arbitrary Precision Arithmetic898767
+Node: Computer Arithmetic900183
+Ref: table-numeric-ranges903774
+Ref: Computer Arithmetic-Footnote-1904496
+Node: Math Definitions904553
+Ref: table-ieee-formats907867
+Ref: Math Definitions-Footnote-1908470
+Node: MPFR features908575
+Node: FP Math Caution910292
+Ref: FP Math Caution-Footnote-1911364
+Node: Inexactness of computations911733
+Node: Inexact representation912693
+Node: Comparing FP Values914053
+Node: Errors accumulate915135
+Node: Getting Accuracy916568
+Node: Try To Round919278
+Node: Setting precision920177
+Ref: table-predefined-precision-strings920874
+Node: Setting the rounding mode922704
+Ref: table-gawk-rounding-modes923078
+Ref: Setting the rounding mode-Footnote-1926486
+Node: Arbitrary Precision Integers926665
+Ref: Arbitrary Precision Integers-Footnote-1931582
+Node: POSIX Floating Point Problems931731
+Ref: POSIX Floating Point Problems-Footnote-1935613
+Node: Floating point summary935651
+Node: Dynamic Extensions937841
+Node: Extension Intro939394
+Node: Plugin License940660
+Node: Extension Mechanism Outline941457
+Ref: figure-load-extension941896
+Ref: figure-register-new-function943461
+Ref: figure-call-new-function944553
+Node: Extension API Description946615
+Node: Extension API Functions Introduction948147
+Node: General Data Types953006
+Ref: General Data Types-Footnote-1958961
+Node: Memory Allocation Functions959260
+Ref: Memory Allocation Functions-Footnote-1962105
+Node: Constructor Functions962204
+Node: Registration Functions963949
+Node: Extension Functions964634
+Node: Exit Callback Functions967257
+Node: Extension Version String968507
+Node: Input Parsers969170
+Node: Output Wrappers979052
+Node: Two-way processors983564
+Node: Printing Messages985829
+Ref: Printing Messages-Footnote-1987000
+Node: Updating ERRNO987153
+Node: Requesting Values987892
+Ref: table-value-types-returned988629
+Node: Accessing Parameters989512
+Node: Symbol Table Access990747
+Node: Symbol table by name991259
+Node: Symbol table by cookie993280
+Ref: Symbol table by cookie-Footnote-1997432
+Node: Cached values997496
+Ref: Cached values-Footnote-11001003
+Node: Array Manipulation1001094
+Ref: Array Manipulation-Footnote-11002185
+Node: Array Data Types1002222
+Ref: Array Data Types-Footnote-11004880
+Node: Array Functions1004972
+Node: Flattening Arrays1008830
+Node: Creating Arrays1015738
+Node: Redirection API1020507
+Node: Extension API Variables1023338
+Node: Extension Versioning1023971
+Ref: gawk-api-version1024408
+Node: Extension API Informational Variables1026164
+Node: Extension API Boilerplate1027228
+Node: Finding Extensions1031042
+Node: Extension Example1031601
+Node: Internal File Description1032399
+Node: Internal File Ops1036479
+Ref: Internal File Ops-Footnote-11048241
+Node: Using Internal File Ops1048381
+Ref: Using Internal File Ops-Footnote-11050764
+Node: Extension Samples1051038
+Node: Extension Sample File Functions1052567
+Node: Extension Sample Fnmatch1060216
+Node: Extension Sample Fork1061703
+Node: Extension Sample Inplace1062921
+Node: Extension Sample Ord1066131
+Node: Extension Sample Readdir1066967
+Ref: table-readdir-file-types1067856
+Node: Extension Sample Revout1068661
+Node: Extension Sample Rev2way1069250
+Node: Extension Sample Read write array1069990
+Node: Extension Sample Readfile1071932
+Node: Extension Sample Time1073027
+Node: Extension Sample API Tests1074375
+Node: gawkextlib1074867
+Node: Extension summary1077314
+Node: Extension Exercises1081016
+Node: Language History1082514
+Node: V7/SVR3.11084170
+Node: SVR41086322
+Node: POSIX1087756
+Node: BTL1089135
+Node: POSIX/GNU1089864
+Node: Feature History1095726
+Node: Common Extensions1110096
+Node: Ranges and Locales1111379
+Ref: Ranges and Locales-Footnote-11115995
+Ref: Ranges and Locales-Footnote-21116022
+Ref: Ranges and Locales-Footnote-31116257
+Node: Contributors1116478
+Node: History summary1122038
+Node: Installation1123418
+Node: Gawk Distribution1124362
+Node: Getting1124846
+Node: Extracting1125807
+Node: Distribution contents1127445
+Node: Unix Installation1133530
+Node: Quick Installation1134212
+Node: Shell Startup Files1136626
+Node: Additional Configuration Options1137704
+Node: Configuration Philosophy1139509
+Node: Non-Unix Installation1141878
+Node: PC Installation1142338
+Node: PC Binary Installation1143176
+Node: PC Compiling1143611
+Node: PC Using1144728
+Node: Cygwin1147773
+Node: MSYS1148543
+Node: VMS Installation1149044
+Node: VMS Compilation1149835
+Ref: VMS Compilation-Footnote-11151064
+Node: VMS Dynamic Extensions1151122
+Node: VMS Installation Details1152807
+Node: VMS Running1155060
+Node: VMS GNV1159339
+Node: VMS Old Gawk1160074
+Node: Bugs1160545
+Node: Bug address1161208
+Node: Usenet1163605
+Node: Maintainers1164380
+Node: Other Versions1165756
+Node: Installation summary1172340
+Node: Notes1173375
+Node: Compatibility Mode1174240
+Node: Additions1175022
+Node: Accessing The Source1175947
+Node: Adding Code1177382
+Node: New Ports1183601
+Node: Derived Files1188089
+Ref: Derived Files-Footnote-11193574
+Ref: Derived Files-Footnote-21193609
+Ref: Derived Files-Footnote-31194207
+Node: Future Extensions1194321
+Node: Implementation Limitations1194979
+Node: Extension Design1196162
+Node: Old Extension Problems1197316
+Ref: Old Extension Problems-Footnote-11198834
+Node: Extension New Mechanism Goals1198891
+Ref: Extension New Mechanism Goals-Footnote-11202255
+Node: Extension Other Design Decisions1202444
+Node: Extension Future Growth1204557
+Node: Old Extension Mechanism1205393
+Node: Notes summary1207156
+Node: Basic Concepts1208338
+Node: Basic High Level1209019
+Ref: figure-general-flow1209301
+Ref: figure-process-flow1209986
+Ref: Basic High Level-Footnote-11213287
+Node: Basic Data Typing1213472
+Node: Glossary1216800
+Node: Copying1248747
+Node: GNU Free Documentation License1286286
+Node: Index1311404

End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 2be335bd..bdc64777 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -28923,10 +28923,12 @@ This example would be better done with @code{dcngettext()}:
@example
if (groggy)
message = dcngettext("%d customer disturbing me\n",
- "%d customers disturbing me\n", "adminprog")
+ "%d customers disturbing me\n",
+ ncustomers, "adminprog")
else
message = dcngettext("enjoying %d customer\n",
- "enjoying %d customers\n", "adminprog")
+ "enjoying %d customers\n",
+ ncustomers, "adminprog")
printf(message, ncustomers)
@end example
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index a2f6b3b3..efca7b6e 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -27937,10 +27937,12 @@ This example would be better done with @code{dcngettext()}:
@example
if (groggy)
message = dcngettext("%d customer disturbing me\n",
- "%d customers disturbing me\n", "adminprog")
+ "%d customers disturbing me\n",
+ ncustomers, "adminprog")
else
message = dcngettext("enjoying %d customer\n",
- "enjoying %d customers\n", "adminprog")
+ "enjoying %d customers\n",
+ ncustomers, "adminprog")
printf(message, ncustomers)
@end example