1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
|
2002-11-01 Bruno Haible <bruno@clisp.org>
* msgcmp.c: Include read-po.h.
(is_message_selected, remove_obsoletes): New functions.
(grammar, compare_constructor, compare_destructor,
compare_directive_domain, compare_directive_message): Remove functions.
(compare_class_ty): Remove type.
(compare_methods): Remove variable.
(compare): Use read_po_file instead.
2002-10-14 Bruno Haible <bruno@clisp.org>
* project-id: When testing for "GNU $package", ignore libtool, because
libtool.m4 calls a package "GNU $package" even if it is not GNU.
Reported by Andrew Suffield <asuffield@debian.org>.
2002-10-03 Bruno Haible <bruno@clisp.org>
* msgl-equal.h (message_equal, message_list_equal,
msgdomain_list_equal): Add 'ignore_potcdate' argument.
* msgl-equal-c (msgstr_equal, msgstr_equal_ignoring_potcdate): New
functions.
(message_equal, message_list_equal, msgdomain_equal,
msgdomain_list_equal): Add 'ignore_potcdate' argument.
* msgmerge.c (main): Call msgdomain_list_equal with ignore_potcdate =
true.
2002-09-09 Bruno Haible <bruno@clisp.org>
* x-smalltalk.h: New file.
* x-smalltalk.c: New file.
* xgettext.c: Include x-smalltalk.h.
(usage): Mention Smalltalk language.
(language_to_extractor): Add Smalltalk support.
(extension_to_language): Likewise.
* Makefile.am (noinst_HEADERS): Add x-smalltalk.h.
(xgettext_SOURCES): Add x-smalltalk.c.
2002-08-18 Bruno Haible <bruno@clisp.org>
* message.h (enum format_type): New enum value 'format_php'.
(NFORMATS): Increment.
* message.c (format_language, format_language_pretty): Add entry
for php.
* format.h (formatstring_php): New declaration.
* format-php.c: New file.
* format.c (formatstring_parsers): Add entry for php.
* x-php.h: New file.
* x-php.c: New file.
* xgettext.c: Include x-php.c.
(main): Call x_php_extract_all, x_php_keyword.
(language_to_scanner): Add PHP rule.
(extension_to_language): Add PHP rule.
* Makefile.am (noinst_HEADERS): Add x-php.h.
(FORMAT_SOURCE): Add format-php.c.
(xgettext_SOURCES): Add x-php.c.
2002-08-17 Bruno Haible <bruno@clisp.org>
* urlget.c (fetch): Also try invoking the 'curl' program.
2002-08-06 Bruno Haible <bruno@clisp.org>
* gettext-0.11.5 released.
2002-08-02 Bruno Haible <bruno@clisp.org>
* read-mo.c (get_sysdep_string): Make the error message easier to
translate.
2002-07-25 Bruno Haible <bruno@clisp.org>
* gettext-0.11.4 released.
2002-07-21 Bruno Haible <bruno@clisp.org>
* format.h (struct interval): New type.
(get_c99_format_directives): New declaration.
* format-c.c (FAT_SIZE_8_T, FAT_SIZE_16_T, FAT_SIZE_32_T,
FAT_SIZE_64_T, FAT_SIZE_LEAST8_T, FAT_SIZE_LEAST16_T,
FAT_SIZE_LEAST32_T, FAT_SIZE_LEAST64_T, FAT_SIZE_FAST8_T,
FAT_SIZE_FAST16_T, FAT_SIZE_FAST32_T, FAT_SIZE_FAST64_T,
FAT_SIZE_INTPTR_T): New enum values.
(FAT_SIZE_MASK): Update.
(struct spec): New fields c99_directives_count, c99_directives.
(format_parse): Recognize C 99 <inttypes.h> macros. Set the new
fields c99_directives_count, c99_directives in the result.
(get_c99_format_directives): New function.
(format_print): Update.
* x-c.c (is_inttypes_macro, phase8a_get, phase8a_unget): New functions.
(phase8_get): Use phase8a_get instead of phase6_get.
* write-mo.c: Include format.h, xmalloc.h.
(freea): New macro.
(struct pre_string): New type.
(struct pre_message): Renamed from struct id_str_pair.
(compare_id): Update.
(struct pre_sysdep_segment): New type.
(struct pre_segment_pair): New type.
(struct pre_sysdep_string): New type.
(struct pre_sysdep_message): New type.
(write_table): Rewritten.
* read-mo.c (endian): Remove variable.
(read32, seek32, string32): Remove functions.
(struct binary_mo_file): New type.
(read_binary_mo_file, get_uint32, get_string, get_sysdep_string): New
functions.
(read_mo_file): Reworked to work in-memory, without fseek/lseek calls.
* msgfmt.c (format_directive_message): Copy the is_format array.
Needed by write-mo.c.
2002-07-20 Andreas Schwab <schwab@suse.de>
* plural-eval.c: Include <signal.h> if !INTDIV0_RAISES_SIGFPE.
2002-07-17 Bruno Haible <bruno@clisp.org>
* gettext-0.11.3 released.
2002-07-17 Bruno Haible <bruno@clisp.org>
* dir-list.c: Include stdlib.h.
2002-07-16 Bruno Haible <bruno@clisp.org>
* read-java.c (msgdomain_read_java): Pass $GETTEXTJEXEDIR to
execute_java_class.
* urlget.c (fetch): Likewise.
* Makefile.am (DEFS): Define USEJEXE and GETTEXTJEXEDIR.
(GCJ, GCJFLAGS, USEJEXE): New variables.
(all-java*): Renamed to take into account BUILDJAVAEXE.
(install-data-java*): Likewise.
(installdirs-java*): Likewise.
(uninstall-java*): Likewise.
(install-exec-*): New rules.
(gnu.gettext.DumpResource, gnu.gettext.GetURL): New rules.
(CLEANFILES): Add them.
2002-07-16 Bruno Haible <bruno@clisp.org>
* project-id: Make it work when the configure file was generated by
autoconf-2.52 with AC_INIT and AM_INIT_AUTOMAKE(...).
2002-06-14 Bruno Haible <bruno@clisp.org>
* po-lex.c (mbfile_getc): Handle the case where iconv converts
some character and returns -1 at once; this can happen immediately
after an invalid multibyte sequence.
Reported by Andrew V. Samoilov <kai@cmail.ru>.
2002-06-08 Bruno Haible <bruno@clisp.org>
* user-email.in: Look at /etc/sysconfig/mail, found on SuSE Linux.
Suggested by Karl Eichwalder <ke@suse.de>.
2002-06-07 Bruno Haible <bruno@clisp.org>
* user-email.in: Look at /etc/mailname, found on Debian systems.
Suggested by Mark W. Eichin <eichin@thok.org>.
2002-06-07 Bruno Haible <bruno@clisp.org>
* msgfmt.c (install_sigfpe_handler): Assume the signal is always
SIGFPE, regardless of the platform.
(uninstall_sigfpe_handler): Likewise.
2002-05-29 Bruno Haible <bruno@clisp.org>
* dir-list.h (dir_list_save_reset, dir_list_restore): New declarations.
* dir-list.c (dir_list_save_reset, dir_list_restore): New functions.
* xgettext.c (main): Temporarily reset the dir_list while opening
reading the contents of the output file.
Reported by Mark Eichin <eichin@thok.org>.
2002-05-22 Bruno Haible <bruno@clisp.org>
* msgl-iconv.h (iconv_message_list): Add from_filename argument.
(iconv_msgdomain_list): Likewise.
* msgl-iconv.c (iconv_message_list): Add from_filename argument.
Don't give an error for POT files containing charset=CHARSET.
(iconv_msgdomain_list): Add from_filename argument.
* msgl-cat.c (catenate_msgdomain_list): Don't give an error for
POT files containing charset=CHARSET. Pass input file name to
iconv_message_list.
* msgconv.c (main): Pass input file name to iconv_msgdomain_list.
* write-java.c (msgdomain_write_java): Update.
* write-tcl.c (msgdomain_write_tcl): Update.
* x-glade.c (do_extract_glade): Update.
* x-python.c (extract_python): Update.
* x-tcl.c (extract_tcl): Update.
2002-05-18 Bruno Haible <bruno@clisp.org>
* Makefile.am (RM): New variable.
(install-exec-am): Depend on install-exec-clean.
(install-exec-clean): New rule.
2002-05-14 Bruno Haible <bruno@clisp.org>
* write-po.c (wrap): Canonicalize the charset. Handle the case when
po_charset_canonicalize returns NULL.
Reported by Jan-Marek Glogowski <glogow@stud.fbi.fh-darmstadt.de>.
2002-05-12 Bruno Haible <bruno@clisp.org>
* po-charset.c (po_charset_canonicalize): Add ISO-8859-14, KOI8-T,
GEORGIAN-PS to the list of allowed encodings.
2002-04-30 Bruno Haible <bruno@clisp.org>
* hostname.c (ipv6_ntop): Provide a fallback definition for systems
that define s6_addr but no s6_addr16 element of 'struct in6_addr'.
Reported by Perry Rapp <PRapp@smartronix.com>.
2002-04-28 Bruno Haible <bruno@clisp.org>
* project-id: Recognize package name and version when given by a
two-argument AC_INIT invocation (autoconf 2.52 and newer).
2002-04-24 Bruno Haible <bruno@clisp.org>
* gettext-0.11.2 released.
2002-04-23 Bruno Haible <bruno@clisp.org>
* write-po.h (message_page_width_ignore): New declaration.
* write-po.c (wrap_strings): New variable.
(message_page_width_ignore): New function.
(wrap): Ignore the do_wrap argument if wrap_strings is false.
* msgattrib.c (long_options): Add --no-wrap option.
(main): Handle option --no-wrap.
(usage): Document option --no-wrap.
* msgcat.c: Likewise.
* msgcomm.c: Likewise.
* msgconv.c: Likewise.
* msgen.c: Likewise.
* msgfilter.c: Likewise.
* msggrep.c: Likewise.
* msginit.c: Likewise.
* msgmerge.c: Likewise.
* msgunfmt.c: Likewise.
* msguniq.c: Likewise.
* xgettext.c: Likewise.
2002-04-19 Bruno Haible <bruno@clisp.org>
* msginit.c (catalogname_for_locale): Add wa_BE. Change Javanese from
jw to jv.
2002-04-15 Bruno Haible <bruno@clisp.org>
* po-lex.h (po_gram_error): Treat Apple's version of GCC like non-GCC.
* po-lex.c (po_gram_error): Likewise.
Reported by Richard S. Blake <blakers@presence-group.com>.
2002-04-04 Bruno Haible <bruno@clisp.org>
* po-lex.h (po_gram_error): Use __VA_ARGS__ + 0 instead of __VA_ARGS__.
(po_gram_error_at_line): LIkewise.
Fixes syntax error when __VA_ARGS__ is empty.
Reported by Trond Eivind Glomsrød <teg@redhat.com>.
2002-04-04 Bruno Haible <bruno@clisp.org>
* msginit.c (find_pot): Add dummy return, to avoid gcc warning.
2002-03-12 Bruno Haible <bruno@clisp.org>
* gettext-0.11.1 released.
2002-03-10 Bruno Haible <bruno@clisp.org>
* x-python.c (phase7_getuc): Change type of buf to 'unsigned char[]'.
2002-03-07 Bruno Haible <bruno@clisp.org>
* Makefile.am (msginit_LDADD): Use @INTL_LIBTOOL_SUFFIX_PREFIX@o
instead of $(OBJEXT).
2002-03-05 Bruno Haible <bruno@clisp.org>
* hostname.c (s6_addr16): Define if not defined by the system.
(ipv6_ntop): Use s6_addr16 instead of in6_u.u6_addr16.
2002-03-05 Bruno Haible <bruno@clisp.org>
* xgettext.c (usage): Mention languages Python, awk, Tcl, RST, Glade.
2002-03-03 Bruno Haible <bruno@clisp.org>
* message.h (format_type): New enum value 'format_tcl'.
(NFORMATS): Increment.
* message.c (format_language): Add format_tcl entry.
(format_language_pretty): Likewise.
* format.h (formatstring_tcl): New declaration.
* format-tcl.c: New file.
* format.c (formatstring_parsers): Add formatstring_tcl.
* x-tcl.h: New file.
* x-tcl.c: New file.
* xgettext.c: Include x-tcl.h.
(main): Call x_tcl_extract_all, x_tcl_keyword.
(language_to_scanner): Add Tcl rule.
(extension_to_language): Add Tcl rule.
* write-tcl.h: New file.
* write-tcl.c: New file.
* msgfmt.c: Include write-tcl.h.
(tcl_mode, tcl_locale_name, tcl_base_directory): New variables.
(long_options): Add option "--tcl".
(main): Handle --tcl option. Set tcl_mode, tcl_locale_name,
tcl_base_directory. More checks for contradicting options. Call
msgdomain_write_tcl.
(usage): Mention Tcl mode.
(format_directive_domain): Ignore domain directive if in Tcl mode.
* read-tcl.h: New file.
* read-tcl.c: New file.
* msgunfmt.c: Include read-tcl.h.
(tcl_mode, tcl_locale_name, tcl_base_directory): New variables.
(long_options): Add option "--tcl".
(main): Handle --tcl and -d options. Set tcl_mode, tcl_locale_name,
tcl_base_directory. More checks for contradicting options. Call
msgdomain_read_tcl.
(usage): Mention Tcl mode.
* msgunfmt.tcl: New file.
* Makefile.am (noinst_HEADERS): Add read-tcl.h, write-tcl.h, x-tcl.h.
(EXTRA_DIST): Add msgunfmt.tcl.
(DEFS): Add -DGETTEXTDATADIR.
(FORMAT_SOURCE): Add format-tcl.c.
(msgfmt_SOURCES): Add write-tcl.c.
(msgunfmt_SOURCES): Add read-tcl.c.
(xgettext_SOURCES): Add x-tcl.c.
(install-tcl, installdirs-tcl, uninstall-tcl): New targets.
2002-03-02 Bruno Haible <bruno@clisp.org>
* msgfmt.c (check_pair): Don't count "&&" as an accelerator designator,
for consistency with Qt and KDE.
2002-02-24 Bruno Haible <bruno@clisp.org>
* po-lex.c: Include libstdarg.h.
(VA_START, va_alist, va_dcl): Remove macros.
(po_gram_error): Modernize varargs handling. Fix memory leak.
(po_gram_error_at_line): Likewise.
2002-02-21 Bruno Haible <bruno@clisp.org>
* msggrep.c: Include liballoca.h.
(grep_args): Add a third one.
(grep_argv): Likewise.
(long_options): Add --comment option.
(main): Handle option --comment/-C.
(usage): Document option -C.
(is_message_selected): If option -C is given, concatenate the
translator comments and run a third grep pass on the result.
2002-02-09 Bruno Haible <bruno@clisp.org>
* message.h (possible_format_p): Change return type to bool.
* message.c (possible_format_p): Likewise.
2002-01-14 Bruno Haible <bruno@clisp.org>
* x-glade.h: New file.
* x-glade.c: New file.
* xgettext.c: Include x-glade.h.
(main): Call x_glade_extract_all, x_glade_keyword.
(language_to_scanner): Add glade rule.
(extension_to_language): Add glade rule.
* Makefile.am (noinst_HEADERS): Add x-glade.h.
(xgettext_SOURCES): Add x-glade.c.
(xgettext_LDADD): Add @LTLIBEXPAT@.
2002-01-27 Bruno Haible <bruno@clisp.org>
* message.h (format_type): New enum value 'format_awk'.
(NFORMATS): Increment.
* message.c (format_language): Add format_awk entry.
(format_language_pretty): Likewise.
* format.h (formatstring_awk): New declaration.
* format-awk.c: New file.
* format.c (formatstring_parsers): Add formatstring_awk.
* x-awk.h: New file.
* x-awk.c: New file.
* xgettext.c: Include x-awk.h.
(main): Call x_awk_extract_all, x_awk_keyword.
(language_to_scanner): Add awk rule.
(extension_to_language): Add awk rule.
* Makefile.am (noinst_HEADERS): Add x-awk.h.
(FORMAT_SOURCE): Add format-awk.c.
(xgettext_SOURCES): Add x-awk.c.
2002-02-02 Bruno Haible <bruno@clisp.org>
* x-python.h: New file.
* x-python.c: New file.
* xgettext.c: Include x-python.h.
(main): Call x_python_extract_all, x_python_keyword.
(language_to_scanner): Add Python rule.
(extension_to_language): Add Python rule.
* Makefile.am (noinst_HEADERS): Add x-python.h.
(INCLUDES): Add -I$(top_srcdir)/libuniname.
(LIBUNINAME): New variable.
(xgettext_SOURCES): Add x-python.c.
(xgettext_LDADD): Add $(LIBUNINAME).
2002-02-03 Bruno Haible <bruno@clisp.org>
* msgfmt.c (check_header_entry): Terminate the error strings with
newlines.
2002-02-03 Bruno Haible <bruno@clisp.org>
* plural-table.h: New file.
* plural-table.c: New file.
* msginit.c: Include plural-table.h.
(plural_forms): Use plural_table.
* msgfmt.c: Include plural-table.h.
(check_plural): Print a recommendation about the right plural formula.
* Makefile.am (noinst_HEADERS): Add plural-table.h.
(libgettextsrc_la_SOURCES): Add plural-table.c.
2002-02-03 Bruno Haible <bruno@clisp.org>
* xgettext.c (finalize_header): New function.
(main): Call it.
2002-02-03 Bruno Haible <bruno@clisp.org>
* msginit.c (fill_header): Also replace "PACKAGE" in the comment.
2002-02-02 Bruno Haible <bruno@clisp.org>
* Makefile.am (INCLUDES): Add -I../lib. Needed for builds with
builddir != srcdir on platforms that don't have fnmatch and stdbool.h.
2002-01-31 Bruno Haible <bruno@clisp.org>
* gettext-0.11 released.
2002-01-31 Bruno Haible <bruno@clisp.org>
* plural-eval.h: Include eval-plural.h instead of plural-eval.c.
2002-01-30 Bruno Haible <bruno@clisp.org>
Make the gettext and ngettext programs independent of libgettextlib.
* Makefile.am (gettext_LDADD, ngettext_LDADD): New variables.
2002-01-27 Bruno Haible <bruno@clisp.org>
* x-ycp.c (enum token_type_ty): New enum value token_type_symbol.
(x_ycp_lex): Assign a value to tp->string if and only if the type is
token_type_string_literal or token_type_symbol.
(extract_ycp): Simplify cleanup.
2002-01-27 Bruno Haible <bruno@clisp.org>
* x-java.l (extract_java): Don't create a plural message if the
function can take two string argument but actually has only one
string argument.
2002-01-27 Bruno Haible <bruno@clisp.org>
* x-lisp.c (extract_lisp): Free memory allocated in toplevel_object.
* x-elisp.c (string_of_object): Use memcpy.
(extract_elisp): Free memory allocated in toplevel_object.
* x-librep.c (string_of_object): Use memcpy.
(extract_librep): Free memory allocated in toplevel_object.
2002-01-27 Bruno Haible <bruno@clisp.org>
* x-c.c (ALERT_CHAR): New macro.
(phase7_getc): Accept \a and \v as well.
* x-c.c (free_token): New inline function.
(phase6_get): Use it.
2002-01-27 Bruno Haible <bruno@clisp.org>
* format-elisp.c (format_check): Don't use Java syntax for format
argument number in error message.
* format-librep.c (format_check): Likewise.
* format-pascal.c (format_check): Likewise.
2002-01-24 Bruno Haible <bruno@clisp.org>
* Makefile.am (LDADD): Use @LTLIBINTL@ instead of @INTLLIBS@.
(libgettextsrc_la_LDFLAGS): Likewise. Use @LTLIBICONV@ instead of
@LIBICONV@.
2002-01-21 Bruno Haible <bruno@clisp.org>
* msggrep.c (main): On SunOS4, don't pass option "-q" to grep.
2002-01-19 Bruno Haible <bruno@clisp.org>
* msgfmt.c (check_header_entry): Emit error messages including the
file name.
2002-01-19 Bruno Haible <bruno@clisp.org>
* open-po.c (open_po_file): Use 'size_t' instead of 'int'.
* x-java.l (translate_esc): Likewise.
* read-mo.c (read_mo_file): Use 'unsigned int' instead of 'int'.
2002-01-13 Bruno Haible <bruno@clisp.org>
* msgl-iconv.c (iconv_message_list): Don't complain by a nonportable
encoding name if it has been overridden by an argument canon_from_code.
2002-01-13 Bruno Haible <bruno@clisp.org>
* msgl-ascii.c (is_ascii_message): Don't consider a message as being
ASCII if its msgid or msgid_plural is not ASCII.
2002-01-12 Bruno Haible <bruno@clisp.org>
* gettext.c (main): Update year in --version output.
* ngettext.c (main): Likewise.
* msgattrib.c (main): Likewise.
* msgcat.c (main): Likewise.
* msgcmp.c (main): Likewise.
* msgcomm.c (main): Likewise.
* msgconv.c (main): Likewise.
* msgen.c (main): Likewise.
* msgexec.c (main): Likewise.
* msgfilter.c (main): Likewise.
* msgfmt.c (main): Likewise.
* msggrep.c (main): Likewise.
* msginit.c (main): Likewise.
* msgmerge.c (main): Likewise.
* msgunfmt.c (main): Likewise.
* msguniq.c (main): Likewise.
* xgettext.c (main): Likewise.
2002-01-11 Bruno Haible <bruno@clisp.org>
* write-po.c: Include po-charset.h.
2002-01-11 Bruno Haible <bruno@clisp.org>
* msgfmt.c (install_sigfpe_handler, uninstall_sigfpe_handler): On AIX,
treat SIGTRAP like SIGFPE.
2002-01-09 Bruno Haible <bruno@clisp.org>
* msgfmt.c (USE_SIGINFO): New macro.
(sigfpe_code, sigfpe_handler, install_sigfpe_handler,
uninstall_sigfpe_handler, check_plural_eval): Use USE_SIGINFO instead
of HAVE_SIGINFO.
(install_sigfpe_handler, uninstall_sigfpe_handler): On Irix, treat
SIGTRAP like SIGFPE.
2002-01-09 Bruno Haible <bruno@clisp.org>
* x-java.l (strip_ending_spaces): Fix logic.
2002-01-09 Tommy Johansson <tommy.johansson@kanalen.org>
* x-java.l: Avoid endless loop when encountering unterminated string.
2002-01-08 Bruno Haible <bruno@clisp.org>
* message.h (format_type): New enum value 'format_elisp'.
(NFORMATS): Increment.
* message.c (format_language): Add format_elisp entry.
(format_language_pretty): Likewise.
* format.h (formatstring_elisp): New declaration.
* format-elisp.c: New file.
* format.c (formatstring_parsers): Add formatstring_elisp.
* x-elisp.h: New file.
* x-elisp.c: New file.
* xgettext.c: Include x-elisp.h.
(main): Call x_elisp_extract_all, x_elisp_keyword.
(usage): Mention the languages Lisp, EmacsLisp, librep.
(language_to_scanner): Add elisp rule.
(extension_to_language): Add elisp rule.
* Makefile.am (noinst_HEADERS): Add x-elisp.h.
(FORMAT_SOURCE): Add format-elisp.c.
(xgettext_SOURCES): Add x-elisp.c.
2002-01-06 Bruno Haible <bruno@clisp.org>
* x-librep.c (read_object): Fix handling of #[ and #(.
2002-01-06 Bruno Haible <bruno@clisp.org>
* x-lisp.c (read_object): Treat ',.' like ',@'.
2002-01-05 Bruno Haible <bruno@clisp.org>
Make "msgmerge --update" work better on CJK files even if iconv() is
not available.
* po-charset.h (po_is_charset_weird): New declaration.
(po_is_charset_weird_cjk): Likewise..
(po_lex_weird_cjk): New variable declaration.
* po-charset.c (po_is_charset_weird): New function, extracted from
po_lex_charset_set.
(po_is_charset_weird_cjk): New function.
(po_lex_weird_cjk): New variable.
(po_lex_charset_init): Initialize po_lex_weird_cjk.
(po_lex_charset_set): Call po_is_charset_weird and
po_is_charset_weird_cjk. Set po_lex_weird_cjk.
(po_lex_charset_close): Reset po_lex_weird_cjk.
* po-lex.c (mbfile_getc): If po_lex_weird_cjk is set, possibly return
a double byte instead of single byte.
* write-po.c (wrap): Call po_is_charset_weird_cjk. If it returns true,
group double bytes where possible.
2002-01-05 Bruno Haible <bruno@clisp.org>
* gettext.c: TESTS version is now separate.
2002-01-05 Bruno Haible <bruno@clisp.org>
* x-java.l (extract_java): Avoid "uninitialized variable" warnings.
Free a temporary string.
2002-01-05 Bruno Haible <bruno@clisp.org>
* Makefile.am (libgettextsrc_la_LDFLAGS): Add -lc. Needed on AIX.
2002-01-05 Bruno Haible <bruno@clisp.org>
* x-c.c (buflen): Make static.
* x-librep.c (buflen): Likewise.
* x-lisp.c (buflen): Likewise.
2001-12-23 Bruno Haible <bruno@clisp.org>
* msgexec.c (process_string): Use xsetenv instead of setenv.
* msginit.c (canonical_locale_charset): Likewise.
(get_title): Likewise.
2001-12-22 Bruno Haible <bruno@clisp.org>
* dir-list.c: Include <stddef.h> instead of <stdlib.h>.
* xgettext.h: Likewise.
* file-list.c: Include exit.h instead of system.h.
* gettext.c: Likewise.
* hostname.c: Likewise.
* msgattrib.c: Likewise.
* msgcat.c: Likewise.
* msgcomm.c: Likewise.
* msgconv.c: Likewise.
* msgexec.c: Likewise.
* msgunfmt.c: Likewise.
* msguniq.c: Likewise.
* ngettext.c: Likewise.
* read-java.c: Likewise.
* x-ycp.c: Likewise.
* msgcmp.c: Include exit.h instead of system.h. Don't include
str-list.h.
* msgfilter.c: Likewise.
* msgen.c: Include exit.h instead of system.h. Don't include xmalloc.h.
* msgfmt.c: Include exit.h, stpcpy.h instead of system.h. Don't
include <errno.h>, getline.h.
* msggrep.c: Include exit.h instead of system.h. Don't include
<fcntl.h>.
* msginit.c: Include liballoca.h, <limits.h>, exit.h, pathname.h
instead of system.h.
* msgl-cat.c: Include liballoca.h, exit.h instead of system.h.
Include <stddef.h> instead of <stdlib.h>.
* msgl-charset.c: Likewise.
* msgl-iconv.c: Include liballoca.h, exit.h instead of system.h.
* write-po.c: Likewise.
* msgmerge.c: Include liballoca.h, exit.h, strcase.h, stpcpy.h,
stpncpy.h instead of system.h.
* format-java.c: Include liballoca.h instead of system.h.
* format-lisp.c: Don't include system.h.
* open-po.c: Include pathname.h, xmalloc.h instead of system.h.
Don't include <sys/types.h>, error.h.
* po-charset.c: Include liballoca.h, string.h, strcase.h instead of
system.h. Don't include error.h. Include progname.h.
(program_name): Remove declaration.
* po-gram-gen.y: Include <string.h>.
* po-hash-gen.y: Include <string.h>.
* po-lex.c: Include exit.h instead of system.h. Don't include
<sys/types.h>.
* read-mo.c: Include binary-io.h, exit.h instead of system.h.
Include <stddef.h> instead of <stdlib.h>.
* urlget.c: Include <unistd.h>, binary-io.h, exit.h instead of
system.h.
(O_BINARY): Remove fallback definition.
* write-java.c: Include liballoca.h, pathname.h instead of system.h.
* write-mo.c: Include liballoca.h, binary-io.h, exit.h instead of
system.h. Don't include msgfmt.h.
* x-c.c: Include exit.h instead of system.h. Don't include <ctype.h>.
* x-librep.c: Include exit.h instead of system.h. Include hash.h.
* x-lisp.c: Likewise.
* x-rst.c: Include exit.h instead of system.h. Include <stddef.h>
instead of <stdlib.h>.
* xgettext.c: Include <string.h>, exit.h, pathname.h, strcase.h,
stpcpy.h instead of system.h. Include str-list.h. Don't include
<sys/param.h>, <pwd.h>, <sys/types.h>, <unistd.h>, getline.h.
(getpwuid): Remove declaration.
2001-12-21 Bruno Haible <bruno@clisp.org>
* format-lisp.c: Include minmax.h.
2001-12-21 Bruno Haible <bruno@clisp.org>
* file-list.c: Include gettext.h instead of libgettext.h.
* format-c.c: Likewise.
* format-java.c: Likewise.
* format-librep.c: Likewise.
* format-lisp.c: Likewise.
* format-pascal.c: Likewise.
* format-python.c: Likewise.
* format-ycp.c: Likewise.
* gettext.c: Likewise.
* hostname.c: Likewise.
* msgattrib.c: Likewise.
* msgcat.c: Likewise.
* msgcmp.c: Likewise.
* msgcomm.c: Likewise.
* msgconv.c: Likewise.
* msgen.c: Likewise.
* msgexec.c: Likewise.
* msgfilter.c: Likewise.
* msgfmt.c: Likewise.
* msggrep.c: Likewise.
* msginit.c: Likewise.
* msgl-cat.c: Likewise.
* msgl-charset.c: Likewise.
* msgl-iconv.c: Likewise.
* msgmerge.c: Likewise.
* msgunfmt.c: Likewise.
* msguniq.c: Likewise.
* ngettext.c: Likewise.
* open-po.c: Likewise.
* po-charset.c: Likewise.
* po-gram-gen.y: Likewise.
* po-lex.c: Likewise.
* read-java.c: Likewise.
* read-mo.c: Likewise.
* read-po.c: Likewise.
* urlget.c: Likewise.
* write-java.c: Likewise.
* write-mo.c: Likewise.
* write-po.c: Likewise.
* x-c.c: Likewise.
* x-librep.c: Likewise.
* x-lisp.c: Likewise.
* x-po.c: Likewise.
* x-rst.c: Likewise.
* x-ycp.c: Likewise.
* xgettext.c: Likewise.
2001-12-21 Bruno Haible <bruno@clisp.org>
* message.h (message_merge): Remove declaration.
* message.c (msgfmt_check_pair_fails, message_merge): Move to
msgmerge.c.
* msgmerge.c (msgfmt_check_pair_fails, message_merge): Moved to here
from message.c.
2001-12-20 Bruno Haible <bruno@clisp.org>
* format-java.c: Include system.h.
* format-lisp.c (parse_upto): Fix prototype. char promotes to int.
* po-lex.c (mb_iseq, mb_setascii): Likewise.
* po-hash-gen.y: alloca fix for AIX 3.
* x-lisp.c (syntax_code_of, read_char_syntax, attribute_of, is_number):
Move prototypes, to avoid compilation errors on AIX 3.
(syntax_code_of, attribute_of): Fix prototype. unsigned char promotes
to int.
* x-java.l (TOKEN_TYPE): Remove trailing comma in enum.
(PARSER_STATE): Likewise.
* msgfilter.c: Include <sys/select.h> on AIX.
2001-12-12 Bruno Haible <bruno@clisp.org>
* xgettext.c: Include <limits.h>.
(copyright_holder): New variable.
(foreign_user): Remove variable.
(long_options): Add --copyright-holder option.
(main): Implement --copyright-holder option.
(usage): Document --copyright-holder option.
(construct_header): Use the copyright_holder variable. If it is
empty, add a "public domain" comment.
2001-12-17 Bruno Haible <bruno@clisp.org>
* msggrep.c: Include <fnmatch.h>.
(filename_list_match): New function.
(is_message_selected): Use it instead of string_list_member.
2001-12-16 Bruno Haible <bruno@clisp.org>
* message.h (format_type): New enum value 'format_librep'.
(NFORMATS): Increment.
* message.c (format_language): Add format_librep entry.
(format_language_pretty): Likewise.
* format.h (formatstring_librep): New declaration.
* format-librep.c: New file.
* format.c (formatstring_parsers): Add formatstring_librep.
* x-librep.h: New file.
* x-librep.c: New file.
* xgettext.c: Include x-librep.h.
(main): Call x_librep_extract_all, x_librep_keyword.
(language_to_scanner): Add librep rule.
(extension_to_language): Add librep rule.
* Makefile.am (noinst_HEADERS): Add x-librep.h.
(FORMAT_SOURCE): Add format-librep.c.
(xgettext_SOURCES): Add x-librep.c.
2001-12-15 Bruno Haible <bruno@clisp.org>
* msgfmt.c (check_plural): Use ngettext for two messages.
Reported by Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>.
2001-12-15 Bruno Haible <bruno@clisp.org>
* xgettext.c (remember_a_message_plural): Mark the message as xx-format
if the English plural form has xx format syntax and the singular form
may or may not have xx format syntax.
2001-12-15 Bruno Haible <bruno@clisp.org>
* format.h (struct formatstring_parser): Add 'equality' and
'pretty_msgstr' arguments to 'check' field.
* format-c.c (format_check): Add 'equality' and 'pretty_msgstr'
arguments.
* format-java.c (format_check): Likewise.
* format-lisp.c (format_check): Likewise.
* format-pascal.c (format_check): Likewise.
* format-python.c (format_check): Likewise.
* format-ycp.c (format_check): Likewise.
* msgfmt.c (check_pair): Check messages with plural forms as well.
* message.c (msgfmt_check_pair_fails): Add msgid_plural, msgstr_len
arguments. Check messages with plural forms as well.
(message_merge): Check messages with plural forms as well.
2001-12-11 Bruno Haible <bruno@clisp.org>
* x-java.l (strip_ending_spaces): Fix isspace call.
* xgettext.h (xgettext_omit_header): Renamed from omit_header.
* xgettext.c (xgettext_omit_header): Likewise.
(long_options, main, remember_a_message): Update.
* x-po.c (extract_directive_message): Update.
2001-12-09 Bruno Haible <bruno@clisp.org>
* x-lisp.h: New file.
* x-lisp.c: New file.
* xgettext.c: Include x-lisp.h.
(main): Call x_lisp_extract_all, x_lisp_keyword.
(language_to_scanner): Add Lisp rule. Remove preliminary Lisp rule.
(extension_to_language): Add Lisp rule.
* Makefile.am (noinst_HEADERS): Add x-lisp.h.
(xgettext_SOURCES): Add x-lisp.c.
2001-12-09 Bruno Haible <bruno@clisp.org>
* xgettext.h (split_keywordspec): New declaration.
* xgettext.c (split_keywordspec): New function.
* x-c.c (x_c_keyword): Use split_keywordspec.
* x-java.l (extract_keyword, extract_msgid_arg,
extract_msgid_plural_arg): Remove functions.
(x_java_keyword): Use split_keywordspec.
2001-12-09 Bruno Haible <bruno@clisp.org>
* x-c.c: Reorder.
2001-12-08 Bruno Haible <bruno@clisp.org>
* msgattrib.c (process_message_list): Never make the header entry
obsolete.
2001-12-08 Bruno Haible <bruno@clisp.org>
* msgfilter.c (main): Fix getopt_long string: -i takes an argument.
2001-12-08 Bruno Haible <bruno@clisp.org>
* xgettext.c (remember_a_message): Don't print the line number if it
is = (size_t)(-1).
2001-12-08 Bruno Haible <bruno@clisp.org>
* msgfilter.c: Renamed from msgexec.c.
* msgexec.c: New file.
* Makefile.am (bin_PROGRAMS): Add msgfilter.
(msgfilter_SOURCES): New variable.
(msgfilter_LDADD): New variable.
2001-12-07 Bruno Haible <bruno@clisp.org>
* msgexec.c (keep_header): New variable.
(long_options): New option --keep-header.
(usage): Document option --keep-header.
(process_message): Implement --keep-header.
2001-12-06 Bruno Haible <bruno@clisp.org>
* format.h (struct formatstring_parser): Add 'noisy' argument to
'check' field.
* format-c.c (format_check): Add 'noisy' argument.
* format-java.c (format_check): Likewise.
* format-lisp.c (format_check): Likewise.
* format-pascal.c (format_check): Likewise.
* format-python.c (format_check): Likewise.
* format-ycp.c (format_check): Likewise.
* msgfmt.c (check_pair): Pass noisy=true.
* message.c: Include format.h.
(msgfmt_check_pair_fails): New function.
(message_merge): Set fuzzy flag when adding a -format specifier that
needs the translator's attention.
2001-12-10 Bruno Haible <bruno@clisp.org>
* x-java.l (tailcmp): If s1 ends with s2, it must be either equal to
s2 or have a dot right before s2.
2001-12-01 Bruno Haible <bruno@clisp.org>
* msginit.c (project_id): Make it possible to specify the location
of the project-id script through an environment variable.
(project_id_version): Likewise.
2001-12-03 Tommy Johansson <tommy.johansson@kanalen.org>
* x-java.l (tailcmp): New function.
(do_compare): Use it instead of strcmp.
(extract_java): After seeing an invocation, don't set the state to
STATE_NONE.
2001-11-30 Bruno Haible <bruno@clisp.org>
* message.c (message_merge): Determine whether postprocessing is
needed.
* msgmerge.c (match_domain): Postprocess some problematic cases.
* Makefile.am (libgettextsrc_la_SOURCES): Add plural.c.
(msgfmt_SOURCES): Remove plural.c.
2001-11-29 Bruno Haible <bruno@clisp.org>
* plural-eval.c: Include config.h and plural-exp.h.
2001-11-27 Bruno Haible <bruno@clisp.org>
* msgfmt.c (struct msgfmt_class_ty): New field
'has_nonfuzzy_header_entry'.
(format_constructor): Initialize it.
(format_debrief): Give a warning if the header entry exists but is
fuzzy.
(format_directive_message): Update has_nonfuzzy_header_entry.
2001-11-25 Bruno Haible <bruno@clisp.org>
* x-c.c (comment_start, comment_add, comment_line_end): New inline
functions.
(phase4_getc): Use them.
2001-11-25 Bruno Haible <bruno@clisp.org>
* msginit.c (no_translator): New variable.
(long_options): Add option --no-translator.
(main): Handle option --no-translator.
(usage): Document option --no-translator.
(po_revision_date): Add header argument. Return POT's creation date
if no_translator.
(last_translator): Return a dummy string if no_translator.
(language_team): Likewise.
(fields): Allow getter with 0 or 1 argument.
(get_field): New function.
(fill_header): Call getter with 0 or 1 argument.
2001-11-25 Bruno Haible <bruno@clisp.org>
* msginit.c (canonical_locale_charset): Return the charset of 'locale'
if available.
(get_title): Return a correct value even if 'locale' is a nonexistent
locale.
2001-11-24 Bruno Haible <bruno@clisp.org>
* urlget.c (fetch): Call execute_java_class with quiet=true. If Java
program failed, try wget or lynx.
* read-java.c (msgdomain_read_java): Update for changed
execute_java_class parameter list.
2001-11-24 Bruno Haible <bruno@clisp.org>
* msgexec.c (process_message): Really process each plural form once.
2001-11-17 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c (is_nonobsolete): New function.
(main): Remove obsolete messages after reading all input files.
(check_header_entry): New function, extracted from
format_directive_message.
(format_directive_message): Perform duplicate checking also on
obsolete, untranslated and fuzzy messages, like msgmerge and the
other tools do. Put also obsolete, untranslated and fuzzy messages
on the result list, but mark them obsolete.
(read_po_file): Call po_lex_pass_obsolete_entries.
2001-11-17 Bruno Haible <haible@clisp.cons.org>
* po.c (po_callback_message): Ignore obsolete header entries, for
consistency with msgdomain_list_print(), compare_po_locale_charsets(),
iconv_message_list(), catenate_msgdomain_list().
2001-11-17 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c (struct msg_domain): Remove symbol_tab field.
(main, new_domain): Update.
(format_directive_message): Use message_list_search instead of
explicit hash table calls.
2001-11-17 Bruno Haible <haible@clisp.cons.org>
* message.h: Include hash.h.
(message_list_ty): Add use_hashtable, htable fields.
(message_list_alloc): Add 'use_hashtable' argument.
(msgdomain_alloc): Likewise.
(msgdomain_list_ty): Add use_hashtable field.
(msgdomain_list_alloc): Add 'use_hashtable' argument.
* message.c: Include hash.h.
(message_list_alloc): Add 'use_hashtable' argument.
(message_list_free): Delete the hash table if present.
(message_list_append): If a hash table is in use, verify no duplicates.
(message_list_prepend): Likewise.
(message_list_remove_if_not): Remove hash table after removal.
(message_list_search): Use hash table if present.
(msgdomain_alloc): Add 'use_hashtable' argument.
(msgdomain_list_alloc): Add 'use_hashtable' argument.
(msgdomain_list_sublist): Use 'use_hashtable'.
* msgcmp.c (compare): Update.
(compare_constructor): Allocate a message list with hash table.
* msgfmt.c (new_domain): Allocate a message list with hash table.
Remove impossible error message.
* msgl-cat.c (catenate_msgdomain_list): Allocate message lists with
hash table.
* msgmerge.c (merge): Update.
* msgunfmt.c (main): Update.
* read-po.c (readall_constructor): Allocate a message list with hash
table if and only if duplicates will lead to an error message.
* xgettext.c (main): Allocate a message list with hash table, to
speed up insertion.
(exclude_directive_message): Allocate a message list with hash table,
to speed up exclusion test.
2001-11-17 Bruno Haible <haible@clisp.cons.org>
* message.h (msgdomain_list_sublist): Change last argument to bool.
* message.c (msgdomain_list_sublist): Likewise.
* msgcmp.c (compare): Update msgdomain_list_sublist calls.
(compare_constructor, compare_directive_message): Likewise.
* msgl-cat.c (catenate_msgdomain_list): Likewise.
* msgmerge.c (merge): Likewise.
* read-po.c (readall_constructor, readall_directive_message): Likewise.
2001-11-17 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c (format_directive_message): Finish 2001-08-30 patch.
2001-11-17 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c (accelerator_char): New variable.
(long_options): --check-accelerators has optional argument.
(main): Store --check-accelerators value in accelerator_char.
(usage): --check-accelerators has optional argument.
(check_pair): Use accelerator_char instead of hardwired '&'.
2001-11-17 Bruno Haible <haible@clisp.cons.org>
* msginit.c (main): Print a blank line.
(get_title): Always use the English title first.
(fill_header): Update accordingly.
2001-11-17 Bruno Haible <haible@clisp.cons.org>
* message.h (NFORMATS): Fix misapplied patch.
2001-11-11 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c (check_accelerators): New variable.
(long_options): Add --check-accelerators.
(main): Handle --check-accelerators.
(usage): Document --check-accelerators option.
(check_pair): Implement check_accelerators handling.
2001-11-11 Bruno Haible <haible@clisp.cons.org>
* msgl-cat.c (catenate_msgdomain_list): Fix a typo in 2001-11-01 patch.
Reported by Karl Eichwalder.
2001-11-11 Bruno Haible <haible@clisp.cons.org>
* msginit.c (verbose): Remove variable.
(long_options): Remove --verbose.
(main): Remove --verbose option handling.
(usage): Remove --verbose documentation.
(language_team_address): Don't pass a verbose option to the subprocess.
2001-11-08 Bruno Haible <haible@clisp.cons.org>
* message.h: New enum value format_smalltalk.
* message.c (format_language): Add value for format_smalltalk.
(format_language_pretty): Likewise.
* format.h (formatstring_smalltalk): New declaration.
* format-ycp.c (formatstring_smalltalk): New variable.
* format.c (formatstring_parsers): Add value for format_smalltalk.
2001-11-05 Bruno Haible <haible@clisp.cons.org>
* format-lisp.c (parse_upto): Remove 'base' argument. It is always 0.
(format_parse): Update.
* msgl-equal.c: Include string.h.
* str-list.c: Likewise.
2001-11-03 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (line_comment): Remove variable, so default value is
always 1.
2001-11-03 Bruno Haible <haible@clisp.cons.org>
* x-c.c (extract_parenthesized): New function, extracted from
extract_c.
(extract_c): Call extract_parenthesized.
2001-11-03 Bruno Haible <haible@clisp.cons.org>
Add YCP plural form support.
* x-ycp.c (enum token_type_ty): New value token_type_comma.
(x_ycp_lex): Recognize comma.
(extract_ycp): Also recognize the _("singular","plural" pattern.
2001-11-01 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c (check_plural_eval): Fix #if mistake.
2001-11-01 Bruno Haible <haible@clisp.cons.org>
* msgl-iconv.h (iconv_message_list): Add argument 'canon_from_code'.
* msgl-iconv.c (iconv_message_list): Add argument 'canon_from_code'.
(iconv_msgdomain_list): Update.
* write-java.c (msgdomain_write_java): Update.
* msgl-cat.c (catenate_msgdomain_list): Pass the canon_charsets[n][k]
to iconv_message_list; the header entry that contained the charset
specification may already have been removed from the message list.
2001-11-01 Bruno Haible <haible@clisp.cons.org>
* msgl-equal.h (string_list_equal): New declaration.
* msgl-equal.c (string_list_equal): Export function.
* message.h (struct altstr): New fields 'comment', 'comment_dot'.
* msgl-cat.c: Include msgl-equal.h.
(catenate_msgdomain_list): If all alternative comments are equal,
use one copy of them, instead of concatenating them. Likewise for dot
comments.
* Makefile.am (libgettextsrc_la_SOURCES): Add msgl-equal.c.
(msgmerge_SOURCES): Remove msgl-equal.c.
2001-10-31 Bruno Haible <haible@clisp.cons.org>
* Makefile.am (noinst_HEADERS): Add read-java.h, write-java.h,
format.h, msgunfmt.h.
(EXTRA_DIST): Add project-id, gnu/gettext/*.java.
* message.h (NFORMATS): Define via #define, not via an enum value.
* format.h (struct formatstring_parser): Use PARAMS.
* format-c.c (FAT_SIZE_MASK): Remove extraneous backslashes.
* po-charset.c (po_lex_charset_set): Fix syntax error.
* write-java.c (write_java_string): Drop hexdigit[] size.
* x-java.l (add_object): Remove C++ style comment.
2001-10-28 Bruno Haible <haible@clisp.cons.org>
* hostname.c: Include "progname.h".
(program_name): Remove variable.
(main): Call set_program_name instead of setting program_name.
2001-10-28 Bruno Haible <haible@clisp.cons.org>
Create a libgettextsrc shared library.
* Makefile.am (lib_LTLIBRARIES): New variable.
(libgettextsrc_la_SOURCES): New variable.
(msgcmp_SOURCES, msgfmt_SOURCES, msgmerge_SOURCES, msgunfmt_SOURCES,
xgettext_SOURCES, msgattrib_SOURCES, msgcat_SOURCES, msgcomm_SOURCES,
msgconv_SOURCES, msgen_SOURCES, msgexec_SOURCES, msggrep_SOURCES,
msginit_SOURCES, msguniq_SOURCES): Remove source files listed in
libgettextsrc_la_SOURCES.
(libgettextsrc_la_LDFLAGS): New variable.
(msgcmp_LDADD, msgfmt_LDADD, msgmerge_LDADD, msgunfmt_LDADD,
xgettext_LDADD, msgattrib_LDADD, msgcat_LDADD, msgcomm_LDADD,
msgconv_LDADD, msgen_LDADD, msgexec_LDADD, msggrep_LDADD,
msginit_LDADD, msguniq_LDADD): Add libgettextsrc.la. Remove all
dependencies already listed in libgettextsrc_la_LDFLAGS.
(po-lex.lo): Depend on po-gram-gen2.h.
2001-10-21 Bruno Haible <haible@clisp.cons.org>
* Makefile.am (LDADD): Replace libnlsut.a with libgettextlib.la.
(*_LDADD): Likewise.
2001-10-26 Bruno Haible <haible@clisp.cons.org>
* x-c.h (EXTENSIONS_C): Add ".hxx".
2001-10-21 Bruno Haible <haible@clisp.cons.org>
* msgmerge.c (match_domain): Change type of 'processed' argument to
'unsigned int *'.
(merge): Change type of 'processed' to 'unsigned int'.
2001-10-21 Bruno Haible <haible@clisp.cons.org>
Avoid warnings on platforms where size_t is larger than int.
* msgfmt.c (check_pair): Use an 'unsigned int' variable instead of
'size_t', to avoid warnings.
* po-lex.h (po_gram_error): Cast line number to 'unsigned long'.
* po-lex.c (po_gram_error): Likewise.
* x-c.c (extract_c): Likewise.
2001-10-21 Bruno Haible <haible@clisp.cons.org>
* msgexec.c [BeOS]: Fix #ifdef conditional.
2001-10-21 Bruno Haible <haible@clisp.cons.org>
* read-java.c (execute_and_read_po_output): Return false, not 0.
2001-10-11 Bruno Haible <haible@clisp.cons.org>
* msgattrib.c (usage): Fix: --sort-output doesn't deal with duplicates.
* msgcat.c (usage): Likewise.
* msgcomm.c (usage): Likewise.
* msgconv.c (usage): Likewise.
* msgen.c (usage): Likewise.
* msgexec.c (usage): Likewise.
* msggrep.c (usage): Likewise.
* msgmerge.c (usage): Likewise.
* msgunfmt.c (usage): Likewise.
* msguniq.c (usage): Likewise.
* xgettext.c (usage): Likewise.
2001-10-09 Bruno Haible <haible@clisp.cons.org>
* write-po.c (memcpy_small): New function.
(wrap): Use it instead of memcpy. Optimize handling of escape
characters.
2001-10-09 Bruno Haible <haible@clisp.cons.org>
* write-po.c (putc): Define as putc_unlocked if available.
2001-10-09 Bruno Haible <haible@clisp.cons.org>
* po-lex.c (getc): Define as getc_unlocked if available.
2001-10-21 Bruno Haible <haible@clisp.cons.org>
* msginit.c: New file.
* project-id: New file.
* Makefile.am (bin_PROGRAMS): Add msginit.
(projectsdir): New variable.
(DEFS): Add -DLIBDIR and -DPROJECTSDIR.
(msginit_SOURCES): New variable.
(msginit_LDADD): New variable.
(install-exec-local): Also install project-id.
(uninstall-local): Also uninstall project-id.
2001-10-21 Bruno Haible <haible@clisp.cons.org>
* gnu/gettext/GetURL.java: New file.
* urlget.c: New file.
* Makefile.am (noinst_PROGRAMS): Add urlget.
(urlget_SOURCES): New variable.
(install-exec-local): Also install urlget.
(uninstall-local): Also uninstall urlget.
(gnu/gettext/GetURL.class): New rule.
(gettext.jar): Also include gnu/gettext/GetURL*.class.
2001-10-08 Bruno Haible <haible@clisp.cons.org>
* msgl-english.h: New file.
* msgl-english.c: New file, extracted from msgen.c.
* msgen.c: Include msgl-english.h.
(english): Move to msgl-english.c.
(main): Update accordingly.
* Makefile.am (noinst_HEADERS): Add msgl-english.h.
(msgen_SOURCES): Add msgl-english.c.
2001-10-08 Bruno Haible <haible@clisp.cons.org>
* po-time.h: New file.
* po-time.c: New file, extracted from xgettext.c.
* xgettext.c: Include po-time.h.
(difftm): Move to po-time.c.
(construct_header): Move some code to po-time.c. Call po_strftime.
* Makefile.am (noinst_HEADERS): Add po-time.h.
(xgettext_SOURCES): Add po-time.c.
2001-09-29 Bruno Haible <haible@clisp.cons.org>
* user-email.in: New file.
* Makefile.am (install-exec-local): Install user-email.
(uninstall-local): Uninstall user-email.
(DISTCLEANFILES): Add user-email.
2001-09-29 Bruno Haible <haible@clisp.cons.org>
* hostname.c: New file.
* Makefile.am (noinst_PROGRAMS, hostname_SOURCES): New variables.
(install-exec-local, installdirs-local, uninstall-local): New rules.
2001-10-10 Bruno Haible <haible@clisp.cons.org>
* msgexec.c (process_string): Update for changed create_pipe_bidi(),
wait_subprocess().
* msggrep.c (is_string_selected): Update for changed create_pipe_out(),
wait_subprocess().
* read-java.c (execute_and_read_po_output): Update for changed
create_pipe_in(), wait_subprocess().
2001-10-08 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (remember_a_message): When the comment tag is seen,
remember all remaining comment lines, not just one.
2001-09-25 Bruno Haible <haible@clisp.cons.org>
Upgrade to automake-1.5.
* Makefile.am (AUTOMAKE_OPTIONS): Add 'no-dependencies'.
(COMMON_SOURCE): Renamed from COMMON_SOURCES.
(FORMAT_SOURCE): Renamed from FORMAT_SOURCES.
* ylwrap: Remove file.
2001-09-22 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (extractor_func): New typedef.
(scanner_fp): Remove typedef.
(main): Use extractor_func and call it via extract_from_file.
(extract_from_file): New function.
(scan_c_file, scan_po_file, scan_java_file, scan_ycp_file,
scan_rst_file): Remove functions.
(language_to_extractor): Renamed from language_to_scanner.
* x-c.h (SCANNERS_C): Use extract_c instead of scan_c_file.
* x-java.h (SCANNERS_JAVA): Use extract_java instead of scan_java_file.
* x-po.h (SCANNERS_PO): Use extract_po instead of scan_po_file.
* x-rst.h (SCANNERS_RST): Use extract_rst instead of scan_rst_file.
* x-ycp.h (SCANNERS_YCP): Use extract_ycp instead of scan_ycp_file.
2001-09-23 Bruno Haible <haible@clisp.cons.org>
* plural-eval.c: New file.
* msgfmt.c: Include plural-exp.h.
(sigfpe_exit, sigfpe_code): New variables.
(sigfpe_handler, install_sigfpe_handler, uninstall_sigfpe_handler,
check_plural_eval, check_plural): New functions.
(main): Call it if --check-header is enabled.
* Makefile.am (msgfmt_SOURCES): Add plural-eval.c.
2001-10-04 Tommy Johansson <tommy.johansson@kanalen.org>
* x-java.l (object_list): New type.
(INITIAL_OBJECT_LIST_SIZE, OBJECT_LIST_GROWTH): New macros.
(java_keyword): New type.
(strip_ending_spaces): New function.
(object_list_alloc, object_list_destroy, get_num_objects, get_object,
add_object, alloc_keyword): New functions.
(java_keywords): Change type.
(extract_keyword, extract_msgid_arg, extract_msgid_plural_arg): New
functions.
(is_keyword): Change return type.
(x_java_keyword): Update.
(extract_java): Count arguments, and support plural keywords like
ngettext.
2001-09-19 Bruno Haible <haible@clisp.cons.org>
* xgettext.h (omit_header): New declaration.
* xgettext.c (omit_header): Make global.
* x-po.c (extract_directive_message): Don't throw the header entry
away if omit_header is true.
2001-09-19 Bruno Haible <haible@clisp.cons.org>
* write-po.c (msgdomain_list_print): Treat charset=CHARSET as if it
were absent, i.e. like ASCII, not like an unknown 8-bit encoding.
2001-09-18 Bruno Haible <haible@clisp.cons.org>
* msgl-equal.h: New file.
* msgl-equal.c: New file.
* msgmerge.c: Include msgl-equal.h, backupfile.h, copy-file.h.
(update_mode, version_control_string, backup_suffix_string): New
variables.
(long_options): Add --backup, --suffix, --update.
(main): Accept options --backup, --suffix, -U/--update. If in update
mode, compare old and new message lists, backup the def.po file, and
overwrite the def.po file.
(usage): Document --backup, --suffix, -U/--update.
(DOT_FREQUENCY): Renamed from DOT_FREQUENCE.
(merge): Also return def.po message list. Don't share messages between
def and result; copy instead.
* Makefile.am (noinst_HEADERS): Add msgl-equal.h.
(msgmerge_SOURCES): Add msgl-equal.c.
2001-09-19 Bruno Haible <haible@clisp.cons.org>
* po-hash-gen.y (number): Change type from 'int' to 'size_t'.
(filepos): Accept strings without line number.
(yylex): Change n from 'int' to 'size_t'.
* po.h (po_method_ty): In field comment_filepos, change line's type
from 'int' to 'size_t'.
(po_callback_comment_filepos): Change line's type from 'int' to
'size_t'.
* read-po.c (readall_comment_filepos): Likewise.
* x-po.c (extract_comment_filepos): Likewise.
* po.c (po_comment_filepos): Likewise.
(po_callback_comment_filepos): Likewise.
(po_callback_comment): Reduce the possibility that po_hash succeeds
if the comment is not a Sun file position comment.
2001-09-16 Bruno Haible <haible@clisp.cons.org>
* x-rst.h: New file.
* x-rst.c: New file.
* xgettext.c: Include x-rst.h.
(scan_rst_file): New function.
(language_to_scanner): Add RST rule.
(extension_to_language): Add RST rule.
* write-po.c (message_print): Don't print the line number if it is
= (size_t)(-1).
* Makefile.am (noinst_HEADERS): Add x-rst.h.
(xgettext_SOURCES): Add x-rst.c.
2001-09-20 Bruno Haible <haible@clisp.cons.org>
* format-pascal.c: New file.
* format.h (formatstring_pascal): New declaration.
* message.h (enum format_type): Add format_pascal.
* message.c (format_language): Add format_pascal entry.
(format_language_pretty): Likewise.
* format.c (formatstring_parsers): Add formatstring_pascal.
* Makefile.am (FORMAT_SOURCES): Add format-pascal.c.
2001-09-16 Bruno Haible <haible@clisp.cons.org>
* x-ycp.h: New file.
* x-ycp.c: New file.
* xgettext.c: Include x-ycp.h.
(usage): Mention YCP.
(scan_ycp_file): New function.
(language_to_scanner): Add YCP rule. Remove preliminary YCP rule.
(extension_to_language): Add YCP rule.
* Makefile.am (noinst_HEADERS): Add x-ycp.h.
(xgettext_SOURCES): Add x-ycp.c.
2001-09-17 Bruno Haible <haible@clisp.cons.org>
* gettext.c: Include basename.h.
* ngettext.c: Likewise.
* msgattrib.c: Likewise.
* msgcat.c: Likewise.
* msgcmp.c: Likewise.
* msgcomm.c: Likewise.
* msgconv.c: Likewise.
* msgen.c: Likewise.
* msgexec.c: Likewise.
* msgfmt.c: Likewise.
* msggrep.c: Likewise.
* msgl-cat.c: Likewise.
* msgl-charset.c: Likewise.
* msgl-iconv.c: Likewise.
* msgmerge.c: Likewise.
* msgunfmt.c: Likewise.
* msguniq.c: Likewise.
* xgettext.c: Likewise.
* po-charset.c: Include <stdlib.h> and basename.h.
2001-09-16 Bruno Haible <haible@clisp.cons.org>
* x-c.c (phase4_getc): Rename local variable 'state' to
'last_was_star'.
2001-09-11 Bruno Haible <haible@clisp.cons.org>
* Makefile.am (COMMON_SOURCES, FORMAT_SOURCES): New variables.
(msgcmp_SOURCES, msgfmt_SOURCES, msgmerge_SOURCES, msgunfmt_SOURCES,
xgettext_SOURCES, msgattrib_SOURCES, msgcat_SOURCES, msgcomm_SOURCES,
msgconv_SOURCES, msgen_SOURCES, msgexec_SOURCES, msggrep_SOURCES,
msguniq_SOURCES): Simplify.
2001-09-09 Bruno Haible <haible@clisp.cons.org>
* file-list.c: Include system.h.
* format-c.c: Include xmalloc.h instead of system.h.
* format-ycp.c: Likewise.
* read-po.c: Likewise.
* x-po.c: Likewise.
* format-java.c: Include xmalloc.h.
* format-lisp.c: Likewise.
* format-python.c: Likewise.
* gettext.c: Likewise.
* msgen.c: Likewise.
* msgexec.c: Likewise.
* msggrep.c: Likewise.
* ngettext.c: Likewise.
* po-lex.c: Likewise.
* read-mo.c: Likewise.
* x-c.c: Likewise.
* message.c: Include xmalloc.h and strstr.h.
* msgfmt.c: Likewise.
* write-po.c: Likewise.
* msgl-cat.c: Include string.h, xmalloc.h and strstr.h.
* msgl-iconv.c: Likewise.
* msgl-charset.c: Include strstr.h.
* po-charset.c: Likewise.
* po-gram-gen.y: Include stdlib.h, xmalloc.h instead of system.h.
* po-hash-gen.y: Likewise.
* str-list.c: Likewise.
* po.c: Include string.h, xmalloc.h instead of system.h.
* write-java.c: Include string.h, xmalloc.h.
* x-java.l: Include stdlib.h, xmalloc.h, strstr.h instead of system.h.
* xgettext.c: Include xmalloc.h, strstr.h, xerror.h.
(main, construct_header): Use xasprintf instead of asprintf.
2001-09-24 Bruno Haible <haible@clisp.cons.org>
* po-lex.c (mb_iseq): Compare the byte sequence, not the Unicode
equivalent. This is necessary for non-ASCII-compatible encodings like
SHIFT_JIS.
2001-09-08 Bruno Haible <haible@clisp.cons.org>
* msgunfmt.h: New file.
* msgunfmt.c (verbose): New variable.
(java_mode, java_resource_name, java_locale_name): New variables.
(long_options): Add --java, --locale, --resource, --verbose.
(main): Recognize new options -j, -l, -r, -v. Handle java mode
differently.
(usage): Document --java, --resource, --locale, --verbose.
* read-java.h: New file.
* read-java.c: New file.
* read-po.h (read_po): New declaration.
* read-po.c (read_po): New function.
* gnu/gettext/DumpResource.java: New file.
* Makefile.am (jardir): New variable.
(DEFS): Define GETTEXTJAR, for read-java.c.
(JAR): New variable.
(JAVACOMP): New variable.
(msgunfmt_SOURCES): Add open-po.c, po-gram-gen.y, po-hash-gen.y,
po-charset.c, po-lex.c, po.c, read-po.c, dir-list.c, read-java.c.
(all-local, all-java-no, all-java-yes, gnu/gettext/DumpResource.class,
gettext.jar, install-data-local, install-java-no, install-java-yes,
installdirs-local, installdirs-java-no, installdirs-java-yes,
uninstall-local, uninstall-java-no, uninstall-java-yes): New rules.
(CLEANFILES): New variable.
2001-09-08 Bruno Haible <haible@clisp.cons.org>
* msgexec.c (nonintr_select): Add function prototype.
* xgettext.c (scan_java_file): Add function prototype.
2001-09-23 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (remember_a_message): Warn about empty msgid if it
conflicts with construct_header().
2001-09-08 Bruno Haible <haible@clisp.cons.org>
* msgcat.c (main): Move the option checking after the handling of
--version and --help, but before opening of any file.
* msgcomm.c (main): Move the option checking after the handling of
--version and --help.
* msguniq.c (main): Likewise.
* xgettext.c (main): Likewise.
* msgconv.c (main): Additional option checking for --sort-by-file.
* msgen.c (main): Likewise.
* msgexec.c (main): Likewise.
* msggrep.c (main): Likewise.
* msgmerge.c (main): Likewise.
2001-09-08 Bruno Haible <haible@clisp.cons.org>
* dir-list.c: Include specification header before all other headers.
* file-list.c: Likewise.
* message.c: Likewise.
* msgl-cat.c: Likewise.
* msgl-charset.c: Likewise.
* msgl-iconv.c: Likewise.
* open-po.c: Likewise.
* po.c: Likewise.
* po-gram-gen.y: Likewise.
* po-hash-gen.y: Likewise.
* po-lex.c: Likewise.
* read-po.c: Likewise.
* str-list.c: Likewise.
* write-mo.c: Likewise.
* write-po.c: Likewise.
* msgfmt.h: Don't include message.h.
* open-po.h: Include <stdio.h>, for FILE.
* write-mo.h: Include message.h and <stddef.h>.
2001-09-21 Tommy Johansson <tommy.johansson@kanalen.org>
* x-java.l (create_char_buf): Fix problem with empty messages.
(//): Remove leading "//" from result.
(x_java_keyword): Handle NULL argument.
2001-09-19 Tommy Johansson <tommy.johansson@kanalen.org>
* x-java.l (is_keyword): Swap arguments of do_compare.
2001-09-02 Bruno Haible <haible@clisp.cons.org>
* write-java.h: New file.
* write-java.c: New file.
* plural.c: New file.
* msgfmt.c: Include write-java.h.
(java_mode, assume_java2, java_resource_name, java_locale_name,
java_class_directory): New variables.
(long_options): Add --java, --java2, --locale, --resource.
(main): Add command line option -d, -j, -l, -r. Handle them and
--java2. Forbid some options depending on whether --java was given
or not. In java_mode, call msgdomain_write_java.
(usage): Update.
(format_directive_domain): In java_mode, ignore domain directives.
* Makefile.am (msgfmt_SOURCES): Add write-java.c, msgl-ascii.c,
msgl-iconv.c, plural.c.
2001-09-16 Bruno Haible <haible@clisp.cons.org>
* Makefile.am (noinst_HEADERS): Add x-java.h.
2001-09-14 Tommy Johansson <tommy.johansson@kanalen.org>
* x-java.h (x_java_extract_all): New declaration.
* x-java.l (extract_all_strings): New variable.
(x_java_extract_all): New function.
(extract_java): Test extract_all_strings.
* xgettext.c (main): Call x_java_extract_all.
2001-09-03 Bruno Haible <haible@clisp.cons.org>
* x-c.h (EXTENSIONS_C, SCANNERS_C): Remove extraneous commas.
* x-po.h (EXTENSIONS_PO, SCANNERS_PO): Likewise.
2001-09-11 Bruno Haible <haible@clisp.cons.org>
* xgettext.c: Set msgstr_prefix to "", not NULL.
Reported by Martin Quinson <Martin.Quinson@ens-lyon.fr>.
2001-09-10 Bruno Haible <haible@clisp.cons.org>
* msgattrib.c (main): Call set_program_name instead of assigning
program_name directly.
* msgcat.c (main): Likewise.
* msgconv.c (main): Likewise.
* msgen.c (main): Likewise.
* msgexec.c (main): Likewise.
* msggrep.c (main): Likewise.
* msguniq.c (main): Likewise.
2001-09-08 Bruno Haible <haible@clisp.cons.org>
* msgattrib.c: New file.
* Makefile.am (bin_PROGRAMS): Add msgattrib.
(msgattrib_SOURCES, msgattrib_LDADD): New variables.
2001-09-02 Bruno Haible <haible@clisp.cons.org>
* format-lisp.c (gcd): Remove function. Include "gcd.h" instead.
2001-09-03 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (usage): Mention ObjectiveC and Java.
* xgettext.h (substring_match): New declaration.
* Makefile.am (x-java.c): New rule. Automake's .l.c rules doesn't
work if $(LEX) is defined to ":".
2001-09-03 Tommy Johansson <tommy.johansson@kanalen.org>
* x-java.h: New file.
* x-java.l: New file.
* xgettext.c: Include x-java.h.
(substring_match): New variable.
(long_options): Add --keyword-substring.
(main): For -k, also call x_java_keyword. Treat --keyword-substring.
(scan_java_file): New function.
(language_to_scanner): Add Java rule. Remove preliminary Java rule.
(extension_to_language): Add Java rule.
* Makefile.am (xgettext_SOURCES): Add x-java.l.
2001-09-02 Bruno Haible <haible@clisp.cons.org>
* read-mo.h: New file.
* read-mo.c: New file, extracted from msgunfmt.c.
(read_mo_file): Require non-null message list argument. Return void.
* msgunfmt.c (endian, read32, seek32, string32, read_mo_file): Move to
read-mo.c.
(main): Pass a fresh list, not NULL, to read_mo_file.
* Makefile.am (noinst_HEADERS): Add read-mo.h.
(msgunfmt_SOURCES): Add read-mo.c.
2001-09-02 Bruno Haible <haible@clisp.cons.org>
* msgfmt.h (struct hashtable_entry): Remove type.
(verbose): New declaration.
* msgfmt.c (msg_domain): Add a message list field.
(verbose): Make non-static.
(main): Pass the message list, not the hash table, to
msgdomain_write_mo. Free the message list when done.
(new_domain): Initialize the message list to empty.
(format_directive_message): Change type of entry to 'message_ty *'.
Store msgid in it.
* write-mo.h: Don't include hash.h.
(msgdomain_write_mo): Change argument type from hash table to message
list.
* write-mo.c (id_str_pair): Add const.
(write_table): Change argument type from hash table to message list.
Use 'message_ty' instead of 'struct hashtable_entry'.
(msgdomain_write_mo): Change argument type from hash table to message
list.
2001-09-01 Bruno Haible <haible@clisp.cons.org>
* msgfmt.h: New file, extracted from msgfmt.c.
* write-mo.h: New file, extracted from msgfmt.c.
* write-mo.c: New file, extracted from msgfmt.c.
(write_table): Don't call delete_hash here.
(msgdomain_write_mo): Add check against writing on full disk.
* msgfmt.c (struct id_str_pair): Move to write-mo.c.
(struct hashtable_entry): Move to msgfmt.h.
(alignment): Move to write-mo.h and write-mo.c.
(no_hash_table): Likewise. Change type to boolean.
(long_options): Don't take &no_hash_table.
(roundup): Move to write-mo.c.
(main): Set no_hash_table here. Call msgdomain_write_mo and
delete_hash.
(compare_id): Move to write-mo.c.
(write_table): Likewise.
(read_po_file): Renamed from grammar.
* Makefile.am (noinst_HEADERS): Add msgfmt.h, write-mo.h.
(msgfmt_SOURCES): Add write-mo.c.
2001-09-01 Bruno Haible <haible@clisp.cons.org>
* write-po.c (msgdomain_list_print): Before fclose, check for ferror.
2001-09-01 Bruno Haible <haible@clisp.cons.org>
* message.c (message_list_list_search): If the first match has an
empty translation but there is later in the list a non-empty
translation, return the latter one. This fixes the msgmerge-8 test.
2001-08-30 Bruno Haible <haible@clisp.cons.org>
Reorganize msgfmt checking options.
* msgfmt.c: Include limits.h.
(verbose): Renamed from verbose_level.
(check_format_strings): Renamed from do_check.
(check_header, check_domain, check_compatibility): New variables.
(long_options): Add --check-domain, --check-format, --check-header,
--check-compatibility.
(main): Recognize options -C, --check-compatibility, --check-domain,
--check-format, --check-header. Option -c implies the last three.
(usage): Update.
(format_debrief): Test check_header, not verbose_level.
(format_directive_domain): Test check_domain, not verbose_level.
(format_directive_message): Test check_compatibility and check_header,
not verbose_level. Always perform the check for duplicates.
(format_comment_special): Test check_compatibility, not verbose_level.
(check_pair): Error if check_compatibility is true an msgid_plural is
used.
2001-08-26 Bruno Haible <haible@clisp.cons.org>
* format.h: New file.
* format-c.c: New file.
* format-java.c: New file.
* format-lisp.c: New file.
* format-python.c: New file.
* format-ycp.c: New file.
* format.c: New file.
* Makefile.am (msgfmt_SOURCES): Add format.c, format-c.c,
format-java.c, format-lisp.c, format-python.c, format-ycp.c.
(xgettext_SOURCES): Likewise.
* message.h (enum format_type): New type.
(format_language, format_language_pretty): New declarations.
(parse_c_format_description_string): Remove declaration.
(possible_format_p): Renamed from possible_c_format_p.
(struct message_ty): Change field 'is_c_format' to an array and
rename it to 'is_format'.
* message.c (parse_c_format_description_string): Remove function.
(format_language): New array.
(format_language_pretty): New array.
(possible_format_p): Renamed from possible_c_format_p.
(parse_c_width_description_string): Remove function.
(message_alloc): Update for is_format array.
(message_copy): Likewise.
(message_merge): Likewise.
* po.h (po_parse_comment_special): New declaration.
* po.c (po_parse_comment_special): New function.
* msgl-cat.c (catenate_msgdomain_list): Update for is_format array.
* read-po.c (struct readall_class_ty): Change field 'is_c_format' to
an array and rename it to 'is_format'.
(readall_constructor): Update for is_format array.
(readall_directive_message): Likewise.
(readall_comment_special): Call po_parse_comment_special instead of
parse_c_format_description_string and parse_c_width_description_string.
* write-po.c (make_format_description_string): Renamed from
make_c_format_description_string. Add a language argument. Remove the
impossible and undecided cases.
(significant_format_p): Renamed from significant_c_format_p.
(has_significant_format_p): New function.
(message_print): Update for is_format array.
* msgfmt.c: Include format.h instead of printf.h.
(struct msgfmt_class_ty): Change field 'is_c_format' to an array and
rename it to 'is_format'.
(format_constructor): Update for is_format array.
(format_directive_message): Likewise.
(format_comment_special): Call po_parse_comment_special instead of
parse_c_format_description_string and parse_c_width_description_string.
(check_pair): Change is_format argument to an array. Call language
dependent format string checking routines.
* x-po.c (struct extract_class_ty): Change field 'is_c_format' to
an array and rename it to 'is_format'.
(extract_constructor): Update for is_format array.
(extract_directive_message): Likewise.
(extract_comment_special): Call po_parse_comment_special instead of
parse_c_format_description_string and parse_c_width_description_string.
* x-c.h (SCANNERS_C): Refer to formatstring_c.
* x-po.h (SCANNERS_PO): Add NULL formatstring reference.
* xgettext.c: Include format.h instead of printf-parse.h.
(test_whether_c_format): Remove function.
(current_formatstring_parser): New variable.
(remember_a_message): Update for is_format array. Call
po_parse_comment_special instead of parse_c_format_description_string
and parse_c_width_description_string. Decide whether format string
depending on current_formatstring_parser.
(language_to_scanner): Also set current_formatstring_parser. Add
dummy table entries for Python, Lisp, Java, YCP.
2001-08-12 Bruno Haible <haible@clisp.cons.org>
* pos.h: Include <stddef.h>.
2001-08-12 Bruno Haible <haible@clisp.cons.org>
* x-c.c (real_file_name): Renamed from file_name.
(last_comment_line, last_non_comment_line, newline_count): Don't
initialize statically.
(phase1_getc): Update.
(x_c_lex): Don't reset last_comment_line, last_non_comment_line,
newline_count upon EOF.
(extract_c): Reset them here. Update.
* x-c.c (x_c_lex): Move lazy keyword initialization...
(init_keywords): ... to here. New function.
(extract_c): Call init_keywords.
* x-c.c (x_c_lex): Look up token without NUL in hash table.
(x_c_keyword): Store keywords without NUL in hash table.
2001-07-28 Bruno Haible <haible@clisp.cons.org>
* gettext.c (usage): If IN_HELP2MAN is set, output template for
localedir, not its value.
* ngettext.c (usage): Likewise.
2001-07-28 Bruno Haible <haible@clisp.cons.org>
* po-lex.c: Include c-ctype.h instead of <ctype.h>.
(control_sequence): Use C locale character classifications.
* xgettext.c (main): Cast isspace argument to 'unsigned char'.
2001-07-28 Bruno Haible <haible@clisp.cons.org>
* po-lex.h (lex_start, lex_end): New declarations.
* po-lex.c (lex_start): New function.
(lex_end): New function.
(lex_open): Call lex_start.
(lex_close): Call lex_end.
* open-po.h (open_po_file): Nop.
* open-po.c (open_po_file): Small optimization.
* po.h (po_scan): New declaration.
(po_scan_file): Renamed from po_scan.
* po.c (po_scan): New function.
(po_scan_file): Renamed from po_scan.
* msgcmp.c (grammar): Update po_scan_file call.
* msgfmt.c (grammar): Likewise.
* read-po.c (read_po_file): Likewise.
* x-po.h: New file.
* x-po.c: New file.
(extract_class_ty, extract_constructor, extract_directive_domain,
extract_directive_message, extract_parse_brief, extract_comment,
extract_comment_dot, extract_comment_filepos, extract_comment_special,
extract_methods): Moved here from xgettext.c.
(extract_po): New function, extracted from read_po_file.
* xgettext.h (line_comment, exclude): New declarations.
* xgettext.c: Include x-po.h.
(line_comment): Make non-static.
(exclude): Likewise.
(main): Update scan_po_file call.
(read_exclusion_file): Update po_scan_file call.
(extract_class_ty, extract_constructor, extract_directive_domain,
extract_directive_message, extract_parse_brief, extract_comment,
extract_comment_dot, extract_comment_filepos, extract_comment_special,
extract_methods): Move to x-po.c.
(scan_po_file): Renamed from read_po_file. Call xgettext_open and
extract_po.
(language_to_scanner): Use SCANNERS_PO.
(extension_to_language): Use EXTENSIONS_PO.
* Makefile.am (noinst_HEADERS): Add x-po.h.
(xgettext_SOURCES): Add x-po.c.
2001-07-27 Bruno Haible <haible@clisp.cons.org>
* x-c.h: New file.
* x-c.c: New file.
(xgettext_token_type_ty, xgettext_token_ty): Moved here from
xget-lex.h. In xgettext_token_ty, unify line_number and file_name into
lex_pos_ty.
(token_type_ty, token_ty): Moved here from xget-lex.c.
(extract_all): Moved here from xgettext.c.
(keywords, default_keywords, trigraphs, file_name, logical_file_name,
line_number, fp, last_comment_line, last_non_comment_line,
newline_count): Moved here from xget-lex.c.
(phase1_pushback, phase1_pushback_length, phase1_getc, phase1_ungetc,
phase2_pushback, phase2_pushback_length, phase2_getc, phase2_ungetc,
phase3_pushback, phase3_pushback_length, phase3_getc, phase3_ungetc,
phase4_getc, phase4_ungetc, phase7_getc, phase7_ungetc,
phase5_pushback, phase5_pushback_length, phase5_get, phase5_unget,
phaseX_get, phase6_pushback, phase6_pushback_length, phase6_get,
phase6_unget, phase8_get): Moved here from xget-lex.c. Use
xgettext_comment_add instead of accessing 'comment'. Don't free
logical_file_name; it is still used as file_name of messages in mdlp.
(x_c_lex): Moved here from xget-lex.c, renamed from xgettext_lex.
(extract_c): Moved here from xgettext.c, renamed from scan_c_file.
Change arguments from filename to FILE * and two filenames. Don't call
xgettext_lex_open and xgettext_lex_close.
(x_c_extract_all): New function.
(x_c_keyword): Moved here from xget-lex.c, renamed from
xgettext_lex_keyword.
(x_c_any_keywords): Moved here from xget-lex.c, renamed from
xgettext_any_keywords.
(x_c_trigraphs): Moved here from xget-lex.c, renamed from
xgettext_lex_trigraphs.
* xgettext.h: New file.
* xgettext.c (extract_all): Move to x-c.c.
(comment): Moved here from xget-lex.c.
(xgettext_comment_add): New function.
(xgettext_comment): Moved here from xget-lex.c, renamed from
xgettext_lex_comment.
(xgettext_comment_reset): Moved here from xget-lex.c, renamed from
xgettext_lex_comment_reset.
(xgettext_open): New function, mostly taken from xgettext_lex_open
in xget-lex.c.
(remember_a_message): Make non-static. Replace xgettext_token_ty arg
with lex_pos_ty argument.
(remember_a_message_plural): Likewise.
(scan_c_file): Moved the body to x-c.c:extract_c.
(language_to_scanner): Use SCANNERS_C.
(extension_to_language): Use EXTENSIONS_C.
* xget-lex.h: Remove file.
* xget-lex.c: Remove file.
* Makefile.am (noinst_HEADERS): Remove xget-lex.h. Add xgettext.h and
x-c.h.
(xgettext_SOURCES): Remove xget-lex.c. Add x-c.c.
2001-07-26 Bruno Haible <haible@clisp.cons.org>
* file-list.h: New file.
* file-list.c: New file, extracted from msgcomm.c.
* msgcat.c: Include file-list.h.
(main): Call read_names_from_file instead of read_name_from_file.
(read_name_from_file): Remove function.
* msgcomm.c: Include file-list.h.
(main): Call read_names_from_file instead of read_name_from_file.
(read_name_from_file): Remove function.
* xgettext.c: Include file-list.h.
(main): Call read_names_from_file instead of read_name_from_file.
(read_name_from_file): Remove function.
* Makefile.am (noinst_HEADERS): Add file-list.h.
(xgettext_SOURCES): Add file-list.c.
(msgcat_SOURCES): Likewise.
(msgcomm_SOURCES): Likewise.
2001-07-23 Bruno Haible <haible@clisp.cons.org>
* msgcomm.c: Assume <limits.h> exists.
* msgexec.c: Likewise.
* msggrep.c: Likewise.
* write-po.c: Likewise.
2001-08-02 Bruno Haible <haible@clisp.cons.org>
* gettext.c (usage): Change bug report address to
<bug-gnu-gettext@gnu.org>.
* ngettext.c (usage): Likewise.
* msgcat.c (usage): Likewise.
* msgcmp.c (usage): Likewise.
* msgcomm.c (usage): Likewise.
* msgconv.c (usage): Likewise.
* msgen.c (usage): Likewise.
* msgexec.c (usage): Likewise.
* msgfmt.c (usage): Likewise.
* msggrep.c (usage): Likewise.
* msgmerge.c (usage): Likewise.
* msgunfmt.c (usage): Likewise.
* msguniq.c (usage): Likewise.
* xgettext.c (usage): Likewise.
2001-07-22 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (language_to_scanner): Add language "ObjectiveC".
(extension_to_language): Map extension "m" to "ObjectiveC".
2001-07-22 Bruno Haible <haible@clisp.cons.org>
Make msgcomm work with multidomain input and different encodings.
* msgl-cat.h (msgcomm_mode, omit_header): New declarations.
* msgl-cat.c (msgcomm_mode, omit_header): New variables.
(is_message_selected): Different behaviour if omit_header is true.
(is_message_needed): Different behaviour if msgcomm_mode is true.
(catenate_msgdomain_list): Likewise.
* msgcomm.c: Don't include <sys/types.h>, <unistd.h>, po.h. Include
read-po.h, msgl-cat.h instead.
(line_comment, omit_header, more_than, less_than): Remove variables.
(to_code): New variable.
(long_options): New option --to-code.
(main): New option -t/--to-code. Don't take the address of omit_header.
Call catenate_msgdomain_list instead of read_po_file and
is_message_selected.
(is_message_selected, extract_constructor, extract_directive_domain,
extract_directive_message, extract_parse_brief, extract_comment,
extract_comment_dot, extract_comment_filepos, extract_comment_special,
read_po_file): Remove functions.
* Makefile.am (msgcomm_SOURCES): Add read-po.c, msgl-iconv.c,
msgl-cat.c.
2001-07-22 Bruno Haible <haible@clisp.cons.org>
* msgl-ascii.h: New file.
* msgl-ascii.c: New file.
* po-charset.h (po_charset_ascii, po_charset_ascii_compatible): New
declarations.
* po-charset.c (po_charset_ascii): New variable.
(po_charset_ascii_compatible): New function.
* write-po.c (has_nonascii): Remove function.
(message_print, message_print_obsolete): Use is_ascii_string instead.
* msgl-iconv.c (iconv_message_list): Don't complain about missing
header entry with charset if all messages are ASCII.
* msgl-cat.c (catenate_msgdomain_list): Don't complain about missing
header entry with charset if all messages are ASCII. Better choice of
canon_to_code: when combining ASCII and an ASCII compatible encoding,
choose the latter, not UTF-8. Avoid performing trivial conversions.
* Makefile.am (noinst_HEADERS): Add msgl-ascii.h.
(msgmerge_SOURCES): Add msgl-ascii.c.
(msgunfmt_SOURCES): Likewise.
(msgcat_SOURCES): Likewise.
(msgcomm_SOURCES): Likewise.
(msgconv_SOURCES): Likewise.
(msgen_SOURCES): Likewise.
(msgexec_SOURCES): Likewise.
(msggrep_SOURCES): Likewise.
(msguniq_SOURCES): Likewise.
2001-07-22 Bruno Haible <haible@clisp.cons.org>
* msgl-cat.h: Include <stdbool.h>.
* po.h: Likewise.
* read-po.h: Likewise.
* write-po.h: Likewise.
* xget-lex.h: Likewise.
2001-07-21 Bruno Haible <haible@clisp.cons.org>
* msgl-cat.h: New file.
* msgl-cat.c: New file, extracted from msgcat.c.
* msgcat.c (more_than, less_than): Move to msgl-cat.c.
(use_first): Likewise. Change type to bool.
(long_options): Don't take the address of use_first.
(main): Initialize more_than, less_than, use_first explicitly.
Add --use-first handling.
(is_message_selected, is_message_needed, is_message_first_needed,
catenate_msgdomain_list): Move to msgl-cat.c.
* read-po.h (allow_duplicates): New declaration.
* read-po.c (allow_duplicates): New variable.
(readall_directive_message): If allow_duplicates is true, don't search
for the message ID, just append the message.
* msguniq.c: New file.
* Makefile.am (bin_PROGRAMS): Add msguniq.
(noinst_HEADERS): Add msgl-cat.h.
(msgcat_SOURCES): Add msgl-cat.c.
(msguniq_SOURCES, msguniq_LDADD): New variables.
2001-07-21 Bruno Haible <haible@clisp.cons.org>
* msgcat.c (usage): The default value for more-than is 0 here.
(is_message_selected): Always keep the header entry. Needed when
option --unique is used.
2001-07-21 Bruno Haible <haible@clisp.cons.org>
* message.h (struct message_ty): Add fields 'alternative_count',
'alternative'.
* msgcat.c (catenate_msgdomain_list): is_c_format defaults to
undecided, not to no. If all alternative translations of a message
are the same, keep the first translation instead of mentioning them
all, and don't make the message fuzzy.
2001-07-21 Bruno Haible <haible@clisp.cons.org>
* msgcomm.c (extract_directive_message): Don't make the message fuzzy
if the first occurrence wasn't fuzzy.
2001-07-21 Bruno Haible <haible@clisp.cons.org>
* message.c (message_comment_filepos): Don't keep the filepos[] array
sorted.
* write-po.c (cmp_by_msgid): Renamed from msgid_cmp.
(cmp_filepos, msgdomain_list_sort_filepos): New functions.
(cmp_by_filepos): Renamed from filepos_cmp.
(msgdomain_list_sort_by_filepos): Call msgdomain_list_sort_filepos.
2001-07-12 Bruno Haible <haible@clisp.cons.org>
* msgexec.c: New file.
* msgsed.c: Remove file.
* Makefile.am (bin_PROGRAMS): Replace msgsed with msgexec.
(msgexec_SOURCES, msgexec_LDADD): New variables.
(msgsed_SOURCES, msgsed_LDADD): Remove variables.
2001-07-11 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (test_whether_c_format): When encountering an
unterminated % format specifier, return 'impossible'.
Reported by Gaute B Strokkenes <gs234@cam.ac.uk>.
2001-07-09 Bruno Haible <haible@clisp.cons.org>
* write-po.c (has_nonascii): New function.
(message_print): Warn if the msgid is not fully ASCII.
(message_print_obsolete): Likewise.
2001-07-05 Bruno Haible <haible@clisp.cons.org>
* msgcomm.c (is_message_selected): Keep the header entry.
2001-07-01 Bruno Haible <haible@clisp.cons.org>
* po-charset.h (po_lex_charset): New declaration.
* po-charset.c (po_lex_charset): Export variable.
* po-lex.h: Include xerror.h.
(gram_pos_column): New declaration.
(po_gram_error): Also output current column number.
(po_gram_error_at_line): Work around ## problem in gcc.
* po-lex.c: Include linebreak.h and utf8-ucs4.h.
(gram_pos_column): New variable.
(po_gram_error): Also output current column number.
(MBCHAR_BUF_SIZE): New macro.
(struct mbchar, mbchar_t): New types.
(memcpy_small, mb_iseof, mb_ptr, mb_len, mb_iseq, mb_isnul, mb_cmp,
mb_equal, mb_isascii): New functions.
(MB_UNPRINTABLE_WIDTH): New macro.
(mb_width, mb_putc, mb_setascii, mb_copy): New functions.
(NPUSHBACK): New macro.
(struct mbfile, mbfile_t): New types.
(signal_eilseq): New variable.
(mbfile_init, mbfile_getc, mbfile_ungetc): New functions.
(mbf): New variable.
(fp): Remove variable.
(lex_open): Initialize mbf, gram_pos_column, signal_eilseq.
(lex_close): Reset mbf, gram_pos_column, signal_eilseq.
(lex_getc): Return a multibyte character. Update gram_pos_column.
(lex_ungetc): Take a multibyte character. Update gram_pos_column.
(keyword_p): Use po_gram_error_at_line instead of po_gram_error.
No column number needed here.
(control_sequence): Read multibyte characters instead of bytes.
(po_gram_lex): Likewise.
* xgettext.c (exclude_directive_domain): Use po_gram_error_at_line
instead of po_gram_error. No column number needed here.
(extract_directive_domain): Likewise.
* msgcomm.c (extract_directive_domain): Likewise.
2001-06-30 Bruno Haible <haible@clisp.cons.org>
* message.h: Include stdbool.h.
(message_ty): Change type of fields 'is_fuzzy', 'obsolete' to bool.
(message_predicate_ty): Change return type to bool.
* message.c (message_alloc): Update.
* msgcat.c (is_message_selected): Change return type to bool.
(is_message_needed): Likewise.
(is_message_first_needed): Likewise.
(main): Use bool.
(catenate_msgdomain_list): Update. Use yes/no for is_c_format and
do_wrap.
* msgcmp.c (multi_domain_mode): Change type to bool.
(compare_directive_message): Change 'obsolete' argument type to bool.
(main): Use bool.
* msgcomm.c (is_message_selected): Change return type to bool.
(extract_directive_message): Change 'obsolete' argument type to bool.
(main): Use bool.
(struct extract_class_ty): Change type of field 'is_fuzzy' to bool.
Change type of field 'filepos_count' to size_t.
(extract_constructor): Update.
(extract_parse_brief): Update.
(extract_comment_special): Update.
(read_po_file): Update.
* msgconv.c (main): Use bool.
* msgen.c (main): Use bool.
* msgfmt.c (struct msgfmt_class_ty): Change type of fields 'is_fuzzy',
'has_header_entry' to bool.
(include_all): Change type to bool.
(do_check): Likewise.
(long_options): Update.
(format_directive_message): Change 'obsolete' argument type to bool.
(main): Use bool.
(format_constructor): Update.
(format_debrief): Update.
(format_comment_special): Update.
(check_pair): Update.
* msggrep.c (is_string_selected): Change return type to bool.
(is_message_selected): Likewise.
(main): Use bool.
* msgl-charset.c (compare_po_locale_charsets): Use bool.
* msgl-iconv.c (iconv_message_list): Update.
* msgmerge.c (quiet): Change type to bool.
(multi_domain_mode): Likewise.
(main): Use bool.
(match_domain): Update.
(merge): Update.
* msgsed.c (main): Use bool.
* msgunfmt.c (main): Use bool.
* po-gram-gen.y (string, stringlist, number, pos, rhs): Change type of
'obsolete' field to bool.
* po-lex.h: Include stdbool.h.
(pass_obsolete_entries): Change type to bool.
(po_lex_pass_comments): Change argument type to bool.
(po_lex_pass_obsolete_entries): Likewise.
(po_gram_error): Update.
(po_gram_error_at_line): Update.
* po-lex.c (po_lex_obsolete): Change type to bool.
(pass_comments): Likewise.
(pass_obsolete_entries): Likewise.
(lex_open): Update.
(lex_close): Update.
(po_gram_error): Update.
(po_gram_error_at_line): Update.
(po_gram_lex): Update.
(po_lex_pass_comments): Change argument type to bool.
(po_lex_pass_obsolete_entries): Likewise.
* po.h (struct po_method_ty): Change 'obsolete' argument type of
directive_message to bool.
(po_callback_message): Change 'obsolete' argument type to bool.
* po.c (po_directive_message): Change 'obsolete' argument type to bool.
(po_callback_message): Likewise.
* read-po.c (struct readall_class_ty): Change type of field 'is_fuzzy'
to bool.
(readall_directive_message): Change 'obsolete' argument type to bool.
(readall_constructor): Update.
(readall_parse_brief): Update.
(readall_comment_special): Update.
(read_po_file): Update.
* str-list.h: Include stdbool.h.
(string_list_member): Change return type to bool.
* str-list.c (string_list_member): Change return type to bool.
* write-po.h (message_print_style_escape, msgdomain_list_print): Change
argument type to bool.
* write-po.c (make_c_format_description_string) Change argument type
to bool.
(message_print): Likewise.
(message_print_obsolete): Likewise.
(indent): Change type to bool.
(uniforum): Likewise.
(escape): Likewise.
(message_print_style_indent): Update.
(message_print_style_uniforum): Update.
(message_print_style_escape): Change argument type to bool.
(wrap): Update.
(msgdomain_list_print): Change argument type to bool.
* xget-lex.h (xgettext_any_keywords): Change return type to bool.
* xget-lex.c (trigraphs): Change type to bool.
(default_keywords): Likewise.
(phase5_get): Use NULL not 0. Update.
(phaseX_get): Use bool.
(xgettext_lex): Update.
(xgettext_lex_keyword): Update.
(xgettext_any_keywords): Change return type to bool.
(xgettext_lex_trigraphs): Update.
* xgettext.c (add_all_comments): Change type to bool.
(extract_all): Likewise.
(long_options): Update.
(exclude_directive_message): Change 'obsolete' argument type to bool.
(extract_directive_message): Likewise.
(main): Use bool.
(scan_c_file): Update.
(struct extract_class_ty): Change type of field 'is_fuzzy' to bool.
Change type of field 'filepos_count' to size_t.
(extract_constructor): Update.
(extract_parse_brief): Update.
(extract_comment_special): Update.
(construct_header): Update.
2001-06-25 Bruno Haible <haible@clisp.cons.org>
* msggrep.c (usage): Explain the pattern syntax.
2001-06-18 Karl Eichwalder <ke@suse.de>
* msgcomm.c (long_options): Add '--unique' option as documented
within --help output.
2001-06-12 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (extension_to_language): Recognize "*.hh" as being C++.
Reported by Felix Natter.
2001-06-10 Bruno Haible <haible@clisp.cons.org>
* msgcmp.c (main): Set gram_max_allowed_errors to UINT_MAX, as in
msgmerge.c.
2001-06-10 Bruno Haible <haible@clisp.cons.org>
* message.c (message_alloc): Cast xmalloc return value.
(message_list_alloc): Likewise.
(message_list_list_alloc): Likewise.
(msgdomain_alloc): Likewise.
(msgdomain_list_alloc): Likewise.
* msgunfmt.c (string32): Likewise.
* po.c (po_alloc): Likewise.
* str-list.c (string_list_concat): Likewise.
(string_list_join): Likewise.
2001-06-10 Bruno Haible <haible@clisp.cons.org>
* message.h (message_ty): New field 'tmp'.
(message_predicate_ty): New type.
(message_list_remove_if_not): New declaration.
* message.c (message_list_delete_nth): Comment out.
(message_list_remove_if_not): New function.
* msgl-charset.h: New file.
* msgl-charset.c: New file.
* msgl-iconv.h: New file.
* msgl-iconv.c: New file.
* msgcat.c: New file.
* msgconv.c: New file.
* msgen.c: New file.
* msggrep.c: New file.
* msgsed.c: New file.
* msgcomm.c (default_domain, output_dir): Remove variables.
(long_options): Remove --default-domain and --output-dir. Add
--output-file.
(main): Don't accept -a, -C, -d, -k, -l, -L, -m, -M, -p, -T, -x.
Use output_file instead of complexly computed file_name.
Use O(n) loop instead of O(n^2) loop for removing messages.
(usage): Don't document --default-domain and --output-dir.
(is_message_selected): New function.
* Makefile.am (bin_PROGRAMS): Add msgcat, msgconv, msgen, msggrep,
msgsed.
(noinst_HEADERS): Add msgl-charset.h, msgl-iconv.h.
(msgcat_SOURCES, msgconv_SOURCES, msgen_SOURCES, msggrep_SOURCES,
msgsed_SOURCES): New variables.
(msgcat_LDADD, msgconv_LDADD, msgen_LDADD, msggrep_LDADD,
msgsed_LDADD): New variables.
2001-06-10 Bruno Haible <haible@clisp.cons.org>
* message.h (struct message_variant_ty): Remove type.
(struct message_ty): Remove variant_count, variant fields. Add
msgstr, msgstr_len, pos fields.
(message_alloc): Add msgstr, msgstr_len, pp arguments.
(message_variant_search, message_variant_append): Remove declarations.
(msgdomain_ty): New type.
(msgdomain_alloc, msgdomain_free): New declarations.
(msgdomain_list_ty): New type.
(msgdomain_list_alloc, msgdomain_list_free, msgdomain_list_append,
msgdomain_list_append_list, msgdomain_list_sublist,
msgdomain_list_search, msgdomain_list_search_fuzzy): New declarations.
* message.c (message_alloc): Add msgstr, msgstr_len, pp arguments.
(message_free): Update.
(message_variant_search): Remove function.
(message_variant_append): Remove function.
(message_copy): Update.
(message_merge): Update.
(message_list_alloc): Use NULL, not 0.
(message_list_search): Likewise.
(message_list_search_fuzzy_inner): Update.
(message_list_list_alloc): Use NULL, not 0.
(message_list_list_search): Likewise.
(message_list_list_free): Comment out.
(msgdomain_alloc, msgdomain_free, msgdomain_list_alloc,
msgdomain_list_append, msgdomain_list_sublist): New functions.
* read-po.h (read_po_file): Change return type to
'msgdomain_list_ty *'.
* read-po.c (readall_class_ty): Remove field domain_list, add field
mdlp.
(readall_constructor): Update.
(readall_destructor): Likewise.
(readall_directive_message): Likewise.
(readall_parse_debrief): Remove function.
(readall_methods): Use NULL instead of readall_parse_debrief.
(read_po_file): Change return type to 'msgdomain_list_ty *'.
* write-po.h (message_list_print, message_list_sort_by_msgid,
message_list_sort_by_filepos): Remove declarations.
(msgdomain_list_print, msgdomain_list_sort_by_msgid,
msgdomain_list_sort_by_filepos): New declarations.
* write-po.c (message_print): Remove domain argument. Update. Assume
'first' is true.
(message_print_obsolete): Likewise.
(msgdomain_list_print): Renamed from message_list_print. Change type
of first argument.
(msgdomain_list_sort_by_msgid): Renamed from
message_list_sort_by_msgid. Change type of argument.
(msgdomain_list_sort_by_filepos): Renamed from
message_list_sort_by_filepos. Change type of argument.
* msgcmp.c (compare_class_ty): Remove field domain_list, add field
mdlp.
(multi_domain_mode): New variable.
(long_options): Add --multi-domain.
(main): Accept -m/--multi-domain.
(usage): Explain --multi-domain.
(match_domain): New function, extracted from 'compare'.
(compare): Update. Handle multi_domain_mode. Change argument types to
'const char *'.
(compare_constructor): Update.
(compare_destructor): Likewise.
(compare_directive_message): Likewise.
(compare_parse_debrief): Remove function.
(compare_methods): Use NULL instead of compare_parse_debrief.
(grammar): Change argument type to 'const char *' and return type to
'msgdomain_list_ty *'.
* msgcomm.c (main): Update.
(extract_directive_message): Update.
* msgmerge.c (multi_domain_mode): New variable.
(long_options): Add --multi-domain.
(struct statistics): New type.
(main): Accept -m/--multi-domain. Update.
(usage): Explain --multi-domain.
(compendium): Update.
(match_domain): New function, extracted from 'merge'.
(merge): Update. Handle multi_domain_mode.
* msgunfmt.c (main): Update.
(read_mo_file): Update.
* xgettext.c (main): Update.
(exclude_directive_message): Update.
(remember_a_message): Likewise.
(remember_a_message_plural): Likewise.
(scan_c_file): Change argument type to 'msgdomain_list_ty *'.
(extract_directive_message): Update.
(read_po_file): Change argument type to 'msgdomain_list_ty *'.
(construct_header): Update.
* dir-list.h: Don't use reserved identifiers in prototypes.
* gettext.c: Likewise.
* message.c: Likewise.
* msgcmp.c: Likewise.
* msgcomm.c: Likewise.
* msgfmt.c: Likewise.
* msgunfmt.c: Likewise.
* ngettext.c: Likewise.
* open-po.h: Likewise.
* po-hash.h: Likewise.
* po-lex.h: Likewise.
* po-lex.c: Likewise.
* po.h: Likewise.
* po.c: Likewise.
* str-list.h: Likewise.
* write-po.c: Likewise.
* xget-lex.h: Likewise.
* xget-lex.c: Likewise.
* xgettext.c: Likewise.
2001-06-10 Bruno Haible <haible@clisp.cons.org>
* message.h (message_list_prepend): New declaration.
* message.c (message_list_prepend): New function.
* msgmerge.c (merge): Add a header entry to the ref list if it has
none.
2001-06-10 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c: Change the --strict option to not apply to domain
directives, only to the output filename argument.
(struct msg_domain): Add file_name field.
(domain_list): Renamed from domain.
(new_domain): Add file_name argument.
(main): Pass file name to new_domain(). Use file_name passed to
new_domain() in fopen call; don't free it.
(new_domain): New argument 'file_name'.
(format_directive_domain): Always ensure ".mo" suffix, independently
of --strict.
(format_directive_message): Likewise.
(add_mo_suffix): Don't call xstrdup.
2001-06-01 Bruno Haible <haible@clisp.cons.org>
* Makefile.am (datadir): Remove definition.
Reported by Albert Chin-A-Young <china@thewrittenword.com>.
2001-05-15 Bruno Haible <haible@clisp.cons.org>
* msgcmp.c (main): Call set_program_name instead of assigning
program_name directly.
* msgcomm.c (main): Likewise.
* msgfmt.c (main): Likewise.
* msgmerge.c (main): Likewise.
* msgunfmt.c (main): Likewise.
* xgettext.c (main): Likewise.
* gettext.c (main): Remove "lt-" prefix from program_name.
* ngettext.c (main): Likewise.
2001-05-04 Bruno Haible <haible@clisp.cons.org>
* gettext.c (usage): Add description of what the program does.
Separate blocks with blank lines.
* ngettext.c (usage): Likewise.
* msgcmp.c (usage): Add a blank line after the first usage line.
Hardwire the blank line output.
* msgcomm.c (usage): Likewise.
* msgfmt.c (usage): Likewise.
* msgmerge.c (usage): Likewise.
* msgunfmt.c (usage): Likewise.
* xgettext.c (usage): Likewise.
2001-05-05 Karl Eichwalder <ke@suse.de>
* xgettext.c (read_name_from_file): Remove trailing space from line.
* msgcomm.c (read_name_from_file): Likewise.
2001-05-02 Bruno Haible <haible@clisp.cons.org>
* po-charset.c: Don't include stdio.h, stdlib.h, mbswidth.h. Include
xerror.h instead.
(multiline_warning): Move to xerror.c.
(po_lex_charset_set): Use xasprintf instead of asprintf.
* msgfmt.c: Include xerror.h.
(format_debrief): Use multiline_error for the error message.
2001-05-01 Bruno Haible <haible@clisp.cons.org>
Prefix most error messages with the program name, except those
starting with "filename:lineno:".
* po-lex.h: Include progname.h.
(po_gram_error): Set error_with_progname = 0 during error_at_line()
call.
(po_gram_error_at_line): Likewise.
* po-lex.c (po_gram_error): Likewise.
(po_gram_error_at_line): Likewise.
* msgcmp.c: Include progname.h.
(program_name): Remove variable.
(error_print): Remove function.
(main): Initialize error_print_progname with maybe_print_progname.
* msgcomm.c: Include progname.h.
(program_name): Remove variable.
(error_print): Remove function.
(main): Initialize error_print_progname with maybe_print_progname.
* msgfmt.c: Include progname.h.
(program_name): Remove variable.
(error_print): Remove function.
(main): Initialize error_print_progname with maybe_print_progname.
(format_directive_message): Set error_with_progname = 0 during
error_at_line() call.
(check_pair): Likewise.
* msgmerge.c: Include progname.h.
(program_name): Remove variable.
(error_print): Remove function.
(main): Initialize error_print_progname with maybe_print_progname.
* msgunfmt.c: Include progname.h.
(program_name): Remove variable.
(error_print): Remove function.
(main): Initialize error_print_progname with maybe_print_progname.
* xget-lex.c: Include progname.h.
(phase5_get): Set error_with_progname = 0 during error() call.
* xgettext.c: Include progname.h.
(program_name): Remove variable.
(error_print): Remove function.
(main): Initialize error_print_progname with maybe_print_progname.
(scan_c_file): Set error_with_progname = 0 during error() call.
2001-04-30 Bruno Haible <haible@clisp.cons.org>
Save the messages' obsoleteness status in the 'message_ty'.
* po.h (struct po_method_ty): Add 'obsolete' argument to
directive_message method.
(po_callback_message): Add 'obsolete' argument.
* po.c (po_directive_message): Add 'obsolete' argument. Pass it to
method->directive_message.
(po_callback_message): Add 'obsolete' argument.
* po-gram-gen.y (message): Pass 'obsolete' argument to
po_callback_message.
* msgcmp.c (compare_directive_message): Add 'obsolete' argument.
* msgcomm.c (extract_directive_message): Likewise.
* msgfmt.c (format_directive_message): Likewise.
* xgettext.c (exclude_directive_message, extract_directive_message):
Likewise.
* read-po.c (readall_directive_message): Likewise. Set mp->obsolete.
2001-05-01 Bruno Haible <haible@clisp.cons.org>
Reduce running time for very long msgstrs from O(n^2) to O(n) where
n is the number of string pieces.
* str-list.h (string_list_init, string_list_destroy,
string_list_concat, string_list_concat_destroy): New declarations.
* str-list.c (string_list_init, string_list_destroy,
string_list_concat, string_list_concat_destroy): New functions.
* po-gram-gen.y Include str-list.h.
(%union): Add new alternative of type string_list_ty.
(string_list): Change type to stringlist.
(message): Use string_list_concat_destroy to convert a stringlist to
a single string. Use string_list_destroy instead of free.
(msgid_pluralform): Likewise.
(pluralform): Likewise.
(string_list): Return a stringlist. Don't concatenate the strings one
by one.
* po-lex.c: Include str-list.h.
2001-04-30 Bruno Haible <haible@clisp.cons.org>
* message.h (message_alloc): Add const to prototype.
* message.c (message_alloc): Add const to argument type.
* msgcmp.c (compare_class_ty): Add const to 'domain' field.
* msgcomm.c (default_domain): Add const.
(main): Add const to 'file_name' variable.
* xgettext.c (default_domain): Add const.
(msgstr_prefix): Likewise.
(msgstr_suffix): Likewise.
(main): Add const to 'file_name' variable.
2001-04-29 Bruno Haible <haible@clisp.cons.org>
* read-po.h: New file.
* read-po.c: New file, extracted from msgmerge.c.
* msgmerge.c: Don't include string.h. Include read-po.h instead.
(merge_class_ty, line_comment, merge_constructor, merge_destructor,
merge_directive_domain, merge_directive_message, merge_parse_brief,
merge_parse_debrief, merge_comment, merge_comment_dot,
merge_comment_special, merge_comment_filepos, grammar): Move out to
read-po.c.
(compendium, merge): Call read_po_file() instead of grammar().
* Makefile.am (noinst_HEADERS): Add read-po.h.
(msgmerge_SOURCES): Add read-po.c.
* FILES: Update.
2001-04-28 Bruno Haible <haible@clisp.cons.org>
* msgcmp.c (usage): Restructure usage message. Talk about ref.pot, not
ref.po.
* msgcomm.c (long_options): Remove --add-comments, --join-existing
options.
(main): Rename local variables sort_output, sort_by_file to
sort_by_msgid, sort_by_filepos. Remove -c and -j options.
(usage): Restructure usage message. INPUTFILE is not mandatory. Remove
--trigraphs option.
* msgfmt.c (usage): Restructure usage message.
* msgmerge.c (main): Signal error if both --sort-output and
--sort-by-file were given.
(usage): Restructure usage message. Talk about ref.pot, not ref.po.
Document --sort-output, --sort-by-file, --quiet.
* msgunfmt.c (long_options): Add --sort-output.
(main): Recognize -s/--sort-output option, and sort the message list
when it is given.
(usage): Restructure usage message.
* xgettext.c (main): Rename local variables sort_output, sort_by_file
to sort_by_msgid, sort_by_filepos.
(usage): Restructure usage message.
2001-04-28 Bruno Haible <haible@clisp.cons.org>
* po-charset.h: New file.
* po-charset.c: New file, extracted from po.c. Don't warn about wrong
or missing charset if it's a POT file.
* po-lex.h (iconv.h, po_lex_iconv): Move to po-charset.h.
(po_lex_charset): Remove declaration.
* po-lex.c: Include po-charset.h.
(po_lex_charset, po_lex_iconv): Move to po-charset.c.
(lex_open): Call po_lex_charset_init.
(lex_close): Call po_lex_charset_close.
* po.c: Don't include ctype.h, stdio.h, mbswidth.h, libgettext.h.
Include po-charset.h instead.
(program_name, _, SIZEOF, multiline_warning): Move to po-charset.c.
(po_callback_message): Move charset handling to po-charset.c.
* Makefile.am (noinst_HEADERS): Add po-charset.h.
(msgcmp_SOURCES, msgfmt_SOURCES, msgmerge_SOURCES, xgettext_SOURCES,
msgcomm_SOURCES): Add po-charset.c.
* FILES: Update.
* msgfmt.c: Don't include ctype.h.
* msgunfmt.c: Likewise.
2001-04-28 Bruno Haible <haible@clisp.cons.org>
* po.h (PO_BASE_TY): Remove next_is_fuzzy field.
* po.c (po_alloc): Don't reset next_is_fuzzy.
(po_callback_message): Ignore fuzziness of the header entry. Don't
reset next_is_fuzzy.
(po_callback_comment): Don't set next_is_fuzzy.
* msgfmt.c (format_directive_message): Ignore fuzziness of the header
entry. Count fuzzy untranslated entries as untranslated.
2001-09-13 Bruno Haible <haible@clisp.cons.org>
* gettext-0.10.40 released.
2001-07-24 Bruno Haible <haible@clisp.cons.org>
* gettext-0.10.39 released.
2001-05-23 Bruno Haible <haible@clisp.cons.org>
* gettext-0.10.38 released.
2001-05-23 Bruno Haible <haible@clisp.cons.org>
* write-po.c (wrap): Avoid broken EUC-KR conversion in glibc-2.1.
2001-05-21 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (construct_header): Replace 8-bit with 8bit.
2001-04-19 Bruno Haible <haible@clisp.cons.org>
* gettext-0.10.37 released.
2001-04-18 Bruno Haible <haible@clisp.cons.org>
* po.c (po_callback_message): Don't call iconv_open when the
OLD_PO_FILE_INPUT environment variable is set.
* write-po.c (wrap): Don't call iconv_open when the OLD_PO_FILE_OUTPUT
environment variable is set.
2001-04-09 Bruno Haible <haible@clisp.cons.org>
* po.c: Include mbswidth.h.
(program_name): New declaration.
(multiline_warning): New function.
(po_callback_message): Change messages again. Call multiline_warning
instead of error.
2001-04-04 Bruno Haible <haible@clisp.cons.org>
* gettext.c (program_name): Change type to 'const char *'.
* ngettext.c (program_name): Likewise.
2001-04-04 Bruno Haible <haible@clisp.cons.org>
* write-po.c (wrap): Prohibit line breaks inside backslash escape
sequences.
2001-03-29 Bruno Haible <haible@clisp.cons.org>
* gettext-0.10.36 released.
2001-03-27 Bruno Haible <haible@clisp.cons.org>
* po.c (po_callback_message): Change message again.
2001-03-26 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (test_whether_c_format): Recognize '%%' as valid.
* msgfmt.c (check_pair): In error message, count format
specifications starting from 1, not 0.
2001-03-25 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (warn_id_len): Remove unused variable.
(main): Don't set it. 'l' option becomes a nop.
(usage): Remove mention of --string-limits/-l.
2001-03-23 Bruno Haible <haible@clisp.cons.org>
* msgcomm.c (main): Don't give an error message if there are "too few"
messages in the input files. Do sanity checking before reading the
input files. Make --add-location the default, even if --omit-header
is specified.
2001-03-22 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (construct_header): Replace ENCODING with 8-bit.
2001-03-20 Bruno Haible <haible@clisp.cons.org>
* po.c (po_callback_message): Change message, refer to GNU libiconv.
2001-03-18 Bruno Haible <haible@clisp.cons.org>
* gettext.c [TESTS]: When testing, set HAVE_SETLOCALE.
(main): Expand escape sequences also if no domain is given. Don't need
to call bindtextdomain if there are no string arguments.
* ngettext.c: New file.
* Makefile.am (bin_PROGRAMS): Add ngettext.
(ngettext_SOURCES): New variable.
2001-03-19 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (extension_to_language): Recognize "*.cpp" and "*.hpp" as
being C++.
Patch by Dennis Bjorklund <db@zigo.dhs.org>.
2001-03-11 Bruno Haible <haible@clisp.cons.org>
* gettext.c: Force inclusion of libgnuintl.h. On Solaris, <locale.h>
has already included libintl.h.
2001-03-11 Bruno Haible <haible@clisp.cons.org>
Karl Eichwalder <ke@suse.de>
* po.c (po_callback_message): Add comments to support translators.
2001-03-11 Bruno Haible <haible@clisp.cons.org>
* po-lex.c (lex_close): Use ngettext and plural-form message.
* msgcmp.c (compare): Likewise.
* msgfmt.c (main): Likewise.
2001-03-10 Bruno Haible <haible@clisp.cons.org>
* po.c (po_callback_message): Cast %*s argument from size_t to int.
* msgfmt.c (format_debrief): Likewise.
(check_pair): Cast format string argument from size_t to long.
* msgmerge.c (merge): Likewise.
* gettext.c (main): Update copyright year.
* msgcmp.c (main): Likewise.
* msgcomm.c (main): Likewise.
* msgfmt.c (main): Likewise.
* msgmerge.c (main): Likewise.
* msgunfmt.c (main): Likewise.
* xgettext.c (main): Likewise.
* po.c (po_callback_message): Also warn if no iconv is present and
the charset is a CJK encoding requiring iconv. Also avoid broken
EUC-KR conversion in glibc-2.1.
2001-03-09 Bruno Haible <haible@clisp.cons.org>
Fix output of strings in CJK encodings.
* write-po.c: Include iconv.h.
(wrap): While preparing a line, use iconv to avoid treating the second
byte of a multi-byte character as an ASCII character.
2001-03-04 Bruno Haible <haible@clisp.cons.org>
* msgcomm.c (main): Use IS_ABSOLUTE_PATH and concatenated_pathname.
Fixes an incorrectly computed memory allocation.
* xgettext.c (main): Likewise.
* open-po.c (open_po_file): Use IS_ABSOLUTE_PATH and
concatenated_pathname.
* xget-lex.c (xgettext_lex_open): Likewise.
* msgfmt.c (main): Use SET_BINARY instead of setmode.
* msgunfmt.c (read_mo_file): Likewise.
2001-03-04 Bruno Haible <haible@clisp.cons.org>
Check syntax of obsolete entries of PO files, not only in msgmerge.
* po-lex.h (pass_obsolete_entries): New declaration.
(msgstr_def): Remove pos field.
* po-lex.c (po_lex_obsolete): New variable.
(pass_obsolete_entries): Make non-static.
(lex_open): Initialize po_lex_obsolete.
(lex_close): Reset po_lex_obsolete.
(po_gram_lex): Don't look at pass_obsolete_entries. Instead, set
po_lex_obsolete to 1 when "#~" is seen. Reset po_lex_obsolete when
a newline is seen. Before returning, fill the 'pos' and 'obsolete'
fields of any token.
* po-gram.gen.y (check_obsolete): New macro.
(union): Add a 'pos' and 'obsolete' field for any symbol type.
(NAME): Assign to type <string>.
(DOMAIN, MSGID, MSGID_PLURAL, MSGSTR, '[', ']'): Assign to type <pos>.
(msgid, msgstr): Remove.
(message, msgid_pluralform, pluralform_list, pluralform, string_list):
Signal an error if the 'obsolete' field is not the same across the
entire token sequence of the rule.
(message): Deal with pass_obsolete_entries here.
(msgid_pluralform, pluralform_list, pluralform, string_list): Fill the
'pos' and 'obsolete' fields of $$.
2001-03-03 Bruno Haible <haible@clisp.cons.org>
Fix parsing of strings in CJK encodings.
* po.h (PO_BASE_TY): New field next_is_fuzzy.
* po-lex.h: Include iconv.h.
(po_lex_charset, po_lex_iconv): New declarations.
* po.c (SIZEOF): New macro.
(po_alloc): Initialize next_is_fuzzy.
(po_callback_message): Add check of charset in header entry.
Set po_lex_charset and po_lex_iconv.
After calling po_directive_message, reset next_is_fuzzy.
(po_callback_comment): Set next_is_fuzzy.
* msgfmt.c (format_directive_message): Remove check of charset in
header entry, now done in po.c.
* po-lex.c (po_lex_charset, po_lex_iconv): New variables.
(lex_open): Initialize them.
(lex_close): Reset them.
(po_gram_lex): While parsing a string, use 'po_lex_iconv' to avoid
treating the second byte of a multi-byte character as an ASCII
character.
* Makefile.am (msgcmp_LDADD, msgfmt_LDADD): New variables.
2001-03-03 Bruno Haible <haible@clisp.cons.org>
* write-po.h: New file, pieces of message.h.
* message.h (message_page_width_set, message_print_style_indent,
message_print_style_uniforum, message_print_style_escape,
message_list_print, message_list_sort_by_msgid,
message_list_sort_by_filepos): Move to write-po.h.
* write-po.c: New file, pieces of message.c.
(wrap): Add charset argument. Rewritten to use mbs_width_linebreaks().
Use c_isprint() instead of isprint().
(message_print): Add charset argument. Insert a space after '#' even
if the comment line's first character is a tab.
(message_print_obsolete): Likewise.
(message_list_print): Don't change locales. Extract the charset name
from the header entry.
(msgid_cmp, filepos_cmp): Always use strcmp, never use strcoll.
(message_list_sort_by_msgid, message_list_sort_by_filepos): Don't
change locales.
* message.c (indent, uniforum, escape, page_width,
make_c_format_description_string, significant_c_format_p,
make_c_width_description_string, message_print_style_indent,
message_print_style_uniforum, message_print_style_escape, wrap,
print_blank_line, message_print, message_print_obsolete,
message_list_print, msgid_cmp, message_list_sort_by_msgid,
filepos_cmp, message_list_sort_by_filepos, message_page_width_set):
Move to write-po.c.
* msgmerge.c: Include write-po.h.
* msgunfmt.c: Likewise.
* xgettext.c: Likewise.
* msgcomm.c: Likewise.
* Makefile.am (noinst_HEADERS): Add write-po.h.
(msgmerge_SOURCES): Add write-po.c.
(msgunfmt_SOURCES): Likewise.
(xgettext_SOURCES): Likewise.
(msgcomm_SOURCES): Likewise.
(msgmerge_LDADD, msgunfmt_LDADD, xgettext_LDADD, msgcomm_LDADD): New
variables.
2001-03-03 Bruno Haible <haible@clisp.cons.org>
* msgcmp.c (compare): Internationalize error message.
2001-02-10 Bruno Haible <haible@clisp.cons.org>
* msgunfmt.c (main): Accept -e and -E options.
2001-02-04 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c (main): Open the output file in binary mode.
* msgunfmt.c (read_mo_file): Open the input file in binary mode.
2001-01-21 Bruno Haible <haible@clisp.cons.org>
Use libtool.
* Makefile.am (LDADD): Remove ../intl/libintl.$la, not needed any more.
(l): Remove macro.
2001-01-20 Bruno Haible <haible@clisp.cons.org>
* msgcomm.c (main): Options '-<' and '->' want an argument.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* gettext.c: Renamed from gettextp.c. Use included libintl if TESTS
is defined.
* setlocale.c: Move to ../tests.
* Makefile.am (EXTRA_PROGRAMS, all-local, CLEANFILES): Remove.
(tstgettext_SOURCES): Remove.
(gettext_SOURCES): Update.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* msgcmp.c: Include libgettext.h instead of libintl.h, so that the
configure argument --disable-nls gets respected.
* msgfmt.c: Likewise.
* msgmerge.c: Likewise.
* msgunfmt.c: Likewise.
* open-po.c: Likewise.
* po-gram-gen.y: Likewise.
* po-lex.c: Likewise.
* xgettext.c: Likewise. Don't include gettext.h.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
* dir-list.c: Likewise.
* gettextp.c: Likewise.
* message.c: Likewise.
* msgcmp.c: Likewise.
* msgcomm.c: Likewise.
* msgfmt.c: Likewise.
* msgmerge.c: Likewise.
* msgunfmt.c: Likewise.
* open-po.c: Likewise.
* po.c: Likewise.
* setlocale.c: Likewise.
* str-list.h: Likewise.
* xget-lex.c: Likewise.
* xgettext.c: Likewise.
2001-01-06 Bruno Haible <haible@clisp.cons.org>
* Makefile.am (datadir): Assume DATADIRNAME = share.
2001-01-06 Bruno Haible <haible@clisp.cons.org>
* setlocale.c: New file.
* Makefile.am (EXTRA_PROGRAMS): New variable.
(all-local): New target.
(CLEANFILES): New variable.
(tstgettext_SOURCES): New variable.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* Makefile.am (po-gram-gen.h): Don't use $^, not supported by the
SUSV2 "make" specification.
(LDADD): Add @INTLLIBS@. Needed on Solaris without
--with-included-gettext.
* po-lex.c (gram_max_allowed_errors): Change type to
'unsigned int'.
2001-01-01 Bruno Haible <haible@clisp.cons.org>
Implement plural form handling.
* message.h (struct message_variant_ty): Add msgstr_len field.
(struct message_ty): Add msgid_plural field.
(message_alloc): Take additional msgid_plural argument.
(message_variant_append): Take additional msgstr_len argument.
* message.c (message_alloc): Take additional msgid_plural argument.
(message_free): Free msgid_plural field.
(message_variant_append): Take additional msgstr_len argument.
(message_copy): Copy msgid_plural as well. Pass msgstr_len.
(message_merge): Likewise.
(message_print): Print plural entries using a different format.
(message_print_obsolete): Likewise.
* msgunfmt.c (string32): Return the string's size as well. Verify
the string is NUL terminated.
(read_mo_file): Split the original string into msgid and msgid_plural.
Pass msgstr_len.
* po-lex.h (msgstr_def): New definition, taken from msgfmt.c.
* po-lex.c (keyword_p): Recognize the msgid_plural keyword.
(po_gram_lex): Accept brackets as single-character tokens.
* po.h (struct po_method_ty): Method 'directive_message' takes
additional arguments 'msgid_plural', 'msgstr_len'.
(po_callback_message): Additional arguments 'msgid_plural',
'msgstr_len'.
* po-hash-gen.y (yyerror): Effectively rename to po_hash_error.
* po-gram-gen.y (yyerror): Effectively rename to po_gram_error,
thus enabling reporting of syntax errors.
(plural_counter): New variable.
(%token): Add MSGID_PLURAL, '[', ']' as new tokens.
(%union): Add new alternative of type 'struct msgstr_def'.
(msgid_pluralform, pluralform, pluralform_list): New productions.
(message): Add plural rules.
* po.c (po_directive_message): Additional arguments 'msgid_plural',
'msgstr_len'.
(po_callback_message): Likewise.
* msgfmt.c (SIZEOF): New macro.
(struct id_str_pair): Add id_len, id_plural, id_plural_len, str_len
fields.
(struct hashtable_entry): Renamed from struct msgstr_def. Add
'msgid_plural', 'msgstr_len' fields.
(format_directive_message): Additional arguments 'msgid_plural',
'msgstr_len'. Verify the validity of the charset field in the header.
Compare msgstr using memcmp, not strcmp.
(check_pair): Additional arguments 'msgid_plural', 'msgstr_len'.
Apply the tests to msgid_plural and each msgstr[i] string.
(format_debrief): Change error message.
(write_table): Store msgid_plural and msgstr_len in msg_arr[], then
output the strings including embedded NULs.
* msgcmp.c (compare_directive_message): Additional arguments
'msgid_plural', 'msgstr_len'.
* msgcomm.c (extract_directive_message): Additional arguments
'msgid_plural', 'msgstr_len'.
* msgmerge.c (merge_directive_message): Additional arguments
'msgid_plural', 'msgstr_len'.
* xget-lex.h (struct xgettext_token_ty): Replace argnum field with
argnum1, argnum2.
* xget-lex.c (xgettext_lex): Add to default keywords: "ngettext:1,2",
"dngettext:2,3", "dcngettext:2,3".
(xgettext_lex_keyword): Accept new syntax "id:argnum1,argnum2".
* xgettext.c (exclude_directive_message): Additional arguments
'msgid_plural', 'msgstr_len'.
(remember_a_message): Return the new message.
(remember_a_message_plural): New function.
(scan_c_file): Extend state machine to allow remembering msgid1 and
msgid2 later.
(extract_directive_message): Additional arguments 'msgid_plural',
'msgstr_len'. Compare msgstr using memcmp, not strcmp.
(construct_header): Update.
2000-12-31 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c (format_directive_message): Pass to insert_entry and
find_entry the length including the terminating NUL.
* xget-lex.c (xgettext_lex, xgettext_lex_keyword): Likewise.
2000-12-31 Bruno Haible <haible@clisp.cons.org>
* msgunfmt.c (read_mo_file): Recognize "/dev/stdin", not "/dev/stdout".
2000-12-31 Bruno Haible <haible@clisp.cons.org>
* str-list.h: Fix typo. Add comments.
* str-list.c: Add comments.
* dir-list.h: Add comments.
* dir-list.c: Likewise.
* domain.h: Remove file.
* msgfmt.c: Incorporate it here. Don't include "domain.h".
* msgunfmt.c: Don't include "domain.h".
* xgettext.c: Likewise.
* Makefile.am (noinst_HEADERS): Remove domain.h.
* open-po.h: New file.
* open-po.c: Include it.
* po-lex.c: Likewise.
* Makefile.am (noinst_HEADERS): Add open-po.h.
* open-po.c (open_po_file): Merge duplicated code.
* po-lex.h: Add comments.
(gram_max_allowed_errors): Change type to 'unsigned int'.
(po_gram_error_at_line): Renamed from gram_error_at_line.
(po_gram_error, po_gram_error_at_line): Use ISO C 99 macro vararg
syntax if possible.
* po-lex.c: Add comments. Don't include "po-gram.h".
(po_gram_error_at_line): Renamed from gram_error_at_line.
* msgmerge.c (main): Initialize gram_max_allowed_errors to UINT_MAX.
* message.h: Add comments.
(enum is_wrap): New type.
(parse_c_width_description_string): Change return type.
(message_ty): Change type of do_wrap field.
* message.c (wrap): Change type of do_wrap argument.
* msgfmt.c (msgfmt_class_ty): Change type of do_wrap field.
* msgmerge.c (merge_class_ty): Change type of do_wrap field.
* msgcomm.c (extract_class_ty): Change types of is_c_format, do_wrap
fields.
* xgettext.c (extract_class_ty): Likewise.
(remember_a_message): Change type of do_wrap.
* pos.h: New file.
* po-lex.h: Include it.
(struct lex_pos_ty): Remove type, now in pos.h.
* message,h: Include pos.h instead of po-lex.h.
* Makefile.am (noinst_HEADERS): Add pos.h.
* po.h: Add comments.
* gettextp.c (main): Use bindtextdomain instead of bindtextdomain__,
and dgettext instead of dgettext__. There is no need to use the
included libintl when GNU gettext or an X/Open gettext or a catgets
has been found in the system's C library.
* ylwrap: Update from automake-1.4.
* FILES: New file.
* Makefile.am (EXTRA_DIST): New variable.
2000-12-30 Bruno Haible <haible@clisp.cons.org>
* xgettext.c (scanner_c, scanner_cxx): Remove declarations.
2000-12-30 Bruno Haible <haible@clisp.cons.org>
* msgfmt.c (write_table): Pass additional argument &id_len to
iterate_table.
2000-09-13 Bruno Haible <haible@clisp.cons.org>
Look into #define bodies.
* xget-lex.c (phaseX_get): Simplify.
(phase6_get): Stop the loop when recognizing a #define directive.
Based on a patch by Martin v. Löwis.
Accept ISO C 99 comment syntax.
* xget-lex.c (cplusplus_comments: Remove variable.
(phase4_getc): Always recognize // comments.
(xgettext_lex_cplusplus): Remove function.
* xget-lex.h (xgettext_lex_cplusplus): Remove declaration.
* xgettext.c (scan_c_file): Remove is_cpp_file argument.
(scanner_c, scanner_cxx): Remove functions.
(language_to_scanner): Call scan_c_file directly.
2000-08-23 Bruno Haible <haible@clisp.cons.org>
* po-lex.c (ALERT_CHAR): New constant macro.
(control_sequence): Accept \a. Don't accept \X.
2000-08-23 Ulrich Drepper <drepper@redhat.com>
* po-lex.c (control_sequence): Unget character which ended \x..
sequence.
2000-07-28 Bruno Haible <haible@clisp.cons.org>
* xget-lex.h (enum xgettext_token_type_ty): Rename
xgettext_token_type_lp/rp to xgettext_token_type_lparen/rparen.
* xget-lex.c (enum token_type_ty): Rename token_type_lp/rp to
token_type_lparen/rparen.
(xgettext_any_keywords): `keywords' is now a hash table.
* xgettext.c (construct_header): Change two printf directives %02d
to %02ld.
1998-07-17 Paul Eggert <eggert@twinsun.com>
Add support for user-specified argument numbers for keywords.
Extract all strings from a keyword arg, not just the first one.
Handle parenthesized commas inside keyword args correctly.
Warn about nested keywords.
* xgettext.c (scan_c_file):
Warn about nested keywords, e.g. _(_("xxx")).
Warn also about not-yet-implemented but allowed nesting, e.g.
dcgettext(..._("xxx")..., "yyy").
Get all strings in a keyword arg, not just the first one.
Handle parenthesized commas inside keyword args correctly.
* xget-lex.h (enum xgettext_token_type_ty):
Replace xgettext_token_type_keyword1 and
xgettext_token_type_keyword2 with just plain
xgettext_token_type_keyword; it now has argnum value.
Add xgettext_token_type_rp.
(struct xgettext_token_ty): Add argnum member.
line_number and file_name are now also set for
xgettext_token_type_keyword.
(xgettext_lex_keyword): Arg is const char *.
* xget-lex.c: Include "hash.h".
(enum token_type_ty): Add token_type_rp.
(keywords): Now a hash table.
(phase5_get): Return token_type_rp for ')'.
(xgettext_lex, xgettext_lex_keyword): Add support for keyword argnums.
(xgettext_lex): Return xgettext_token_type_rp for ')'.
Report keyword argnum, line number, and file name back to caller.
2000-05-06 Ulrich Drepper <drepper@redhat.com>
* Makefile.am (EXTRA_DIST): Replace po-gram.gen.h and po-hash.gen.h
with po-gram-gen.h and po-hash-gen.h.
(YACC): Define as @YACC@ -d.
(YFLAGS): Removed.
(msgcmp_SOURCES): Replace dependencies on po-gram.gen.c and
po-hash.gen.c with po-gram-gen.y and po-hash-gen.y.
(msgmerge_SOURCES): Likewise.
(xgettext_SOURCES): Likewise.
(msgcomm_SOURCES): Likewise.
Add rule to built po-gram-gen2.h and make po-lex.o depend on it.
Remove rules to generate po-gram.gen.c and po-hash.gen.c.
Patches by Jim Meyering.
* po-lex.c: Include "po-gram-gen2.h" instead of "po-gram.gen.h".
* message.c (message_list_search_fuzzy_inner): Define static. Take
extra parameter with best weight so far.
(message_list_search_fuzzy): New function.
(message_list_list_alloc): New function.
(message_list_list_append): New function.
(message_list_list_append_list): New function.
(message_list_list_search): New function.
(message_list_list_search_fuzzy): New function.
(message_list_list_free): New function.
* message.h (message_list_list_ty): Define type.
(message_list_list_alloc): Add prototype.
(message_list_list_free): Likewise.
(message_list_list_append): Likewise.
(message_list_list_append_list): Likewise.
(message_list_list_search): Likewise.
(message_list_list_search_fuzzy): Likewise.
* msgmerge.c: Implement --compendium/-C option.
* xget-lex.c (xgettext_any_keywords): New function.
* xget-lex.h (xgettext_any_keywords): Add prototype.
* xgettext.c: Use xgettext_any_keywords to see whether keywords are
defined.
Patches by Peter Miller.
1998-05-15 Ulrich Drepper <drepper@cygnus.com>
* po-lex.c (control_sequence): Replace illegal with invalid.
1998-05-01 08:47 Ulrich Drepper <drepper@cygnus.com>
* gettext-0.10.35 released.
1998-04-30 Ulrich Drepper <drepper@cygnus.com>
* dir-list.c: Update Peter Miller's mail address.
* dir-list.h: Likewise.
* message.c: Likewise.
* message.h: Likewise.
* msgcmp.c: Likewise.
* msgcomm.c: Likewise.
* msgmerge.c: Likewise.
* po-gram.h: Likewise.
* po-gram.y: Likewise.
* po-hash.h: Likewise.
* po-hash.y: Likewise.
* po-lex.c: Likewise.
* po-lex.h: Likewise.
* po.c: Likewise.
* po.h: Likewise.
* str-list.c: Likewise.
* str-list.h: Likewise.
* xget-lex.c: Likewise.
* xget-lex.h: Likewise.
1998-04-30 Ulrich Drepper <drepper@cygnus.com>
* msgfmt.c: Fix typo in --help text.
Reported by Jan.Djarv@mbox200.swipnet.se.
1998-04-03 01:18 1998 Philippe De Muyter <phdm@macqel.be>
* str-list.h (stddef.h): Include that file only if STDC_HEADERS.
Otherwise include sys/types.h and stdio.h.
* msgmerge.c (string.h): Include that file if HAVE_STRING_H, not
if STDC_HEADERS.
1998-04-29 Ulrich Drepper <drepper@cygnus.com>
* message.c: Use unsigned char for various local variables.
* xgettext.c (comment_tag): Define as unsigned char *.
For loosing Solaris systems. Patches by Jim Meyering.
* msgfmt.c: Use extra braces in if to shut up gcc.
* po-lex.h: Don't declare function po_gram_error and
gram_error_at_line if macros with the same names are defined.
* Makefile.am (MAINTAINERCLEANFILES): New variable.
Patches by Jim Meyering.
1998-04-27 Ulrich Drepper <drepper@cygnus.com>
* xgettext.c: Update year and bug report address. Add little
explanation in --help messages.
* msgfmt.c: Likewise.
* msgmerge.c: Update year and bug report address.
* msgcomm.c: Likewise.
* msgcmp.c: Likewise.
* msgunfmt.c: Likewise.
1997-08-31 22:20 Ulrich Drepper <drepper@cygnus.com>
* msgfmt.c (format_directive_message): Count fuzzy messages as
fuzzy, even if they are not written to the output file.
1997-08-18 13:47 Philippe De Muyter <phdm@info.ucl.ac.be>
* msgcomm.c (sys/types.h): File included.
1997-08-15 12:38 Ulrich Drepper <drepper@cygnus.com>
* xgettext.c: Include <sys/param.h> to define MIN/MAX for HP/UX.
Patch by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
* msgfmt.c: Change DEFAULT_ALIGNMENT to DEFAULT_OUTPUT_ALIGNMENT
to avoid clash with macro with same name in obstack.c.
Reported by Akim Demaille <demaille@inf.enst.fr>.
1997-08-01 15:48 Ulrich Drepper <drepper@cygnus.com>
* Makefile.am (AUTOMAKE_OPTIONS): Require version 1.2.
1997-05-07 04:21 Ulrich Drepper <drepper@cygnus.com>
* msgcomm.c (main): Print author in --version message.
* msgunfmt.c: Likewise.
* msgcmp.c: Likewise.
* msgmerge.c: Likewise.
* msgfmt.c: Likewise.
* xgettext.c: Likewise.
* gettextp.c: Likewise.
1997-05-01 02:33 Ulrich Drepper <drepper@cygnus.com>
* msgcmp.c (main): Update copyright.
* msgunfmt.c (main): Likewise.
* msgcomm.c (main): Likewise.
* msgmerge.c (main): Likewise.
* msgfmt.c (main): Likewise.
* gettextp.c (main): Likewise.
* msgcomm.c: Fix comment about default output (Jan Djarv). Split
help message.
1997-03-31 16:09 Ulrich Drepper <drepper@cygnus.com>
* msgcomm.c (usage): Use program_name as argument for print to
print message, not stdout.
Patch by Jan Djarv <jan.djarv@mbox200.swipnet.se>.
Mon Mar 10 06:18:58 1997 Ulrich Drepper <drepper@cygnus.com>
* xgettext.c: Implement generic language scanner handling.
* xget-lex.c (phase7_getc): Better comments.
(phase5_get): Print warnings about unterminated strings and
character constants.
* po-lex.c (po_gram_error): Don't count continuation lines in
messages as errors.
(gram_error_at_line): Likewise.
* po-lex.h: Likewise for macro versions.
* po-hash.y: Correct typo.
* msgunfmt.c: Implement --force-po option.
* msgmerge.c: Implement --force-po, --no-location, and
--add-location options.
* msgfmt.c (format_directive_message): If messages are duplicated
and translations are different this is a fatal error.
* msgcmp.c (compare_directive_message): Use correct format for
continuation line in message.
* message.h: Add prototype for message_list_delete_nth.
* message.c: Add message_list_delete_nth function.
* Makefile.am (bin_PROGRAMS): Add msgcomm. (l): New variable.
Set to `l' is using libtool. (LDADD): Change for the needs of
libtool. (msgcomm_SOURCES): New variable.
* msgcomm.c: New file.
Wed Dec 4 01:58:10 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile.am (LDADD): Change for use of libtool.
Tue Dec 3 18:08:46 1996 Ulrich Drepper <drepper@cygnus.com>
* xget-lex.c (phase7_getc): Return \n when newline is seen, not
P7_NEWLINE.
* xgettext.c (main): Implement --foreign-user flag.
* msgcmp.c (main): Change --version output to what is required by
GNU standards. (usage): Correct bug report address.
* msgfmt.c: Likewise.
* msgunfmt.c: Likewise.
* msgmerge.c: Likewise.
* xgettext.c: Likewise.
* gettextp.c: Likewise.
Sat Sep 14 04:28:09 1996 Ulrich Drepper <drepper@cygnus.com>
* msgunfmt.c (usage): Put bug report address in separate string.
* msgmerge.c (usage): Likewise.
* msgcmp.c (usage): Likewise.
* xgettext.c (usage): Likewise.
* msgfmt.c (usage): Likewise.
* gettextp.c (usage): Likewise.
Thu Sep 12 21:40:48 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* msgfmt.c (check_pair): Fix error messages.
Sat Aug 31 14:05:29 1996 Ulrich Drepper <drepper@cygnus.com>
* msgunfmt.c (usage): Add hint about where to report bugs to.
* msgmerge.c (usage): Likewise.
* msgcmp.c (usage): Likewise.
* xgettext.c (usage): Likewise.
* msgfmt.c (usage): Likewise.
* gettextp.c (usage): Likewise.
Sat Aug 31 04:49:38 1996 Ulrich Drepper <drepper@cygnus.com>
* gettextp.c: Don't include <libintl.h> since this can generate
conflicts.
Mon Jul 15 02:21:25 1996 Ulrich Drepper <drepper@cygnus.com>
* msgfmt.c: Major change: msgfmt now does not write fuzzy messages
out by default. The option -f/--use-fuzzy must be used to
explicitely tell to do it.
Sat Jul 13 20:23:34 1996 Ulrich Drepper <drepper@cygnus.com>
* xget-lex.c (phase6_get): Reset selected comments on every
preprocessor directive.
Fri Jul 12 12:38:49 1996 Ulrich Drepper <drepper@cygnus.com>
* xgettext.c (main): Remove `v' from short option list.
Sat Jul 6 11:22:47 1996 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* message.c (message_merge): Add some casts to (char *) in alloca
calls. Make KNOWN_FIELDS array static.
Sat Jul 6 11:15:43 1996 Jim Meyering <meyering@na-net.ornl.gov>
* msgfmt.c (check_pair): Correct English in Message.
Fri Jul 5 17:27:11 1996 Ulrich Drepper <drepper@cygnus.com>
* message.c (message_merge): Terminate string for UNKNOWN fields
in header entry.
* message.c (message_merge): Don't print POT-Revision-Date twice.
* msgfmt.c: Implement --statistics.
Suggested by Santiago Vila Doncel.
* msgfmt.c: and change message checking so that tests for leading
and trailing \n are always performed.
Suggested by François Pinard.
Wed Jun 19 02:42:52 1996 Ulrich Drepper <drepper@cygnus.com>
* message.c (message_merge): Implement sorting of header entry
lines.
Sat Jun 15 19:46:50 1996 Ulrich Drepper <drepper@cygnus.com>
* msgmerge.c (usage): Correct -w option in help string (was -W).
Tue Jun 11 15:28:44 1996 Ulrich Drepper <drepper@cygnus.com>
* xget-lex.c, xget-lex.h (xgettext_lex_comment): Change parameter
type to size_t.
* po-lex.h, po-lex.c (gram_max_allowed_errors): Change type to
size_t.
* message.c, message.h (message_page_width_set): Change parameter
type to size_t.
* Makefile.am (AUTOMAKE_OPTIONS): Add variable. Must be defined
in all subdirs.
Mon Jun 10 02:53:52 1996 Marcus Daniels <marcus@sysc.pdx.edu>
* dir-list.c: Include system.h in order to get size_t and NULL.
Thu Jun 6 01:59:31 1996 Ulrich Drepper <drepper@cygnus.com>
* str-list.h: Include <stddef.h> to get size_t defined.
Reported by Philippe Defert.
* Makefile.am (LDADD): Remove `@INTLLIBS@ ../lib/libnlsut.a
@LIBS@'. This is not necessary anymore.
Wed Jun 5 00:00:08 1996 Ulrich Drepper <drepper@cygnus.com>
* xgettext.c, msgunfmt.c (usage): Correct --page-width to --width
in usage string.
* open-po.c (open_po_file): Implement search path for PO files.
* xget-lex.c (xgettext_lex_open): Implement search path for PO
files. Patch by Peter Miller.
* message.h (struct message_ty): Add do_wrap member.
Add prototypes for parse_c_width_description_string and
message_page_width_set.
* xgettext.c: Implement --width option to specify width for which
line wrapping is done. Change --directory option implement search
path instead of single directory. Patch by Peter Miller.
* message.c (wrap): Implement no-wrap special comment. If given
no wrapping is performed.
* gettextp.c, msgcmp.c, msgfmt.c, msgmerge.c, msgunfmt.c,
xgettext.c: Add `no-wrap' comments at usage message strings.
* msgcmp.c: Implement --directory to specify search path for .po
files. Patch by Peter Miller.
Tue Jun 4 23:57:59 1996 Ulrich Drepper <drepper@cygnus.com>
* msgfmt.c: Implement --width option to specify width for which
line wrapping is done. Patch by Peter Miller.
* msgmerge.c: Implement --width option to specify width for which
line wrapping is done. Implement --directory to specify search
path for .po files. Patch by Peter Miller.
* msgunfmt.c: Implement --width option to specify width for which
line wrapping is done. Patch by Peter Miller.
Tue Jun 4 00:12:25 1996 Ulrich Drepper <drepper@cygnus.com>
* po-hash.y: Add new clause where in GNU style format the name is
`file'.
* Makefile.am (noinst_HEADERS): Add dir-list.h.
(msgcmp_SOURCES, msgfmt_SOURCES, msgmerge_SOURCES, xgettext_SOURCES):
Add dir-list.c
Mon Jun 3 00:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* message.h: Add new parameter for message_list_print.
* msgmerge.c, msgunfmt.c (main): Add new parameter to
message_list_print. Set to 0 because we don't need to know about
the reasoning.
* xgettext.c: Implement new option --debug which determines
whether a difference is made between c-format and
possible-c-format. Default is to print c-format for both cases.
* message.c (make_c_format_description_string): Take additional
parameter DEBUG. If nonzero, distinguish between c-format and
possible-c-format.
* message.c (message_print_obsolete): Copy precious translator
comment to output file. Reported by Santiago Vila Doncel.
* dir-list.c: Include file now is called dir-list.h, not
dir_list.h.
* message.c: Include <limits.h>.
* Makefile.am (EXTRA_DIST): Add variable to distribute po-gram.y
and po-hash.y.
* Makefile.am (msgfmt_SOURCES): Fix typo: msgfmt.o -> msgfmt.c.
Sat Jun 1 04:33:48 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile.in: Remove support for tupdate. msgmerge is stable
now.
Wed Apr 10 01:20:49 1996 Ulrich Drepper <drepper@myware>
* message.c (message_print_obsolete): Don't print
c-format/no-c-format flags for obsolete entries.
* xgettext.c (construct_header): Change DIST to ZONE in header
entry template.
* message.c (message_merge): Insert POT-Creation-Date field before
PO-Revision-Date.
Tue Apr 9 17:13:34 1996 Ulrich Drepper <drepper@myware>
* xgettext.c (construct_header): Move POT-Creation-Date line
before PO-Revision-Date line.
Fri Apr 5 12:07:19 1996 Ulrich Drepper <drepper@myware>
* msgmerge.c: Implement --quiet option to prevent dots printed as
progress report.
(merge): Don't print dots if `quiet'.
* msgmerge.c (merge): Nicer statistics message.
* message.c (message_merge): Update POT-Creation-Date field in
header entry from contents in reference file.
* msgfmt.c (format_directive_message): Better test for unchanged
fields in header entry.
* xgettext.c (difftm): Is back.
(construct_header): Print distance to GMT in POT file time stamp.
* xgettext.c (construct_header): Print leading comment and fuzzy
flag.
* message.c (message_print): Allow translator comment to fill more
than one line.
* xgettext.c (construct_header): Introduce POT-Creation-Date
field.
Fri Apr 5 03:05:07 1996 Ulrich Drepper <drepper@myware>
* msgmerge.c (merge): Rename empty in missing. There might be
more empty messages which are not missed.
* msgmerge.c (merge): Terminate `.' line if no verbose output is
selected.
* msgmerge.c (main): Implement -v option to increase verbosity
level.
(merge): Print `.' to signal ongoing work.
Unless verbosity level > 1 don't print information about fuzzy and
missing matches. Instead print statistics at the end.
Suggested by François Pinard and Santiago Vila Doncel.
Thu Apr 4 11:59:20 1996 Ulrich Drepper <drepper@myware>
* xgettext.c (difftm): Remove unused function.
(construct_header): Don't fill Last-Translator field with information
about curent user but instead constant text mentioning xgettext.
* message.c (message_list_search_fuzzy): Initialize mp before
using it.
* message.c (message_print): Normalize printed messages even more.
Don't print fuzzy flag is msgstr is empty.
* message.c (message_list_search_fuzzy): Don't try to match
against msgid if none if the msgstr of this message in non-empty.
Thu Apr 4 01:57:37 1996 Ulrich Drepper <drepper@myware>
* msgfmt.c (format_directive_message): When testing header entry
also check whether they still contain the initial values.
Suggested by François Pinard.
Tue Apr 2 16:19:42 1996 Ulrich Drepper <drepper@myware>
* xgettext.c (main): Add "warning" to message about unknown input
file type.
* Makefile.in (all-gettext): New goal. Same as all.
* xgettext.c (usage): Rearange help strings. One of them was too
long for some dumb catgets programs. Reported by Marcus Daniels.
* msgfmt.c (format_directive_message): Check for standard header
entry fields.
* xgettext.c (construct_header): MIME-VERSION should be written
MIME-Version.
* msgmerge.c (main): Don't recognize -f option anymore. This is
the default now.
* msgfmt.c (format_debrief): New function. Warn if no header
entry is found.
(format_directive_message): Remember if header entry is found.
Tue Apr 2 11:12:15 1996 Ulrich Drepper <drepper@myware>
* msgfmt.c (format_constructor): New function. Initialize
is_c_format field.
(format_directive_message): Clear is_c_format field for next message
at the end.
* xgettext.c, po-lex.h, po-lex.c, po-gram.y, msgmerge.c, msgfmt.c,
msgcmp.c: Use gram_error_at_line instead of gram_error_with_loc
and error_at_line instead of error_with_loc. Roland does not like
my English.
Tue Apr 2 03:27:34 1996 Ulrich Drepper <drepper@myware>
* msgunfmt.c (main): Removed -S option. People should think twice
before using this and so are forced to use the long version.
Tue Apr 2 03:25:56 1996 François Pinard <pinard@iro.umontreal.ca>
* msgunfmt.c (usage): Remove Tab character from message.
Tue Apr 2 03:15:16 1996 Marcus Daniels <marcus@sysc.pdx.edu>
* message.c (significant_c_format_p): If is_c_format is `no' this
is significant.
Tue Apr 2 03:12:24 1996 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* po.c (po_comment_filepos): Make definition static as declaration
was before.
* msgunfmt.c (usage): Add missing \n to help string.
Mon Apr 1 02:37:45 1996 Ulrich Drepper <drepper@myware>
* xgettext.c (main): When recognizing file type, default to C
instead of regarding it as an error. Suggested by Marcus Daniels.
* po.c (po_callback_comment): For now recognize #! also as special
comment.
* msgmerge.c (merge): Remove --force option. We now always write
the result. It makes no sense to reject the output because some
messages are not matching.
* po-lex.c (po-gram_error, gram_error_with_loc): Use
error_message_count instead of gram_nerrors.
(gram_nerrors): Remove definition.
* po-lex.h (po-gram_error, gram_error_with_loc): Use
error_message_count instead of gram_nerrors.
* xgettext.c: Remove verbose option and variable.
(test_whether_c_format): Don't return `possible' is string
contains no format specifier.
Sun Mar 31 23:23:40 1996 Ulrich Drepper <drepper@myware>
* xget-lex.c (xgettext_lex): Fix typo. Reported by François
Pinard.
Thu Mar 28 19:01:22 1996 Ulrich Drepper <drepper@myware>
* po.c (po_callback_comment): Correct handling of special
comments. Give whole comment to callback function instead of
tokenized form.
Thu Mar 28 18:37:49 1996 Ulrich Drepper <drepper@myware>
* xgettext.c (remember_a_message): Always look through comments
because we have to look for c-format comments.
* message.h, msgmerge.c, xgettext.c, message.c, msgfmt.c:
Implement more detailed C format string handling. Basically coded
by Marcus Daniels.
Thu Mar 28 16:52:56 1996 Marcus Daniels <marcus@sysc.pdx.edu>
* Makefile.in (MSGFMT_OBJ): Add message.o.
Wed Mar 27 03:16:01 1996 Ulrich Drepper <drepper@myware>
* xget-lex.c (xgettext_lex): Correct implementation of comments
grouped with messages.
Tue Mar 26 21:23:54 1996 Ulrich Drepper <drepper@myware>
* po.c (po_callback_comment): Remove unused variable string.
Include <ctype.h> because isspace is used.
* message.h (message_list_print): Undo change of Mon Mar 25
03:34:44 1996. Don't print trailing comment. Remove additional
argument.
* message.c (message_list_print): Undo change of Mon Mar 25
03:34:44 1996. Don't print trailing comment. We now have a
correct implementation of obsolete entry handling.
* msgmerge.c: Ditto.
* po-lex.h: Add prototype for po_lex_pass_obsolete_entries.
* po-lex.c (po_gram_lex): Implement handling of comments for
obsolete entries (#~).
* msgunfmt.c, xgettext.c (main): Undo change of Mon Mar 25
03:34:44 1996. Remove added argument to message_list_print again.
* po-lex.c (po_gram_lex): Small optimization in string collection.
* message.c (message_print_obsolete): Obsolete messages are now
preceded by #~ on each line.
* xgettext.c (remember_a_message): Fix bug with dereferencing
dangling pointer. This caused xgettext test 1 to fail.
* xgettext.c (construct_header): Update format for file header.
* xgettext.c (extract_directive_message): Don't report error when
message variant exists but the value is the same. Reported by
Roland McGrath.
* message.c (wrap): Only write characters in escape notation if
explicitely wanted or if it is one of the well known escapes like
\n.
* msgunfmt.c (main): Adopt interface to GNU coding standard. All
given files on command line are input files. Output by default is
written to standard output and can be redirected using -o.
Mon Mar 25 04:25:42 1996 Ulrich Drepper <drepper@myware>
* message.c, message.h (message_list_print): Parameter filename is
const.
* message.c (wrap): Change line break behaviour a bit. While it
is reasonable to break long line containing #: comments
immediately when reaching the the limit, this could lead to unnice
results for the strings in msgid and msgstr. The programmer
usually knows why the lines are that long.
So we break for now after reaching 2 * PAGE_WIDTH instead of
PAGE_WIDTH.
* message.c (message_list_print): Print blank line before trailing
comments.
* message.c (message_print_obsolete): Don't print anything for
obsolete entries with empty msgstr.
Mon Mar 25 03:34:44 1996 Ulrich Drepper <drepper@myware>
* msgunfmt.c (main): Make program by default read from stdin and
by default write to stdout in the appropriate argument is not
given. Suggested by François Pinard.
* msgfmt.c (format_directive_domain): Only check for correct
format string elements is special comment contains c-format.
* msgfmt.c: Use sizeof instead of strlen to determine length of
constant string.
* xgettext.c: Implement generation of c-format special comments.
* msgunfmt.c (main): Call message_list_print with additional
argument set to NULL.
* xgettext.c (main): Call message_list_print with additional
argument set to NULL;
(extract_class_ty): We don't have field comment_special anymore, but
instead flags fuzzy and c_format.
(extract_constructor): Reset fields fuzzy and c_format.
(extract_directive_message): Set flags according to special comments,
not string list.
(extract_comment_special): Set flags according to special comment.
* message.h (message_ty): We don't have field comment_special
anymore. Instead flags fuzzy and c_format.
(message_comment_special_append): Remove prototype.
(message_list_print): Add new argument to prototype.
* message.c (message_alloc): We don't have the comment_special,
but fuzzy and c_format.
(message_comment_special_append): Remove function. We now have flags.
(message_copy, message_merge): Copy fuzzy and c_format flag
appropriately.
(message_print, message_print_obsolete): Print special comment using
flags, not string list.
(message_list_print): Additional argument with trailing comments.
Printed at the end if not NULL.
* msgmerge.c (merge_class_ty): New fields fuzzy and c_format for
flags;
(trailing_comments): New global variable for list of trailing
comments in definition file.
(grammar): Takes an additional argument which if NULL gets the list of
trailing comments assigned to.
(main): Call message_list_print with additional argument of trailing
comments.
(merge_comment_special): Recognize fuzzy and c-format special comment.
Sun Mar 24 17:35:26 1996 Ulrich Drepper <drepper@myware>
* xgettext.c (usage): Option --output-suffix does not exist
anymore.
* msgmerge.c (usage): --strict does not have short form -S.
* message.h (message_ty): New field `obsolete'.
* msgmerge.c (merge): Change behaviour not not matched entries.
Instead of giving a message write them out at the end of the
regular output and precede each line with `# '.
* message.c (message_list_print): Handle obsolete entries
separately by printing them at the end and preceded by `# '.
(message_print_obsolete): New function to print obsolete entries.
* Makefile.in ($(PROGRAMS)): Add generated libraries as
dependencies for programs.
* Makefile.in (PROGRAMS): Remove msgjoin.
Sun Mar 24 01:03:32 1996 Ulrich Drepper <drepper@myware>
* xgettext.c (extract_comment_filepos): Only add line comment if
requested by -n option.
* po.c (po_callback_comment): Short by one bug in special comment
entry copying.
* po.c (po_callback_comment): Handle special comments. Separate
them into a list of comma separate entries.
* message.c (message_print): Format of lines containing fuzzy
comments et.al. is now `#, xxx'.
* Makefile.in: msgjoin program is not anymore generated.
* xgettext.c: First step to implementing general input file
handling. The program now recognizes the file type by the file
name extension and uses the appropriate function. For now two
file types are recognized: C/C++ and PO. Especially handling PO
files make the msgjoin program obsolete.
Sat Mar 23 01:50:00 1996 Ulrich Drepper <drepper@myware>
* msgfmt.c (verbose): Rename to verbose_level.
(main): Increment verbose_level each time -v option is given.
(format_directive_domain): Print some of the diagnostic messages only
if verbosity level is > 1. Suggested by François Pinard for a
better interface to PO mode.
* xgettext.c (scan_c_file): Extract all string if `extract-all'
option is given. Reported by Roland McGrath.
Thu Mar 14 14:55:20 1996 Ulrich Drepper <drepper@myware>
* msgfmt.c (format_comment_special): Be prepared that special
comment contains more than one entry, separated by commas.
* message.c (message_print): Special comments are now written in a
line, separated by commas.
* msgmerge.c (merge): Replace `INEXACT' with `fuzzy'.
Thu Mar 14 11:50:48 1996 Marcus Daniels <marcus@sysc.pdx.edu>
* po-hash.h (po_hash): Change __P to PARAMS in prototype.
Fri Mar 1 13:35:01 1996 Ulrich Drepper <drepper@myware>
* msgfmt.c (main): Set error_one_per_line to 1 to prevent more
than one error message per line. Suggested by François Pinard.
* po-lex.h (po_gram_error): Don't write source file name in fatal
message.
(po_gram_error_with_loc): Ditto.
* po-lex.c (lex_close): Don't write source file name in fatal
message.
(po_gram_error): Ditto.
(po_gram_error_with_loc): Ditto.
Fri Mar 1 00:30:49 1996 Ulrich Drepper <drepper@myware>
* po-lex.h: Use PARAMS instead of __P in header declarations.
* msgcmp.c (compare_methods): Set new field comment_special to
NULL.
* msgjoin.c (join_methods): Set new field comment_special to NULL.
* xgettext.c (exclude_methods): Set new field comment_special to
NULL.
* po.h (struct po_method_ty): New field comment_special.
(po_directive_domain, po_directive_message, po_parse_brief,
po_parse_debrief, po_comment, po_comment_dot, po_comment_filepos):
Remove prototypes. Now are local functions.
* po.c (po_parse_brief, po_parse_debrief, po_directive_domain,
po_directive_message, po_comment, po_comment_dot,
po_comment_filepos): Declare functions as local and add
prototypes.
(po_comment_special): New function.
(po_callback_comment): For special comments call po_comment_special.
* msgmerge.c (usage): Add --force in help message.
(merge_methods): Set special comment callback to NULL.
* po-lex.c (lex_open): Don't set pass_comments to 0. This has to
be done in upper layer functions.
(po_gram_lex): Also pass #! comments up.
* msgfmt.c (main): Make lexer pass comments up.
(format_comment_special): New function. Warns about `#! INEXACT'
comments.
(format_methods): Add callback for special comment.
Wed Feb 14 01:56:14 1996 Ulrich Drepper <drepper@myware>
* xgettext.c (main): Remove option --output-suffix. When default
domain name is "-" write to stdout.
Mon Feb 12 02:20:09 1996 Ulrich Drepper <drepper@myware>
* xgettext.c (main): Implement --output-suffix parameter to
determine alternative form of suffix for output file.
* xgettext.c, msgjoin.c, msgmerge.c, msgunfmt.c (main): Add
additional argument to message_list_print call: control output in
case of empty PO file.
* message.c (message_list_print): Implement FORCE parameter.
* message.h: Change prototype.
Sun Jan 21 17:24:56 1996 Ulrich Drepper <drepper@myware>
* Makefile.in (install-exec): Include empty else case for case
when Perl is not available. Reported by John David Anglin.
Sat Dec 23 12:41:43 1995 Jun Young <bangjy@nownuri.nowcom.co.kr>
* gettextp.c (usage): Short option for version info is -V.
Tue Dec 19 22:10:12 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (Makefile, tupdate): Explicitly use $(SHELL) for
running shell scripts.
Sat Dec 9 17:06:11 1995 Ulrich Drepper <drepper@myware>
* xgettext.c, xget-lex.h, xget-lex.c, str-list.h, po.h, po.c,
po-lex.c, po-hash.y, po-gram.h, open-po.c, msgunfmt.c, msgmerge.c,
msgjoin.c, msgfmt.c, msgcmp.c, message.h, message.c, gettextp.c:
Use PARAMS instead of __P. Suggested by Roland McGrath.
Fri Dec 8 01:38:40 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (PROGRAMS): Add definitions for new msgjoin program.
* msgjoin.c: Initial revision.
Wed Dec 6 18:43:14 1995 Ulrich Drepper <drepper@myware>
* open-po.c (open_po_file): Recognize /dev/stdin as name for
stdin. Recognize .pot as valid extension.
Wed Dec 6 18:05:11 1995 Ulrich Drepper <drepper@myware>
* msgmerge.c (main): Sort options in getopt loop.
Mon Dec 4 15:37:22 1995 Ulrich Drepper <drepper@myware>
* msgmerge.c: (main): Remove unused variable `exit_status'.
Sun Dec 3 02:51:31 1995 Ulrich Drepper <drepper@myware>
* xget-lex.h: [xgettext_token_type_ty]: We now have two keyword
types and also the comma is important.
* xgettext.c (remember_a_message):
Correct handling of -c option. This is not a
string to prepend to output. Instead it selects single strings to
include (instead of all). Reported by Marcus Daniels.
(scan_c_file): Extend state machine. We have to retrieve the second
argument for the keywords `dgettext' and `dcgetetxt`.
* xget-lex.c (phase5_get): Recognize ','.
(xgettext_lex): Pass ',' on caller.
Return different value for keywords `dgetetxt' and `dcgettext`.
* xget-lex.c (xgettext_lex): `gettext_noop' is an default keyword.
* msgunfmt.c (usage):
Message should not contain TABs. Reported by François Pinard.
* msgunfmt.c (usage):
Correct typo: Uniforun -> Uniforum. Reported by François Pinard.
Mon Nov 20 21:12:52 1995 Ulrich Drepper <drepper@myware>
* po-lex.c, message.c: Some more pretty printing.
* message.c (wrap): Don't support '\a' and '\v'.
* xget-lex.c (phase7_getc): Don't support '\v'.
* po-lex.c (control_sequence): Don't support '\v'.
* gettextp.c (expand_escape): Don't support \a and \v.
* msgcmp.c (compare): Really define static.
Thu Nov 16 22:42:33 1995 Ulrich Drepper <drepper@myware>
* msgmerge.c (merge): Remove additional parameter in in prototype.
* xgettext.c: Reomved unused type definition. Patch by Peter Miller.
* xget-lex.c: Correct some comments and better implementation of
-k option. Patch by Peter Miller.
* po.h: Fix typos. By Peter Miller.
* po-lex.c (po_gram_lex): Prevent accumulation of #! comments.
* po-gram.y (comments): Remove unused rule.
* msgmerge.c: Implement new options sort-by-file and sort-output.
Patches by Peter Miller.
* msgcmp.c (domain): Remove unused global variable.
(domain_directive): Remove unused function.
* message.h: Fix comment for MESSAGE_DOMAIN_DEFAULT definition.
* message.c (message_print): Correct typo.
Clarify comments about ANSI escape sequences.
Patches by Peter Miller.
* Makefile.in (DISTFILES): Remove $(COMSRCS).
(MSGFMT_OBJ): Correct indentation. Patches by Peter Miller.
Sun Nov 12 12:52:29 1995 Ulrich Drepper <drepper@myware>
* xgettext.c (line, string, comment): Remove unused global variables.
(read_name_from_file): Remove unused variable `cp'.
* msgmerge.c (merge): Add missing return statement.
* msgfmt.c (check_pair): Correctly pair comparisons.
* msgcmp.c (domain_list, mlp): Remove unused global variables.
Sat Nov 11 21:39:17 1995 Ulrich Drepper <drepper@myware>
* message.c (message_list_print):
Prevent output if we have no (real) entry.
* xgettext.c (remember_a_message): Implement exclude file handling.
Sat Nov 11 17:38:05 1995 Ulrich Drepper <drepper@myware>
* msgunfmt.c: Fix message.
* xgettext.c: Use string handling from str-list and .po file
handling use xget-lex et.al.
* xget-lex.h, xget-lex.c, str-list.h, str-list.c, po.h:
Initial revision.
* po-lex.h: Allow variable upper limit of errors.
New prototypes.
* po-lex.c: Allow variable upper limit of errors.
Make comment's text available to the caller.
* po.c, po-hash.y, po-hash.h: Initial revision.
* po-gram.y: Add handling of comments.
* po-gram.h: Remove all but one declaration.
* msgunfmt.c, msgmerge.c: Initial revision.
* msgfmt.c: Adopt for new interface to parser.
* msgcmp.c: Move lot's of general code to other files.
* message.h, message.c:
Extended functionality for Peter Miller's pseudo-OO programming.
* Makefile.in: Rewrite after adding rules for new programs.
Fri Nov 10 10:01:37 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (PROGRAMS): Add new programs msgmerge and msgunfmt.
Thu Nov 9 01:29:46 1995 Ulrich Drepper <drepper@myware>
* gettextp.c (usage): Split message in two parts.
* xgettext.c (usage): Split message in three parts.
* xgettext.c (main):
Print warning if --files-from option and file names on command
line are given.
* xgettext.c (long_options):
Mixed up `default-domain' and `directory' values.
Wed Nov 8 23:31:34 1995 Ulrich Drepper <drepper@myware>
* xgettext.c: Implement -D and -f option.
Tue Nov 7 13:44:44 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (LIBS): One @LIBS@ must be @INTLLIBS@.
* Makefile.in (LIBS): Correct definition. We must be prepared to
use two different libintl.a libraries.
(po-gram.gen.c): Don't use $< in non-implicit rule.
* Makefile.in (install-exec): Use `test -n' instead of
`test XXX != ""'. Proposed by François Pinard.
Sun Nov 5 23:59:03 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (INSTALL_PROGRAM): Do not specify mode.
Sun Nov 5 21:13:57 1995 Ulrich Drepper <drepper@myware>
* xgettext.c, msgfmt.c:
Comments describing what has to be done should start with FIXME.
Sun Nov 5 19:39:56 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (dist-gettext): Make synonym for dist.
Sun Nov 5 18:11:15 1995 Ulrich Drepper <drepper@myware>
* po-lex.h (gram_error, gram_error_with_loc):
Don't define macros when !__STDC__
even when using gcc.
* po-lex.c (gram_error, gram_error_with_loc):
Compile if !__STDC__ even if using gcc.
* Makefile.in (po-gram.gen.c po-gram.gen.h):
Remove file prior of generation.
Sun Nov 5 11:39:21 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (dist): Suppress error message when ln failed.
Get files from $(srcdir) explicitly.
* xgettext.c (process_c_source):
Make gettext_noop the forth builtin marker.
Fri Nov 3 00:57:52 1995 Ulrich Drepper <drepper@myware>
* msgfmt.c (main): Don't free fname when no suffix was added.
Thu Nov 2 22:55:44 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (dist): Also remove msgcmp.
Tue Oct 31 22:27:52 1995 Ulrich Drepper <drepper@myware>
* msgfmt.c: New option --strict: Only if this is given the .mo
file ending is forced.
* msgfmt.c (message_directive):
Call error_with_loc with correct parameters.
* msgfmt.c (message_directive):
Ignores empty message does not count as fatal error.
* Makefile.in (po-gram.gen.c):
Add g suffix to make multiple substitution in one
line possible.
Mon Oct 30 22:35:41 1995 Ulrich Drepper <drepper@myware>
* po-gram.h:
Don't give defines for translation of yy* symbols. This is not enough
to be able to have more than one parser. See src/Makefile for the way
we chose.
* Makefile.in (po-gram.gen.c):
Rewrite generated source while copying. This is the
only portable way to get more than one parser in the same program.
Patch by Peter Miller.
Sun Oct 29 10:49:59 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (INSTALL_SCRIPT): New variable.
(install-exec): Install tupdate using INSTALL_SCRIPT to prevent error
when using strip flag.
Sat Oct 28 14:39:33 1995 Ulrich Drepper <drepper@myware>
* po-gram.h: Include <sys/types.h>.
* xgettext.c (main):
Honour -n option even if --omit-header is given. By Peter Miller.
* msgcmp.c (check_domain_coverage):
No double space in message. By Peter Miller.
* msgcmp.c (grammar):
Close input file after coverage check. Patch by Peter Miller.
Wed Sep 27 20:27:26 1995 Ulrich Drepper <drepper@myware>
* msgcmp.c:
Don't try to include <string.h>. This is done in "system.h".
* po-lex.c (gram_error, gram_error_with_loc):
Add argument definition for K&R style.
(gram_error, gram_error_with_loc): We increase gram_nerrors,
not nerrors. Reported by Francesco Potorti`.
Tue Sep 26 10:03:29 1995 Ulrich Drepper <drepper@myware>
* po-gram.h (yyparse): Add redefinition to gram_parse.
* Makefile.in (YFLAGS):
Don't use -p option. Stupid old yaccs do not know it.
* po-lex.c: Include po-gram.h to get redefinitions of yy* symbols.
* po-gram.h (yylex, yylval, yyerror):
Redefine these symbols to gram_* because the
yacc is now called without -p option.
* Makefile.in (LIBS):
Undid last change. On some systems libintl.a is not
completely self-contained. alloca() is miisong e.g. on HP-UX.
Mon Sep 25 22:35:55 1995 Ulrich Drepper <drepper@myware>
* msgfmt.c (add_mo_suffix): Fix typo.
* po-lex.h: Include <sys/types.h>.
(lex_open): Argument is now `const char *'.
* msgfmt.c (add_mo_suffix):
Allow .gmo suffix. Great idea by Marcus Daniels.
Sat Sep 23 08:20:54 1995 Ulrich Drepper <drepper@myware>
* po-gram.y, po-lex.c: Include error.h.
* open-po.c (open_po_file):
Remove unused variables `path_dir' and `open_po_file'.
Thu Sep 21 15:30:36 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (LIBS):
using libnlsut.a twice is not necessary anymore. libintl.a is
selfcontained.
* gettextp.c (main):
Use dcgettext__ and bindtextdomain__ instead of __dcgettext
and __bindtextdomain.
* msgfmt.c, xgettext.c (exit_status):
New variables. Contains exit status for the case the program
ends normally. Changed when non-fatal error messages are given.
Wed Sep 20 09:16:57 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (xgettext): No also link po-gram.gen.o and po-lex.o.
* po-lex.c: Pretty print comments.
Do some CSE in computation of hex value.
* xgettext.c (read_po_file): Now use the generated scanner.
(domain_directive, message_directive): New functions needed for
scanner.
(add_id_str): Correct test for exclude files. The messages in the
exclude table are in raw format, not C format.
(write_out_domain): Check for zero messages and don't write anything in
this case.
* po-lex.c (lex_open): Argument NAME is now const.
(gram_error): Move VARARGS1 comment to right place.
(control_sequence): Pretty print some comments.
Mon Sep 18 21:23:55 1995 Ulrich Drepper <drepper@myware>
* msgfmt.c (add_mo_suffix): Really check for not .mo suffix.
* xgettext.c (write_out_domain):
Write file names in #: lines to file, not stdout.
* po-gram.y (grammar):
Remove function. This allows sharing this file in different
programs.
* domain.h (msg_domain): Member DOMAIN_NAME is now const.
* Makefile.in (PROGRAMS): Add msgcmp.
(HEADERS): Add message.h.
(SOURCES): Add message.c and msgcmp.c.
(OBJECTS): Add message.o and msgcmp.o.
(msgcmp): Rule to construct program.
* message.h, message.c: Initial revision
* msgfmt.c (grammar): Close comment so that function is seen.
(message_directive): MSGID and MSGSTR are not const.
* msgcmp.c: Initial revision
* po-gram.h (message_directive):
MSGID and MSGSTR argument are not const.
* po-gram.h (grammar): Remove prototype. Is now locally defined.
* po-lex.h (gram_error, gram_error_with_loc):
Protect the instructions by do while (0).
* msgfmt.c (grammar):
Define function here. This allows sharing the grammar file
with the msgcmp program.
* msgfmt.c (domain_directive): Free memory of NAME if not needed.
(new_domain): Do not duplicate filename, use it as it is.
* msgfmt.c (message_directive):
Free parameter string memory here if necessary.
Was done in po-gram.y before.
* po-gram.h: Remove comment after closing #endif.
* po-gram.h (grammar): Name parameter in prototype.
Sun Sep 17 23:29:30 1995 Ulrich Drepper <drepper@myware>
* xgettext.c (read_po_file): We don't have a search path anymore,
so third argument to open_po_file is not needed anymore. Reduce
argument list by this parameter, too.
* po-lex.c (lex_open):
We don't have a search path anymore, so third argument to
ope_po_file is not needed anymore.
* open-po.c (open_po_file): Remove unused `use_path' parameter.
* Makefile.in (HEADERS): Add po-gram.h and po-lex.h.
* po-gram.h, po-lex.h: Initial revision
* Makefile.in (YACC, YFLAGS): New program used for .po file grammar.
(SOURCES): Add po-gram.y and po-lex.c.
(GENHEADERS, GENSOURCES): New variables for generated headers
and sources.
(OBJECTS): Add po-gram.gen.o and po-lex.o.
Add rules for new files and add to dependency list for msgfmt.
* po-lex.c, po-gram.y: Initial revision
* xgettext.c: Remove input path handling.
Adapt for new hashing functions return values.
* msgfmt.c:
Rewrite .po file handling. Use Peter Millers .po file Yacc grammar.
* open-po.c: Remove handling of input path.
* xgettext.c (write_out_domain):
Split #: lines each 80 columns. Based on a patch by
Peter Miller.
* Makefile.in: hash.[ch] moved from src/ to lib/ subdirectory.
Wed Aug 23 21:13:11 1995 Ulrich Drepper <drepper@myware>
* tupdate.in: Don't print comment in front of obsolete entries.
Tue Aug 22 22:16:31 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (AR, RANLIB): Remove definition. Not needed here.
Reported by François Pinard.
Sat Aug 19 17:38:22 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (install-src):
Make behave like install. I.e. really install the catalogs.
Sat Aug 19 00:57:07 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (SCRIPTS):
New variable. Contains names of scipts to be generated and
installed. For now it is tupdate.
(PROGRAMS): Remove tupdate.
(all): Also depend on $(SCRIPTS).
Fri Aug 18 13:02:04 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (PROGRAMS): Add tupdate.
(tupdate): New rule. Rebuild tupdate if tupdate.in or
../config.status changed.
* tupdate.in: Correct case where message is new: no really print msgid.
Better help message by François Pinard.
Recognize #\t as comment.
Print comment for now obsolete entries.
Handle real comments (translator comments and tupdate generate obsolete
entries).
* gettextp.c (usage): Better help message.
(usage): Add -s description to help screen.
Mon Aug 14 23:50:48 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (install-src): New no-op goal.
Thu Aug 10 11:26:45 1995 Ulrich Drepper <drepper@myware>
* tupdate.in: Don't print two " in front of commented out msgstrs.
Wed Aug 9 09:10:30 1995 Ulrich Drepper <drepper@myware>
* hash.c:
Better implementation. Rehashing is now much faster because the
hashing value stored in the `used' field is reused.
(insert_entry): Split into two function. `insert_entry_2' now does the
the work while in `insert_entry' the checks are done.
(lookup_2): New function. Expects the search key to be NUL
terminated. This is the case when the key is already in the
hash table when rehashing.
* msgfmt.c (write_table):
Third argument to `iterate_table' is now a `const' pointer.
* hash.h (iterate_table): Third arguemtn is `const' pointer.
* xgettext.c (struct id_str): Make fields `const' pointers.
Fri Aug 4 22:45:39 1995 Ulrich Drepper <drepper@myware>
* msgfmt.c (main): Fix typo: me -> we.
* msgfmt.c (output_file_open): Remove this unused variable.
Reported by Jim Meyering.
* Makefile.in (dist): Remove `copying instead' message.
* gettextp.c: Start to implement non-Uniforum behaviour.
Implemented new mode where gettext behaves like `echo',
while translating the messages available in the specified test.
New option: -d, -e, -E, also available in normal mode:
-E: ignored.
-e: enable expansion of some escape sequences.
-d: specify text domain to use.
New option: -s: enable `echo' mode.
Thu Aug 3 18:25:37 1995 Ulrich Drepper <drepper@myware>
* msgfmt.c (usage):
Fix typo: anormalies -> anomalies.
Reported by Karl Anders O/ygard.
Wed Aug 2 18:51:08 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (ID, TAGS): Do not use $^.
* xgettext.c (write-header): Add `Content-Type' field.
Tue Aug 1 20:07:58 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (distclean): Remove ID file.
* Makefile.in (TAGS, ID): Use $^ as command argument.
(TAGS): Give etags -o option t write to current directory,
not $(srcdir).
(ID): Use $(srcdir) instead os $(top_srcdir)/src.
Mon Jul 31 20:57:48 1995 Ulrich Drepper <drepper@myware>
* msgfmt.c (process_po_file):
Quote msgstr in message "empty `msgstr' entry ignored".
Report by Karl Anders O/ygard.
Sun Jul 30 12:14:29 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (LIBS): Always use ../intl/libintl.a.
(all): Always depend on ../intl/libintl.a.
Tue Jul 25 00:15:01 1995 Ulrich Drepper <drepper@myware>
* msgfmt.c (process_po_file): Correct problem with empty lines.
Sun Jul 23 22:47:56 1995 Ulrich Drepper <drepper@myware>
* msgfmt.c (process_po_file):
Give a message when a sole msgid is found at the end of file.
Wed Jul 19 01:52:13 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (PROGRAMS): Always compile all three programs.
* gettextp.c: Include libgettext.h explicitly, in addition to
libintl.h. On system having libintl.h provided by the C library
this assures to have the prototypes for the function defined in
GNU gettext library.
Use __bindtextdomain and __dgettext instead of bindtextdomain and
dgettext resp.
Swap arguments in bindtextdomain call.
Tue Jul 18 23:57:16 1995 Ulrich Drepper <drepper@myware>
* xgettext.c (add_id_str):
`free(msgstr)' can fail on system not allowing free(0).
Reported by Francesco Potorti`.
Tue Jul 18 19:43:41 1995 Ulrich Drepper <drepper@myware>
* xgettext.c (getpwuid):
Define prototype if !defined _POSIX_VERSION.
* hash.c: Don't include malloc.h and string.h because it will be
done in system.h.
* msgfmt.c: Don't include malloc.h because it will be done in
system.h.
Sat Jul 15 00:45:31 1995 Ulrich Drepper <drepper@myware>
* xgettext.c (main):
Disable line_comment option when omit_header is selected.
(write_out_domain): Don't write empty line if !line_comment.
* Makefile.in (DISTFILES):
Due shorted file names now distribute tupdate.in.
(install, clean): Handle tupdate, not tupdate.perl.
* tupdate.in: Rename tupdate.perl.in to tupdate.in to fit in 14
character file systems.
Thu Jul 13 22:21:22 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (install): Test whether Perl was found before
installing.
* tupdate.perl.in: Make die message more GNU-like.
* gettextp.c (usage):
Protect prototypes with __P and use K&R form for parameters.
* xgettext.c (main):
Don't use 100u; poor K&R compilers need (unsigned) 100.
* open-po.c (xstrdup): Protect prototype with __P.
* msgfmt.c (usage, new_domain, process_po_file, compare_id,
write_table, check_pair): Protect prototypes with __P.
* hash.c (xmalloc): Protect prototype with __P.
Thu Jul 13 01:39:47 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (check): New no-op goal.
Wed Jul 12 10:40:54 1995 Ulrich Drepper <drepper@myware>
* tupdate.perl.in: Implement --help and --version options
* xgettext.c: Add --string-limit option to specify limit on string
length.
Only warned when verbose mode is selected.
Add --verbose option.
Help message now correctly says --version == -V.
Tue Jul 11 22:57:54 1995 Ulrich Drepper <drepper@myware>
* xgettext.c (usage): Split help string because it breaks 1024
byte limit.
* Makefile.in (install-exec): Install tupdate.
* xgettext.c (stdlib.h): Protect inclusion by STDC_HEADERS.
(assert): No assertions anymore.
(HAVE_STRTOUL): strtoul is now substituted when not available.
Add warning about too long strings (some systems have limits
for strings in their compiler and/or tools). E.g. Sinix's
gencat program.
* msgfmt.c (printf.h): Include always
(assert): No assertions anymore (all bugs are gone :-).
(HAVE_STRTOUL): Not needed anymore because we substitute
strtoul if not present.
* Makefile.in (DISTFILES,distclean): tupdate.perl is now found here.
Tue Jul 11 01:31:03 1995 Ulrich Drepper <drepper@myware>
* Makefile.in: msgfmt.o depends on ../lib/printf.h.
* msgfmt.c: protect inclusion of malloc.h and stdlib.h.
Don't use GCC's `case b ... e:' feature (NeXT's gcc is
gcc-2.xx but does not understand this. Grrr!).
* open-po.c: Protect inclusion of string.h and stdlib.h.
* hash.c: Pretty print #define.
(init_hash, insert_entry): Cast result of calloc.
(insert_entry): Remove non-ANSI `(type *) var = ...' by
`*(type **) &var = ...'.
(compute_hashval): Cast constant to unsigned long (default: int).
Has effects on 64-bit machines.
Tue Jul 4 00:39:58 1995 Ulrich Drepper <drepper@myware>
* xgettext.c: Don't write "Version:" field for msgid "".
Mon Jul 3 23:02:04 1995 Ulrich Drepper <drepper@myware>
* xgettext.c, msgfmt.c: Better comment.
* Makefile.in: Pretty print with François.
Fix typo in dependencies.
Even more dependency corrections.
Correct dependencies of open-po.c.
Remove unneeded $(srcdir) from Makefile.in dependency.
(LIBS): Correct for building in different directory.
(INCLUDES): Correct for building in different directory.
(DEFS): Rename DEF_MSG_DOM_DIR to LOCALEDIR.
(INCLUDE): Don't use -I paths when not needed.
* hash.c: Include malloc.c and protect string.h inclusion.
* gettextp.c: Protect include of stdlib.h declare prototype for
getenv if not __STDC__.
Include system.h for EXIT_FAILURE.
(main, usage): Replace DEF_MSG_DOM_DIR by LOCALEDIR.
* open-po.c: Include system.h for EXIT_FAILURE.
* msgfmt.c: Fix typo in !__STDC__ path.
(process_po_file): Change for new .po file format.
* xgettext.c (main): Rename DEF_MSG_DOM_DIR to LOCALEDIR.
Update to new .po file format because Solaris' msgfmt can only
handle ANSI C style multi-line strings.
Sun Jul 2 21:31:00 1995 Ulrich Drepper <drepper@myware>
* gettextp.c: gettextp.c (usage): Fix typo in help message.
Reported by François Pinard.
Sun Jul 2 02:12:41 1995 Ulrich Drepper <drepper@myware>
* First official release. This directory contains the
source code for the programs specified in the Uniforum proposal
for internationalization.
|