Use modern @image, fix a .txt image file.

5 files changed, 357 insertions, 421 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e4db0d0f..f554d30a 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 f6f107b1..1991a3b7 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -10813,10 +10813,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
 
@@ -22604,7 +22604,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
                          +---+
                          |   |
@@ -22637,7 +22637,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.
 
-
+
 
             +--------------------------------------------+
             |                                            |
@@ -22659,7 +22659,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);
     }
             +--------------------------------------------+
@@ -29208,7 +29208,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 |
 +------+         \\_______/         +---------+"
@@ -29223,7 +29223,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 |
 +----------------+    ^      \\   ?  /           +----------+
@@ -34724,350 +34724,350 @@ Node: Arrays460633
 Node: Array Basics461962
 Node: Array Intro462806
 Ref: figure-array-elements464781
-Ref: Array Intro-Footnote-1467493
-Node: Reference to Elements467621
-Node: Assigning Elements470085
-Node: Array Example470576
-Node: Scanning an Array472335
-Node: Controlling Scanning475359
-Ref: Controlling Scanning-Footnote-1480758
-Node: Numeric Array Subscripts481074
-Node: Uninitialized Subscripts483258
-Node: Delete484877
-Ref: Delete-Footnote-1487629
-Node: Multidimensional487686
-Node: Multiscanning490781
-Node: Arrays of Arrays492372
-Node: Arrays Summary497140
-Node: Functions499233
-Node: Built-in500271
-Node: Calling Built-in501349
-Node: Numeric Functions503345
-Ref: Numeric Functions-Footnote-1507373
-Ref: Numeric Functions-Footnote-2507730
-Ref: Numeric Functions-Footnote-3507778
-Node: String Functions508050
-Ref: String Functions-Footnote-1531558
-Ref: String Functions-Footnote-2531687
-Ref: String Functions-Footnote-3531935
-Node: Gory Details532022
-Ref: table-sub-escapes533813
-Ref: table-sub-proposed535332
-Ref: table-posix-sub536695
-Ref: table-gensub-escapes538236
-Ref: Gory Details-Footnote-1539059
-Node: I/O Functions539210
-Ref: I/O Functions-Footnote-1546431
-Node: Time Functions546579
-Ref: Time Functions-Footnote-1557084
-Ref: Time Functions-Footnote-2557152
-Ref: Time Functions-Footnote-3557310
-Ref: Time Functions-Footnote-4557421
-Ref: Time Functions-Footnote-5557533
-Ref: Time Functions-Footnote-6557760
-Node: Bitwise Functions558026
-Ref: table-bitwise-ops558620
-Ref: Bitwise Functions-Footnote-1562928
-Node: Type Functions563101
-Node: I18N Functions564257
-Node: User-defined565908
-Node: Definition Syntax566713
-Ref: Definition Syntax-Footnote-1572400
-Node: Function Example572471
-Ref: Function Example-Footnote-1575393
-Node: Function Caveats575415
-Node: Calling A Function575933
-Node: Variable Scope576891
-Node: Pass By Value/Reference579885
-Node: Return Statement583384
-Node: Dynamic Typing586363
-Node: Indirect Calls587293
-Ref: Indirect Calls-Footnote-1597544
-Node: Functions Summary597672
-Node: Library Functions600377
-Ref: Library Functions-Footnote-1603986
-Ref: Library Functions-Footnote-2604129
-Node: Library Names604300
-Ref: Library Names-Footnote-1607761
-Ref: Library Names-Footnote-2607984
-Node: General Functions608070
-Node: Strtonum Function609173
-Node: Assert Function612195
-Node: Round Function615521
-Node: Cliff Random Function617062
-Node: Ordinal Functions618078
-Ref: Ordinal Functions-Footnote-1621141
-Ref: Ordinal Functions-Footnote-2621393
-Node: Join Function621603
-Ref: Join Function-Footnote-1623373
-Node: Getlocaltime Function623573
-Node: Readfile Function627317
-Node: Shell Quoting629291
-Node: Data File Management630692
-Node: Filetrans Function631324
-Node: Rewind Function635421
-Node: File Checking636807
-Ref: File Checking-Footnote-1638141
-Node: Empty Files638342
-Node: Ignoring Assigns640321
-Node: Getopt Function641871
-Ref: Getopt Function-Footnote-1653341
-Node: Passwd Functions653541
-Ref: Passwd Functions-Footnote-1662382
-Node: Group Functions662470
-Ref: Group Functions-Footnote-1670369
-Node: Walking Arrays670576
-Node: Library Functions Summary673586
-Node: Library Exercises674992
-Node: Sample Programs676271
-Node: Running Examples677041
-Node: Clones677769
-Node: Cut Program678993
-Node: Egrep Program688714
-Ref: Egrep Program-Footnote-1696226
-Node: Id Program696336
-Node: Split Program700016
-Ref: Split Program-Footnote-1703475
-Node: Tee Program703604
-Node: Uniq Program706394
-Node: Wc Program713820
-Ref: Wc Program-Footnote-1718075
-Node: Miscellaneous Programs718169
-Node: Dupword Program719382
-Node: Alarm Program721412
-Node: Translate Program726267
-Ref: Translate Program-Footnote-1730832
-Node: Labels Program731102
-Ref: Labels Program-Footnote-1734453
-Node: Word Sorting734537
-Node: History Sorting738609
-Node: Extract Program740444
-Node: Simple Sed747975
-Node: Igawk Program751049
-Ref: Igawk Program-Footnote-1765380
-Ref: Igawk Program-Footnote-2765582
-Ref: Igawk Program-Footnote-3765704
-Node: Anagram Program765819
-Node: Signature Program768881
-Node: Programs Summary770128
-Node: Programs Exercises771343
-Ref: Programs Exercises-Footnote-1775472
-Node: Advanced Features775563
-Node: Nondecimal Data777553
-Node: Array Sorting779144
-Node: Controlling Array Traversal779844
-Ref: Controlling Array Traversal-Footnote-1788213
-Node: Array Sorting Functions788331
-Ref: Array Sorting Functions-Footnote-1792218
-Node: Two-way I/O792414
-Ref: Two-way I/O-Footnote-1797365
-Ref: Two-way I/O-Footnote-2797552
-Node: TCP/IP Networking797634
-Node: Profiling800541
-Node: Advanced Features Summary808080
-Node: Internationalization810016
-Node: I18N and L10N811496
-Node: Explaining gettext812183
-Ref: Explaining gettext-Footnote-1817206
-Ref: Explaining gettext-Footnote-2817391
-Node: Programmer i18n817556
-Ref: Programmer i18n-Footnote-1822412
-Node: Translator i18n822461
-Node: String Extraction823255
-Ref: String Extraction-Footnote-1824388
-Node: Printf Ordering824474
-Ref: Printf Ordering-Footnote-1827260
-Node: I18N Portability827324
-Ref: I18N Portability-Footnote-1829780
-Node: I18N Example829843
-Ref: I18N Example-Footnote-1832649
-Node: Gawk I18N832722
-Node: I18N Summary833367
-Node: Debugger834708
-Node: Debugging835730
-Node: Debugging Concepts836171
-Node: Debugging Terms837980
-Node: Awk Debugging840555
-Node: Sample Debugging Session841461
-Node: Debugger Invocation841995
-Node: Finding The Bug843381
-Node: List of Debugger Commands849859
-Node: Breakpoint Control851192
-Node: Debugger Execution Control854886
-Node: Viewing And Changing Data858248
-Node: Execution Stack861622
-Node: Debugger Info863259
-Node: Miscellaneous Debugger Commands867330
-Node: Readline Support872339
-Node: Limitations873235
-Node: Debugging Summary875344
-Node: Arbitrary Precision Arithmetic876517
-Node: Computer Arithmetic877933
-Ref: table-numeric-ranges881524
-Ref: Computer Arithmetic-Footnote-1882246
-Node: Math Definitions882303
-Ref: table-ieee-formats885617
-Ref: Math Definitions-Footnote-1886220
-Node: MPFR features886325
-Node: FP Math Caution887998
-Ref: FP Math Caution-Footnote-1889070
-Node: Inexactness of computations889439
-Node: Inexact representation890399
-Node: Comparing FP Values891759
-Node: Errors accumulate892841
-Node: Getting Accuracy894274
-Node: Try To Round896984
-Node: Setting precision897883
-Ref: table-predefined-precision-strings898580
-Node: Setting the rounding mode900410
-Ref: table-gawk-rounding-modes900784
-Ref: Setting the rounding mode-Footnote-1904192
-Node: Arbitrary Precision Integers904371
-Ref: Arbitrary Precision Integers-Footnote-1907355
-Node: POSIX Floating Point Problems907504
-Ref: POSIX Floating Point Problems-Footnote-1911386
-Node: Floating point summary911424
-Node: Dynamic Extensions913614
-Node: Extension Intro915167
-Node: Plugin License916433
-Node: Extension Mechanism Outline917230
-Ref: figure-load-extension917669
-Ref: figure-register-new-function919234
-Ref: figure-call-new-function920326
-Node: Extension API Description922389
-Node: Extension API Functions Introduction923839
-Node: General Data Types928651
-Ref: General Data Types-Footnote-1934606
-Node: Memory Allocation Functions934905
-Ref: Memory Allocation Functions-Footnote-1937750
-Node: Constructor Functions937849
-Node: Registration Functions939594
-Node: Extension Functions940279
-Node: Exit Callback Functions942578
-Node: Extension Version String943828
-Node: Input Parsers944491
-Node: Output Wrappers954376
-Node: Two-way processors958888
-Node: Printing Messages961152
-Ref: Printing Messages-Footnote-1962228
-Node: Updating 'ERRNO'962381
-Node: Requesting Values963122
-Ref: table-value-types-returned963861
-Node: Accessing Parameters964744
-Node: Symbol Table Access965980
-Node: Symbol table by name966492
-Node: Symbol table by cookie968513
-Ref: Symbol table by cookie-Footnote-1972662
-Node: Cached values972726
-Ref: Cached values-Footnote-1976227
-Node: Array Manipulation976318
-Ref: Array Manipulation-Footnote-1977417
-Node: Array Data Types977454
-Ref: Array Data Types-Footnote-1980112
-Node: Array Functions980204
-Node: Flattening Arrays984063
-Node: Creating Arrays990971
-Node: Extension API Variables995743
-Node: Extension Versioning996379
-Node: Extension API Informational Variables998270
-Node: Extension API Boilerplate999334
-Node: Finding Extensions1003148
-Node: Extension Example1003708
-Node: Internal File Description1004506
-Node: Internal File Ops1008586
-Ref: Internal File Ops-Footnote-11020348
-Node: Using Internal File Ops1020488
-Ref: Using Internal File Ops-Footnote-11022871
-Node: Extension Samples1023146
-Node: Extension Sample File Functions1024675
-Node: Extension Sample Fnmatch1032324
-Node: Extension Sample Fork1033811
-Node: Extension Sample Inplace1035029
-Node: Extension Sample Ord1037115
-Node: Extension Sample Readdir1037951
-Ref: table-readdir-file-types1038840
-Node: Extension Sample Revout1039645
-Node: Extension Sample Rev2way1040234
-Node: Extension Sample Read write array1040974
-Node: Extension Sample Readfile1042916
-Node: Extension Sample Time1044011
-Node: Extension Sample API Tests1045359
-Node: gawkextlib1045851
-Node: Extension summary1048275
-Node: Extension Exercises1051967
-Node: Language History1053464
-Node: V7/SVR3.11055120
-Node: SVR41057273
-Node: POSIX1058707
-Node: BTL1060087
-Node: POSIX/GNU1060817
-Node: Feature History1066338
-Node: Common Extensions1079668
-Node: Ranges and Locales1080951
-Ref: Ranges and Locales-Footnote-11085567
-Ref: Ranges and Locales-Footnote-21085594
-Ref: Ranges and Locales-Footnote-31085829
-Node: Contributors1086050
-Node: History summary1091619
-Node: Installation1092999
-Node: Gawk Distribution1093944
-Node: Getting1094428
-Node: Extracting1095251
-Node: Distribution contents1096889
-Node: Unix Installation1102642
-Node: Quick Installation1103258
-Node: Additional Configuration Options1105685
-Node: Configuration Philosophy1107489
-Node: Non-Unix Installation1109859
-Node: PC Installation1110317
-Node: PC Binary Installation1111637
-Node: PC Compiling1113489
-Ref: PC Compiling-Footnote-11116513
-Node: PC Testing1116622
-Node: PC Using1117802
-Node: Cygwin1121916
-Node: MSYS1122686
-Node: VMS Installation1123187
-Node: VMS Compilation1123978
-Ref: VMS Compilation-Footnote-11125208
-Node: VMS Dynamic Extensions1125266
-Node: VMS Installation Details1126951
-Node: VMS Running1129204
-Node: VMS GNV1132045
-Node: VMS Old Gawk1132780
-Node: Bugs1133251
-Node: Other Versions1137365
-Node: Installation summary1143839
-Node: Notes1144897
-Node: Compatibility Mode1145762
-Node: Additions1146544
-Node: Accessing The Source1147469
-Node: Adding Code1148905
-Node: New Ports1155060
-Node: Derived Files1159548
-Ref: Derived Files-Footnote-11165033
-Ref: Derived Files-Footnote-21165068
-Ref: Derived Files-Footnote-31165666
-Node: Future Extensions1165780
-Node: Implementation Limitations1166438
-Node: Extension Design1167621
-Node: Old Extension Problems1168775
-Ref: Old Extension Problems-Footnote-11170293
-Node: Extension New Mechanism Goals1170350
-Ref: Extension New Mechanism Goals-Footnote-11173714
-Node: Extension Other Design Decisions1173903
-Node: Extension Future Growth1176016
-Node: Old Extension Mechanism1176852
-Node: Notes summary1178615
-Node: Basic Concepts1179797
-Node: Basic High Level1180478
-Ref: figure-general-flow1180760
-Ref: figure-process-flow1181445
-Ref: Basic High Level-Footnote-11184746
-Node: Basic Data Typing1184931
-Node: Glossary1188259
-Node: Copying1220205
-Node: GNU Free Documentation License1257744
-Node: Index1282862
+Ref: Array Intro-Footnote-1467485
+Node: Reference to Elements467613
+Node: Assigning Elements470077
+Node: Array Example470568
+Node: Scanning an Array472327
+Node: Controlling Scanning475351
+Ref: Controlling Scanning-Footnote-1480750
+Node: Numeric Array Subscripts481066
+Node: Uninitialized Subscripts483250
+Node: Delete484869
+Ref: Delete-Footnote-1487621
+Node: Multidimensional487678
+Node: Multiscanning490773
+Node: Arrays of Arrays492364
+Node: Arrays Summary497132
+Node: Functions499225
+Node: Built-in500263
+Node: Calling Built-in501341
+Node: Numeric Functions503337
+Ref: Numeric Functions-Footnote-1507365
+Ref: Numeric Functions-Footnote-2507722
+Ref: Numeric Functions-Footnote-3507770
+Node: String Functions508042
+Ref: String Functions-Footnote-1531550
+Ref: String Functions-Footnote-2531679
+Ref: String Functions-Footnote-3531927
+Node: Gory Details532014
+Ref: table-sub-escapes533805
+Ref: table-sub-proposed535324
+Ref: table-posix-sub536687
+Ref: table-gensub-escapes538228
+Ref: Gory Details-Footnote-1539051
+Node: I/O Functions539202
+Ref: I/O Functions-Footnote-1546423
+Node: Time Functions546571
+Ref: Time Functions-Footnote-1557076
+Ref: Time Functions-Footnote-2557144
+Ref: Time Functions-Footnote-3557302
+Ref: Time Functions-Footnote-4557413
+Ref: Time Functions-Footnote-5557525
+Ref: Time Functions-Footnote-6557752
+Node: Bitwise Functions558018
+Ref: table-bitwise-ops558612
+Ref: Bitwise Functions-Footnote-1562920
+Node: Type Functions563093
+Node: I18N Functions564249
+Node: User-defined565900
+Node: Definition Syntax566705
+Ref: Definition Syntax-Footnote-1572392
+Node: Function Example572463
+Ref: Function Example-Footnote-1575385
+Node: Function Caveats575407
+Node: Calling A Function575925
+Node: Variable Scope576883
+Node: Pass By Value/Reference579877
+Node: Return Statement583376
+Node: Dynamic Typing586355
+Node: Indirect Calls587285
+Ref: Indirect Calls-Footnote-1597536
+Node: Functions Summary597664
+Node: Library Functions600369
+Ref: Library Functions-Footnote-1603978
+Ref: Library Functions-Footnote-2604121
+Node: Library Names604292
+Ref: Library Names-Footnote-1607753
+Ref: Library Names-Footnote-2607976
+Node: General Functions608062
+Node: Strtonum Function609165
+Node: Assert Function612187
+Node: Round Function615513
+Node: Cliff Random Function617054
+Node: Ordinal Functions618070
+Ref: Ordinal Functions-Footnote-1621133
+Ref: Ordinal Functions-Footnote-2621385
+Node: Join Function621595
+Ref: Join Function-Footnote-1623365
+Node: Getlocaltime Function623565
+Node: Readfile Function627309
+Node: Shell Quoting629283
+Node: Data File Management630684
+Node: Filetrans Function631316
+Node: Rewind Function635413
+Node: File Checking636799
+Ref: File Checking-Footnote-1638133
+Node: Empty Files638334
+Node: Ignoring Assigns640313
+Node: Getopt Function641863
+Ref: Getopt Function-Footnote-1653333
+Node: Passwd Functions653533
+Ref: Passwd Functions-Footnote-1662374
+Node: Group Functions662462
+Ref: Group Functions-Footnote-1670361
+Node: Walking Arrays670568
+Node: Library Functions Summary673578
+Node: Library Exercises674984
+Node: Sample Programs676263
+Node: Running Examples677033
+Node: Clones677761
+Node: Cut Program678985
+Node: Egrep Program688706
+Ref: Egrep Program-Footnote-1696218
+Node: Id Program696328
+Node: Split Program700008
+Ref: Split Program-Footnote-1703467
+Node: Tee Program703596
+Node: Uniq Program706386
+Node: Wc Program713812
+Ref: Wc Program-Footnote-1718067
+Node: Miscellaneous Programs718161
+Node: Dupword Program719374
+Node: Alarm Program721404
+Node: Translate Program726259
+Ref: Translate Program-Footnote-1730824
+Node: Labels Program731094
+Ref: Labels Program-Footnote-1734445
+Node: Word Sorting734529
+Node: History Sorting738601
+Node: Extract Program740436
+Node: Simple Sed747967
+Node: Igawk Program751041
+Ref: Igawk Program-Footnote-1765372
+Ref: Igawk Program-Footnote-2765574
+Ref: Igawk Program-Footnote-3765696
+Node: Anagram Program765811
+Node: Signature Program768873
+Node: Programs Summary770120
+Node: Programs Exercises771335
+Ref: Programs Exercises-Footnote-1775464
+Node: Advanced Features775555
+Node: Nondecimal Data777545
+Node: Array Sorting779136
+Node: Controlling Array Traversal779836
+Ref: Controlling Array Traversal-Footnote-1788205
+Node: Array Sorting Functions788323
+Ref: Array Sorting Functions-Footnote-1792210
+Node: Two-way I/O792406
+Ref: Two-way I/O-Footnote-1797357
+Ref: Two-way I/O-Footnote-2797544
+Node: TCP/IP Networking797626
+Node: Profiling800533
+Node: Advanced Features Summary808072
+Node: Internationalization810008
+Node: I18N and L10N811488
+Node: Explaining gettext812175
+Ref: Explaining gettext-Footnote-1817198
+Ref: Explaining gettext-Footnote-2817383
+Node: Programmer i18n817548
+Ref: Programmer i18n-Footnote-1822404
+Node: Translator i18n822453
+Node: String Extraction823247
+Ref: String Extraction-Footnote-1824380
+Node: Printf Ordering824466
+Ref: Printf Ordering-Footnote-1827252
+Node: I18N Portability827316
+Ref: I18N Portability-Footnote-1829772
+Node: I18N Example829835
+Ref: I18N Example-Footnote-1832641
+Node: Gawk I18N832714
+Node: I18N Summary833359
+Node: Debugger834700
+Node: Debugging835722
+Node: Debugging Concepts836163
+Node: Debugging Terms837972
+Node: Awk Debugging840547
+Node: Sample Debugging Session841453
+Node: Debugger Invocation841987
+Node: Finding The Bug843373
+Node: List of Debugger Commands849851
+Node: Breakpoint Control851184
+Node: Debugger Execution Control854878
+Node: Viewing And Changing Data858240
+Node: Execution Stack861614
+Node: Debugger Info863251
+Node: Miscellaneous Debugger Commands867322
+Node: Readline Support872331
+Node: Limitations873227
+Node: Debugging Summary875336
+Node: Arbitrary Precision Arithmetic876509
+Node: Computer Arithmetic877925
+Ref: table-numeric-ranges881516
+Ref: Computer Arithmetic-Footnote-1882238
+Node: Math Definitions882295
+Ref: table-ieee-formats885609
+Ref: Math Definitions-Footnote-1886212
+Node: MPFR features886317
+Node: FP Math Caution887990
+Ref: FP Math Caution-Footnote-1889062
+Node: Inexactness of computations889431
+Node: Inexact representation890391
+Node: Comparing FP Values891751
+Node: Errors accumulate892833
+Node: Getting Accuracy894266
+Node: Try To Round896976
+Node: Setting precision897875
+Ref: table-predefined-precision-strings898572
+Node: Setting the rounding mode900402
+Ref: table-gawk-rounding-modes900776
+Ref: Setting the rounding mode-Footnote-1904184
+Node: Arbitrary Precision Integers904363
+Ref: Arbitrary Precision Integers-Footnote-1907347
+Node: POSIX Floating Point Problems907496
+Ref: POSIX Floating Point Problems-Footnote-1911378
+Node: Floating point summary911416
+Node: Dynamic Extensions913606
+Node: Extension Intro915159
+Node: Plugin License916425
+Node: Extension Mechanism Outline917222
+Ref: figure-load-extension917661
+Ref: figure-register-new-function919226
+Ref: figure-call-new-function920318
+Node: Extension API Description922381
+Node: Extension API Functions Introduction923831
+Node: General Data Types928643
+Ref: General Data Types-Footnote-1934598
+Node: Memory Allocation Functions934897
+Ref: Memory Allocation Functions-Footnote-1937742
+Node: Constructor Functions937841
+Node: Registration Functions939586
+Node: Extension Functions940271
+Node: Exit Callback Functions942570
+Node: Extension Version String943820
+Node: Input Parsers944483
+Node: Output Wrappers954368
+Node: Two-way processors958880
+Node: Printing Messages961144
+Ref: Printing Messages-Footnote-1962220
+Node: Updating 'ERRNO'962373
+Node: Requesting Values963114
+Ref: table-value-types-returned963853
+Node: Accessing Parameters964736
+Node: Symbol Table Access965972
+Node: Symbol table by name966484
+Node: Symbol table by cookie968505
+Ref: Symbol table by cookie-Footnote-1972654
+Node: Cached values972718
+Ref: Cached values-Footnote-1976219
+Node: Array Manipulation976310
+Ref: Array Manipulation-Footnote-1977409
+Node: Array Data Types977446
+Ref: Array Data Types-Footnote-1980104
+Node: Array Functions980196
+Node: Flattening Arrays984055
+Node: Creating Arrays990963
+Node: Extension API Variables995735
+Node: Extension Versioning996371
+Node: Extension API Informational Variables998262
+Node: Extension API Boilerplate999326
+Node: Finding Extensions1003140
+Node: Extension Example1003700
+Node: Internal File Description1004498
+Node: Internal File Ops1008578
+Ref: Internal File Ops-Footnote-11020340
+Node: Using Internal File Ops1020480
+Ref: Using Internal File Ops-Footnote-11022863
+Node: Extension Samples1023138
+Node: Extension Sample File Functions1024667
+Node: Extension Sample Fnmatch1032316
+Node: Extension Sample Fork1033803
+Node: Extension Sample Inplace1035021
+Node: Extension Sample Ord1037107
+Node: Extension Sample Readdir1037943
+Ref: table-readdir-file-types1038832
+Node: Extension Sample Revout1039637
+Node: Extension Sample Rev2way1040226
+Node: Extension Sample Read write array1040966
+Node: Extension Sample Readfile1042908
+Node: Extension Sample Time1044003
+Node: Extension Sample API Tests1045351
+Node: gawkextlib1045843
+Node: Extension summary1048267
+Node: Extension Exercises1051959
+Node: Language History1053456
+Node: V7/SVR3.11055112
+Node: SVR41057265
+Node: POSIX1058699
+Node: BTL1060079
+Node: POSIX/GNU1060809
+Node: Feature History1066330
+Node: Common Extensions1079660
+Node: Ranges and Locales1080943
+Ref: Ranges and Locales-Footnote-11085559
+Ref: Ranges and Locales-Footnote-21085586
+Ref: Ranges and Locales-Footnote-31085821
+Node: Contributors1086042
+Node: History summary1091611
+Node: Installation1092991
+Node: Gawk Distribution1093936
+Node: Getting1094420
+Node: Extracting1095243
+Node: Distribution contents1096881
+Node: Unix Installation1102634
+Node: Quick Installation1103250
+Node: Additional Configuration Options1105677
+Node: Configuration Philosophy1107481
+Node: Non-Unix Installation1109851
+Node: PC Installation1110309
+Node: PC Binary Installation1111629
+Node: PC Compiling1113481
+Ref: PC Compiling-Footnote-11116505
+Node: PC Testing1116614
+Node: PC Using1117794
+Node: Cygwin1121908
+Node: MSYS1122678
+Node: VMS Installation1123179
+Node: VMS Compilation1123970
+Ref: VMS Compilation-Footnote-11125200
+Node: VMS Dynamic Extensions1125258
+Node: VMS Installation Details1126943
+Node: VMS Running1129196
+Node: VMS GNV1132037
+Node: VMS Old Gawk1132772
+Node: Bugs1133243
+Node: Other Versions1137357
+Node: Installation summary1143831
+Node: Notes1144889
+Node: Compatibility Mode1145754
+Node: Additions1146536
+Node: Accessing The Source1147461
+Node: Adding Code1148897
+Node: New Ports1155052
+Node: Derived Files1159540
+Ref: Derived Files-Footnote-11165025
+Ref: Derived Files-Footnote-21165060
+Ref: Derived Files-Footnote-31165658
+Node: Future Extensions1165772
+Node: Implementation Limitations1166430
+Node: Extension Design1167613
+Node: Old Extension Problems1168767
+Ref: Old Extension Problems-Footnote-11170285
+Node: Extension New Mechanism Goals1170342
+Ref: Extension New Mechanism Goals-Footnote-11173706
+Node: Extension Other Design Decisions1173895
+Node: Extension Future Growth1176008
+Node: Old Extension Mechanism1176844
+Node: Notes summary1178607
+Node: Basic Concepts1179789
+Node: Basic High Level1180470
+Ref: figure-general-flow1180752
+Ref: figure-process-flow1181437
+Ref: Basic High Level-Footnote-11184738
+Node: Basic Data Typing1184923
+Node: Glossary1188251
+Node: Copying1220197
+Node: GNU Free Documentation License1257736
+Node: Index1282854
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index a71ceae6..18ef080b 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -15527,12 +15527,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
 
@@ -31213,15 +31208,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
 
@@ -31248,12 +31235,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
 
@@ -31281,12 +31263,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
 
@@ -39497,12 +39474,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
 
@@ -39540,12 +39512,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 c9b10838..0066593f 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -14809,12 +14809,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
 
@@ -30304,15 +30299,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
 
@@ -30339,12 +30326,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
 
@@ -30372,12 +30354,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
 
@@ -38588,12 +38565,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
 
@@ -38631,12 +38603,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