Merge branch 'gawk-4.1-stable'

5 files changed, 359 insertions, 423 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 700275d7..70a7147c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -5,7 +5,9 @@
 2015-05-19         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Bump patch level and modified date.
+	Move to modern version of @image.
 	* texinfo.tex: Update to latest.
+	* array-elements.txt: Remove texinfo commands.
 
 2015-05-18         Arnold D. Robbins     <arnold@skeeve.com>
 
diff --git a/doc/array-elements.txt b/doc/array-elements.txt
index 8906318a..424c1708 100644
--- a/doc/array-elements.txt
+++ b/doc/array-elements.txt
@@ -1,4 +1,4 @@
 +---------+---------+--------+---------+
-|    8    |  "foo"  |   ""   |    30   |    @r{Value}
+|    8    |  "foo"  |   ""   |    30   |    Value
 +---------+---------+--------+---------+
-     0         1         2         3        @r{Index}
+     0         1         2         3        Index
diff --git a/doc/gawk.info b/doc/gawk.info
index 3b174128..6a52baec 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -10944,10 +10944,10 @@ declared.)
 figure-array-elements, conceptually, if the element values are eight,
 '"foo"', '""', and 30.
 
-
-|    8    |  \"foo\"  |   \"\"   |    30   |    @r{Value}
+
+|    8    |  \"foo\"  |   \"\"   |    30   |    Value
 +---------+---------+--------+---------+
-     0         1         2         3        @r{Index}"
+     0         1         2         3        Index"
 
 Figure 8.1: A contiguous array
 
@@ -22821,7 +22821,7 @@ an extension is loaded, 'gawk' passes it a pointer to a 'struct' whose
 fields are function pointers.  This is shown in *note Figure 16.1:
 figure-load-extension.
 
-
+
                          Struct
                          +---+
                          |   |
@@ -22854,7 +22854,7 @@ symbols.  One of these function pointers is to a function for
 "registering" new functions.  This is shown in *note Figure 16.2:
 figure-register-new-function.
 
-
+
 
             +--------------------------------------------+
             |                                            |
@@ -22876,7 +22876,7 @@ function pointer with a name and can then call it, using a defined
 calling convention.  This is shown in *note Figure 16.3:
 figure-call-new-function.
 
-
+
         chdir(\"/path\")                             (*fnptr)(1);
     }
             +--------------------------------------------+
@@ -29571,7 +29571,7 @@ D.1 What a Program Does
 At the most basic level, the job of a program is to process some input
 data and produce results.  See *note Figure D.1: figure-general-flow.
 
-
+
 +------+         /       \\         +---------+
 | Data | -----> < Program > -----> | Results |
 +------+         \\_______/         +---------+"
@@ -29586,7 +29586,7 @@ uses the instructions in your program to process the data.
    When you write a program, it usually consists of the following, very
 basic set of steps, as shown in *note Figure D.2: figure-process-flow.:
 
-
+
 +----------------+           / More \\  No       +----------+
 | Initialization | -------> <  Data  > -------> | Clean Up |
 +----------------+    ^      \\   ?  /           +----------+
@@ -35100,352 +35100,352 @@ Node: Arrays466496
 Node: Array Basics467825
 Node: Array Intro468669
 Ref: figure-array-elements470644
-Ref: Array Intro-Footnote-1473356
-Node: Reference to Elements473484
-Node: Assigning Elements475948
-Node: Array Example476439
-Node: Scanning an Array478198
-Node: Controlling Scanning481222
-Ref: Controlling Scanning-Footnote-1486621
-Node: Numeric Array Subscripts486937
-Node: Uninitialized Subscripts489121
-Node: Delete490740
-Ref: Delete-Footnote-1493492
-Node: Multidimensional493549
-Node: Multiscanning496644
-Node: Arrays of Arrays498235
-Node: Arrays Summary503003
-Node: Functions505096
-Node: Built-in506134
-Node: Calling Built-in507212
-Node: Numeric Functions509208
-Ref: Numeric Functions-Footnote-1514041
-Ref: Numeric Functions-Footnote-2514398
-Ref: Numeric Functions-Footnote-3514446
-Node: String Functions514718
-Ref: String Functions-Footnote-1538226
-Ref: String Functions-Footnote-2538355
-Ref: String Functions-Footnote-3538603
-Node: Gory Details538690
-Ref: table-sub-escapes540481
-Ref: table-sub-proposed542000
-Ref: table-posix-sub543363
-Ref: table-gensub-escapes544904
-Ref: Gory Details-Footnote-1545727
-Node: I/O Functions545878
-Ref: I/O Functions-Footnote-1553099
-Node: Time Functions553247
-Ref: Time Functions-Footnote-1563752
-Ref: Time Functions-Footnote-2563820
-Ref: Time Functions-Footnote-3563978
-Ref: Time Functions-Footnote-4564089
-Ref: Time Functions-Footnote-5564201
-Ref: Time Functions-Footnote-6564428
-Node: Bitwise Functions564694
-Ref: table-bitwise-ops565288
-Ref: Bitwise Functions-Footnote-1569596
-Node: Type Functions569769
-Node: I18N Functions570925
-Node: User-defined572576
-Node: Definition Syntax573381
-Ref: Definition Syntax-Footnote-1579068
-Node: Function Example579139
-Ref: Function Example-Footnote-1582061
-Node: Function Caveats582083
-Node: Calling A Function582601
-Node: Variable Scope583559
-Node: Pass By Value/Reference586553
-Node: Return Statement590052
-Node: Dynamic Typing593031
-Node: Indirect Calls593961
-Ref: Indirect Calls-Footnote-1604212
-Node: Functions Summary604340
-Node: Library Functions607045
-Ref: Library Functions-Footnote-1610654
-Ref: Library Functions-Footnote-2610797
-Node: Library Names610968
-Ref: Library Names-Footnote-1614429
-Ref: Library Names-Footnote-2614652
-Node: General Functions614738
-Node: Strtonum Function615841
-Node: Assert Function618863
-Node: Round Function622189
-Node: Cliff Random Function623730
-Node: Ordinal Functions624746
-Ref: Ordinal Functions-Footnote-1627809
-Ref: Ordinal Functions-Footnote-2628061
-Node: Join Function628271
-Ref: Join Function-Footnote-1630041
-Node: Getlocaltime Function630241
-Node: Readfile Function633985
-Node: Shell Quoting635959
-Node: Data File Management637360
-Node: Filetrans Function637992
-Node: Rewind Function642089
-Node: File Checking643475
-Ref: File Checking-Footnote-1644809
-Node: Empty Files645010
-Node: Ignoring Assigns646989
-Node: Getopt Function648539
-Ref: Getopt Function-Footnote-1660009
-Node: Passwd Functions660209
-Ref: Passwd Functions-Footnote-1669050
-Node: Group Functions669138
-Ref: Group Functions-Footnote-1677037
-Node: Walking Arrays677244
-Node: Library Functions Summary680254
-Node: Library Exercises681660
-Node: Sample Programs682939
-Node: Running Examples683709
-Node: Clones684437
-Node: Cut Program685661
-Node: Egrep Program695382
-Ref: Egrep Program-Footnote-1702894
-Node: Id Program703004
-Node: Split Program706684
-Ref: Split Program-Footnote-1710143
-Node: Tee Program710272
-Node: Uniq Program713062
-Node: Wc Program720488
-Ref: Wc Program-Footnote-1724743
-Node: Miscellaneous Programs724837
-Node: Dupword Program726050
-Node: Alarm Program728080
-Node: Translate Program732935
-Ref: Translate Program-Footnote-1737500
-Node: Labels Program737770
-Ref: Labels Program-Footnote-1741121
-Node: Word Sorting741205
-Node: History Sorting745277
-Node: Extract Program747112
-Node: Simple Sed754643
-Node: Igawk Program757717
-Ref: Igawk Program-Footnote-1772048
-Ref: Igawk Program-Footnote-2772250
-Ref: Igawk Program-Footnote-3772372
-Node: Anagram Program772487
-Node: Signature Program775549
-Node: Programs Summary776796
-Node: Programs Exercises778011
-Ref: Programs Exercises-Footnote-1782140
-Node: Advanced Features782231
-Node: Nondecimal Data784221
-Node: Array Sorting785812
-Node: Controlling Array Traversal786512
-Ref: Controlling Array Traversal-Footnote-1794881
-Node: Array Sorting Functions794999
-Ref: Array Sorting Functions-Footnote-1798886
-Node: Two-way I/O799082
-Ref: Two-way I/O-Footnote-1804033
-Ref: Two-way I/O-Footnote-2804220
-Node: TCP/IP Networking804302
-Node: Profiling807209
-Node: Advanced Features Summary815480
-Node: Internationalization817416
-Node: I18N and L10N818896
-Node: Explaining gettext819583
-Ref: Explaining gettext-Footnote-1824606
-Ref: Explaining gettext-Footnote-2824791
-Node: Programmer i18n824956
-Ref: Programmer i18n-Footnote-1829812
-Node: Translator i18n829861
-Node: String Extraction830655
-Ref: String Extraction-Footnote-1831788
-Node: Printf Ordering831874
-Ref: Printf Ordering-Footnote-1834660
-Node: I18N Portability834724
-Ref: I18N Portability-Footnote-1837180
-Node: I18N Example837243
-Ref: I18N Example-Footnote-1840049
-Node: Gawk I18N840122
-Node: I18N Summary840767
-Node: Debugger842108
-Node: Debugging843130
-Node: Debugging Concepts843571
-Node: Debugging Terms845380
-Node: Awk Debugging847955
-Node: Sample Debugging Session848861
-Node: Debugger Invocation849395
-Node: Finding The Bug850781
-Node: List of Debugger Commands857259
-Node: Breakpoint Control858592
-Node: Debugger Execution Control862286
-Node: Viewing And Changing Data865648
-Node: Execution Stack869022
-Node: Debugger Info870659
-Node: Miscellaneous Debugger Commands874730
-Node: Readline Support879739
-Node: Limitations880635
-Node: Debugging Summary882744
-Node: Arbitrary Precision Arithmetic883917
-Node: Computer Arithmetic885333
-Ref: table-numeric-ranges888924
-Ref: Computer Arithmetic-Footnote-1889646
-Node: Math Definitions889703
-Ref: table-ieee-formats893017
-Ref: Math Definitions-Footnote-1893620
-Node: MPFR features893725
-Node: FP Math Caution895398
-Ref: FP Math Caution-Footnote-1896470
-Node: Inexactness of computations896839
-Node: Inexact representation897799
-Node: Comparing FP Values899159
-Node: Errors accumulate900241
-Node: Getting Accuracy901674
-Node: Try To Round904384
-Node: Setting precision905283
-Ref: table-predefined-precision-strings905980
-Node: Setting the rounding mode907810
-Ref: table-gawk-rounding-modes908184
-Ref: Setting the rounding mode-Footnote-1911592
-Node: Arbitrary Precision Integers911771
-Ref: Arbitrary Precision Integers-Footnote-1916688
-Node: POSIX Floating Point Problems916837
-Ref: POSIX Floating Point Problems-Footnote-1920719
-Node: Floating point summary920757
-Node: Dynamic Extensions922947
-Node: Extension Intro924500
-Node: Plugin License925766
-Node: Extension Mechanism Outline926563
-Ref: figure-load-extension927002
-Ref: figure-register-new-function928567
-Ref: figure-call-new-function929659
-Node: Extension API Description931722
-Node: Extension API Functions Introduction933256
-Node: General Data Types938115
-Ref: General Data Types-Footnote-1944070
-Node: Memory Allocation Functions944369
-Ref: Memory Allocation Functions-Footnote-1947214
-Node: Constructor Functions947313
-Node: Registration Functions949058
-Node: Extension Functions949743
-Node: Exit Callback Functions952042
-Node: Extension Version String953292
-Node: Input Parsers953955
-Node: Output Wrappers963840
-Node: Two-way processors968352
-Node: Printing Messages970616
-Ref: Printing Messages-Footnote-1971692
-Node: Updating 'ERRNO'971845
-Node: Requesting Values972586
-Ref: table-value-types-returned973325
-Node: Accessing Parameters974208
-Node: Symbol Table Access975444
-Node: Symbol table by name975956
-Node: Symbol table by cookie977977
-Ref: Symbol table by cookie-Footnote-1982126
-Node: Cached values982190
-Ref: Cached values-Footnote-1985691
-Node: Array Manipulation985782
-Ref: Array Manipulation-Footnote-1986873
-Node: Array Data Types986910
-Ref: Array Data Types-Footnote-1989568
-Node: Array Functions989660
-Node: Flattening Arrays993519
-Node: Creating Arrays1000427
-Node: Redirection API1005199
-Node: Extension API Variables1008030
-Node: Extension Versioning1008663
-Node: Extension API Informational Variables1010554
-Node: Extension API Boilerplate1011618
-Node: Finding Extensions1015432
-Node: Extension Example1015992
-Node: Internal File Description1016790
-Node: Internal File Ops1020870
-Ref: Internal File Ops-Footnote-11032632
-Node: Using Internal File Ops1032772
-Ref: Using Internal File Ops-Footnote-11035155
-Node: Extension Samples1035430
-Node: Extension Sample File Functions1036959
-Node: Extension Sample Fnmatch1044608
-Node: Extension Sample Fork1046095
-Node: Extension Sample Inplace1047313
-Node: Extension Sample Ord1049399
-Node: Extension Sample Readdir1050235
-Ref: table-readdir-file-types1051124
-Node: Extension Sample Revout1051929
-Node: Extension Sample Rev2way1052518
-Node: Extension Sample Read write array1053258
-Node: Extension Sample Readfile1055200
-Node: Extension Sample Time1056295
-Node: Extension Sample API Tests1057643
-Node: gawkextlib1058135
-Node: Extension summary1060582
-Node: Extension Exercises1064274
-Node: Language History1065771
-Node: V7/SVR3.11067427
-Node: SVR41069580
-Node: POSIX1071014
-Node: BTL1072394
-Node: POSIX/GNU1073124
-Node: Feature History1078963
-Node: Common Extensions1092954
-Node: Ranges and Locales1094237
-Ref: Ranges and Locales-Footnote-11098853
-Ref: Ranges and Locales-Footnote-21098880
-Ref: Ranges and Locales-Footnote-31099115
-Node: Contributors1099336
-Node: History summary1104905
-Node: Installation1106285
-Node: Gawk Distribution1107230
-Node: Getting1107714
-Node: Extracting1108537
-Node: Distribution contents1110175
-Node: Unix Installation1116271
-Node: Quick Installation1116953
-Node: Shell Startup Files1119367
-Node: Additional Configuration Options1120445
-Node: Configuration Philosophy1122250
-Node: Non-Unix Installation1124620
-Node: PC Installation1125078
-Node: PC Binary Installation1126398
-Node: PC Compiling1128250
-Ref: PC Compiling-Footnote-11131274
-Node: PC Testing1131383
-Node: PC Using1132563
-Node: Cygwin1136677
-Node: MSYS1137447
-Node: VMS Installation1137948
-Node: VMS Compilation1138739
-Ref: VMS Compilation-Footnote-11139969
-Node: VMS Dynamic Extensions1140027
-Node: VMS Installation Details1141712
-Node: VMS Running1143965
-Node: VMS GNV1146806
-Node: VMS Old Gawk1147541
-Node: Bugs1148012
-Node: Other Versions1152126
-Node: Installation summary1158600
-Node: Notes1159658
-Node: Compatibility Mode1160523
-Node: Additions1161305
-Node: Accessing The Source1162230
-Node: Adding Code1163666
-Node: New Ports1169821
-Node: Derived Files1174309
-Ref: Derived Files-Footnote-11179794
-Ref: Derived Files-Footnote-21179829
-Ref: Derived Files-Footnote-31180427
-Node: Future Extensions1180541
-Node: Implementation Limitations1181199
-Node: Extension Design1182382
-Node: Old Extension Problems1183536
-Ref: Old Extension Problems-Footnote-11185054
-Node: Extension New Mechanism Goals1185111
-Ref: Extension New Mechanism Goals-Footnote-11188475
-Node: Extension Other Design Decisions1188664
-Node: Extension Future Growth1190777
-Node: Old Extension Mechanism1191613
-Node: Notes summary1193376
-Node: Basic Concepts1194558
-Node: Basic High Level1195239
-Ref: figure-general-flow1195521
-Ref: figure-process-flow1196206
-Ref: Basic High Level-Footnote-11199507
-Node: Basic Data Typing1199692
-Node: Glossary1203020
-Node: Copying1234966
-Node: GNU Free Documentation License1272505
-Node: Index1297623
+Ref: Array Intro-Footnote-1473348
+Node: Reference to Elements473476
+Node: Assigning Elements475940
+Node: Array Example476431
+Node: Scanning an Array478190
+Node: Controlling Scanning481214
+Ref: Controlling Scanning-Footnote-1486613
+Node: Numeric Array Subscripts486929
+Node: Uninitialized Subscripts489113
+Node: Delete490732
+Ref: Delete-Footnote-1493484
+Node: Multidimensional493541
+Node: Multiscanning496636
+Node: Arrays of Arrays498227
+Node: Arrays Summary502995
+Node: Functions505088
+Node: Built-in506126
+Node: Calling Built-in507204
+Node: Numeric Functions509200
+Ref: Numeric Functions-Footnote-1514033
+Ref: Numeric Functions-Footnote-2514390
+Ref: Numeric Functions-Footnote-3514438
+Node: String Functions514710
+Ref: String Functions-Footnote-1538218
+Ref: String Functions-Footnote-2538347
+Ref: String Functions-Footnote-3538595
+Node: Gory Details538682
+Ref: table-sub-escapes540473
+Ref: table-sub-proposed541992
+Ref: table-posix-sub543355
+Ref: table-gensub-escapes544896
+Ref: Gory Details-Footnote-1545719
+Node: I/O Functions545870
+Ref: I/O Functions-Footnote-1553091
+Node: Time Functions553239
+Ref: Time Functions-Footnote-1563744
+Ref: Time Functions-Footnote-2563812
+Ref: Time Functions-Footnote-3563970
+Ref: Time Functions-Footnote-4564081
+Ref: Time Functions-Footnote-5564193
+Ref: Time Functions-Footnote-6564420
+Node: Bitwise Functions564686
+Ref: table-bitwise-ops565280
+Ref: Bitwise Functions-Footnote-1569588
+Node: Type Functions569761
+Node: I18N Functions570917
+Node: User-defined572568
+Node: Definition Syntax573373
+Ref: Definition Syntax-Footnote-1579060
+Node: Function Example579131
+Ref: Function Example-Footnote-1582053
+Node: Function Caveats582075
+Node: Calling A Function582593
+Node: Variable Scope583551
+Node: Pass By Value/Reference586545
+Node: Return Statement590044
+Node: Dynamic Typing593023
+Node: Indirect Calls593953
+Ref: Indirect Calls-Footnote-1604204
+Node: Functions Summary604332
+Node: Library Functions607037
+Ref: Library Functions-Footnote-1610646
+Ref: Library Functions-Footnote-2610789
+Node: Library Names610960
+Ref: Library Names-Footnote-1614421
+Ref: Library Names-Footnote-2614644
+Node: General Functions614730
+Node: Strtonum Function615833
+Node: Assert Function618855
+Node: Round Function622181
+Node: Cliff Random Function623722
+Node: Ordinal Functions624738
+Ref: Ordinal Functions-Footnote-1627801
+Ref: Ordinal Functions-Footnote-2628053
+Node: Join Function628263
+Ref: Join Function-Footnote-1630033
+Node: Getlocaltime Function630233
+Node: Readfile Function633977
+Node: Shell Quoting635951
+Node: Data File Management637352
+Node: Filetrans Function637984
+Node: Rewind Function642081
+Node: File Checking643467
+Ref: File Checking-Footnote-1644801
+Node: Empty Files645002
+Node: Ignoring Assigns646981
+Node: Getopt Function648531
+Ref: Getopt Function-Footnote-1660001
+Node: Passwd Functions660201
+Ref: Passwd Functions-Footnote-1669042
+Node: Group Functions669130
+Ref: Group Functions-Footnote-1677029
+Node: Walking Arrays677236
+Node: Library Functions Summary680246
+Node: Library Exercises681652
+Node: Sample Programs682931
+Node: Running Examples683701
+Node: Clones684429
+Node: Cut Program685653
+Node: Egrep Program695374
+Ref: Egrep Program-Footnote-1702886
+Node: Id Program702996
+Node: Split Program706676
+Ref: Split Program-Footnote-1710135
+Node: Tee Program710264
+Node: Uniq Program713054
+Node: Wc Program720480
+Ref: Wc Program-Footnote-1724735
+Node: Miscellaneous Programs724829
+Node: Dupword Program726042
+Node: Alarm Program728072
+Node: Translate Program732927
+Ref: Translate Program-Footnote-1737492
+Node: Labels Program737762
+Ref: Labels Program-Footnote-1741113
+Node: Word Sorting741197
+Node: History Sorting745269
+Node: Extract Program747104
+Node: Simple Sed754635
+Node: Igawk Program757709
+Ref: Igawk Program-Footnote-1772040
+Ref: Igawk Program-Footnote-2772242
+Ref: Igawk Program-Footnote-3772364
+Node: Anagram Program772479
+Node: Signature Program775541
+Node: Programs Summary776788
+Node: Programs Exercises778003
+Ref: Programs Exercises-Footnote-1782132
+Node: Advanced Features782223
+Node: Nondecimal Data784213
+Node: Array Sorting785804
+Node: Controlling Array Traversal786504
+Ref: Controlling Array Traversal-Footnote-1794873
+Node: Array Sorting Functions794991
+Ref: Array Sorting Functions-Footnote-1798878
+Node: Two-way I/O799074
+Ref: Two-way I/O-Footnote-1804025
+Ref: Two-way I/O-Footnote-2804212
+Node: TCP/IP Networking804294
+Node: Profiling807201
+Node: Advanced Features Summary815472
+Node: Internationalization817408
+Node: I18N and L10N818888
+Node: Explaining gettext819575
+Ref: Explaining gettext-Footnote-1824598
+Ref: Explaining gettext-Footnote-2824783
+Node: Programmer i18n824948
+Ref: Programmer i18n-Footnote-1829804
+Node: Translator i18n829853
+Node: String Extraction830647
+Ref: String Extraction-Footnote-1831780
+Node: Printf Ordering831866
+Ref: Printf Ordering-Footnote-1834652
+Node: I18N Portability834716
+Ref: I18N Portability-Footnote-1837172
+Node: I18N Example837235
+Ref: I18N Example-Footnote-1840041
+Node: Gawk I18N840114
+Node: I18N Summary840759
+Node: Debugger842100
+Node: Debugging843122
+Node: Debugging Concepts843563
+Node: Debugging Terms845372
+Node: Awk Debugging847947
+Node: Sample Debugging Session848853
+Node: Debugger Invocation849387
+Node: Finding The Bug850773
+Node: List of Debugger Commands857251
+Node: Breakpoint Control858584
+Node: Debugger Execution Control862278
+Node: Viewing And Changing Data865640
+Node: Execution Stack869014
+Node: Debugger Info870651
+Node: Miscellaneous Debugger Commands874722
+Node: Readline Support879731
+Node: Limitations880627
+Node: Debugging Summary882736
+Node: Arbitrary Precision Arithmetic883909
+Node: Computer Arithmetic885325
+Ref: table-numeric-ranges888916
+Ref: Computer Arithmetic-Footnote-1889638
+Node: Math Definitions889695
+Ref: table-ieee-formats893009
+Ref: Math Definitions-Footnote-1893612
+Node: MPFR features893717
+Node: FP Math Caution895390
+Ref: FP Math Caution-Footnote-1896462
+Node: Inexactness of computations896831
+Node: Inexact representation897791
+Node: Comparing FP Values899151
+Node: Errors accumulate900233
+Node: Getting Accuracy901666
+Node: Try To Round904376
+Node: Setting precision905275
+Ref: table-predefined-precision-strings905972
+Node: Setting the rounding mode907802
+Ref: table-gawk-rounding-modes908176
+Ref: Setting the rounding mode-Footnote-1911584
+Node: Arbitrary Precision Integers911763
+Ref: Arbitrary Precision Integers-Footnote-1916680
+Node: POSIX Floating Point Problems916829
+Ref: POSIX Floating Point Problems-Footnote-1920711
+Node: Floating point summary920749
+Node: Dynamic Extensions922939
+Node: Extension Intro924492
+Node: Plugin License925758
+Node: Extension Mechanism Outline926555
+Ref: figure-load-extension926994
+Ref: figure-register-new-function928559
+Ref: figure-call-new-function929651
+Node: Extension API Description931714
+Node: Extension API Functions Introduction933248
+Node: General Data Types938107
+Ref: General Data Types-Footnote-1944062
+Node: Memory Allocation Functions944361
+Ref: Memory Allocation Functions-Footnote-1947206
+Node: Constructor Functions947305
+Node: Registration Functions949050
+Node: Extension Functions949735
+Node: Exit Callback Functions952034
+Node: Extension Version String953284
+Node: Input Parsers953947
+Node: Output Wrappers963832
+Node: Two-way processors968344
+Node: Printing Messages970608
+Ref: Printing Messages-Footnote-1971684
+Node: Updating 'ERRNO'971837
+Node: Requesting Values972578
+Ref: table-value-types-returned973317
+Node: Accessing Parameters974200
+Node: Symbol Table Access975436
+Node: Symbol table by name975948
+Node: Symbol table by cookie977969
+Ref: Symbol table by cookie-Footnote-1982118
+Node: Cached values982182
+Ref: Cached values-Footnote-1985683
+Node: Array Manipulation985774
+Ref: Array Manipulation-Footnote-1986865
+Node: Array Data Types986902
+Ref: Array Data Types-Footnote-1989560
+Node: Array Functions989652
+Node: Flattening Arrays993511
+Node: Creating Arrays1000419
+Node: Redirection API1005191
+Node: Extension API Variables1008022
+Node: Extension Versioning1008655
+Node: Extension API Informational Variables1010546
+Node: Extension API Boilerplate1011610
+Node: Finding Extensions1015424
+Node: Extension Example1015984
+Node: Internal File Description1016782
+Node: Internal File Ops1020862
+Ref: Internal File Ops-Footnote-11032624
+Node: Using Internal File Ops1032764
+Ref: Using Internal File Ops-Footnote-11035147
+Node: Extension Samples1035422
+Node: Extension Sample File Functions1036951
+Node: Extension Sample Fnmatch1044600
+Node: Extension Sample Fork1046087
+Node: Extension Sample Inplace1047305
+Node: Extension Sample Ord1049391
+Node: Extension Sample Readdir1050227
+Ref: table-readdir-file-types1051116
+Node: Extension Sample Revout1051921
+Node: Extension Sample Rev2way1052510
+Node: Extension Sample Read write array1053250
+Node: Extension Sample Readfile1055192
+Node: Extension Sample Time1056287
+Node: Extension Sample API Tests1057635
+Node: gawkextlib1058127
+Node: Extension summary1060574
+Node: Extension Exercises1064266
+Node: Language History1065763
+Node: V7/SVR3.11067419
+Node: SVR41069572
+Node: POSIX1071006
+Node: BTL1072386
+Node: POSIX/GNU1073116
+Node: Feature History1078955
+Node: Common Extensions1092946
+Node: Ranges and Locales1094229
+Ref: Ranges and Locales-Footnote-11098845
+Ref: Ranges and Locales-Footnote-21098872
+Ref: Ranges and Locales-Footnote-31099107
+Node: Contributors1099328
+Node: History summary1104897
+Node: Installation1106277
+Node: Gawk Distribution1107222
+Node: Getting1107706
+Node: Extracting1108529
+Node: Distribution contents1110167
+Node: Unix Installation1116263
+Node: Quick Installation1116945
+Node: Shell Startup Files1119359
+Node: Additional Configuration Options1120437
+Node: Configuration Philosophy1122242
+Node: Non-Unix Installation1124612
+Node: PC Installation1125070
+Node: PC Binary Installation1126390
+Node: PC Compiling1128242
+Ref: PC Compiling-Footnote-11131266
+Node: PC Testing1131375
+Node: PC Using1132555
+Node: Cygwin1136669
+Node: MSYS1137439
+Node: VMS Installation1137940
+Node: VMS Compilation1138731
+Ref: VMS Compilation-Footnote-11139961
+Node: VMS Dynamic Extensions1140019
+Node: VMS Installation Details1141704
+Node: VMS Running1143957
+Node: VMS GNV1146798
+Node: VMS Old Gawk1147533
+Node: Bugs1148004
+Node: Other Versions1152118
+Node: Installation summary1158592
+Node: Notes1159650
+Node: Compatibility Mode1160515
+Node: Additions1161297
+Node: Accessing The Source1162222
+Node: Adding Code1163658
+Node: New Ports1169813
+Node: Derived Files1174301
+Ref: Derived Files-Footnote-11179786
+Ref: Derived Files-Footnote-21179821
+Ref: Derived Files-Footnote-31180419
+Node: Future Extensions1180533
+Node: Implementation Limitations1181191
+Node: Extension Design1182374
+Node: Old Extension Problems1183528
+Ref: Old Extension Problems-Footnote-11185046
+Node: Extension New Mechanism Goals1185103
+Ref: Extension New Mechanism Goals-Footnote-11188467
+Node: Extension Other Design Decisions1188656
+Node: Extension Future Growth1190769
+Node: Old Extension Mechanism1191605
+Node: Notes summary1193368
+Node: Basic Concepts1194550
+Node: Basic High Level1195231
+Ref: figure-general-flow1195513
+Ref: figure-process-flow1196198
+Ref: Basic High Level-Footnote-11199499
+Node: Basic Data Typing1199684
+Node: Glossary1203012
+Node: Copying1234958
+Node: GNU Free Documentation License1272497
+Node: Index1297615
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index a03b0bd7..9d1d88f6 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -15698,12 +15698,7 @@ conceptually, if the element values are eight, @code{"foo"},
 @ifnotdocbook
 @float Figure,figure-array-elements
 @caption{A contiguous array}
-@ifinfo
-@center @image{array-elements, , , A Contiguous Array, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{array-elements, , , A Contiguous Array}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -31532,15 +31527,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-extension"/>}.
 @ifnotdocbook
 @float Figure,figure-load-extension
 @caption{Loading the extension}
-@c FIXME: One day, it should not be necessary to have two cases,
-@c but rather just the one without the "txt" final argument.
-@c This applies to the other figures as well.
-@ifinfo
-@center @image{api-figure1, , , Loading the extension, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{api-figure1, , , Loading the extension}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -31567,12 +31554,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-register-new-function
 @ifnotdocbook
 @float Figure,figure-register-new-function
 @caption{Registering a new function}
-@ifinfo
-@center @image{api-figure2, , , Registering a new Function, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{api-figure2, , , Registering a new Function}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -31600,12 +31582,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-call-new-function"/>}
 @ifnotdocbook
 @float Figure,figure-call-new-function
 @caption{Calling the new function}
-@ifinfo
-@center @image{api-figure3, , , Calling the new function, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{api-figure3, , , Calling the new function}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -39992,12 +39969,7 @@ See @inlineraw{docbook, <xref linkend="figure-general-flow"/>}.
 @ifnotdocbook
 @float Figure,figure-general-flow
 @caption{General Program Flow}
-@ifinfo
-@center @image{general-program, , , General program flow, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{general-program, , , General program flow}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -40035,12 +40007,7 @@ as shown in @inlineraw{docbook, <xref linkend="figure-process-flow"/>}:
 @ifnotdocbook
 @float Figure,figure-process-flow
 @caption{Basic Program Steps}
-@ifinfo
-@center @image{process-flow, , , Basic Program Stages, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{process-flow, , , Basic Program Stages}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 49dce544..c55557a2 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -14980,12 +14980,7 @@ conceptually, if the element values are eight, @code{"foo"},
 @ifnotdocbook
 @float Figure,figure-array-elements
 @caption{A contiguous array}
-@ifinfo
-@center @image{array-elements, , , A Contiguous Array, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{array-elements, , , A Contiguous Array}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -30623,15 +30618,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-extension"/>}.
 @ifnotdocbook
 @float Figure,figure-load-extension
 @caption{Loading the extension}
-@c FIXME: One day, it should not be necessary to have two cases,
-@c but rather just the one without the "txt" final argument.
-@c This applies to the other figures as well.
-@ifinfo
-@center @image{api-figure1, , , Loading the extension, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{api-figure1, , , Loading the extension}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -30658,12 +30645,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-register-new-function
 @ifnotdocbook
 @float Figure,figure-register-new-function
 @caption{Registering a new function}
-@ifinfo
-@center @image{api-figure2, , , Registering a new Function, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{api-figure2, , , Registering a new Function}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -30691,12 +30673,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-call-new-function"/>}
 @ifnotdocbook
 @float Figure,figure-call-new-function
 @caption{Calling the new function}
-@ifinfo
-@center @image{api-figure3, , , Calling the new function, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{api-figure3, , , Calling the new function}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -39083,12 +39060,7 @@ See @inlineraw{docbook, <xref linkend="figure-general-flow"/>}.
 @ifnotdocbook
 @float Figure,figure-general-flow
 @caption{General Program Flow}
-@ifinfo
-@center @image{general-program, , , General program flow, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{general-program, , , General program flow}
-@end ifnotinfo
 @end float
 @end ifnotdocbook
 
@@ -39126,12 +39098,7 @@ as shown in @inlineraw{docbook, <xref linkend="figure-process-flow"/>}:
 @ifnotdocbook
 @float Figure,figure-process-flow
 @caption{Basic Program Steps}
-@ifinfo
-@center @image{process-flow, , , Basic Program Stages, txt}
-@end ifinfo
-@ifnotinfo
 @center @image{process-flow, , , Basic Program Stages}
-@end ifnotinfo
 @end float
 @end ifnotdocbook