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 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072 7073 7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527 7528 7529 7530 7531 7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632 7633 7634 7635 7636 7637 7638 7639 7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 7664 7665 7666 7667 7668 7669 7670 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 7686 7687 7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 7701 7702 7703 7704 7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731 7732 7733 7734 7735 7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800 7801 7802 7803 7804 7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819 7820 7821 7822 7823 7824 7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863 7864 7865 7866 7867 7868 7869 7870 7871 7872 7873 7874 7875 7876 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 7947 7948 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995 7996 7997 7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 8012 8013 8014 8015 8016 8017 8018 8019 8020 8021 8022 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 8169 8170 8171 8172 8173 8174 8175 8176 8177 8178 8179 8180 8181 8182 8183 8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213 8214 8215 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 8255 8256 8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331 8332 8333 8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 8367 8368 8369 8370 8371 8372 8373 8374 8375 8376 8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 8390 8391 8392 8393 8394 8395 8396 8397 8398 8399 8400 8401 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411 8412 8413 8414 8415 8416 8417 8418 8419 8420 8421 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478 8479 8480 8481 8482 8483 8484 8485 8486 8487 8488 8489 8490 8491 8492 8493 8494 8495 8496 8497 8498 8499 8500 8501 8502 8503 8504 8505 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 8522 8523 8524 8525 8526 8527 8528 8529 8530 8531 8532 8533 8534 8535 8536 8537 8538 8539 8540 8541 8542 8543 8544 8545 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569 8570 8571 8572 8573 8574 8575 8576 8577 8578 8579 8580 8581 8582 8583 8584 8585 8586 8587 8588 8589 8590 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 8605 8606 8607 8608 8609 8610 8611 8612 8613 8614 8615 8616 8617 8618 8619 8620 8621 8622 8623 8624 8625 8626 8627 8628 8629 8630 8631 8632 8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 8645 8646 8647 8648 8649 8650 8651 8652 8653 8654 8655 8656 8657 8658 8659 8660 8661 8662 8663 8664 8665 8666 8667 8668 8669 8670 8671 8672 8673 8674 8675 8676 8677 8678 8679 8680 8681 8682 8683 8684 8685 8686 8687 8688 8689 8690 8691 8692 8693 8694 8695 8696 8697 8698 8699 8700 8701 8702 8703 8704 8705 8706 8707 8708 8709 8710 8711 8712 8713 8714 8715 8716 8717 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 8730 8731 8732 8733 8734 8735 8736 8737 8738 8739 8740 8741 8742 8743 8744 8745 8746 8747 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774 8775 8776 8777 8778 8779 8780 8781 8782 8783 8784 8785 8786 8787 8788 8789 8790 8791 8792 8793 8794 8795 8796 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 8809 8810 8811 8812 8813 8814 8815 8816 8817 8818 8819 8820 8821 8822 8823 8824 8825 8826 8827 8828 8829 8830 8831 8832 8833 8834 8835 8836 8837 8838 8839 8840 8841 8842 8843 8844 8845 8846 8847 8848 8849 8850 8851 8852 8853 8854 8855 8856 8857 8858 8859 8860 8861 8862 8863 8864 8865 8866 8867 8868 8869 8870 8871 8872 8873 8874 8875 8876 8877 8878 8879 8880 8881 8882 8883 8884 8885 8886 8887 8888 8889 8890 8891 8892 8893 8894 8895 8896 8897 8898 8899 8900 8901 8902 8903 8904 8905 8906 8907 8908 8909 8910 8911 8912 8913 8914 8915 8916 8917 8918 8919 8920 8921 8922 8923 8924 8925 8926 8927 8928 8929 8930 8931 8932 8933 8934 8935 8936 8937 8938 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 8954 8955 8956 8957 8958 8959 8960 8961 8962 8963 8964 8965 8966 8967 8968 8969 8970 8971 8972 8973 8974 8975 8976 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986 8987 8988 8989 8990 8991 8992 8993 8994 8995 8996 8997 8998 8999 9000 9001 9002 9003 9004 9005 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 9021 9022 9023 9024 9025 9026 9027 9028 9029 9030 9031 9032 9033 9034 9035 9036 9037 9038 9039 9040 9041 9042 9043 9044 9045 9046 9047 9048 9049 9050 9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 9064 9065 9066 9067 9068 9069 9070 9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088 9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 9116 9117 9118 9119 9120 9121 9122 9123 9124 9125 9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 9294 9295 9296 9297 9298 9299 9300 9301 9302 9303 9304 9305 9306 9307 9308 9309 9310 9311 9312 9313 9314 9315 9316 9317 9318 9319 9320 9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351 9352 9353 9354 9355 9356 9357 9358 9359 9360 9361 9362 9363 9364 9365 9366 9367 9368 9369 9370 9371 9372 9373 9374 9375 9376 9377 9378 9379 9380 9381 9382 9383 9384 9385 9386 9387 9388 9389 9390 9391 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408 9409 9410 9411 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 9422 9423 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434 9435 9436 9437 9438 9439 9440 9441 9442 9443 9444 9445 9446 9447 9448 9449 9450 9451 9452 9453 9454 9455 9456 9457 9458 9459 9460 9461 9462 9463 9464 9465 9466 9467 9468 9469 9470 9471 9472 9473 9474 9475 9476 9477 9478 9479 9480 9481 9482 9483 9484 9485 9486 9487 9488 9489 9490 9491 9492 9493 9494 9495 9496 9497 9498 9499 9500 9501 9502 9503 9504 9505 9506 9507 9508 9509 9510 9511 9512 9513 9514 9515 9516 9517 9518 9519 9520 9521 9522 9523 9524 9525 9526 9527 9528 9529 9530 9531 9532 9533 9534 9535 9536 9537 9538 9539 9540 9541 9542 9543 9544 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 9555 9556 9557 9558 9559 9560 9561 9562 9563 9564 9565 9566 9567 9568 9569 9570 9571 9572 9573 9574 9575 9576 9577 9578 9579 9580 9581 9582 9583 9584 9585 9586 9587 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 9603 9604 9605 9606 9607 9608 9609 9610 9611 9612 9613 9614 9615 9616 9617 9618 9619 9620 9621 9622 9623 9624 9625 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 9639 9640 9641 9642 9643 9644 9645 9646 9647 9648 9649 9650 9651 9652 9653 9654 9655 9656 9657 9658 9659 9660 9661 9662 9663 9664 9665 9666 9667 9668 9669 9670 9671 9672 9673 9674 9675 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 9691 9692 9693 9694 9695 9696 9697 9698 9699 9700 9701 9702 9703 9704 9705 9706 9707 9708 9709 9710 9711 9712 9713 9714 9715 9716 9717 9718 9719 9720 9721 9722 9723 9724 9725 9726 9727 9728 9729 9730 9731 9732 9733 9734 9735 9736 9737 9738 9739 9740 9741 9742 9743 9744 9745 9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 9757 9758 9759 9760 9761 9762 9763 9764 9765 9766 9767 9768 9769 9770 9771 9772 9773 9774 9775 9776 9777 9778 9779 9780 9781 9782 9783 9784 9785 9786 9787 9788 9789 9790 9791 9792 9793 9794 9795 9796 9797 9798 9799 9800 9801 9802 9803 9804 9805 9806 9807 9808 9809 9810 9811 9812 9813 9814 9815 9816 9817 9818 9819 9820 9821 9822 9823 9824 9825 9826 9827 9828 9829 9830 9831 9832 9833 9834 9835 9836 9837 9838 9839 9840 9841 9842 9843 9844 9845 9846 9847 9848 9849 9850 9851 9852 9853 9854 9855 9856 9857 9858 9859 9860 9861 9862 9863 9864 9865 9866 9867 9868 9869 9870 9871 9872 9873 9874 9875 9876 9877 9878 9879 9880 9881 9882 9883 9884 9885 9886 9887 9888 9889 9890 9891 9892 9893 9894 9895 9896 9897 9898 9899 9900 9901 9902 9903 9904 9905 9906 9907 9908 9909 9910 9911 9912 9913 9914 9915 9916 9917 9918 9919 9920 9921 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9954 9955 9956 9957 9958 9959 9960 9961 9962 9963 9964 9965 9966 9967 9968 9969 9970 9971 9972 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 10000 10001 10002 10003 10004 10005 10006 10007 10008 10009 10010 10011 10012 10013 10014 10015 10016 10017 10018 10019 10020 10021 10022 10023 10024 10025 10026 10027 10028 10029 10030 10031 10032 10033 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 10049 10050 10051 10052 10053 10054 10055 10056 10057 10058 10059 10060 10061 10062 10063 10064 10065 10066 10067 10068 10069 10070 10071 10072 10073 10074 10075 10076 10077 10078 10079 10080 10081 10082 10083 10084 10085 10086 10087 10088 10089 10090 10091 10092 10093 10094 10095 10096 10097 10098 10099 10100 10101 10102 10103 10104 10105 10106 10107 10108 10109 10110 10111 10112 10113 10114 10115 10116 10117 10118 10119 10120 10121 10122 10123 10124 10125 10126 10127 10128 10129 10130 10131 10132 10133 10134 10135 10136 10137 10138 10139 10140 10141 10142 10143 10144 10145 10146 10147 10148 10149 10150 10151 10152 10153 10154 10155 10156 10157 10158 10159 10160 10161 10162 10163 10164 10165 10166 10167 10168 10169 10170 10171 10172 10173 10174 10175 10176 10177 10178 10179 10180 10181 10182 10183 10184 10185 10186 10187 10188 10189 10190 10191 10192 10193 10194 10195 10196 10197 10198 10199 10200 10201 10202 10203 10204 10205 10206 10207 10208 10209 10210 10211 10212 10213 10214 10215 10216 10217 10218 10219 10220 10221 10222 10223 10224 10225 10226 10227 10228 10229 10230 10231 10232 10233 10234 10235 10236 10237 10238 10239 10240 10241 10242 10243 10244 10245 10246 10247 10248 10249 10250 10251 10252 10253 10254 10255 10256 10257 10258 10259 10260 10261 10262 10263 10264 10265 10266 10267 10268 10269 10270 10271 10272 10273 10274 10275 10276 10277 10278 10279 10280 10281 10282 10283 10284 10285 10286 10287 10288 10289 10290 10291 10292 10293 10294 10295 10296 10297 10298 10299 10300 10301 10302 10303 10304 10305 10306 10307 10308 10309 10310 10311 10312 10313 10314 10315 10316 10317 10318 10319 10320 10321 10322 10323 10324 10325 10326 10327 10328 10329 10330 10331 10332 10333 10334 10335 10336 10337 10338 10339 10340 10341 10342 10343 10344 10345 10346 10347 10348 10349 10350 10351 10352 10353 10354 10355 10356 10357 10358 10359 10360 10361 10362 10363 10364 10365 10366 10367 10368 10369 10370 10371 10372 10373 10374 10375 10376 10377 10378 10379 10380 10381 10382 10383 10384 10385 10386 10387 10388 10389 10390 10391 10392 10393 10394 10395 10396 10397 10398 10399 10400 10401 10402 10403 10404 10405 10406 10407 10408 10409 10410 10411 10412 10413 10414 10415 10416 10417 10418 10419 10420 10421 10422 10423 10424 10425 10426 10427 10428 10429 10430 10431 10432 10433 10434 10435 10436 10437 10438 10439 10440 10441 10442 10443 10444 10445 10446 10447 10448 10449 10450 10451 10452 10453 10454 10455 10456 10457 10458 10459 10460 10461 10462 10463 10464 10465 10466 10467 10468 10469 10470 10471 10472 10473 10474 10475 10476 10477 10478 10479 10480 10481 10482 10483 10484 10485 10486 10487 10488 10489 10490 10491 10492 10493 10494 10495 10496 10497 10498 10499 10500 10501 10502 10503 10504 10505 10506 10507 10508 10509 10510 10511 10512 10513 10514 10515 10516 10517 10518 10519 10520 10521 10522 10523 10524 10525 10526 10527 10528 10529 10530 10531 10532 10533 10534 10535 10536 10537 10538 10539 10540 10541 10542 10543 10544 10545 10546 10547 10548 10549 10550 10551 10552 10553 10554 10555 10556 10557 10558 10559 10560 10561 10562 10563 10564 10565 10566 10567 10568 10569 10570 10571 10572 10573 10574 10575 10576 10577 10578 10579 10580 10581 10582 10583 10584 10585 10586 10587 10588 10589 10590 10591 10592 10593 10594 10595 10596 10597 10598 10599 10600 10601 10602 10603 10604 10605 10606 10607 10608 10609 10610 10611 10612 10613 10614 10615 10616 10617 10618 10619 10620 10621 10622 10623 10624 10625 10626 10627 10628 10629 10630 10631 10632 10633 10634 10635 10636 10637 10638 10639 10640 10641 10642 10643 10644 10645 10646 10647 10648 10649 10650 10651 10652 10653 10654 10655 10656 10657 10658 10659 10660 10661 10662 10663 10664 10665 10666 10667 10668 10669 10670 10671 10672 10673 10674 10675 10676 10677 10678 10679 10680 10681 10682 10683 10684 10685 10686 10687 10688 10689 10690 10691 10692 10693 10694 10695 10696 10697 10698 10699 10700 10701 10702 10703 10704 10705 10706 10707 10708 10709 10710 10711 10712 10713 10714 10715 10716 10717 10718 10719 10720 10721 10722 10723 10724 10725 10726 10727 10728 10729 10730 10731 10732 10733 10734 10735 10736 10737 10738 10739 10740 10741 10742 10743 10744 10745 10746 10747 10748 10749 10750 10751 10752 10753 10754 10755 10756 10757 10758 10759 10760 10761 10762 10763 10764 10765 10766 10767 10768 10769 10770 10771 10772 10773 10774 10775 10776 10777 10778 10779 10780 10781 10782 10783 10784 10785 10786 10787 10788 10789 10790 10791 10792 10793 10794 10795 10796 10797 10798 10799 10800 10801 10802 10803 10804 10805 10806 10807 10808 10809 10810 10811 10812 10813 10814 10815 10816 10817 10818 10819 10820 10821 10822 10823 10824 10825 10826 10827 10828 10829 10830 10831 10832 10833 10834 10835 10836 10837 10838 10839 10840 10841 10842 10843 10844 10845 10846 10847 10848 10849 10850 10851 10852 10853 10854 10855 10856 10857 10858 10859 10860 10861 10862 10863 10864 10865 10866 10867 10868 10869 10870 10871 10872 10873 10874 10875 10876 10877 10878 10879 10880 10881 10882 10883 10884 10885 10886 10887 10888 10889 10890 10891 10892 10893 10894 10895 10896 10897 10898 10899 10900 10901 10902 10903 10904 10905 10906 10907 10908 10909 10910 10911 10912 10913 10914 10915 10916 10917 10918 10919 10920 10921 10922 10923 10924 10925 10926 10927 10928 10929 10930 10931 10932 10933 10934 10935 10936 10937 10938 10939 10940 10941 10942 10943 10944 10945 10946 10947 10948 10949 10950 10951 10952 10953 10954 10955 10956 10957 10958 10959 10960 10961 10962 10963 10964 10965 10966 10967 10968 10969 10970 10971 10972 10973 10974 10975 10976 10977 10978 10979 10980 10981 10982 10983 10984 10985 10986 10987 10988 10989 10990 10991 10992 10993 10994 10995 10996 10997 10998 10999 11000 11001 11002 11003 11004 11005 11006 11007 11008 11009 11010 11011 11012 11013 11014 11015 11016 11017 11018 11019 11020 11021 11022 11023 11024 11025 11026 11027 11028 11029 11030 11031 11032 11033 11034 11035 11036 11037 11038 11039 11040 11041 11042 11043 11044 11045 11046 11047 11048 11049 11050 11051 11052 11053 11054 11055 11056 11057 11058 11059 11060 11061 11062 11063 11064 11065 11066 11067 11068 11069 11070 11071 11072 11073 11074 11075 11076 11077 11078 11079 11080 11081 11082 11083 11084 11085 11086 11087 11088 11089 11090 11091 11092 11093 11094 11095 11096 11097 11098 11099 11100 11101 11102 11103 11104 11105 11106 11107 11108 11109 11110 11111 11112 11113 11114 11115 11116 11117 11118 11119 11120 11121 11122 11123 11124 11125 11126 11127 11128 11129 11130 11131 11132 11133 11134 11135 11136 11137 11138 11139 11140 11141 11142 11143 11144 11145 11146 11147 11148 11149 11150 11151 11152 11153 11154 11155 11156 11157 11158 11159 11160 11161 11162 11163 11164 11165 11166 11167 11168 11169 11170 11171 11172 11173 11174 11175 11176 11177 11178 11179 11180 11181 11182 11183 11184 11185 11186 11187 11188 11189 11190 11191 11192 11193 11194 11195 11196 11197 11198 11199 11200 11201 11202 11203 11204 11205 11206 11207 11208 11209 11210 11211 11212 11213 11214 11215 11216 11217 11218 11219 11220 11221 11222 11223 11224 11225 11226 11227 11228 11229 11230 11231 11232 11233 11234 11235 11236 11237 11238 11239 11240 11241 11242 11243 11244 11245 11246 11247 11248 11249 11250 11251 11252 11253 11254 11255 11256 11257 11258 11259 11260 11261 11262 11263 11264 11265 11266 11267 11268 11269 11270 11271 11272 11273 11274 11275 11276 11277 11278 11279 11280 11281 11282 11283 11284 11285 11286 11287 11288 11289 11290 11291 11292 11293 11294 11295 11296 11297 11298 11299 11300 11301 11302 11303 11304 11305 11306 11307 11308 11309 11310 11311 11312 11313 11314 11315 11316 11317 11318 11319 11320 11321 11322 11323 11324 11325 11326 11327 11328 11329 11330 11331 11332 11333 11334 11335 11336 11337 11338 11339 11340 11341 11342 11343 11344 11345 11346 11347 11348 11349 11350 11351 11352 11353 11354 11355 11356 11357 11358 11359 11360 11361 11362 11363 11364 11365 11366 11367 11368 11369 11370 11371 11372 11373 11374 11375 11376 11377 11378 11379 11380 11381 11382 11383 11384 11385 11386 11387 11388 11389 11390 11391 11392 11393 11394 11395 11396 11397 11398 11399 11400 11401 11402 11403 11404 11405 11406 11407 11408 11409 11410 11411 11412 11413 11414 11415 11416 11417 11418 11419 11420 11421 11422 11423 11424 11425 11426 11427 11428 11429 11430 11431 11432 11433 11434 11435 11436 11437 11438 11439 11440 11441 11442 11443 11444 11445 11446 11447 11448 11449 11450 11451 11452 11453 11454 11455 11456 11457 11458 11459 11460 11461 11462 11463 11464 11465 11466 11467 11468 11469 11470 11471 11472 11473 11474 11475 11476 11477 11478 11479 11480 11481 11482 11483 11484 11485 11486 11487 11488 11489 11490 11491 11492 11493 11494 11495 11496 11497 11498 11499 11500 11501 11502 11503 11504 11505 11506 11507 11508 11509 11510 11511 11512 11513 11514 11515 11516 11517 11518 11519 11520 11521 11522 11523 11524 11525 11526 11527 11528 11529 11530 11531 11532 11533 11534 11535 11536 11537 11538 11539 11540 11541 11542 11543 11544 11545 11546 11547 11548 11549 11550 11551 11552 11553 11554 11555 11556 11557 11558 11559 11560 11561 11562 11563 11564 11565 11566 11567 11568 11569 11570 11571 11572 11573 11574 11575 11576 11577 11578 11579 11580 11581 11582 11583 11584 11585 11586 11587 11588 11589 11590 11591 11592 11593 11594 11595 11596 11597 11598 11599 11600 11601 11602 11603 11604 11605 11606 11607 11608 11609 11610 11611 11612 11613 11614 11615 11616 11617 11618 11619 11620 11621 11622 11623 11624 11625 11626 11627 11628 11629 11630 11631 11632 11633 11634 11635 11636 11637 11638 11639 11640 11641 11642 11643 11644 11645 11646 11647 11648 11649 11650 11651 11652 11653 11654 11655 11656 11657 11658 11659 11660 11661 11662 11663 11664 11665 11666 11667 11668 11669 11670 11671 11672 11673 11674 11675 11676 11677 11678 11679 11680 11681 11682 11683 11684 11685 11686 11687 11688 11689 11690 11691 11692 11693 11694 11695 11696 11697 11698 11699 11700 11701 11702 11703 11704 11705 11706 11707 11708 11709 11710 11711 11712 11713 11714 11715 11716 11717 11718 11719 11720 11721 11722 11723 11724 11725 11726 11727 11728 11729 11730 11731 11732 11733 11734 11735 11736 11737 11738 11739 11740 11741 11742 11743 11744 11745 11746 11747 11748 11749 11750 11751 11752 11753 11754 11755 11756 11757 11758 11759 11760 11761 11762 11763 11764 11765 11766 11767 11768 11769 11770 11771 11772 11773 11774 11775 11776 11777 11778 11779 11780 11781 11782 11783 11784 11785 11786 11787 11788 11789 11790 11791 11792 11793 11794 11795 11796 11797 11798 11799 11800 11801 11802 11803 11804 11805 11806 11807 11808 11809 11810 11811 11812 11813 11814 11815 11816 11817 11818 11819 11820 11821 11822 11823 11824 11825 11826 11827 11828 11829 11830 11831 11832 11833 11834 11835 11836 11837 11838 11839 11840 11841 11842 11843 11844 11845 11846 11847 11848 11849 11850 11851 11852 11853 11854 11855 11856 11857 11858 11859 11860 11861 11862 11863 11864 11865 11866 11867 11868 11869 11870 11871 11872 11873 11874 11875 11876 11877 11878 11879 11880 11881 11882 11883 11884 11885 11886 11887 11888 11889 11890 11891 11892 11893 11894 11895 11896 11897 11898 11899 11900 11901 11902 11903 11904 11905 11906 11907 11908 11909 11910 11911 11912 11913 11914 11915 11916 11917 11918 11919 11920 11921 11922 11923 11924 11925 11926 11927 11928 11929 11930 11931 11932 11933 11934 11935 11936 11937 11938 11939 11940 11941 11942 11943 11944 11945 11946 11947 11948 11949 11950 11951 11952 11953 11954 11955 11956 11957 11958 11959 11960 11961 11962 11963 11964 11965 11966 11967 11968 11969 11970 11971 11972 11973 11974 11975 11976 11977 11978 11979 11980 11981 11982 11983 11984 11985 11986 11987 11988 11989 11990 11991 11992 11993 11994 11995 11996 11997 11998 11999 12000 12001 12002 12003 12004 12005 12006 12007 12008 12009 12010 12011 12012 12013 12014 12015 12016 12017 12018 12019 12020 12021 12022 12023 12024 12025 12026 12027 12028 12029 12030 12031 12032 12033 12034 12035 12036 12037 12038 12039 12040 12041 12042 12043 12044 12045 12046 12047 12048 12049 12050 12051 12052 12053 12054 12055 12056 12057 12058 12059 12060 12061 12062 12063 12064 12065 12066 12067 12068 12069 12070 12071 12072 12073 12074 12075 12076 12077 12078 12079 12080 12081 12082 12083 12084 12085 12086 12087 12088 12089 12090 12091 12092 12093 12094 12095 12096 12097 12098 12099 12100 12101 12102 12103 12104 12105 12106 12107 12108 12109 12110 12111 12112 12113 12114 12115 12116 12117 12118 12119 12120 12121 12122 12123 12124 12125 12126 12127 12128 12129 12130 12131 12132 12133 12134 12135 12136 12137 12138 12139 12140 12141 12142 12143 12144 12145 12146 12147 12148 12149 12150 12151 12152 12153 12154 12155 12156 12157 12158 12159 12160 12161 12162 12163 12164 12165 12166 12167 12168 12169 12170 12171 12172 12173 12174 12175 12176 12177 12178 12179 12180 12181 12182 12183 12184 12185 12186 12187 12188 12189 12190 12191 12192 12193 12194 12195 12196 12197 12198 12199 12200 12201 12202 12203 12204 12205 12206 12207 12208 12209 12210 12211 12212 12213 12214 12215 12216 12217 12218 12219 12220 12221 12222 12223 12224 12225 12226 12227 12228 12229 12230 12231 12232 12233 12234 12235 12236 12237 12238 12239 12240 12241 12242 12243 12244 12245 12246 12247 12248 12249 12250 12251 12252 12253 12254 12255 12256 12257 12258 12259 12260 12261 12262 12263 12264 12265 12266 12267 12268 12269 12270 12271 12272 12273 12274 12275 12276 12277 12278 12279 12280 12281 12282 12283 12284 12285 12286 12287 12288 12289 12290 12291 12292 12293 12294 12295 12296 12297 12298 12299 12300 12301 12302 12303 12304 12305 12306 12307 12308 12309 12310 12311 12312 12313 12314 12315 12316 12317 12318 12319 12320 12321 12322 12323 12324 12325 12326 12327 12328 12329 12330 12331 12332 12333 12334 12335 12336 12337 12338 12339 12340 12341 12342 12343 12344 12345 12346 12347 12348 12349 12350 12351 12352 12353 12354 12355 12356 12357 12358 12359 12360 12361 12362 12363 12364 12365 12366 12367 12368 12369 12370 12371 12372 12373 12374 12375 12376 12377 12378 12379 12380 12381 12382 12383 12384 12385 12386 12387 12388 12389 12390 12391 12392 12393 12394 12395 12396 12397 12398 12399 12400 12401 12402 12403 12404 12405 12406 12407 12408 12409 12410 12411 12412 12413 12414 12415 12416 12417 12418 12419 12420 12421 12422 12423 12424 12425 12426 12427 12428 12429 12430 12431 12432 12433 12434 12435 12436 12437 12438 12439 12440 12441 12442 12443 12444 12445 12446 12447 12448 12449 12450 12451 12452 12453 12454 12455 12456 12457 12458 12459 12460 12461 12462 12463 12464 12465 12466 12467 12468 12469 12470 12471 12472 12473 12474 12475 12476 12477 12478 12479 12480 12481 12482 12483 12484 12485 12486 12487 12488 12489 12490 12491 12492 12493 12494 12495 12496 12497 12498 12499 12500 12501 12502 12503 12504 12505 12506 12507 12508 12509 12510 12511 12512 12513 12514 12515 12516 12517 12518 12519 12520 12521 12522 12523 12524 12525 12526 12527 12528 12529 12530 12531 12532 12533 12534 12535 12536 12537 12538 12539 12540 12541 12542 12543 12544 12545 12546 12547 12548 12549 12550 12551 12552 12553 12554 12555 12556 12557 12558 12559 12560 12561 12562 12563 12564 12565 12566 12567 12568 12569 12570 12571 12572 12573 12574 12575 12576 12577 12578 12579 12580 12581 12582 12583 12584 12585 12586 12587 12588 12589 12590 12591 12592 12593 12594 12595 12596 12597 12598 12599 12600 12601 12602 12603 12604 12605 12606 12607 12608 12609 12610 12611 12612 12613 12614 12615 12616 12617 12618 12619 12620 12621 12622 12623 12624 12625 12626 12627 12628 12629 12630 12631 12632 12633 12634 12635 12636 12637 12638 12639 12640 12641 12642 12643 12644 12645 12646 12647 12648 12649 12650 12651 12652 12653 12654 12655 12656 12657 12658 12659 12660 12661 12662 12663 12664 12665 12666 12667 12668 12669 12670 12671 12672 12673 12674 12675 12676 12677 12678 12679 12680 12681 12682 12683 12684 12685 12686 12687 12688 12689 12690 12691 12692 12693 12694 12695 12696 12697 12698 12699 12700 12701 12702 12703 12704 12705 12706 12707 12708 12709 12710 12711 12712 12713 12714 12715 12716 12717 12718 12719 12720 12721 12722 12723 12724 12725 12726 12727 12728 12729 12730 12731 12732 12733 12734 12735 12736 12737 12738 12739 12740 12741 12742 12743 12744 12745 12746 12747 12748 12749 12750 12751 12752 12753 12754 12755 12756 12757 12758 12759 12760 12761 12762 12763 12764 12765 12766 12767 12768 12769 12770 12771 12772 12773 12774 12775 12776 12777 12778 12779 12780 12781 12782 12783 12784 12785 12786 12787 12788 12789 12790 12791 12792 12793 12794 12795 12796 12797 12798 12799 12800 12801 12802 12803 12804 12805 12806 12807 12808 12809 12810 12811 12812 12813 12814 12815 12816 12817 12818 12819 12820 12821 12822 12823 12824 12825 12826 12827 12828 12829 12830 12831 12832 12833 12834 12835 12836 12837 12838 12839 12840 12841 12842 12843 12844 12845 12846 12847 12848 12849 12850 12851 12852 12853 12854 12855 12856 12857 12858 12859 12860 12861 12862 12863 12864 12865 12866 12867 12868 12869 12870 12871 12872 12873 12874 12875 12876 12877 12878 12879 12880 12881 12882 12883 12884 12885 12886 12887 12888 12889 12890 12891 12892 12893 12894 12895 12896 12897 12898 12899 12900 12901 12902 12903 12904 12905 12906 12907 12908 12909 12910 12911 12912 12913 12914 12915 12916 12917 12918 12919 12920 12921 12922 12923 12924 12925 12926 12927 12928 12929 12930 12931 12932 12933 12934 12935 12936 12937 12938 12939 12940 12941 12942 12943 12944 12945 12946 12947 12948 12949 12950 12951 12952 12953 12954 12955 12956 12957 12958 12959 12960 12961 12962 12963 12964 12965 12966 12967 12968 12969 12970 12971 12972 12973 12974 12975 12976 12977 12978 12979 12980 12981 12982 12983 12984 12985 12986 12987 12988 12989 12990 12991 12992 12993 12994 12995 12996 12997 12998 12999 13000 13001 13002 13003 13004 13005 13006 13007 13008 13009 13010 13011 13012 13013 13014 13015 13016 13017 13018 13019 13020 13021 13022 13023 13024 13025 13026 13027 13028 13029 13030 13031 13032 13033 13034 13035 13036 13037 13038 13039 13040 13041 13042 13043 13044 13045 13046 13047 13048 13049 13050 13051 13052 13053 13054 13055 13056 13057 13058 13059 13060 13061 13062 13063 13064 13065 13066 13067 13068 13069 13070 13071 13072 13073 13074 13075 13076 13077 13078 13079 13080 13081 13082 13083 13084 13085 13086 13087 13088 13089 13090 13091 13092 13093 13094 13095 13096 13097 13098 13099 13100 13101 13102 13103 13104 13105 13106 13107 13108 13109 13110 13111 13112 13113 13114 13115 13116 13117 13118 13119 13120 13121 13122 13123 13124 13125 13126 13127 13128 13129 13130 13131 13132 13133 13134 13135 13136 13137 13138 13139 13140 13141 13142 13143 13144 13145 13146 13147 13148 13149 13150 13151 13152 13153 13154 13155 13156 13157 13158 13159 13160 13161 13162 13163 13164 13165 13166 13167 13168 13169 13170 13171 13172 13173 13174 13175 13176 13177 13178 13179 13180 13181 13182 13183 13184 13185 13186 13187 13188 13189 13190 13191 13192 13193 13194 13195 13196 13197 13198 13199 13200 13201 13202 13203 13204 13205 13206 13207 13208 13209 13210 13211 13212 13213 13214 13215 13216 13217 13218 13219 13220 13221 13222 13223 13224 13225 13226 13227 13228 13229 13230 13231 13232 13233 13234 13235 13236 13237 13238 13239 13240 13241 13242 13243 13244 13245 13246 13247 13248 13249 13250 13251 13252 13253 13254 13255 13256 13257 13258 13259 13260 13261 13262 13263 13264 13265 13266 13267 13268 13269 13270 13271 13272 13273 13274 13275 13276 13277 13278 13279 13280 13281 13282 13283 13284 13285 13286 13287 13288 13289 13290 13291 13292 13293 13294 13295 13296 13297 13298 13299 13300 13301 13302 13303 13304 13305 13306 13307 13308 13309 13310 13311 13312 13313 13314 13315 13316 13317 13318 13319 13320 13321 13322 13323 13324 13325 13326 13327 13328 13329 13330 13331 13332 13333 13334 13335 13336 13337 13338 13339 13340 13341 13342 13343 13344 13345 13346 13347 13348 13349 13350 13351 13352 13353 13354 13355 13356 13357 13358 13359 13360 13361 13362 13363 13364 13365 13366 13367 13368 13369 13370 13371 13372 13373 13374 13375 13376 13377 13378 13379 13380 13381 13382 13383 13384 13385 13386 13387 13388 13389 13390 13391 13392 13393 13394 13395 13396 13397 13398 13399 13400 13401 13402 13403 13404 13405 13406 13407 13408 13409 13410 13411 13412 13413 13414 13415 13416 13417 13418 13419 13420 13421 13422 13423 13424 13425 13426 13427 13428 13429 13430 13431 13432 13433 13434 13435 13436 13437 13438 13439 13440 13441 13442 13443 13444 13445 13446 13447 13448 13449 13450 13451 13452 13453 13454 13455 13456 13457 13458 13459 13460 13461 13462 13463 13464 13465 13466 13467 13468 13469 13470 13471 13472 13473 13474 13475 13476 13477 13478 13479 13480 13481 13482 13483 13484 13485 13486 13487 13488 13489 13490 13491 13492 13493 13494 13495 13496 13497 13498 13499 13500 13501 13502 13503 13504 13505 13506 13507 13508 13509 13510 13511 13512 13513 13514 13515 13516 13517 13518 13519 13520 13521 13522 13523 13524 13525 13526 13527 13528 13529 13530 13531 13532 13533 13534 13535 13536 13537 13538 13539 13540 13541 13542 13543 13544 13545 13546 13547 13548 13549 13550 13551 13552 13553 13554 13555 13556 13557 13558 13559 13560 13561 13562 13563 13564 13565 13566 13567 13568 13569 13570 13571 13572 13573 13574 13575 13576 13577 13578 13579 13580 13581 13582 13583 13584 13585 13586 13587 13588 13589 13590 13591 13592 13593 13594 13595 13596 13597 13598 13599 13600 13601 13602 13603 13604 13605 13606 13607 13608 13609 13610 13611 13612 13613 13614 13615 13616 13617 13618 13619 13620 13621 13622 13623 13624 13625 13626 13627 13628 13629 13630 13631 13632 13633 13634 13635 13636 13637 13638 13639 13640 13641 13642 13643 13644 13645 13646 13647 13648 13649 13650 13651 13652 13653 13654 13655 13656 13657 13658 13659 13660 13661 13662 13663 13664 13665 13666 13667 13668 13669 13670 13671 13672 13673 13674 13675 13676 13677 13678 13679 13680 13681 13682 13683 13684 13685 13686 13687 13688 13689 13690 13691 13692 13693 13694 13695 13696 13697 13698 13699 13700 13701 13702 13703 13704 13705 13706 13707 13708 13709 13710 13711 13712 13713 13714 13715 13716 13717 13718 13719 13720 13721 13722 13723 13724 13725 13726 13727 13728 13729 13730 13731 13732 13733 13734 13735 13736 13737 13738 13739 13740 13741 13742 13743 13744 13745 13746 13747 13748 13749 13750 13751 13752 13753 13754 13755 13756 13757 13758 13759 13760 13761 13762 13763 13764 13765 13766 13767 13768 13769 13770 13771 13772 13773 13774 13775 13776 13777 13778 13779 13780 13781 13782 13783 13784 13785 13786 13787 13788 13789 13790 13791 13792 13793 13794 13795 13796 13797 13798 13799 13800 13801 13802 13803 13804 13805 13806 13807 13808 13809 13810 13811 13812 13813 13814 13815 13816 13817 13818 13819 13820 13821 13822 13823 13824 13825 13826 13827 13828 13829 13830 13831 13832 13833 13834 13835 13836 13837 13838 13839 13840 13841 13842 13843 13844 13845 13846 13847 13848 13849 13850 13851 13852 13853 13854 13855 13856 13857 13858 13859 13860 13861 13862 13863 13864 13865 13866 13867 13868 13869 13870 13871 13872 13873 13874 13875 13876 13877 13878 13879 13880 13881 13882 13883 13884 13885 13886 13887 13888 13889 13890 13891 13892 13893 13894 13895 13896 13897 13898 13899 13900 13901 13902 13903 13904 13905 13906 13907 13908 13909 13910 13911 13912 13913 13914 13915 13916 13917 13918 13919 13920 13921 13922 13923 13924 13925 13926 13927 13928 13929 13930 13931 13932 13933 13934 13935 13936 13937 13938 13939 13940 13941 13942 13943 13944 13945 13946 13947 13948 13949 13950 13951 13952 13953 13954 13955 13956 13957 13958 13959 13960 13961 13962 13963 13964 13965 13966 13967 13968 13969 13970 13971 13972 13973 13974 13975 13976 13977 13978 13979 13980 13981 13982 13983 13984 13985 13986 13987 13988 13989 13990 13991 13992 13993 13994 13995 13996 13997 13998 13999 14000 14001 14002 14003 14004 14005 14006 14007 14008 14009 14010 14011 14012 14013 14014 14015 14016 14017 14018 14019 14020 14021 14022 14023 14024 14025 14026 14027 14028 14029 14030 14031 14032 14033 14034 14035 14036 14037 14038 14039 14040 14041 14042 14043 14044 14045 14046 14047 14048 14049 14050 14051 14052 14053 14054 14055 14056 14057 14058 14059 14060 14061 14062 14063 14064 14065 14066 14067 14068 14069 14070 14071 14072 14073 14074 14075 14076 14077 14078 14079 14080 14081 14082 14083 14084 14085 14086 14087 14088 14089 14090 14091 14092 14093 14094 14095 14096 14097 14098 14099 14100 14101 14102 14103 14104 14105 14106 14107 14108 14109 14110 14111 14112 14113 14114 14115 14116 14117 14118 14119 14120 14121 14122 14123 14124 14125 14126 14127 14128 14129 14130 14131 14132 14133 14134 14135 14136 14137 14138 14139 14140 14141 14142 14143 14144 14145 14146 14147 14148 14149 14150 14151 14152 14153 14154 14155 14156 14157 14158 14159 14160 14161 14162 14163 14164 14165 14166 14167 14168 14169 14170 14171 14172 14173 14174 14175 14176 14177 14178 14179 14180 14181 14182 14183 14184 14185 14186 14187 14188 14189 14190 14191 14192 14193 14194 14195 14196 14197 14198 14199 14200 14201 14202 14203 14204 14205 14206 14207 14208 14209 14210 14211 14212 14213 14214 14215 14216 14217 14218 14219 14220 14221 14222 14223 14224 14225 14226 14227 14228 14229 14230 14231 14232 14233 14234 14235 14236 14237 14238 14239 14240 14241 14242 14243 14244 14245 14246 14247 14248 14249 14250 14251 14252 14253 14254 14255 14256 14257 14258 14259 14260 14261 14262 14263 14264 14265 14266 14267 14268 14269 14270 14271 14272 14273 14274 14275 14276 14277 14278 14279 14280 14281 14282 14283 14284 14285 14286 14287 14288 14289 14290 14291 14292 14293 14294 14295 14296 14297 14298 14299 14300 14301 14302 14303 14304 14305 14306 14307 14308 14309 14310 14311 14312 14313 14314 14315 14316 14317 14318 14319 14320 14321 14322 14323 14324 14325 14326 14327 14328 14329 14330 14331 14332 14333 14334 14335 14336 14337 14338 14339 14340 14341 14342 14343 14344 14345 14346 14347 14348 14349 14350 14351 14352 14353 14354 14355 14356 14357 14358 14359 14360 14361 14362 14363 14364 14365 14366 14367 14368 14369 14370 14371 14372 14373 14374 14375 14376 14377 14378 14379 14380 14381 14382 14383 14384 14385 14386 14387 14388 14389 14390 14391 14392 14393 14394 14395 14396 14397 14398 14399 14400 14401 14402 14403 14404 14405 14406 14407 14408 14409 14410 14411 14412 14413 14414 14415 14416 14417 14418 14419 14420 14421 14422 14423 14424 14425 14426 14427 14428 14429 14430 14431 14432 14433 14434 14435 14436 14437 14438 14439 14440 14441 14442 14443 14444 14445 14446 14447 14448 14449 14450 14451 14452 14453 14454 14455 14456 14457 14458 14459 14460 14461 14462 14463 14464 14465 14466 14467 14468 14469 14470 14471 14472 14473 14474 14475 14476 14477 14478 14479 14480 14481 14482 14483 14484 14485 14486 14487 14488 14489 14490 14491 14492 14493 14494 14495 14496 14497 14498 14499 14500 14501 14502 14503 14504 14505 14506 14507 14508 14509 14510 14511 14512 14513 14514 14515 14516 14517 14518 14519 14520 14521 14522 14523 14524 14525 14526 14527 14528 14529 14530 14531 14532 14533 14534 14535 14536 14537 14538 14539 14540 14541 14542 14543 14544 14545 14546 14547 14548 14549 14550 14551 14552 14553 14554 14555 14556 14557 14558 14559 14560 14561 14562 14563 14564 14565 14566 14567 14568 14569 14570 14571 14572 14573 14574 14575 14576 14577 14578 14579 14580 14581 14582 14583 14584 14585 14586 14587 14588 14589 14590 14591 14592 14593 14594 14595 14596 14597 14598 14599 14600 14601 14602 14603 14604 14605 14606 14607 14608 14609 14610 14611 14612 14613 14614 14615 14616 14617 14618 14619 14620 14621 14622 14623 14624 14625 14626 14627 14628 14629 14630 14631 14632 14633 14634 14635 14636 14637 14638 14639 14640 14641 14642 14643 14644 14645 14646 14647 14648 14649 14650 14651 14652 14653 14654 14655 14656 14657 14658 14659 14660 14661 14662 14663 14664 14665 14666 14667 14668 14669 14670 14671 14672 14673 14674 14675 14676 14677 14678 14679 14680 14681 14682 14683 14684 14685 14686 14687 14688 14689 14690 14691 14692 14693 14694 14695 14696 14697 14698 14699 14700 14701 14702 14703 14704 14705 14706 14707 14708 14709 14710 14711 14712 14713 14714 14715 14716 14717 14718 14719 14720 14721 14722 14723 14724 14725 14726 14727 14728 14729 14730 14731 14732 14733 14734 14735 14736 14737 14738 14739 14740 14741 14742 14743 14744 14745 14746 14747 14748 14749 14750 14751 14752 14753 14754 14755 14756 14757 14758 14759 14760 14761 14762 14763 14764 14765 14766 14767 14768 14769 14770 14771 14772 14773 14774 14775 14776 14777 14778 14779 14780 14781 14782 14783 14784 14785 14786 14787 14788 14789 14790 14791 14792 14793 14794 14795 14796 14797 14798 14799 14800 14801 14802 14803 14804 14805 14806 14807 14808 14809 14810 14811 14812 14813 14814 14815 14816 14817 14818 14819 14820 14821 14822 14823 14824 14825 14826 14827 14828 14829 14830 14831 14832 14833 14834 14835 14836 14837 14838 14839 14840 14841 14842 14843 14844 14845 14846 14847 14848 14849 14850 14851 14852 14853 14854 14855 14856 14857 14858 14859 14860 14861 14862 14863 14864 14865 14866 14867 14868 14869 14870 14871 14872 14873 14874 14875 14876 14877 14878 14879 14880 14881 14882 14883 14884 14885 14886 14887 14888 14889 14890 14891 14892 14893 14894 14895 14896 14897 14898 14899 14900 14901 14902 14903 14904 14905 14906 14907 14908 14909 14910 14911 14912 14913 14914 14915 14916 14917 14918 14919 14920 14921 14922 14923 14924 14925 14926 14927 14928 14929 14930 14931 14932 14933 14934 14935 14936 14937 14938 14939 14940 14941 14942 14943 14944 14945 14946 14947 14948 14949 14950 14951 14952 14953 14954 14955 14956 14957 14958 14959 14960 14961 14962 14963 14964 14965 14966 14967 14968 14969 14970 14971 14972 14973 14974 14975 14976 14977 14978 14979 14980 14981 14982 14983 14984 14985 14986 14987 14988 14989 14990 14991 14992 14993 14994 14995 14996 14997 14998 14999 15000 15001 15002 15003 15004 15005 15006 15007 15008 15009 15010 15011 15012 15013 15014 15015 15016 15017 15018 15019 15020 15021 15022 15023 15024 15025 15026 15027 15028 15029 15030 15031 15032 15033 15034 15035 15036 15037 15038 15039 15040 15041 15042 15043 15044 15045 15046 15047 15048 15049 15050 15051 15052 15053 15054 15055 15056 15057 15058 15059 15060 15061 15062 15063 15064 15065 15066 15067 15068 15069 15070 15071 15072 15073 15074 15075 15076 15077 15078 15079 15080 15081 15082 15083 15084 15085 15086 15087 15088 15089 15090 15091 15092 15093 15094 15095 15096 15097 15098 15099 15100 15101 15102 15103 15104 15105 15106 15107 15108 15109 15110 15111 15112 15113 15114 15115 15116 15117 15118 15119 15120 15121 15122 15123 15124 15125 15126 15127 15128 15129 15130 15131 15132 15133 15134 15135 15136 15137 15138 15139 15140 15141 15142 15143 15144 15145 15146 15147 15148 15149 15150 15151 15152 15153 15154 15155 15156 15157 15158 15159 15160 15161 15162 15163 15164 15165 15166 15167 15168 15169 15170 15171 15172 15173 15174 15175 15176 15177 15178 15179 15180 15181 15182 15183 15184 15185 15186 15187 15188 15189 15190 15191 15192 15193 15194 15195 15196 15197 15198 15199 15200 15201 15202 15203 15204 15205 15206 15207 15208 15209 15210 15211 15212 15213 15214 15215 15216 15217 15218 15219 15220 15221 15222 15223 15224 15225 15226 15227 15228 15229 15230 15231 15232 15233 15234 15235 15236 15237 15238 15239 15240 15241 15242 15243 15244 15245 15246 15247 15248 15249 15250 15251 15252 15253 15254 15255 15256 15257 15258 15259 15260 15261 15262 15263 15264 15265 15266 15267 15268 15269 15270 15271 15272 15273 15274 15275 15276 15277 15278 15279 15280 15281 15282 15283 15284 15285 15286 15287 15288 15289 15290 15291 15292 15293 15294 15295 15296 15297 15298 15299 15300 15301 15302 15303 15304 15305 15306 15307 15308 15309 15310 15311 15312 15313 15314 15315 15316 15317 15318 15319 15320 15321 15322 15323 15324 15325 15326 15327 15328 15329 15330 15331 15332 15333 15334 15335 15336 15337 15338 15339 15340 15341 15342 15343 15344 15345 15346 15347 15348 15349 15350 15351 15352 15353 15354 15355 15356 15357 15358 15359 15360 15361 15362 15363 15364 15365 15366 15367 15368 15369 15370 15371 15372 15373 15374 15375 15376 15377 15378 15379 15380 15381 15382 15383 15384 15385 15386 15387 15388 15389 15390 15391 15392 15393 15394 15395 15396 15397 15398 15399 15400 15401 15402 15403 15404 15405 15406 15407 15408 15409 15410 15411 15412 15413 15414 15415 15416 15417 15418 15419 15420 15421 15422 15423 15424 15425 15426 15427 15428 15429 15430 15431 15432 15433 15434 15435 15436 15437 15438 15439 15440 15441 15442 15443 15444 15445 15446 15447 15448 15449 15450 15451 15452 15453 15454 15455 15456 15457 15458 15459 15460 15461 15462 15463 15464 15465 15466 15467 15468 15469 15470 15471 15472 15473 15474 15475 15476 15477 15478 15479 15480 15481 15482 15483 15484 15485 15486 15487 15488 15489 15490 15491 15492 15493 15494 15495 15496 15497 15498 15499 15500 15501 15502 15503 15504 15505 15506 15507 15508 15509 15510 15511 15512 15513 15514 15515 15516 15517 15518 15519 15520 15521 15522 15523 15524 15525 15526 15527 15528 15529 15530 15531 15532 15533 15534 15535 15536 15537 15538 15539 15540 15541 15542 15543 15544 15545 15546 15547 15548 15549 15550 15551 15552 15553 15554 15555 15556 15557 15558 15559 15560 15561 15562 15563 15564 15565 15566 15567 15568 15569 15570 15571 15572 15573 15574 15575 15576 15577 15578 15579 15580 15581 15582 15583 15584 15585 15586 15587 15588 15589 15590 15591 15592 15593 15594 15595 15596 15597 15598 15599 15600 15601 15602 15603 15604 15605 15606 15607 15608 15609 15610 15611 15612 15613 15614 15615 15616 15617 15618 15619 15620 15621 15622 15623 15624 15625 15626 15627 15628 15629 15630 15631 15632 15633 15634 15635 15636 15637 15638 15639 15640 15641 15642 15643 15644 15645 15646 15647 15648 15649 15650 15651 15652 15653 15654 15655 15656 15657 15658 15659 15660 15661 15662 15663 15664 15665 15666 15667 15668 15669 15670 15671 15672 15673 15674 15675 15676 15677 15678 15679 15680 15681 15682 15683 15684 15685 15686 15687 15688 15689 15690 15691 15692 15693 15694 15695 15696 15697 15698 15699 15700 15701 15702 15703 15704 15705 15706 15707 15708 15709 15710 15711 15712 15713 15714 15715 15716 15717 15718 15719 15720 15721 15722 15723 15724 15725 15726 15727 15728 15729 15730 15731 15732 15733 15734 15735 15736 15737 15738 15739 15740 15741 15742 15743 15744 15745 15746 15747 15748 15749 15750 15751 15752 15753 15754 15755 15756 15757 15758 15759 15760 15761 15762 15763 15764 15765 15766 15767 15768 15769 15770 15771 15772 15773 15774 15775 15776 15777 15778 15779 15780 15781 15782 15783 15784 15785 15786 15787 15788 15789 15790 15791 15792 15793 15794 15795 15796 15797 15798 15799 15800 15801 15802 15803 15804 15805 15806 15807 15808 15809 15810 15811 15812 15813 15814 15815 15816 15817 15818 15819 15820 15821 15822 15823 15824 15825 15826 15827 15828 15829 15830 15831 15832 15833 15834 15835 15836 15837 15838 15839 15840 15841 15842 15843 15844 15845 15846 15847 15848 15849 15850 15851 15852 15853 15854 15855 15856 15857 15858 15859 15860 15861 15862 15863 15864 15865 15866 15867 15868 15869 15870 15871 15872 15873 15874 15875 15876 15877 15878 15879 15880 15881 15882 15883 15884 15885 15886 15887 15888 15889 15890 15891 15892 15893 15894 15895 15896 15897 15898 15899 15900 15901 15902 15903 15904 15905 15906 15907 15908 15909 15910 15911 15912 15913 15914 15915 15916 15917 15918 15919 15920 15921 15922 15923 15924 15925 15926 15927 15928 15929 15930 15931 15932 15933 15934 15935 15936 15937 15938 15939 15940 15941 15942 15943 15944 15945 15946 15947 15948 15949 15950 15951 15952 15953 15954 15955 15956 15957 15958 15959 15960 15961 15962 15963 15964 15965 15966 15967 15968 15969 15970 15971 15972 15973 15974 15975 15976 15977 15978 15979 15980 15981 15982 15983 15984 15985 15986 15987 15988 15989 15990 15991 15992 15993 15994 15995 15996 15997 15998 15999 16000 16001 16002 16003 16004 16005 16006 16007 16008 16009 16010 16011 16012 16013 16014 16015 16016 16017 16018 16019 16020 16021 16022 16023 16024 16025 16026 16027 16028 16029 16030 16031 16032 16033 16034 16035 16036 16037 16038 16039 16040 16041 16042 16043 16044 16045 16046 16047 16048 16049 16050 16051 16052 16053 16054 16055 16056 16057 16058 16059 16060 16061 16062 16063 16064 16065 16066 16067 16068 16069 16070 16071 16072 16073 16074 16075 16076 16077 16078 16079 16080 16081 16082 16083 16084 16085 16086 16087 16088 16089 16090 16091 16092 16093 16094 16095 16096 16097 16098 16099 16100 16101 16102 16103 16104 16105 16106 16107 16108 16109 16110 16111 16112 16113 16114 16115 16116 16117 16118 16119 16120 16121 16122 16123 16124 16125 16126 16127 16128 16129 16130 16131 16132 16133 16134 16135 16136 16137 16138 16139 16140 16141 16142 16143 16144 16145 16146 16147 16148 16149 16150 16151 16152 16153 16154 16155 16156 16157 16158 16159 16160 16161 16162 16163 16164 16165 16166 16167 16168 16169 16170 16171 16172 16173 16174 16175 16176 16177 16178 16179 16180 16181 16182 16183 16184 16185 16186 16187 16188 16189 16190 16191 16192 16193 16194 16195 16196 16197 16198 16199 16200 16201 16202 16203 16204 16205 16206 16207 16208 16209 16210 16211 16212 16213 16214 16215 16216 16217 16218 16219 16220 16221 16222 16223 16224 16225 16226 16227 16228 16229 16230 16231 16232 16233 16234 16235 16236 16237 16238 16239 16240 16241 16242 16243 16244 16245 16246 16247 16248 16249 16250 16251 16252 16253 16254 16255 16256 16257 16258 16259 16260 16261 16262 16263 16264 16265 16266 16267 16268 16269 16270 16271 16272 16273 16274 16275 16276 16277 16278 16279 16280 16281 16282 16283 16284 16285 16286 16287 16288 16289 16290 16291 16292 16293 16294 16295 16296 16297 16298 16299 16300 16301 16302 16303 16304 16305 16306 16307 16308 16309 16310 16311 16312 16313 16314 16315 16316 16317 16318 16319 16320 16321 16322 16323 16324 16325 16326 16327 16328 16329 16330 16331 16332 16333 16334 16335 16336 16337 16338 16339 16340 16341 16342 16343 16344 16345 16346 16347 16348 16349 16350 16351 16352 16353 16354 16355 16356 16357 16358 16359 16360 16361 16362 16363 16364 16365 16366 16367 16368 16369 16370 16371 16372 16373 16374 16375 16376 16377 16378 16379 16380 16381 16382 16383 16384 16385 16386 16387 16388 16389 16390 16391 16392 16393 16394 16395 16396 16397 16398 16399 16400 16401 16402 16403 16404 16405 16406 16407 16408 16409 16410 16411 16412 16413 16414 16415 16416 16417 16418 16419 16420 16421 16422 16423 16424 16425 16426 16427 16428 16429 16430 16431 16432 16433 16434 16435 16436 16437 16438 16439 16440 16441 16442 16443 16444 16445 16446 16447 16448 16449 16450 16451 16452 16453 16454 16455 16456 16457 16458 16459 16460 16461 16462 16463 16464 16465 16466 16467 16468 16469 16470 16471 16472 16473 16474 16475 16476 16477 16478 16479 16480 16481 16482 16483 16484 16485 16486 16487 16488 16489 16490 16491 16492 16493 16494 16495 16496 16497 16498 16499 16500 16501 16502 16503 16504 16505 16506 16507 16508 16509 16510 16511 16512 16513 16514 16515 16516 16517 16518 16519 16520 16521 16522 16523 16524 16525 16526 16527 16528 16529 16530 16531 16532 16533 16534 16535 16536 16537 16538 16539 16540 16541 16542 16543 16544 16545 16546 16547 16548 16549 16550 16551 16552 16553 16554 16555 16556 16557 16558 16559 16560 16561 16562 16563 16564 16565 16566 16567 16568 16569 16570 16571 16572 16573 16574 16575 16576 16577 16578 16579 16580 16581 16582 16583 16584 16585 16586 16587 16588 16589 16590 16591 16592 16593 16594 16595 16596 16597 16598 16599 16600 16601 16602 16603 16604 16605 16606 16607 16608 16609 16610 16611 16612 16613 16614 16615 16616 16617 16618 16619 16620 16621 16622 16623 16624 16625 16626 16627 16628 16629 16630 16631 16632 16633 16634 16635 16636 16637 16638 16639 16640 16641 16642 16643 16644 16645 16646 16647 16648 16649 16650 16651 16652 16653 16654 16655 16656 16657 16658 16659 16660 16661 16662 16663 16664 16665 16666 16667 16668 16669 16670 16671 16672 16673 16674 16675 16676 16677 16678 16679 16680 16681 16682 16683 16684 16685 16686 16687 16688 16689 16690 16691 16692 16693 16694 16695 16696 16697 16698 16699 16700 16701 16702 16703 16704 16705 16706 16707 16708 16709 16710 16711 16712 16713 16714 16715 16716 16717 16718 16719 16720 16721 16722 16723 16724 16725 16726 16727 16728 16729 16730 16731 16732 16733 16734 16735 16736 16737 16738 16739 16740 16741 16742 16743 16744 16745 16746 16747 16748 16749 16750 16751 16752 16753 16754 16755 16756 16757 16758 16759 16760 16761 16762 16763 16764 16765 16766 16767 16768 16769 16770 16771 16772 16773 16774 16775 16776 16777 16778 16779 16780 16781 16782 16783 16784 16785 16786 16787 16788 16789 16790 16791 16792 16793 16794 16795 16796 16797 16798 16799 16800 16801 16802 16803 16804 16805 16806 16807 16808 16809 16810 16811 16812 16813 16814 16815 16816 16817 16818 16819 16820 16821 16822 16823 16824 16825 16826 16827 16828 16829 16830 16831 16832 16833 16834 16835 16836 16837 16838 16839 16840 16841 16842 16843 16844 16845 16846 16847 16848 16849 16850 16851 16852 16853 16854 16855 16856 16857 16858 16859 16860 16861 16862 16863 16864 16865 16866 16867 16868 16869 16870 16871 16872 16873 16874 16875 16876 16877 16878 16879 16880 16881 16882 16883 16884 16885 16886 16887 16888 16889 16890 16891 16892 16893 16894 16895 16896 16897 16898 16899 16900 16901 16902 16903 16904 16905 16906 16907 16908 16909 16910 16911 16912 16913 16914 16915 16916 16917 16918 16919 16920 16921 16922 16923 16924 16925 16926 16927 16928 16929 16930 16931 16932 16933 16934 16935 16936 16937 16938 16939 16940 16941 16942 16943 16944 16945 16946 16947 16948 16949 16950 16951 16952 16953 16954 16955 16956 16957 16958 16959 16960 16961 16962 16963 16964 16965 16966 16967 16968 16969 16970 16971 16972 16973 16974 16975 16976 16977 16978 16979 16980 16981 16982 16983 16984 16985 16986 16987 16988 16989 16990 16991 16992 16993 16994 16995 16996 16997 16998 16999 17000 17001 17002 17003 17004 17005 17006 17007 17008 17009 17010 17011 17012 17013 17014 17015 17016 17017 17018 17019 17020 17021 17022 17023 17024 17025 17026 17027 17028 17029 17030 17031 17032 17033 17034 17035 17036 17037 17038 17039 17040 17041 17042 17043 17044 17045 17046 17047 17048 17049 17050 17051 17052 17053 17054 17055 17056 17057 17058 17059 17060 17061 17062 17063 17064 17065 17066 17067 17068 17069 17070 17071 17072 17073 17074 17075 17076 17077 17078 17079 17080 17081 17082 17083 17084 17085 17086 17087 17088 17089 17090 17091 17092 17093 17094 17095 17096 17097 17098 17099 17100 17101 17102 17103 17104 17105 17106 17107 17108 17109 17110 17111 17112 17113 17114 17115 17116 17117 17118 17119 17120 17121 17122 17123 17124 17125 17126 17127 17128 17129 17130 17131 17132 17133 17134 17135 17136 17137 17138 17139 17140 17141 17142 17143 17144 17145 17146 17147 17148 17149 17150 17151 17152 17153 17154 17155 17156 17157 17158 17159 17160 17161 17162 17163 17164 17165 17166 17167 17168 17169 17170 17171 17172 17173 17174 17175 17176 17177 17178 17179 17180 17181 17182 17183 17184 17185 17186 17187 17188 17189 17190 17191 17192 17193 17194 17195 17196 17197 17198 17199 17200 17201 17202 17203 17204 17205 17206 17207 17208 17209 17210 17211 17212 17213 17214 17215 17216 17217 17218 17219 17220 17221 17222 17223 17224 17225 17226 17227 17228 17229 17230 17231 17232 17233 17234 17235 17236 17237 17238 17239 17240 17241 17242 17243 17244 17245 17246 17247 17248 17249 17250 17251 17252 17253 17254 17255 17256 17257 17258 17259 17260 17261 17262 17263 17264 17265 17266 17267 17268 17269 17270 17271 17272 17273 17274 17275 17276 17277 17278 17279 17280 17281 17282 17283 17284 17285 17286 17287 17288 17289 17290 17291 17292 17293 17294 17295 17296 17297 17298 17299 17300 17301 17302 17303 17304 17305 17306 17307 17308 17309 17310 17311 17312 17313 17314 17315 17316 17317 17318 17319 17320 17321 17322 17323 17324 17325 17326 17327 17328 17329 17330 17331 17332 17333 17334 17335 17336 17337 17338 17339 17340 17341 17342 17343 17344 17345 17346 17347 17348 17349 17350 17351 17352 17353 17354 17355 17356 17357 17358 17359 17360 17361 17362 17363 17364 17365 17366 17367 17368 17369 17370 17371 17372 17373 17374 17375 17376 17377 17378 17379 17380 17381 17382 17383 17384 17385 17386 17387 17388 17389 17390 17391 17392 17393 17394 17395 17396 17397 17398 17399 17400 17401 17402 17403 17404 17405 17406 17407 17408 17409 17410 17411 17412 17413 17414 17415 17416 17417 17418 17419 17420 17421 17422 17423 17424 17425 17426 17427 17428 17429 17430 17431 17432 17433 17434 17435 17436 17437 17438 17439 17440 17441 17442 17443 17444 17445 17446 17447 17448 17449 17450 17451 17452 17453 17454 17455 17456 17457 17458 17459 17460 17461 17462 17463 17464 17465 17466 17467 17468 17469 17470 17471 17472 17473 17474 17475 17476 17477 17478 17479 17480 17481 17482 17483 17484 17485 17486 17487 17488 17489 17490 17491 17492 17493 17494 17495 17496 17497 17498 17499 17500 17501 17502 17503 17504 17505 17506 17507 17508 17509 17510 17511 17512 17513 17514 17515 17516 17517 17518 17519 17520 17521 17522 17523 17524 17525 17526 17527 17528 17529 17530 17531 17532 17533 17534 17535 17536 17537 17538 17539 17540 17541 17542 17543 17544 17545 17546 17547 17548 17549 17550 17551 17552 17553 17554 17555 17556 17557 17558 17559 17560 17561 17562 17563 17564 17565 17566 17567 17568 17569 17570 17571 17572 17573 17574 17575 17576 17577 17578 17579 17580 17581 17582 17583 17584 17585 17586 17587 17588 17589 17590 17591 17592 17593 17594 17595 17596 17597 17598 17599 17600 17601 17602 17603 17604 17605 17606 17607 17608 17609 17610 17611 17612 17613 17614 17615 17616 17617 17618 17619 17620 17621 17622 17623 17624 17625 17626 17627 17628 17629 17630 17631 17632 17633 17634 17635 17636 17637 17638 17639 17640 17641 17642 17643 17644 17645 17646 17647 17648 17649 17650 17651 17652 17653 17654 17655 17656 17657 17658 17659 17660 17661 17662 17663 17664 17665 17666 17667 17668 17669 17670 17671 17672 17673 17674 17675 17676 17677 17678 17679 17680 17681 17682 17683 17684 17685 17686 17687 17688 17689 17690 17691 17692 17693 17694 17695 17696 17697 17698 17699 17700 17701 17702 17703 17704 17705 17706 17707 17708 17709 17710 17711 17712 17713 17714 17715 17716 17717 17718 17719 17720 17721 17722 17723 17724 17725 17726 17727 17728 17729 17730 17731 17732 17733 17734 17735 17736 17737 17738 17739 17740 17741 17742 17743 17744 17745 17746 17747 17748 17749 17750 17751 17752 17753 17754 17755 17756 17757 17758 17759 17760 17761 17762 17763 17764 17765 17766 17767 17768 17769 17770 17771 17772 17773 17774 17775 17776 17777 17778 17779 17780 17781 17782 17783 17784 17785 17786 17787 17788 17789 17790 17791 17792 17793 17794 17795 17796 17797 17798 17799 17800 17801 17802 17803 17804 17805 17806 17807 17808 17809 17810 17811 17812 17813 17814 17815 17816 17817 17818 17819 17820 17821 17822 17823 17824 17825 17826 17827 17828 17829 17830 17831 17832 17833 17834 17835 17836 17837 17838 17839 17840 17841 17842 17843 17844 17845 17846 17847 17848 17849 17850 17851 17852 17853 17854 17855 17856 17857 17858 17859 17860 17861 17862 17863 17864 17865 17866 17867 17868 17869 17870 17871 17872 17873 17874 17875 17876 17877 17878 17879 17880 17881 17882 17883 17884 17885 17886 17887 17888 17889 17890 17891 17892 17893 17894 17895 17896 17897 17898 17899 17900 17901 17902 17903 17904 17905 17906 17907 17908 17909 17910 17911 17912 17913 17914 17915 17916 17917 17918 17919 17920 17921 17922 17923 17924 17925 17926 17927 17928 17929 17930 17931 17932 17933 17934 17935 17936 17937 17938 17939 17940 17941 17942 17943 17944 17945 17946 17947 17948 17949 17950 17951 17952 17953 17954 17955 17956 17957 17958 17959 17960 17961 17962 17963 17964 17965 17966 17967 17968 17969 17970 17971 17972 17973 17974 17975 17976 17977 17978 17979 17980 17981 17982 17983 17984 17985 17986 17987 17988 17989 17990 17991 17992 17993 17994 17995 17996 17997 17998 17999 18000 18001 18002 18003 18004 18005 18006 18007 18008 18009 18010 18011 18012 18013 18014 18015 18016 18017 18018 18019 18020 18021 18022 18023 18024 18025 18026 18027 18028 18029 18030 18031 18032 18033 18034 18035 18036 18037 18038 18039 18040 18041 18042 18043 18044 18045 18046 18047 18048 18049 18050 18051 18052 18053 18054 18055 18056 18057 18058 18059 18060 18061 18062 18063 18064 18065 18066 18067 18068 18069 18070 18071 18072 18073 18074 18075 18076 18077 18078 18079 18080 18081 18082 18083 18084 18085 18086 18087 18088 18089 18090 18091 18092 18093 18094 18095 18096 18097 18098 18099 18100 18101 18102 18103 18104 18105 18106 18107 18108 18109 18110 18111 18112 18113 18114 18115 18116 18117 18118 18119 18120 18121 18122 18123 18124 18125 18126 18127 18128 18129 18130 18131 18132 18133 18134 18135 18136 18137 18138 18139 18140 18141 18142 18143 18144 18145 18146 18147 18148 18149 18150 18151 18152 18153 18154 18155 18156 18157 18158 18159 18160 18161 18162 18163 18164 18165 18166 18167 18168 18169 18170 18171 18172 18173 18174 18175 18176 18177 18178 18179 18180 18181 18182 18183 18184 18185 18186 18187 18188 18189 18190 18191 18192 18193 18194 18195 18196 18197 18198 18199 18200 18201 18202 18203 18204 18205 18206 18207 18208 18209 18210 18211 18212 18213 18214 18215 18216 18217 18218 18219 18220 18221 18222 18223 18224 18225 18226 18227 18228 18229 18230 18231 18232 18233 18234 18235 18236 18237 18238 18239 18240 18241 18242 18243 18244 18245 18246 18247 18248 18249 18250 18251 18252 18253 18254 18255 18256 18257 18258 18259 18260 18261 18262 18263 18264 18265 18266 18267 18268 18269 18270 18271 18272 18273 18274 18275 18276 18277 18278 18279 18280 18281 18282 18283 18284 18285 18286 18287 18288 18289 18290 18291 18292 18293 18294 18295 18296 18297 18298 18299 18300 18301 18302 18303 18304 18305 18306 18307 18308 18309 18310 18311 18312 18313 18314 18315 18316 18317 18318 18319 18320 18321 18322 18323 18324 18325 18326 18327 18328 18329 18330 18331 18332 18333 18334 18335 18336 18337 18338 18339 18340 18341 18342 18343 18344 18345 18346 18347 18348 18349 18350 18351 18352 18353 18354 18355 18356 18357 18358 18359 18360 18361 18362 18363 18364 18365 18366 18367 18368 18369 18370 18371 18372 18373 18374 18375 18376 18377 18378 18379 18380 18381 18382 18383 18384 18385 18386 18387 18388 18389 18390 18391 18392 18393 18394 18395 18396 18397 18398 18399 18400 18401 18402 18403 18404 18405 18406 18407 18408 18409 18410 18411 18412 18413 18414 18415 18416 18417 18418 18419 18420 18421 18422 18423 18424 18425 18426 18427 18428 18429 18430 18431 18432 18433 18434 18435 18436 18437 18438 18439 18440 18441 18442 18443 18444 18445 18446 18447 18448 18449 18450 18451 18452 18453 18454 18455 18456 18457 18458 18459 18460 18461 18462 18463 18464 18465 18466 18467 18468 18469 18470 18471 18472 18473 18474 18475 18476 18477 18478 18479 18480 18481 18482 18483 18484 18485 18486 18487 18488 18489 18490 18491 18492 18493 18494 18495 18496 18497 18498 18499 18500 18501 18502 18503 18504 18505 18506 18507 18508 18509 18510 18511 18512 18513 18514 18515 18516 18517 18518 18519 18520 18521 18522 18523 18524 18525 18526 18527 18528 18529 18530 18531 18532 18533 18534 18535 18536 18537 18538 18539 18540 18541 18542 18543 18544 18545 18546 18547 18548 18549 18550 18551 18552 18553 18554 18555 18556 18557 18558 18559 18560 18561 18562 18563 18564 18565 18566 18567 18568 18569 18570 18571 18572 18573 18574 18575 18576 18577 18578 18579 18580 18581 18582 18583 18584 18585 18586 18587 18588 18589 18590 18591 18592 18593 18594 18595 18596 18597 18598 18599 18600 18601 18602 18603 18604 18605 18606 18607 18608 18609 18610 18611 18612 18613 18614 18615 18616 18617 18618 18619 18620 18621 18622 18623 18624 18625 18626 18627 18628 18629 18630 18631 18632 18633 18634 18635 18636 18637 18638 18639 18640 18641 18642 18643 18644 18645 18646 18647 18648 18649 18650 18651 18652 18653 18654 18655 18656 18657 18658 18659 18660 18661 18662 18663 18664 18665 18666 18667 18668 18669 18670 18671 18672 18673 18674 18675 18676 18677 18678 18679 18680 18681 18682 18683 18684 18685 18686 18687 18688 18689 18690 18691 18692 18693 18694 18695 18696 18697 18698 18699 18700 18701 18702 18703 18704 18705 18706 18707 18708 18709 18710 18711 18712 18713 18714 18715 18716 18717 18718 18719 18720 18721 18722 18723 18724 18725 18726 18727 18728 18729 18730 18731 18732 18733 18734 18735 18736 18737 18738 18739 18740 18741 18742 18743 18744 18745 18746 18747 18748 18749 18750 18751 18752 18753 18754 18755 18756 18757 18758 18759 18760 18761 18762 18763 18764 18765 18766 18767 18768 18769 18770 18771 18772 18773 18774 18775 18776 18777 18778 18779 18780 18781 18782 18783 18784 18785 18786 18787 18788 18789 18790 18791 18792 18793 18794 18795 18796 18797 18798 18799 18800 18801 18802 18803 18804 18805 18806 18807 18808 18809 18810 18811 18812 18813 18814 18815 18816 18817 18818 18819 18820 18821 18822 18823 18824 18825 18826 18827 18828 18829 18830 18831 18832 18833 18834 18835 18836 18837 18838 18839 18840 18841 18842 18843 18844 18845 18846 18847 18848 18849 18850 18851 18852 18853 18854 18855 18856 18857 18858 18859 18860 18861 18862 18863 18864 18865 18866 18867 18868 18869 18870 18871 18872 18873 18874 18875 18876 18877 18878 18879 18880 18881 18882 18883 18884 18885 18886 18887 18888 18889 18890 18891 18892 18893 18894 18895 18896 18897 18898 18899 18900 18901 18902 18903 18904 18905 18906 18907 18908 18909 18910 18911 18912 18913 18914 18915 18916 18917 18918 18919 18920 18921 18922 18923 18924 18925 18926 18927 18928 18929 18930 18931 18932 18933 18934 18935 18936 18937 18938 18939 18940 18941 18942 18943 18944 18945 18946 18947 18948 18949 18950 18951 18952 18953 18954 18955 18956 18957 18958 18959 18960 18961 18962 18963 18964 18965 18966 18967 18968 18969 18970 18971 18972 18973 18974 18975 18976 18977 18978 18979 18980 18981 18982 18983 18984 18985 18986 18987 18988 18989 18990 18991 18992 18993 18994 18995 18996 18997 18998 18999 19000 19001 19002 19003 19004 19005 19006 19007 19008 19009 19010 19011 19012 19013 19014 19015 19016 19017 19018 19019 19020 19021 19022 19023 19024 19025 19026 19027 19028 19029 19030 19031 19032 19033 19034 19035 19036 19037 19038 19039 19040 19041 19042 19043 19044 19045 19046 19047 19048 19049 19050 19051 19052 19053 19054 19055 19056 19057 19058 19059 19060 19061 19062 19063 19064 19065 19066 19067 19068 19069 19070 19071 19072 19073 19074 19075 19076 19077 19078 19079 19080 19081 19082 19083 19084 19085 19086 19087 19088 19089 19090 19091 19092 19093 19094 19095 19096 19097 19098 19099 19100 19101 19102 19103 19104 19105 19106 19107 19108 19109 19110 19111 19112 19113 19114 19115 19116 19117 19118 19119 19120 19121 19122 19123 19124 19125 19126 19127 19128 19129 19130 19131 19132 19133 19134 19135 19136 19137 19138 19139 19140 19141 19142 19143 19144 19145 19146 19147 19148 19149 19150 19151 19152 19153 19154 19155 19156 19157 19158 19159 19160 19161 19162 19163 19164 19165 19166 19167 19168 19169 19170 19171 19172 19173 19174 19175 19176 19177 19178 19179 19180 19181 19182 19183 19184 19185 19186 19187 19188 19189 19190 19191 19192 19193 19194 19195 19196 19197 19198 19199 19200 19201 19202 19203 19204 19205 19206 19207 19208 19209 19210 19211 19212 19213 19214 19215 19216 19217 19218 19219 19220 19221 19222 19223 19224 19225 19226 19227 19228 19229 19230 19231 19232 19233 19234 19235 19236 19237 19238 19239 19240 19241 19242 19243 19244 19245 19246 19247 19248 19249 19250 19251 19252 19253 19254 19255 19256 19257 19258 19259 19260 19261 19262 19263 19264 19265 19266 19267 19268 19269 19270 19271 19272 19273 19274 19275 19276 19277 19278 19279 19280 19281 19282 19283 19284 19285 19286 19287 19288 19289 19290 19291 19292 19293 19294 19295 19296 19297 19298 19299 19300 19301 19302 19303 19304 19305 19306 19307 19308 19309 19310 19311 19312 19313 19314 19315 19316 19317 19318 19319 19320 19321 19322 19323 19324 19325 19326 19327 19328 19329 19330 19331 19332 19333 19334 19335 19336 19337 19338 19339 19340 19341 19342 19343 19344 19345 19346 19347 19348 19349 19350 19351 19352 19353 19354 19355 19356 19357 19358 19359 19360 19361 19362 19363 19364 19365 19366 19367 19368 19369 19370 19371 19372 19373 19374 19375 19376 19377 19378 19379 19380 19381 19382 19383 19384 19385 19386 19387 19388 19389 19390 19391 19392 19393 19394 19395 19396 19397 19398 19399 19400 19401 19402 19403 19404 19405 19406 19407 19408 19409 19410 19411 19412 19413 19414 19415 19416 19417 19418 19419 19420 19421 19422 19423 19424 19425 19426 19427 19428 19429 19430 19431 19432 19433 19434 19435 19436 19437 19438 19439 19440 19441 19442 19443 19444 19445 19446 19447 19448 19449 19450 19451 19452 19453 19454 19455 19456 19457 19458 19459 19460 19461 19462 19463 19464 19465 19466 19467 19468 19469 19470 19471 19472 19473 19474 19475 19476 19477 19478 19479 19480 19481 19482 19483 19484 19485 19486 19487 19488 19489 19490 19491 19492 19493 19494 19495 19496 19497 19498 19499 19500 19501 19502 19503 19504 19505 19506 19507 19508 19509 19510 19511 19512 19513 19514 19515 19516 19517 19518 19519 19520 19521 19522 19523 19524 19525 19526 19527 19528 19529 19530 19531 19532 19533 19534 19535 19536 19537 19538 19539 19540 19541 19542 19543 19544 19545 19546 19547 19548 19549 19550 19551 19552 19553 19554 19555 19556 19557 19558 19559 19560 19561 19562 19563 19564 19565 19566 19567 19568 19569 19570 19571 19572 19573 19574 19575 19576 19577 19578 19579 19580 19581 19582 19583 19584 19585 19586 19587 19588 19589 19590 19591 19592 19593 19594 19595 19596 19597 19598 19599 19600 19601 19602 19603 19604 19605 19606 19607 19608 19609 19610 19611 19612 19613 19614 19615 19616 19617 19618 19619 19620 19621 19622 19623 19624 19625 19626 19627 19628 19629 19630 19631 19632 19633 19634 19635 19636 19637 19638 19639 19640 19641 19642 19643 19644 19645 19646 19647 19648 19649 19650 19651 19652 19653 19654 19655 19656 19657 19658 19659 19660 19661 19662 19663 19664 19665 19666 19667 19668 19669 19670 19671 19672 19673 19674 19675 19676 19677 19678 19679 19680 19681 19682 19683 19684 19685 19686 19687 19688 19689 19690 19691 19692 19693 19694 19695 19696 19697 19698 19699 19700 19701 19702 19703 19704 19705 19706 19707 19708 19709 19710 19711 19712 19713 19714 19715 19716 19717 19718 19719 19720 19721 19722 19723 19724 19725 19726 19727 19728 19729 19730 19731 19732 19733 19734 19735 19736 19737 19738 19739 19740 19741 19742 19743 19744 19745 19746 19747 19748 19749 19750 19751 19752 19753 19754 19755 19756 19757 19758 19759 19760 19761 19762 19763 19764 19765 19766 19767 19768 19769 19770 19771 19772 19773 19774 19775 19776 19777 19778 19779 19780 19781 19782 19783 19784 19785 19786 19787 19788 19789 19790 19791 19792 19793 19794 19795 19796 19797 19798 19799 19800 19801 19802 19803 19804 19805 19806 19807 19808 19809 19810 19811 19812 19813 19814 19815 19816 19817 19818 19819 19820 19821 19822 19823 19824 19825 19826 19827 19828 19829 19830 19831 19832 19833 19834 19835 19836 19837 19838 19839 19840 19841 19842 19843 19844 19845 19846 19847 19848 19849 19850 19851 19852 19853 19854 19855 19856 19857 19858 19859 19860 19861 19862 19863 19864 19865 19866 19867 19868 19869 19870 19871 19872 19873 19874 19875 19876 19877 19878 19879 19880 19881 19882 19883 19884 19885 19886 19887 19888 19889 19890 19891 19892 19893 19894 19895 19896 19897 19898 19899 19900 19901 19902 19903 19904 19905 19906 19907 19908 19909 19910 19911 19912 19913 19914 19915 19916 19917 19918 19919 19920 19921 19922 19923 19924 19925 19926 19927 19928 19929 19930 19931 19932 19933 19934 19935 19936 19937 19938 19939 19940 19941 19942 19943 19944 19945 19946 19947 19948 19949 19950 19951 19952 19953 19954 19955 19956 19957 19958 19959 19960 19961 19962 19963 19964 19965 19966 19967 19968 19969 19970 19971 19972 19973 19974 19975 19976 19977 19978 19979 19980 19981 19982 19983 19984 19985 19986 19987 19988 19989 19990 19991 19992 19993 19994 19995 19996 19997 19998 19999 20000 20001 20002 20003 20004 20005 20006 20007 20008 20009 20010 20011 20012 20013 20014 20015 20016 20017 20018 20019 20020 20021 20022 20023 20024 20025 20026 20027 20028 20029 20030 20031 20032 20033 20034 20035 20036 20037 20038 20039 20040 20041 20042 20043 20044 20045 20046 20047 20048 20049 20050 20051 20052 20053 20054 20055 20056 20057 20058 20059 20060 20061 20062 20063 20064 20065 20066 20067 20068 20069 20070 20071 20072 20073 20074 20075 20076 20077 20078 20079 20080 20081 20082 20083 20084 20085 20086 20087 20088 20089 20090 20091 20092 20093 20094 20095 20096 20097 20098 20099 20100 20101 20102 20103 20104 20105 20106 20107 20108 20109 20110 20111 20112 20113 20114 20115 20116 20117 20118 20119 20120 20121 20122 20123 20124 20125 20126 20127 20128 20129 20130 20131 20132 20133 20134 20135 20136 20137 20138 20139 20140 20141 20142 20143 20144 20145 20146 20147 20148 20149 20150 20151 20152 20153 20154 20155 20156 20157 20158 20159 20160 20161 20162 20163 20164 20165 20166 20167 20168 20169 20170 20171 20172 20173 20174 20175 20176 20177 20178 20179 20180 20181 20182 20183 20184 20185 20186 20187 20188 20189 20190 20191 20192 20193 20194 20195 20196 20197 20198 20199 20200 20201 20202 20203 20204 20205 20206 20207 20208 20209 20210 20211 20212 20213 20214 20215 20216 20217 20218 20219 20220 20221 20222 20223 20224 20225 20226 20227 20228 20229 20230 20231 20232 20233 20234 20235 20236 20237 20238 20239 20240 20241 20242 20243 20244 20245 20246 20247 20248 20249 20250 20251 20252 20253 20254 20255 20256 20257 20258 20259 20260 20261 20262 20263 20264 20265 20266 20267 20268 20269 20270 20271 20272 20273 20274 20275 20276 20277 20278 20279 20280 20281 20282 20283 20284 20285 20286 20287 20288 20289 20290 20291 20292 20293 20294 20295 20296 20297 20298 20299 20300 20301 20302 20303 20304 20305 20306 20307 20308 20309 20310 20311 20312 20313 20314 20315 20316 20317 20318 20319 20320 20321 20322 20323 20324 20325 20326 20327 20328 20329 20330 20331 20332 20333 20334 20335 20336 20337 20338 20339 20340 20341 20342 20343 20344 20345 20346 20347 20348 20349 20350 20351 20352 20353 20354 20355 20356 20357 20358 20359 20360 20361 20362 20363 20364 20365 20366 20367 20368 20369 20370 20371 20372 20373 20374 20375 20376 20377 20378 20379 20380 20381 20382 20383 20384 20385 20386 20387 20388 20389 20390 20391 20392 20393 20394 20395 20396 20397 20398 20399 20400 20401 20402 20403 20404 20405 20406 20407 20408 20409 20410 20411 20412 20413 20414 20415 20416 20417 20418 20419 20420 20421 20422 20423 20424 20425 20426 20427 20428 20429 20430 20431 20432 20433 20434 20435 20436 20437 20438 20439 20440 20441 20442 20443 20444 20445 20446 20447 20448 20449 20450 20451 20452 20453 20454 20455 20456 20457 20458 20459 20460 20461 20462 20463 20464 20465 20466 20467 20468 20469 20470 20471 20472 20473 20474 20475 20476 20477 20478 20479 20480 20481 20482 20483 20484 20485 20486 20487 20488 20489 20490 20491 20492 20493 20494 20495 20496 20497 20498 20499 20500 20501 20502 20503 20504 20505 20506 20507 20508 20509 20510 20511 20512 20513 20514 20515 20516 20517 20518 20519 20520 20521 20522 20523 20524 20525 20526 20527 20528 20529 20530 20531 20532 20533 20534 20535 20536 20537 20538 20539 20540 20541 20542 20543 20544 20545 20546 20547 20548 20549 20550 20551 20552 20553 20554 20555 20556 20557 20558 20559 20560 20561 20562 20563 20564 20565 20566 20567 20568 20569 20570 20571 20572 20573 20574 20575 20576 20577 20578 20579 20580 20581 20582 20583 20584 20585 20586 20587 20588 20589 20590 20591 20592 20593 20594 20595 20596 20597 20598 20599 20600 20601 20602 20603 20604 20605 20606 20607 20608 20609 20610 20611 20612 20613 20614 20615 20616 20617 20618 20619 20620 20621 20622 20623 20624 20625 20626 20627 20628 20629 20630 20631 20632 20633 20634 20635 20636 20637 20638 20639 20640 20641 20642 20643 20644 20645 20646 20647 20648 20649 20650 20651 20652 20653 20654 20655 20656 20657 20658 20659 20660 20661 20662 20663 20664 20665 20666 20667 20668 20669 20670 20671 20672 20673 20674 20675 20676 20677 20678 20679 20680 20681 20682 20683 20684 20685 20686 20687 20688 20689 20690 20691 20692 20693 20694 20695 20696 20697 20698 20699 20700 20701 20702 20703 20704 20705 20706 20707 20708 20709 20710 20711 20712 20713 20714 20715 20716 20717 20718 20719 20720 20721 20722 20723 20724 20725 20726 20727 20728 20729 20730 20731 20732 20733 20734 20735 20736 20737 20738 20739 20740 20741 20742 20743 20744 20745 20746 20747 20748 20749 20750 20751 20752 20753 20754 20755 20756 20757 20758 20759 20760 20761 20762 20763 20764 20765 20766 20767 20768 20769 20770 20771 20772 20773 20774 20775 20776 20777 20778 20779 20780 20781 20782 20783 20784 20785 20786 20787 20788 20789 20790 20791 20792 20793 20794 20795 20796 20797 20798 20799 20800 20801 20802 20803 20804 20805 20806 20807 20808 20809 20810 20811 20812 20813 20814 20815 20816 20817 20818 20819 20820 20821 20822 20823 20824 20825 20826 20827 20828 20829 20830 20831 20832 20833 20834 20835 20836 20837 20838 20839 20840 20841 20842 20843 20844 20845 20846 20847 20848 20849 20850 20851 20852 20853 20854 20855 20856 20857 20858 20859 20860 20861 20862 20863 20864 20865 20866 20867 20868 20869 20870 20871 20872 20873 20874 20875 20876 20877 20878 20879 20880 20881 20882 20883 20884 20885 20886 20887 20888 20889 20890 20891 20892 20893 20894 20895 20896 20897 20898 20899 20900 20901 20902 20903 20904 20905 20906 20907 20908 20909 20910 20911 20912 20913 20914 20915 20916 20917 20918 20919 20920 20921 20922 20923 20924 20925 20926 20927 20928 20929 20930 20931 20932 20933 20934 20935 20936 20937 20938 20939 20940 20941 20942 20943 20944 20945 20946 20947 20948 20949 20950 20951 20952 20953 20954 20955 20956 20957 20958 20959 20960 20961 20962 20963 20964 20965 20966 20967 20968 20969 20970 20971 20972 20973 20974 20975 20976 20977 20978 20979 20980 20981 20982 20983 20984 20985 20986 20987 20988 20989 20990 20991 20992 20993 20994 20995 20996 20997 20998 20999 21000 21001 21002 21003 21004 21005 21006 21007 21008 21009 21010 21011 21012 21013 21014 21015 21016 21017 21018 21019 21020 21021 21022 21023 21024 21025 21026 21027 21028 21029 21030 21031 21032 21033 21034 21035 21036 21037 21038 21039 21040 21041 21042 21043 21044 21045 21046 21047 21048 21049 21050 21051 21052 21053 21054 21055 21056 21057 21058 21059 21060 21061 21062 21063 21064 21065 21066 21067 21068 21069 21070 21071 21072 21073 21074 21075 21076 21077 21078 21079 21080 21081 21082 21083 21084 21085 21086 21087 21088 21089 21090 21091 21092 21093 21094 21095 21096 21097 21098 21099 21100 21101 21102 21103 21104 21105 21106 21107 21108 21109 21110 21111 21112 21113 21114 21115 21116 21117 21118 21119 21120 21121 21122 21123 21124 21125 21126 21127 21128 21129 21130 21131 21132 21133 21134 21135 21136 21137 21138 21139 21140 21141 21142 21143 21144 21145 21146 21147 21148 21149 21150 21151 21152 21153 21154 21155 21156 21157 21158 21159 21160 21161 21162 21163 21164 21165 21166 21167 21168 21169 21170 21171 21172 21173 21174 21175 21176 21177 21178 21179 21180 21181 21182 21183 21184 21185 21186 21187 21188 21189 21190 21191 21192 21193 21194 21195 21196 21197 21198 21199 21200 21201 21202 21203 21204 21205 21206 21207 21208 21209 21210 21211 21212 21213 21214 21215 21216 21217 21218 21219 21220 21221 21222 21223 21224 21225 21226 21227 21228 21229 21230 21231 21232 21233 21234 21235 21236 21237 21238 21239 21240 21241 21242 21243 21244 21245 21246 21247 21248 21249 21250 21251 21252 21253 21254 21255 21256 21257 21258 21259 21260 21261 21262 21263 21264 21265 21266 21267 21268 21269 21270 21271 21272 21273 21274 21275 21276 21277 21278 21279 21280 21281 21282 21283 21284 21285 21286 21287 21288 21289 21290 21291 21292 21293 21294 21295 21296 21297 21298 21299 21300 21301 21302 21303 21304 21305 21306 21307 21308 21309 21310 21311 21312 21313 21314 21315 21316 21317 21318 21319 21320 21321 21322 21323 21324 21325 21326 21327 21328 21329 21330 21331 21332 21333 21334 21335 21336 21337 21338 21339 21340 21341 21342 21343 21344 21345 21346 21347 21348 21349 21350 21351 21352 21353 21354 21355 21356 21357 21358 21359 21360 21361 21362 21363 21364 21365 21366 21367 21368 21369 21370 21371 21372 21373 21374 21375 21376 21377 21378 21379 21380 21381 21382 21383 21384 21385 21386 21387 21388 21389 21390 21391 21392 21393 21394 21395 21396 21397 21398 21399 21400 21401 21402 21403 21404 21405 21406 21407 21408 21409 21410 21411 21412 21413 21414 21415 21416 21417 21418 21419 21420 21421 21422 21423 21424 21425 21426 21427 21428 21429 21430 21431 21432 21433 21434 21435 21436 21437 21438 21439 21440 21441 21442 21443 21444 21445 21446 21447 21448 21449 21450 21451 21452 21453 21454 21455 21456 21457 21458 21459 21460 21461 21462 21463 21464 21465 21466 21467 21468 21469 21470 21471 21472 21473 21474 21475 21476 21477 21478 21479 21480 21481 21482 21483 21484 21485 21486 21487 21488 21489 21490 21491 21492 21493 21494 21495 21496 21497 21498 21499 21500 21501 21502 21503 21504 21505 21506 21507 21508 21509 21510 21511 21512 21513 21514 21515 21516 21517 21518 21519 21520 21521 21522 21523 21524 21525 21526 21527 21528 21529 21530 21531 21532 21533 21534 21535 21536 21537 21538 21539 21540 21541 21542 21543 21544 21545 21546 21547 21548 21549 21550 21551 21552 21553 21554 21555 21556 21557 21558 21559 21560 21561 21562 21563 21564 21565 21566 21567 21568 21569 21570 21571 21572 21573 21574 21575 21576 21577 21578 21579 21580 21581 21582 21583 21584 21585 21586 21587 21588 21589 21590 21591 21592 21593 21594 21595 21596 21597 21598 21599 21600 21601 21602 21603 21604 21605 21606 21607 21608 21609 21610 21611 21612 21613 21614 21615 21616 21617 21618 21619 21620 21621 21622 21623 21624 21625 21626 21627 21628 21629 21630 21631 21632 21633 21634 21635 21636 21637 21638 21639 21640 21641 21642 21643 21644 21645 21646 21647 21648 21649 21650 21651 21652 21653 21654 21655 21656 21657 21658 21659 21660 21661 21662 21663 21664 21665 21666 21667 21668 21669 21670 21671 21672 21673 21674 21675 21676 21677 21678 21679 21680 21681 21682 21683 21684 21685 21686 21687 21688 21689 21690 21691 21692 21693 21694 21695 21696 21697 21698 21699 21700 21701 21702 21703 21704 21705 21706 21707 21708 21709 21710 21711 21712 21713 21714 21715 21716 21717 21718 21719 21720 21721 21722 21723 21724 21725 21726 21727 21728 21729 21730 21731 21732 21733 21734 21735 21736 21737 21738 21739 21740 21741 21742 21743 21744 21745 21746 21747 21748 21749 21750 21751 21752 21753 21754 21755 21756 21757 21758 21759 21760 21761 21762 21763 21764 21765 21766 21767 21768 21769 21770 21771 21772 21773 21774 21775 21776 21777 21778 21779 21780 21781 21782 21783 21784 21785 21786 21787 21788 21789 21790 21791 21792 21793 21794 21795 21796 21797 21798 21799 21800 21801 21802 21803 21804 21805 21806 21807 21808 21809 21810 21811 21812 21813 21814 21815 21816 21817 21818 21819 21820 21821 21822 21823 21824 21825 21826 21827 21828 21829 21830 21831 21832 21833 21834 21835 21836 21837 21838 21839 21840 21841 21842 21843 21844 21845 21846 21847 21848 21849 21850 21851 21852 21853 21854 21855 21856 21857 21858 21859 21860 21861 21862 21863 21864 21865 21866 21867 21868 21869 21870 21871 21872 21873 21874 21875 21876 21877 21878 21879 21880 21881 21882 21883 21884 21885 21886 21887 21888 21889 21890 21891 21892 21893 21894 21895 21896 21897 21898 21899 21900 21901 21902 21903 21904 21905 21906 21907 21908 21909 21910 21911 21912 21913 21914 21915 21916 21917 21918 21919 21920 21921 21922 21923 21924 21925 21926 21927 21928 21929 21930 21931 21932 21933 21934 21935 21936 21937 21938 21939 21940 21941 21942 21943 21944 21945 21946 21947 21948 21949 21950 21951 21952 21953 21954 21955 21956 21957 21958 21959 21960 21961 21962 21963 21964 21965 21966 21967 21968 21969 21970 21971 21972 21973 21974 21975 21976 21977 21978 21979 21980 21981 21982 21983 21984 21985 21986 21987 21988 21989 21990 21991 21992 21993 21994 21995 21996 21997 21998 21999 22000 22001 22002 22003 22004 22005 22006 22007 22008 22009 22010 22011 22012 22013 22014 22015 22016 22017 22018 22019 22020 22021 22022 22023 22024 22025 22026 22027 22028 22029 22030 22031 22032 22033 22034 22035 22036 22037 22038 22039 22040 22041 22042 22043 22044 22045 22046 22047 22048 22049 22050 22051 22052 22053 22054 22055 22056 22057 22058 22059 22060 22061 22062 22063 22064 22065 22066 22067 22068 22069 22070 22071 22072 22073 22074 22075 22076 22077 22078 22079 22080 22081 22082 22083 22084 22085 22086 22087 22088 22089 22090 22091 22092 22093 22094 22095 22096 22097 22098 22099 22100 22101 22102 22103 22104 22105 22106 22107 22108 22109 22110 22111 22112 22113 22114 22115 22116 22117 22118 22119 22120 22121 22122 22123 22124 22125 22126 22127 22128 22129 22130 22131 22132 22133 22134 22135 22136 22137 22138 22139 22140 22141 22142 22143 22144 22145 22146 22147 22148 22149 22150 22151 22152 22153 22154 22155 22156 22157 22158 22159 22160 22161 22162 22163 22164 22165 22166 22167 22168 22169 22170 22171 22172 22173 22174 22175 22176 22177 22178 22179 22180 22181 22182 22183 22184 22185 22186 22187 22188 22189 22190 22191 22192 22193 22194 22195 22196 22197 22198 22199 22200 22201 22202 22203 22204 22205 22206 22207 22208 22209 22210 22211 22212 22213 22214 22215 22216 22217 22218 22219 22220 22221 22222 22223 22224 22225 22226 22227 22228 22229 22230 22231 22232 22233 22234 22235 22236 22237 22238 22239 22240 22241 22242 22243 22244 22245 22246 22247 22248 22249 22250 22251 22252 22253 22254 22255 22256 22257 22258 22259 22260 22261 22262 22263 22264 22265 22266 22267 22268 22269 22270 22271 22272 22273 22274 22275 22276 22277 22278 22279 22280 22281 22282 22283 22284 22285 22286 22287 22288 22289 22290 22291 22292 22293 22294 22295 22296 22297 22298 22299 22300 22301 22302 22303 22304 22305 22306 22307 22308 22309 22310 22311 22312 22313 22314 22315 22316 22317 22318 22319 22320 22321 22322 22323 22324 22325 22326 22327 22328 22329 22330 22331 22332 22333 22334 22335 22336 22337 22338 22339 22340 22341 22342 22343 22344 22345 22346 22347 22348 22349 22350 22351 22352 22353 22354 22355 22356 22357 22358 22359 22360 22361 22362 22363 22364 22365 22366 22367 22368 22369 22370 22371 22372 22373 22374 22375 22376 22377 22378 22379 22380 22381 22382 22383 22384 22385 22386 22387 22388 22389 22390 22391 22392 22393 22394 22395 22396 22397 22398 22399 22400 22401 22402 22403 22404 22405 22406 22407 22408 22409 22410 22411 22412 22413 22414 22415 22416 22417 22418 22419 22420 22421 22422 22423 22424 22425 22426 22427 22428 22429 22430 22431 22432 22433 22434 22435 22436 22437 22438 22439 22440 22441 22442 22443 22444 22445 22446 22447 22448 22449 22450 22451 22452 22453 22454 22455 22456 22457 22458 22459 22460 22461 22462 22463 22464 22465 22466 22467 22468 22469 22470 22471 22472 22473 22474 22475 22476 22477 22478 22479 22480 22481 22482 22483 22484 22485 22486 22487 22488 22489 22490 22491 22492 22493 22494 22495 22496 22497 22498 22499 22500 22501 22502 22503 22504 22505 22506 22507 22508 22509 22510 22511 22512 22513 22514 22515 22516 22517 22518 22519 22520 22521 22522 22523 22524 22525 22526 22527 22528 22529 22530 22531 22532 22533 22534 22535 22536 22537 22538 22539 22540 22541 22542 22543 22544 22545 22546 22547 22548 22549 22550 22551 22552 22553 22554 22555 22556 22557 22558 22559 22560 22561 22562 22563 22564 22565 22566 22567 22568 22569 22570 22571 22572 22573 22574 22575 22576 22577 22578 22579 22580 22581 22582 22583 22584 22585 22586 22587 22588 22589 22590 22591 22592 22593 22594 22595 22596 22597 22598 22599 22600 22601 22602 22603 22604 22605 22606 22607 22608 22609 22610 22611 22612 22613 22614 22615 22616 22617 22618 22619 22620 22621 22622 22623 22624 22625 22626 22627 22628 22629 22630 22631 22632 22633 22634 22635 22636 22637 22638 22639 22640 22641 22642 22643 22644 22645 22646 22647 22648 22649 22650 22651 22652 22653 22654 22655 22656 22657 22658 22659 22660 22661 22662 22663 22664 22665 22666 22667 22668 22669 22670 22671 22672 22673 22674 22675 22676 22677 22678 22679 22680 22681 22682 22683 22684 22685 22686 22687 22688 22689 22690 22691 22692 22693 22694 22695 22696 22697 22698 22699 22700 22701 22702 22703 22704 22705 22706 22707 22708 22709 22710 22711 22712 22713 22714 22715 22716 22717 22718 22719 22720 22721 22722 22723 22724 22725 22726 22727 22728 22729 22730 22731 22732 22733 22734 22735 22736 22737 22738 22739 22740 22741 22742 22743 22744 22745 22746 22747 22748 22749 22750 22751 22752 22753 22754 22755 22756 22757 22758 22759 22760 22761 22762 22763 22764 22765 22766 22767 22768 22769 22770 22771 22772 22773 22774 22775 22776 22777 22778 22779 22780 22781 22782 22783 22784 22785 22786 22787 22788 22789 22790 22791 22792 22793 22794 22795 22796 22797 22798 22799 22800 22801 22802 22803 22804 22805 22806 22807 22808 22809 22810 22811 22812 22813 22814 22815 22816 22817 22818 22819 22820 22821 22822 22823 22824 22825 22826 22827 22828 22829 22830 22831 22832 22833 22834 22835 22836 22837 22838 22839 22840 22841 22842 22843 22844 22845 22846 22847 22848 22849 22850 22851 22852 22853 22854 22855 22856 22857 22858 22859 22860 22861 22862 22863 22864 22865 22866 22867 22868 22869 22870 22871 22872 22873 22874 22875 22876 22877 22878 22879 22880 22881 22882 22883 22884 22885 22886 22887 22888 22889 22890 22891 22892 22893 22894 22895 22896 22897 22898 22899 22900 22901 22902 22903 22904 22905 22906 22907 22908 22909 22910 22911 22912 22913 22914 22915 22916 22917 22918 22919 22920 22921 22922 22923 22924 22925 22926 22927 22928 22929 22930 22931 22932 22933 22934 22935 22936 22937 22938 22939 22940 22941 22942 22943 22944 22945 22946 22947 22948 22949 22950 22951 22952 22953 22954 22955 22956 22957 22958 22959 22960 22961 22962 22963 22964 22965 22966 22967 22968 22969 22970 22971 22972 22973 22974 22975 22976 22977 22978 22979 22980 22981 22982 22983 22984 22985 22986 22987 22988 22989 22990 22991 22992 22993 22994 22995 22996 22997 22998 22999 23000 23001 23002 23003 23004 23005 23006 23007 23008 23009 23010 23011 23012 23013 23014 23015 23016 23017 23018 23019 23020 23021 23022 23023 23024 23025 23026 23027 23028 23029 23030 23031 23032 23033 23034 23035 23036 23037 23038 23039 23040 23041 23042 23043 23044 23045 23046 23047 23048 23049 23050 23051 23052 23053 23054 23055 23056 23057 23058 23059 23060 23061 23062 23063 23064 23065 23066 23067 23068 23069 23070 23071 23072 23073 23074 23075 23076 23077 23078 23079 23080 23081 23082 23083 23084 23085 23086 23087 23088 23089 23090 23091 23092 23093 23094 23095 23096 23097 23098 23099 23100 23101 23102 23103 23104 23105 23106 23107 23108 23109 23110 23111 23112 23113 23114 23115 23116 23117 23118 23119 23120 23121 23122 23123 23124 23125 23126 23127 23128 23129 23130 23131 23132 23133 23134 23135 23136 23137 23138 23139 23140 23141 23142 23143 23144 23145 23146 23147 23148 23149 23150 23151 23152 23153 23154 23155 23156 23157 23158 23159 23160 23161 23162 23163 23164 23165 23166 23167 23168 23169 23170 23171 23172 23173 23174 23175 23176 23177 23178 23179 23180 23181 23182 23183 23184 23185 23186 23187 23188 23189 23190 23191 23192 23193 23194 23195 23196 23197 23198 23199 23200 23201 23202 23203 23204 23205 23206 23207 23208 23209 23210 23211 23212 23213 23214 23215 23216 23217 23218 23219 23220 23221 23222 23223 23224 23225 23226 23227 23228 23229 23230 23231 23232 23233 23234 23235 23236 23237 23238 23239 23240 23241 23242 23243 23244 23245 23246 23247 23248 23249 23250 23251 23252 23253 23254 23255 23256 23257 23258 23259 23260 23261 23262 23263 23264 23265 23266 23267 23268 23269 23270 23271 23272 23273 23274 23275 23276 23277 23278 23279 23280 23281 23282 23283 23284 23285 23286 23287 23288 23289 23290 23291 23292 23293 23294 23295 23296 23297 23298 23299 23300 23301 23302 23303 23304 23305 23306 23307 23308 23309 23310 23311 23312 23313 23314 23315 23316 23317 23318 23319 23320 23321 23322 23323 23324 23325 23326 23327 23328 23329 23330 23331 23332 23333 23334 23335 23336 23337 23338 23339 23340 23341 23342 23343 23344 23345 23346 23347 23348 23349 23350 23351 23352 23353 23354 23355 23356 23357 23358 23359 23360 23361 23362 23363 23364 23365 23366 23367 23368 23369 23370 23371 23372 23373 23374 23375 23376 23377 23378 23379 23380 23381 23382 23383 23384 23385 23386 23387 23388 23389 23390 23391 23392 23393 23394 23395 23396 23397 23398 23399 23400 23401 23402 23403 23404 23405 23406 23407 23408 23409 23410 23411 23412 23413 23414 23415 23416 23417 23418 23419 23420 23421 23422 23423 23424 23425 23426 23427 23428 23429 23430 23431 23432 23433 23434 23435 23436 23437 23438 23439 23440 23441 23442 23443 23444 23445 23446 23447 23448 23449 23450 23451 23452 23453 23454 23455 23456 23457 23458 23459 23460 23461 23462 23463 23464 23465 23466 23467 23468 23469 23470 23471 23472 23473 23474 23475 23476 23477 23478 23479 23480 23481 23482 23483 23484 23485 23486 23487 23488 23489 23490 23491 23492 23493 23494 23495 23496 23497 23498 23499 23500 23501 23502 23503 23504 23505 23506 23507 23508 23509 23510 23511 23512 23513 23514 23515 23516 23517 23518 23519 23520 23521 23522 23523 23524 23525 23526 23527 23528 23529 23530 23531 23532 23533 23534 23535 23536 23537 23538 23539 23540 23541 23542 23543 23544 23545 23546 23547 23548 23549 23550 23551 23552 23553 23554 23555 23556 23557 23558 23559 23560 23561 23562 23563 23564 23565 23566 23567 23568 23569 23570 23571 23572 23573 23574 23575 23576 23577 23578 23579 23580 23581 23582 23583 23584 23585 23586 23587 23588 23589 23590 23591 23592 23593 23594 23595 23596 23597 23598 23599 23600 23601 23602 23603 23604 23605 23606 23607 23608 23609 23610 23611 23612 23613 23614 23615 23616 23617 23618 23619 23620 23621 23622 23623 23624 23625 23626 23627 23628 23629 23630 23631 23632 23633 23634 23635 23636 23637 23638 23639 23640 23641 23642 23643 23644 23645 23646 23647 23648 23649 23650 23651 23652 23653 23654 23655 23656 23657 23658 23659 23660 23661 23662 23663 23664 23665 23666 23667 23668 23669 23670 23671 23672 23673 23674 23675 23676 23677 23678 23679 23680 23681 23682 23683 23684 23685 23686 23687 23688 23689 23690 23691 23692 23693 23694 23695 23696 23697 23698 23699 23700 23701 23702 23703 23704 23705 23706 23707 23708 23709 23710 23711 23712 23713 23714 23715 23716 23717 23718 23719 23720 23721 23722 23723 23724 23725 23726 23727 23728 23729 23730 23731 23732 23733 23734 23735 23736 23737 23738 23739 23740 23741 23742 23743 23744 23745 23746 23747 23748 23749 23750 23751 23752 23753 23754 23755 23756 23757 23758 23759 23760 23761 23762 23763 23764 23765 23766 23767 23768 23769 23770 23771 23772 23773 23774 23775 23776 23777 23778 23779 23780 23781 23782 23783 23784 23785 23786 23787 23788 23789 23790 23791 23792 23793 23794 23795 23796 23797 23798 23799 23800 23801 23802 23803 23804 23805 23806 23807 23808 23809 23810 23811 23812 23813 23814 23815 23816 23817 23818 23819 23820 23821 23822 23823 23824 23825 23826 23827 23828 23829 23830 23831 23832 23833 23834 23835 23836 23837 23838 23839 23840 23841 23842 23843 23844 23845 23846 23847 23848 23849 23850 23851 23852 23853 23854 23855 23856 23857 23858 23859 23860 23861 23862 23863 23864 23865 23866 23867 23868 23869 23870 23871 23872 23873 23874 23875 23876 23877 23878 23879 23880 23881 23882 23883 23884 23885 23886 23887 23888 23889 23890 23891 23892 23893 23894 23895 23896 23897 23898 23899 23900 23901 23902 23903 23904 23905 23906 23907 23908 23909 23910 23911 23912 23913 23914 23915 23916 23917 23918 23919 23920 23921 23922 23923 23924 23925 23926 23927 23928 23929 23930 23931 23932 23933 23934 23935 23936 23937 23938 23939 23940 23941 23942 23943 23944 23945 23946 23947 23948 23949 23950 23951 23952 23953 23954 23955 23956 23957 23958 23959 23960 23961 23962 23963 23964 23965 23966 23967 23968 23969 23970 23971 23972 23973 23974 23975 23976 23977 23978 23979 23980 23981 23982 23983 23984 23985 23986 23987 23988 23989 23990 23991 23992 23993 23994 23995 23996 23997 23998 23999 24000 24001 24002 24003 24004 24005 24006 24007 24008 24009 24010 24011 24012 24013 24014 24015 24016 24017 24018 24019 24020 24021 24022 24023 24024 24025 24026 24027 24028 24029 24030 24031 24032 24033 24034 24035 24036 24037 24038 24039 24040 24041 24042 24043 24044 24045 24046 24047 24048 24049 24050 24051 24052 24053 24054 24055 24056 24057 24058 24059 24060 24061 24062 24063 24064 24065 24066 24067 24068 24069 24070 24071 24072 24073 24074 24075 24076 24077 24078 24079 24080 24081 24082 24083 24084 24085 24086 24087 24088 24089 24090 24091 24092 24093 24094 24095 24096 24097 24098 24099 24100 24101 24102 24103 24104 24105 24106 24107 24108 24109 24110 24111 24112 24113 24114 24115 24116 24117 24118 24119 24120 24121 24122 24123 24124 24125 24126 24127 24128 24129 24130 24131 24132 24133 24134 24135 24136 24137 24138 24139 24140 24141 24142 24143 24144 24145 24146 24147 24148 24149 24150 24151 24152 24153 24154 24155 24156 24157 24158 24159 24160 24161 24162 24163 24164 24165 24166 24167 24168 24169 24170 24171 24172 24173 24174 24175 24176 24177 24178 24179 24180 24181 24182 24183 24184 24185 24186 24187 24188 24189 24190 24191 24192 24193 24194 24195 24196 24197 24198 24199 24200 24201 24202 24203 24204 24205 24206 24207 24208 24209 24210 24211 24212 24213 24214 24215 24216 24217 24218 24219 24220 24221 24222 24223 24224 24225 24226 24227 24228 24229 24230 24231 24232 24233 24234 24235 24236 24237 24238 24239 24240 24241 24242 24243 24244 24245 24246 24247 24248 24249 24250 24251 24252 24253 24254 24255 24256 24257 24258 24259 24260 24261 24262 24263 24264 24265 24266 24267 24268 24269 24270 24271 24272 24273 24274 24275 24276 24277 24278 24279 24280 24281 24282 24283 24284 24285 24286 24287 24288 24289 24290 24291 24292 24293 24294 24295 24296 24297 24298 24299 24300 24301 24302 24303 24304 24305 24306 24307 24308 24309 24310 24311 24312 24313 24314 24315 24316 24317 24318 24319 24320 24321 24322 24323 24324 24325 24326 24327 24328 24329 24330 24331 24332 24333 24334 24335 24336 24337 24338 24339 24340 24341 24342 24343 24344 24345 24346 24347 24348 24349 24350 24351 24352 24353 24354 24355 24356 24357 24358 24359 24360 24361 24362 24363 24364 24365 24366 24367 24368 24369 24370 24371 24372 24373 24374 24375 24376 24377 24378 24379 24380 24381 24382 24383 24384 24385 24386 24387 24388 24389 24390 24391 24392 24393 24394 24395 24396 24397 24398 24399 24400 24401 24402 24403 24404 24405 24406 24407 24408 24409 24410 24411 24412 24413 24414 24415 24416 24417 24418 24419 24420 24421 24422 24423 24424 24425 24426 24427 24428 24429 24430 24431 24432 24433 24434 24435 24436 24437 24438 24439 24440 24441 24442 24443 24444 24445 24446 24447 24448 24449 24450 24451 24452 24453 24454 24455 24456 24457 24458 24459 24460 24461 24462 24463 24464 24465 24466 24467 24468 24469 24470 24471 24472 24473 24474 24475 24476 24477 24478 24479 24480 24481 24482 24483 24484 24485 24486 24487 24488 24489 24490 24491 24492 24493 24494 24495 24496 24497 24498 24499 24500 24501 24502 24503 24504 24505 24506 24507 24508 24509 24510 24511 24512 24513 24514 24515 24516 24517 24518 24519 24520 24521 24522 24523 24524 24525 24526 24527 24528 24529 24530 24531 24532 24533 24534 24535 24536 24537 24538 24539 24540 24541 24542 24543 24544 24545 24546 24547 24548 24549 24550 24551 24552 24553 24554 24555 24556 24557 24558 24559 24560 24561 24562 24563 24564 24565 24566 24567 24568 24569 24570 24571 24572 24573 24574 24575 24576 24577 24578 24579 24580 24581 24582 24583 24584 24585 24586 24587 24588 24589 24590 24591 24592 24593 24594 24595 24596 24597 24598 24599 24600 24601 24602 24603 24604 24605 24606 24607 24608 24609 24610 24611 24612 24613 24614 24615 24616 24617 24618 24619 24620 24621 24622 24623 24624 24625 24626 24627 24628 24629 24630 24631 24632 24633 24634 24635 24636 24637 24638 24639 24640 24641 24642 24643 24644 24645 24646 24647 24648 24649 24650 24651 24652 24653 24654 24655 24656 24657 24658 24659 24660 24661 24662 24663 24664 24665 24666 24667 24668 24669 24670 24671 24672 24673 24674 24675 24676 24677 24678 24679 24680 24681 24682 24683 24684 24685 24686 24687 24688 24689 24690 24691 24692 24693 24694 24695 24696 24697 24698 24699 24700 24701 24702 24703 24704 24705 24706 24707 24708 24709 24710 24711 24712 24713 24714 24715 24716 24717 24718 24719 24720 24721 24722 24723 24724 24725 24726 24727 24728 24729 24730 24731 24732 24733 24734 24735 24736 24737 24738 24739 24740 24741 24742 24743 24744 24745 24746 24747 24748 24749 24750 24751 24752 24753 24754 24755 24756 24757 24758 24759 24760 24761 24762 24763 24764 24765 24766 24767 24768 24769 24770 24771 24772 24773 24774 24775 24776 24777 24778 24779 24780 24781 24782 24783 24784 24785 24786 24787 24788 24789 24790 24791 24792 24793 24794 24795 24796 24797 24798 24799 24800 24801 24802 24803 24804 24805 24806 24807 24808 24809 24810 24811 24812 24813 24814 24815 24816 24817 24818 24819 24820 24821 24822 24823 24824 24825 24826 24827 24828 24829 24830 24831 24832 24833 24834 24835 24836 24837 24838 24839 24840 24841 24842 24843 24844 24845 24846 24847 24848 24849 24850 24851 24852 24853 24854 24855 24856 24857 24858 24859 24860 24861 24862 24863 24864 24865 24866 24867 24868 24869 24870 24871 24872 24873 24874 24875 24876 24877 24878 24879 24880 24881 24882 24883 24884 24885 24886 24887 24888 24889 24890 24891 24892 24893 24894 24895 24896 24897 24898 24899 24900 24901 24902 24903 24904 24905 24906 24907 24908 24909 24910 24911 24912 24913 24914 24915 24916 24917 24918 24919 24920 24921 24922 24923 24924 24925 24926 24927 24928 24929 24930 24931 24932 24933 24934 24935 24936 24937 24938 24939 24940 24941 24942 24943 24944 24945 24946 24947 24948 24949 24950 24951 24952 24953 24954 24955 24956 24957 24958 24959 24960 24961 24962 24963 24964 24965 24966 24967 24968 24969 24970 24971 24972 24973 24974 24975 24976 24977 24978 24979 24980 24981 24982 24983 24984 24985 24986 24987 24988 24989 24990 24991 24992 24993 24994 24995 24996 24997 24998 24999 25000 25001 25002 25003 25004 25005 25006 25007 25008 25009 25010 25011 25012 25013 25014 25015 25016 25017 25018 25019 25020 25021 25022 25023 25024 25025 25026 25027 25028 25029 25030 25031 25032 25033 25034 25035 25036 25037 25038 25039 25040 25041 25042 25043 25044 25045 25046 25047 25048 25049 25050 25051 25052 25053 25054 25055 25056 25057 25058 25059 25060 25061 25062 25063 25064 25065 25066 25067 25068 25069 25070 25071 25072 25073 25074 25075 25076 25077 25078 25079 25080 25081 25082 25083 25084 25085 25086 25087 25088 25089 25090 25091 25092 25093 25094 25095 25096 25097 25098 25099 25100 25101 25102 25103 25104 25105 25106 25107 25108 25109 25110 25111 25112 25113 25114 25115 25116 25117 25118 25119 25120 25121 25122 25123 25124 25125 25126 25127 25128 25129 25130 25131 25132 25133 25134 25135 25136 25137 25138 25139 25140 25141 25142 25143 25144 25145 25146 25147 25148 25149 25150 25151 25152 25153 25154 25155 25156 25157 25158 25159 25160 25161 25162 25163 25164 25165 25166 25167 25168 25169 25170 25171 25172 25173 25174 25175 25176 25177 25178 25179 25180 25181 25182 25183 25184 25185 25186 25187 25188 25189 25190 25191 25192 25193 25194 25195 25196 25197 25198 25199 25200 25201 25202 25203 25204 25205 25206 25207 25208 25209 25210 25211 25212 25213 25214 25215 25216 25217 25218 25219 25220 25221 25222 25223 25224 25225 25226 25227 25228 25229 25230 25231 25232 25233 25234 25235 25236 25237 25238 25239 25240 25241 25242 25243 25244 25245 25246 25247 25248 25249 25250 25251 25252 25253 25254 25255 25256 25257 25258 25259 25260 25261 25262 25263 25264 25265 25266 25267 25268 25269 25270 25271 25272 25273 25274 25275 25276 25277 25278 25279 25280 25281 25282 25283 25284 25285 25286 25287 25288 25289 25290 25291 25292 25293 25294 25295 25296 25297 25298 25299 25300 25301 25302 25303 25304 25305 25306 25307 25308 25309 25310 25311 25312 25313 25314 25315 25316 25317 25318 25319 25320 25321 25322 25323 25324 25325 25326 25327 25328 25329 25330 25331 25332 25333 25334 25335 25336 25337 25338 25339 25340 25341 25342 25343 25344 25345 25346 25347 25348 25349 25350 25351 25352 25353 25354 25355 25356 25357 25358 25359 25360 25361 25362 25363 25364 25365 25366 25367 25368 25369 25370 25371 25372 25373 25374 25375 25376 25377 25378 25379 25380 25381 25382 25383 25384 25385 25386 25387 25388 25389 25390 25391 25392 25393 25394 25395 25396 25397 25398 25399 25400 25401 25402 25403 25404 25405 25406 25407 25408 25409 25410 25411 25412 25413 25414 25415 25416 25417 25418 25419 25420 25421 25422 25423 25424 25425 25426 25427 25428 25429 25430 25431 25432 25433 25434 25435 25436 25437 25438 25439 25440 25441 25442 25443 25444 25445 25446 25447 25448 25449 25450 25451 25452 25453 25454 25455 25456 25457 25458 25459 25460 25461 25462 25463 25464 25465 25466 25467 25468 25469 25470 25471 25472 25473 25474 25475 25476 25477 25478 25479 25480 25481 25482 25483 25484 25485 25486 25487 25488 25489 25490 25491 25492 25493 25494 25495 25496 25497 25498 25499 25500 25501 25502 25503 25504 25505 25506 25507 25508 25509 25510 25511 25512 25513 25514 25515 25516 25517 25518 25519 25520 25521 25522 25523 25524 25525 25526 25527 25528 25529 25530 25531 25532 25533 25534 25535 25536 25537 25538 25539 25540 25541 25542 25543 25544 25545 25546 25547 25548 25549 25550 25551 25552 25553 25554 25555 25556 25557 25558 25559 25560 25561 25562 25563 25564 25565 25566 25567 25568 25569 25570 25571 25572 25573 25574 25575 25576 25577 25578 25579 25580 25581 25582 25583 25584 25585 25586 25587 25588 25589 25590 25591 25592 25593 25594 25595 25596 25597 25598 25599 25600 25601 25602 25603 25604 25605 25606 25607 25608 25609 25610 25611 25612 25613 25614 25615 25616 25617 25618 25619 25620 25621 25622 25623 25624 25625 25626 25627 25628 25629 25630 25631 25632 25633 25634 25635 25636 25637 25638 25639 25640 25641 25642 25643 25644 25645 25646 25647 25648 25649 25650 25651 25652 25653 25654 25655 25656 25657 25658 25659 25660 25661 25662 25663 25664 25665 25666 25667 25668 25669 25670 25671 25672 25673 25674 25675 25676 25677 25678 25679 25680 25681 25682 25683 25684 25685 25686 25687 25688 25689 25690 25691 25692 25693 25694 25695 25696 25697 25698 25699 25700 25701 25702 25703 25704 25705 25706 25707 25708 25709 25710 25711 25712 25713 25714 25715 25716 25717 25718 25719 25720 25721 25722 25723 25724 25725 25726 25727 25728 25729 25730 25731 25732 25733 25734 25735 25736 25737 25738 25739 25740 25741 25742 25743 25744 25745 25746 25747 25748 25749 25750 25751 25752 25753 25754 25755 25756 25757 25758 25759 25760 25761 25762 25763 25764 25765 25766 25767 25768 25769 25770 25771 25772 25773 25774 25775 25776 25777 25778 25779 25780 25781 25782 25783 25784 25785 25786 25787 25788 25789 25790 25791 25792 25793 25794 25795 25796 25797 25798 25799 25800 25801 25802 25803 25804 25805 25806 25807 25808 25809 25810 25811 25812 25813 25814 25815 25816 25817 25818 25819 25820 25821 25822 25823 25824 25825 25826 25827 25828 25829 25830 25831 25832 25833 25834 25835 25836 25837 25838 25839 25840 25841 25842 25843 25844 25845 25846 25847 25848 25849 25850 25851 25852 25853 25854 25855 25856 25857 25858 25859 25860 25861 25862 25863 25864 25865 25866 25867 25868 25869 25870 25871 25872 25873 25874 25875 25876 25877 25878 25879 25880 25881 25882 25883 25884 25885 25886 25887 25888 25889 25890 25891 25892 25893 25894 25895 25896 25897 25898 25899 25900 25901 25902 25903 25904 25905 25906 25907 25908 25909 25910 25911 25912 25913 25914 25915 25916 25917 25918 25919 25920 25921 25922 25923 25924 25925 25926 25927 25928 25929 25930 25931 25932 25933 25934 25935 25936 25937 25938 25939 25940 25941 25942 25943 25944 25945 25946 25947 25948 25949 25950 25951 25952 25953 25954 25955 25956 25957 25958 25959 25960 25961 25962 25963 25964 25965 25966 25967 25968 25969 25970 25971 25972 25973 25974 25975 25976 25977 25978 25979 25980 25981 25982 25983 25984 25985 25986 25987 25988 25989 25990 25991 25992 25993 25994 25995 25996 25997 25998 25999 26000 26001 26002 26003 26004 26005 26006 26007 26008 26009 26010 26011 26012 26013 26014 26015 26016 26017 26018 26019 26020 26021 26022 26023 26024 26025 26026 26027 26028 26029 26030 26031 26032 26033 26034 26035 26036 26037 26038 26039 26040 26041 26042 26043 26044 26045 26046 26047 26048 26049 26050 26051 26052 26053 26054 26055 26056 26057 26058 26059 26060 26061 26062 26063 26064 26065 26066 26067 26068 26069 26070 26071 26072 26073 26074 26075 26076 26077 26078 26079 26080 26081 26082 26083 26084 26085 26086 26087 26088 26089 26090 26091 26092 26093 26094 26095 26096 26097 26098 26099 26100 26101 26102 26103 26104 26105 26106 26107 26108 26109 26110 26111 26112 26113 26114 26115 26116 26117 26118 26119 26120 26121 26122 26123 26124 26125 26126 26127 26128 26129 26130 26131 26132 26133 26134 26135 26136 26137 26138 26139 26140 26141 26142 26143 26144 26145 26146 26147 26148 26149 26150 26151 26152 26153 26154 26155 26156 26157 26158 26159 26160 26161 26162 26163 26164 26165 26166 26167 26168 26169 26170 26171 26172 26173 26174 26175 26176 26177 26178 26179 26180 26181 26182 26183 26184 26185 26186 26187 26188 26189 26190 26191 26192 26193 26194 26195 26196 26197 26198 26199 26200 26201 26202 26203 26204 26205 26206 26207 26208 26209 26210 26211 26212 26213 26214 26215 26216 26217 26218 26219 26220 26221 26222 26223 26224 26225 26226 26227 26228 26229 26230 26231 26232 26233 26234 26235 26236 26237 26238 26239 26240 26241 26242 26243 26244 26245 26246 26247 26248 26249 26250 26251 26252 26253 26254 26255 26256 26257 26258 26259 26260 26261 26262 26263 26264 26265 26266 26267 26268 26269 26270 26271 26272 26273 26274 26275 26276 26277 26278 26279 26280 26281 26282 26283 26284 26285 26286 26287 26288 26289 26290 26291 26292 26293 26294 26295 26296 26297 26298 26299 26300 26301 26302 26303 26304 26305 26306 26307 26308 26309 26310 26311 26312 26313 26314 26315 26316 26317 26318 26319 26320 26321 26322 26323 26324 26325 26326 26327 26328 26329 26330 26331 26332 26333 26334 26335 26336 26337 26338 26339 26340 26341 26342 26343 26344 26345 26346 26347 26348 26349 26350 26351 26352 26353 26354 26355 26356 26357 26358 26359 26360 26361 26362 26363 26364 26365 26366 26367 26368 26369 26370 26371 26372 26373 26374 26375 26376 26377 26378 26379 26380 26381 26382 26383 26384 26385 26386 26387 26388 26389 26390 26391 26392 26393 26394 26395 26396 26397 26398 26399 26400 26401 26402 26403 26404 26405 26406 26407 26408 26409 26410 26411 26412 26413 26414 26415 26416 26417 26418 26419 26420 26421 26422 26423 26424 26425 26426 26427 26428 26429 26430 26431 26432 26433 26434 26435 26436 26437 26438 26439 26440 26441 26442 26443 26444 26445 26446 26447 26448 26449 26450 26451 26452 26453 26454 26455 26456 26457 26458 26459 26460 26461 26462 26463 26464 26465 26466 26467 26468 26469 26470 26471 26472 26473 26474 26475 26476 26477 26478 26479 26480 26481 26482 26483 26484 26485 26486 26487 26488 26489 26490 26491 26492 26493 26494 26495 26496 26497 26498 26499 26500 26501 26502 26503 26504 26505 26506 26507 26508 26509 26510 26511 26512 26513 26514 26515 26516 26517 26518 26519 26520 26521 26522 26523 26524 26525 26526 26527 26528 26529 26530 26531 26532 26533 26534 26535 26536 26537 26538 26539 26540 26541 26542 26543 26544 26545 26546 26547 26548 26549 26550 26551 26552 26553 26554 26555 26556 26557 26558 26559 26560 26561 26562 26563 26564 26565 26566 26567 26568 26569 26570 26571 26572 26573 26574 26575 26576 26577 26578 26579 26580 26581 26582 26583 26584 26585 26586 26587 26588 26589 26590 26591 26592 26593 26594 26595 26596 26597 26598 26599 26600 26601 26602 26603 26604 26605 26606 26607 26608 26609 26610 26611 26612 26613 26614 26615 26616 26617 26618 26619 26620 26621 26622 26623 26624 26625 26626 26627 26628 26629 26630 26631 26632 26633 26634 26635 26636 26637 26638 26639 26640 26641 26642 26643 26644 26645 26646 26647 26648 26649 26650 26651 26652 26653 26654 26655 26656 26657 26658 26659 26660 26661 26662 26663 26664 26665 26666 26667 26668 26669 26670 26671 26672 26673 26674 26675 26676 26677 26678 26679 26680 26681 26682 26683 26684 26685 26686 26687 26688 26689 26690 26691 26692 26693 26694 26695 26696 26697 26698 26699 26700 26701 26702 26703 26704 26705 26706 26707 26708 26709 26710 26711 26712 26713 26714 26715 26716 26717 26718 26719 26720 26721 26722 26723 26724 26725 26726 26727 26728 26729 26730 26731 26732 26733 26734 26735 26736 26737 26738 26739 26740 26741 26742 26743 26744 26745 26746 26747 26748 26749 26750 26751 26752 26753 26754 26755 26756 26757 26758 26759 26760 26761 26762 26763 26764 26765 26766 26767 26768 26769 26770 26771 26772 26773 26774 26775 26776 26777 26778 26779 26780 26781 26782 26783 26784 26785 26786 26787 26788 26789 26790 26791 26792 26793 26794 26795 26796 26797 26798 26799 26800 26801 26802 26803 26804 26805 26806 26807 26808 26809 26810 26811 26812 26813 26814 26815 26816 26817 26818 26819 26820 26821 26822 26823 26824 26825 26826 26827 26828 26829 26830 26831 26832 26833 26834 26835 26836 26837 26838 26839 26840 26841 26842 26843 26844 26845 26846 26847 26848 26849 26850 26851 26852 26853 26854 26855 26856 26857 26858 26859 26860 26861 26862 26863 26864 26865 26866 26867 26868 26869 26870 26871 26872 26873 26874 26875 26876 26877 26878 26879 26880 26881 26882 26883 26884 26885 26886 26887 26888 26889 26890 26891 26892 26893 26894 26895 26896 26897 26898 26899 26900 26901 26902 26903 26904 26905 26906 26907 26908 26909 26910 26911 26912 26913 26914 26915 26916 26917 26918 26919 26920 26921 26922 26923 26924 26925 26926 26927 26928 26929 26930 26931 26932 26933 26934 26935 26936 26937 26938 26939 26940 26941 26942 26943 26944 26945 26946 26947 26948 26949 26950 26951 26952 26953 26954 26955 26956 26957 26958 26959 26960 26961 26962 26963 26964 26965 26966 26967 26968 26969 26970 26971 26972 26973 26974 26975 26976 26977 26978 26979 26980 26981 26982 26983 26984 26985 26986 26987 26988 26989 26990 26991 26992 26993 26994 26995 26996 26997 26998 26999 27000 27001 27002 27003 27004 27005 27006 27007 27008 27009 27010 27011 27012 27013 27014 27015 27016 27017 27018 27019 27020 27021 27022 27023 27024 27025 27026 27027 27028 27029 27030 27031 27032 27033 27034 27035 27036 27037 27038 27039 27040 27041 27042 27043 27044 27045 27046 27047 27048 27049 27050 27051 27052 27053 27054 27055 27056 27057 27058 27059 27060 27061 27062 27063 27064 27065 27066 27067 27068 27069 27070 27071 27072 27073 27074 27075 27076 27077 27078 27079 27080 27081 27082 27083 27084 27085 27086 27087 27088 27089 27090 27091 27092 27093 27094 27095 27096 27097 27098 27099 27100 27101 27102 27103 27104 27105 27106 27107 27108 27109 27110 27111 27112 27113 27114 27115 27116 27117 27118 27119 27120 27121 27122 27123 27124 27125 27126 27127 27128 27129 27130 27131 27132 27133 27134 27135 27136 27137 27138 27139 27140 27141 27142 27143 27144 27145 27146 27147 27148 27149 27150 27151 27152 27153 27154 27155 27156 27157 27158 27159 27160 27161 27162 27163 27164 27165 27166 27167 27168 27169 27170 27171 27172 27173 27174 27175 27176 27177 27178 27179 27180 27181 27182 27183 27184 27185 27186 27187 27188 27189 27190 27191 27192 27193 27194 27195 27196 27197 27198 27199 27200 27201 27202 27203 27204 27205 27206 27207 27208 27209 27210 27211 27212 27213 27214 27215 27216 27217 27218 27219 27220 27221 27222 27223 27224 27225 27226 27227 27228 27229 27230 27231 27232 27233 27234 27235 27236 27237 27238 27239 27240 27241 27242 27243 27244 27245 27246 27247 27248 27249 27250 27251 27252 27253 27254 27255 27256 27257 27258 27259 27260 27261 27262 27263 27264 27265 27266 27267 27268 27269 27270 27271 27272 27273 27274 27275 27276 27277 27278 27279 27280 27281 27282 27283 27284 27285 27286 27287 27288 27289 27290 27291 27292 27293 27294 27295 27296 27297 27298 27299 27300 27301 27302 27303 27304 27305 27306 27307 27308 27309 27310 27311 27312 27313 27314 27315 27316 27317 27318 27319 27320 27321 27322 27323 27324 27325 27326 27327 27328 27329 27330 27331 27332 27333 27334 27335 27336 27337 27338 27339 27340 27341 27342 27343 27344 27345 27346 27347 27348 27349 27350 27351 27352 27353 27354 27355 27356 27357 27358 27359 27360 27361 27362 27363 27364 27365 27366 27367 27368 27369 27370 27371 27372 27373 27374 27375 27376 27377 27378 27379 27380 27381 27382 27383 27384 27385 27386 27387 27388 27389 27390 27391 27392 27393 27394 27395 27396 27397 27398 27399 27400 27401 27402 27403 27404 27405 27406 27407 27408 27409 27410 27411 27412 27413 27414 27415 27416 27417 27418 27419 27420 27421 27422 27423 27424 27425 27426 27427 27428 27429 27430 27431 27432 27433 27434 27435 27436 27437 27438 27439 27440 27441 27442 27443 27444 27445 27446 27447 27448 27449 27450 27451 27452 27453 27454 27455 27456 27457 27458 27459 27460 27461 27462 27463 27464 27465 27466 27467 27468 27469 27470 27471 27472 27473 27474 27475 27476 27477 27478 27479 27480 27481 27482 27483 27484 27485 27486 27487 27488 27489 27490 27491 27492 27493 27494 27495 27496 27497 27498 27499 27500 27501 27502 27503 27504 27505 27506 27507 27508 27509 27510 27511 27512 27513 27514 27515 27516 27517 27518 27519 27520 27521 27522 27523 27524 27525 27526 27527 27528 27529 27530 27531 27532 27533 27534 27535 27536 27537 27538 27539 27540 27541 27542 27543 27544 27545 27546 27547 27548 27549 27550 27551 27552 27553 27554 27555 27556 27557 27558 27559 27560 27561 27562 27563 27564 27565 27566 27567 27568 27569 27570 27571 27572 27573 27574 27575 27576 27577 27578 27579 27580 27581 27582 27583 27584 27585 27586 27587 27588 27589 27590 27591 27592 27593 27594 27595 27596 27597 27598 27599 27600 27601 27602 27603 27604 27605 27606 27607 27608 27609 27610 27611 27612 27613 27614 27615 27616 27617 27618 27619 27620 27621 27622 27623 27624 27625 27626 27627 27628 27629 27630 27631 27632 27633 27634 27635 27636 27637 27638 27639 27640 27641 27642 27643 27644 27645 27646 27647 27648 27649 27650 27651 27652 27653 27654 27655 27656 27657 27658 27659 27660 27661 27662 27663 27664 27665 27666 27667 27668 27669 27670 27671 27672 27673 27674 27675 27676 27677 27678 27679 27680 27681 27682 27683 27684 27685 27686 27687 27688 27689 27690 27691 27692 27693 27694 27695 27696 27697 27698 27699 27700 27701 27702 27703 27704 27705 27706 27707 27708 27709 27710 27711 27712 27713 27714 27715 27716 27717 27718 27719 27720 27721 27722 27723 27724 27725 27726 27727 27728 27729 27730 27731 27732 27733 27734 27735 27736 27737 27738 27739 27740 27741 27742 27743 27744 27745 27746 27747 27748 27749 27750 27751 27752 27753 27754 27755 27756 27757 27758 27759 27760 27761 27762 27763 27764 27765 27766 27767 27768 27769 27770 27771 27772 27773 27774 27775 27776 27777 27778 27779 27780 27781 27782 27783 27784 27785 27786 27787 27788 27789 27790 27791 27792 27793 27794 27795 27796 27797 27798 27799 27800 27801 27802 27803 27804 27805 27806 27807 27808 27809 27810 27811 27812 27813 27814 27815 27816 27817 27818 27819 27820 27821 27822 27823 27824 27825 27826 27827 27828 27829 27830 27831 27832 27833 27834 27835 27836 27837 27838 27839 27840 27841 27842 27843 27844 27845 27846 27847 27848 27849 27850 27851 27852 27853 27854 27855 27856 27857 27858 27859 27860 27861 27862 27863 27864 27865 27866 27867 27868 27869 27870 27871 27872 27873 27874 27875 27876 27877 27878 27879 27880 27881 27882 27883 27884 27885 27886 27887 27888 27889 27890 27891 27892 27893 27894 27895 27896 27897 27898 27899 27900 27901 27902 27903 27904 27905 27906 27907 27908 27909 27910 27911 27912 27913 27914 27915 27916 27917 27918 27919 27920 27921 27922 27923 27924 27925 27926 27927 27928 27929 27930 27931 27932 27933 27934 27935 27936 27937 27938 27939 27940 27941 27942 27943 27944 27945 27946 27947 27948 27949 27950 27951 27952 27953 27954 27955 27956 27957 27958 27959 27960 27961 27962 27963 27964 27965 27966 27967 27968 27969 27970 27971 27972 27973 27974 27975 27976 27977 27978 27979 27980 27981 27982 27983 27984 27985 27986 27987 27988 27989 27990 27991 27992 27993 27994 27995 27996 27997 27998 27999 28000 28001 28002 28003 28004 28005 28006 28007 28008 28009 28010 28011 28012 28013 28014 28015 28016 28017 28018 28019 28020 28021 28022 28023 28024 28025 28026 28027 28028 28029 28030 28031 28032 28033 28034 28035 28036 28037 28038 28039 28040 28041 28042 28043 28044 28045 28046 28047 28048 28049 28050 28051 28052 28053 28054 28055 28056 28057 28058 28059 28060 28061 28062 28063 28064 28065 28066 28067 28068 28069 28070 28071 28072 28073 28074 28075 28076 28077 28078 28079 28080 28081 28082 28083 28084 28085 28086 28087 28088 28089 28090 28091 28092 28093 28094 28095 28096 28097 28098 28099 28100 28101 28102 28103 28104 28105 28106 28107 28108 28109 28110 28111 28112 28113 28114 28115 28116 28117 28118 28119 28120 28121 28122 28123 28124 28125 28126 28127 28128 28129 28130 28131 28132 28133 28134 28135 28136 28137 28138 28139 28140 28141 28142 28143 28144 28145 28146 28147 28148 28149 28150 28151 28152 28153 28154 28155 28156 28157 28158 28159 28160 28161 28162 28163 28164 28165 28166 28167 28168 28169 28170 28171 28172 28173 28174 28175 28176 28177 28178 28179 28180 28181 28182 28183 28184 28185 28186 28187 28188 28189 28190 28191 28192 28193 28194 28195 28196 28197 28198 28199 28200 28201 28202 28203 28204 28205 28206 28207 28208 28209 28210 28211 28212 28213 28214 28215 28216 28217 28218 28219 28220 28221 28222 28223 28224 28225 28226 28227 28228 28229 28230 28231 28232 28233 28234 28235 28236 28237 28238 28239 28240 28241 28242 28243 28244 28245 28246 28247 28248 28249 28250 28251 28252 28253 28254 28255 28256 28257 28258 28259 28260 28261 28262 28263 28264 28265 28266 28267 28268 28269 28270 28271 28272 28273 28274 28275 28276 28277 28278 28279 28280 28281 28282 28283 28284 28285 28286 28287 28288 28289 28290 28291 28292 28293 28294 28295 28296 28297 28298 28299 28300 28301 28302 28303 28304 28305 28306 28307 28308 28309 28310 28311 28312 28313 28314 28315 28316 28317 28318 28319 28320 28321 28322 28323 28324 28325 28326 28327 28328 28329 28330 28331 28332 28333 28334 28335 28336 28337 28338 28339 28340 28341 28342 28343 28344 28345 28346 28347 28348 28349 28350 28351 28352 28353 28354 28355 28356 28357 28358 28359 28360 28361 28362 28363 28364 28365 28366 28367 28368 28369 28370 28371 28372 28373 28374 28375 28376 28377 28378 28379 28380 28381 28382 28383 28384 28385 28386 28387 28388 28389 28390 28391 28392 28393 28394 28395 28396 28397 28398 28399 28400 28401 28402 28403 28404 28405 28406 28407 28408 28409 28410 28411 28412 28413 28414 28415 28416 28417 28418 28419 28420 28421 28422 28423 28424 28425 28426 28427 28428 28429 28430 28431 28432 28433 28434 28435 28436 28437 28438 28439 28440 28441 28442 28443 28444 28445 28446 28447 28448 28449 28450 28451 28452 28453 28454 28455 28456 28457 28458 28459 28460 28461 28462 28463 28464 28465 28466 28467 28468 28469 28470 28471 28472 28473 28474 28475 28476 28477 28478 28479 28480 28481 28482 28483 28484 28485 28486 28487 28488 28489 28490 28491 28492 28493 28494 28495 28496 28497 28498 28499 28500 28501 28502 28503 28504 28505 28506 28507 28508 28509 28510 28511 28512 28513 28514 28515 28516 28517 28518 28519 28520 28521 28522 28523 28524 28525 28526 28527 28528 28529 28530 28531 28532 28533 28534 28535 28536 28537 28538 28539 28540 28541 28542 28543 28544 28545 28546 28547 28548 28549 28550 28551 28552 28553 28554 28555 28556 28557 28558 28559 28560 28561 28562 28563 28564 28565 28566 28567 28568 28569 28570 28571 28572 28573 28574 28575 28576 28577 28578 28579 28580 28581 28582 28583 28584 28585 28586 28587 28588 28589 28590 28591 28592 28593 28594 28595 28596 28597 28598 28599 28600 28601 28602 28603 28604 28605 28606 28607 28608 28609 28610 28611 28612 28613 28614 28615 28616 28617 28618 28619 28620 28621 28622 28623 28624 28625 28626 28627 28628 28629 28630 28631 28632 28633 28634 28635 28636 28637 28638 28639 28640 28641 28642 28643 28644 28645 28646 28647 28648 28649 28650 28651 28652 28653 28654 28655 28656 28657 28658 28659 28660 28661 28662 28663 28664 28665 28666 28667 28668 28669 28670 28671 28672 28673 28674 28675 28676 28677 28678 28679 28680 28681 28682 28683 28684 28685 28686 28687 28688 28689 28690 28691 28692 28693 28694 28695 28696 28697 28698 28699 28700 28701 28702 28703 28704 28705 28706 28707 28708 28709 28710 28711 28712 28713 28714 28715 28716 28717 28718 28719 28720 28721 28722 28723 28724 28725 28726 28727 28728 28729 28730 28731 28732 28733 28734 28735 28736 28737 28738 28739 28740 28741 28742 28743 28744 28745 28746 28747 28748 28749 28750 28751 28752 28753 28754 28755 28756 28757 28758 28759 28760 28761 28762 28763 28764 28765 28766 28767 28768 28769 28770 28771 28772 28773 28774 28775 28776 28777 28778 28779 28780 28781 28782 28783 28784 28785 28786 28787 28788 28789 28790 28791 28792 28793 28794 28795 28796 28797 28798 28799 28800 28801 28802 28803 28804 28805 28806 28807 28808 28809 28810 28811 28812 28813 28814 28815 28816 28817 28818 28819 28820 28821 28822 28823 28824 28825 28826 28827 28828 28829 28830 28831 28832 28833 28834 28835 28836 28837 28838 28839 28840 28841 28842 28843 28844 28845 28846 28847 28848 28849 28850 28851 28852 28853 28854 28855 28856 28857 28858 28859 28860 28861 28862 28863 28864 28865 28866 28867 28868 28869 28870 28871 28872 28873 28874 28875 28876 28877 28878 28879 28880 28881 28882 28883 28884 28885 28886 28887 28888 28889 28890 28891 28892 28893 28894 28895 28896 28897 28898 28899 28900 28901 28902 28903 28904 28905 28906 28907 28908 28909 28910 28911 28912 28913 28914 28915 28916 28917 28918 28919 28920 28921 28922 28923 28924 28925 28926 28927 28928 28929 28930 28931 28932 28933 28934 28935 28936 28937 28938 28939 28940 28941 28942 28943 28944 28945 28946 28947 28948 28949 28950 28951 28952 28953 28954 28955 28956 28957 28958 28959 28960 28961 28962 28963 28964 28965 28966 28967 28968 28969 28970 28971 28972 28973 28974 28975 28976 28977 28978 28979 28980 28981 28982 28983 28984 28985 28986 28987 28988 28989 28990 28991 28992 28993 28994 28995 28996 28997 28998 28999 29000 29001 29002 29003 29004 29005 29006 29007 29008 29009 29010 29011 29012 29013 29014 29015 29016 29017 29018 29019 29020 29021 29022 29023 29024 29025 29026 29027 29028 29029 29030 29031 29032 29033 29034 29035 29036 29037 29038 29039 29040 29041 29042 29043 29044 29045 29046 29047 29048 29049 29050 29051 29052 29053 29054 29055 29056 29057 29058 29059 29060 29061 29062 29063 29064 29065 29066 29067 29068 29069 29070 29071 29072 29073 29074 29075 29076 29077 29078 29079 29080 29081 29082 29083 29084 29085 29086 29087 29088 29089 29090 29091 29092 29093 29094 29095 29096 29097 29098 29099 29100 29101 29102 29103 29104 29105 29106 29107 29108 29109 29110 29111 29112 29113 29114 29115 29116 29117 29118 29119 29120 29121 29122 29123 29124 29125 29126 29127 29128 29129 29130 29131 29132 29133 29134 29135 29136 29137 29138 29139 29140 29141 29142 29143 29144 29145 29146 29147 29148 29149 29150 29151 29152 29153 29154 29155 29156 29157 29158 29159 29160 29161 29162 29163 29164 29165 29166 29167 29168 29169 29170 29171 29172 29173 29174 29175 29176 29177 29178 29179 29180 29181 29182 29183 29184 29185 29186 29187 29188 29189 29190 29191 29192 29193 29194 29195 29196 29197 29198 29199 29200 29201 29202 29203 29204 29205 29206 29207 29208 29209 29210 29211 29212 29213 29214 29215 29216 29217 29218 29219 29220 29221 29222 29223 29224 29225 29226 29227 29228 29229 29230 29231 29232 29233 29234 29235 29236 29237 29238 29239 29240 29241 29242 29243 29244 29245 29246 29247 29248 29249 29250 29251 29252 29253 29254 29255 29256 29257 29258 29259 29260 29261 29262 29263 29264 29265 29266 29267 29268 29269 29270 29271 29272 29273 29274 29275 29276 29277 29278 29279 29280 29281 29282 29283 29284 29285 29286 29287 29288 29289 29290 29291 29292 29293 29294 29295 29296 29297 29298 29299 29300 29301 29302 29303 29304 29305 29306 29307 29308 29309 29310 29311 29312 29313 29314 29315 29316 29317 29318 29319 29320 29321 29322 29323 29324 29325 29326 29327 29328 29329 29330 29331 29332 29333 29334 29335 29336 29337 29338 29339 29340 29341 29342 29343 29344 29345 29346 29347 29348 29349 29350 29351 29352 29353 29354 29355 29356 29357 29358 29359 29360 29361 29362 29363 29364 29365 29366 29367 29368 29369 29370 29371 29372 29373 29374 29375 29376 29377 29378 29379 29380 29381 29382 29383 29384 29385 29386 29387 29388 29389 29390 29391 29392 29393 29394 29395 29396 29397 29398 29399 29400 29401 29402 29403 29404 29405 29406 29407 29408 29409 29410 29411 29412 29413 29414 29415 29416 29417 29418 29419 29420 29421 29422 29423 29424 29425 29426 29427 29428 29429 29430 29431 29432 29433 29434 29435 29436 29437 29438 29439 29440 29441 29442 29443 29444 29445 29446 29447 29448 29449 29450 29451 29452 29453 29454 29455 29456 29457 29458 29459 29460 29461 29462 29463 29464 29465 29466 29467 29468 29469 29470 29471 29472 29473 29474 29475 29476 29477 29478 29479 29480 29481 29482 29483 29484 29485 29486 29487 29488 29489 29490 29491 29492 29493 29494 29495 29496 29497 29498 29499 29500 29501 29502 29503 29504 29505 29506 29507 29508 29509 29510 29511 29512 29513 29514 29515 29516 29517 29518 29519 29520 29521 29522 29523 29524 29525 29526 29527 29528 29529 29530 29531 29532 29533 29534 29535 29536 29537 29538 29539 29540 29541 29542 29543 29544 29545 29546 29547 29548 29549 29550 29551 29552 29553 29554 29555 29556 29557 29558 29559 29560 29561 29562 29563 29564 29565 29566 29567 29568 29569 29570 29571 29572 29573 29574 29575 29576 29577 29578 29579 29580 29581 29582 29583 29584 29585 29586 29587 29588 29589 29590 29591 29592 29593 29594 29595 29596 29597 29598 29599 29600 29601 29602 29603 29604 29605 29606 29607 29608 29609 29610 29611 29612 29613 29614 29615 29616 29617 29618 29619 29620 29621 29622 29623 29624 29625 29626 29627 29628 29629 29630 29631 29632 29633 29634 29635 29636 29637 29638 29639 29640 29641 29642 29643 29644 29645 29646 29647 29648 29649 29650 29651 29652 29653 29654 29655 29656 29657 29658 29659 29660 29661 29662 29663 29664 29665 29666 29667 29668 29669 29670 29671 29672 29673 29674 29675 29676 29677 29678 29679 29680 29681 29682 29683 29684 29685 29686 29687 29688 29689 29690 29691 29692 29693 29694 29695 29696 29697 29698 29699 29700 29701 29702 29703 29704 29705 29706 29707 29708 29709 29710 29711 29712 29713 29714 29715 29716 29717 29718 29719 29720 29721 29722 29723 29724 29725 29726 29727 29728 29729 29730 29731 29732 29733 29734 29735 29736 29737 29738 29739 29740 29741 29742 29743 29744 29745 29746 29747 29748 29749 29750 29751 29752 29753 29754 29755 29756 29757 29758 29759 29760 29761 29762 29763 29764 29765 29766 29767 29768 29769 29770 29771 29772 29773 29774 29775 29776 29777 29778 29779 29780 29781 29782 29783 29784 29785 29786 29787 29788 29789 29790 29791 29792 29793 29794 29795 29796 29797 29798 29799 29800 29801 29802 29803 29804 29805 29806 29807 29808 29809 29810 29811 29812 29813 29814 29815 29816 29817 29818 29819 29820 29821 29822 29823 29824 29825 29826 29827 29828 29829 29830 29831 29832 29833 29834 29835 29836 29837 29838 29839 29840 29841 29842 29843 29844 29845 29846 29847 29848 29849 29850 29851 29852 29853 29854 29855 29856 29857 29858 29859 29860 29861 29862 29863 29864 29865 29866 29867 29868 29869 29870 29871 29872 29873 29874 29875 29876 29877 29878 29879 29880 29881 29882 29883 29884 29885 29886 29887 29888 29889 29890 29891 29892 29893 29894 29895 29896 29897 29898 29899 29900 29901 29902 29903 29904 29905 29906 29907 29908 29909 29910 29911 29912 29913 29914 29915 29916 29917 29918 29919 29920 29921 29922 29923 29924 29925 29926 29927 29928 29929 29930 29931 29932 29933 29934 29935 29936 29937 29938 29939 29940 29941 29942 29943 29944 29945 29946 29947 29948 29949 29950 29951 29952 29953 29954 29955 29956 29957 29958 29959 29960 29961 29962 29963 29964 29965 29966 29967 29968 29969 29970 29971 29972 29973 29974 29975 29976 29977 29978 29979 29980 29981 29982 29983 29984 29985 29986 29987 29988 29989 29990 29991 29992 29993 29994 29995 29996 29997 29998 29999 30000 30001 30002 30003 30004 30005 30006 30007 30008 30009 30010 30011 30012 30013 30014 30015 30016 30017 30018 30019 30020 30021 30022 30023 30024 30025 30026 30027 30028 30029 30030 30031 30032 30033 30034 30035 30036 30037 30038 30039 30040 30041 30042 30043 30044 30045 30046 30047 30048 30049 30050 30051 30052 30053 30054 30055 30056 30057 30058 30059 30060 30061 30062 30063 30064 30065 30066 30067 30068 30069 30070 30071 30072 30073 30074 30075 30076 30077 30078 30079 30080 30081 30082 30083 30084 30085 30086 30087 30088 30089 30090 30091 30092 30093 30094 30095 30096 30097 30098 30099 30100 30101 30102 30103 30104 30105 30106 30107 30108 30109 30110 30111 30112 30113 30114 30115 30116 30117 30118 30119 30120 30121 30122 30123 30124 30125 30126 30127 30128 30129 30130 30131 30132 30133 30134 30135 30136 30137 30138 30139 30140 30141 30142 30143 30144 30145 30146 30147 30148 30149 30150 30151 30152 30153 30154 30155 30156 30157 30158 30159 30160 30161 30162 30163 30164 30165 30166 30167 30168 30169 30170 30171 30172 30173 30174 30175 30176 30177 30178 30179 30180 30181 30182 30183 30184 30185 30186 30187 30188 30189 30190 30191 30192 30193 30194 30195 30196 30197 30198 30199 30200 30201 30202 30203 30204 30205 30206 30207 30208 30209 30210 30211 30212 30213 30214 30215 30216 30217 30218 30219 30220 30221 30222 30223 30224 30225 30226 30227 30228 30229 30230 30231 30232 30233 30234 30235 30236 30237 30238 30239 30240 30241 30242 30243 30244 30245 30246 30247 30248 30249 30250 30251 30252 30253 30254 30255 30256 30257 30258 30259 30260 30261 30262 30263 30264 30265 30266 30267 30268 30269 30270 30271 30272 30273 30274 30275 30276 30277 30278 30279 30280 30281 30282 30283 30284 30285 30286 30287 30288 30289 30290 30291 30292 30293 30294 30295 30296 30297 30298 30299 30300 30301 30302 30303 30304 30305 30306 30307 30308 30309 30310 30311 30312 30313 30314 30315 30316 30317 30318 30319 30320 30321 30322 30323 30324 30325 30326 30327 30328 30329 30330 30331 30332 30333 30334 30335 30336 30337 30338 30339 30340 30341 30342 30343 30344 30345 30346 30347 30348 30349 30350 30351 30352 30353 30354 30355 30356 30357 30358 30359 30360 30361 30362 30363 30364 30365 30366 30367 30368 30369 30370 30371 30372 30373 30374 30375 30376 30377 30378 30379 30380 30381 30382 30383 30384 30385 30386 30387 30388 30389 30390 30391 30392 30393 30394 30395 30396 30397 30398 30399 30400 30401 30402 30403 30404 30405 30406 30407 30408 30409 30410 30411 30412 30413 30414 30415 30416 30417 30418 30419 30420 30421 30422 30423 30424 30425 30426 30427 30428 30429 30430 30431 30432 30433 30434 30435 30436 30437 30438 30439 30440 30441 30442 30443 30444 30445 30446 30447 30448 30449 30450 30451 30452 30453 30454 30455 30456 30457 30458 30459 30460 30461 30462 30463 30464 30465 30466 30467 30468 30469 30470 30471 30472 30473 30474 30475 30476 30477 30478 30479 30480 30481 30482 30483 30484 30485 30486 30487 30488 30489 30490 30491 30492 30493 30494 30495 30496 30497 30498 30499 30500 30501 30502 30503 30504 30505 30506 30507 30508 30509 30510 30511 30512 30513 30514 30515 30516 30517 30518 30519 30520 30521 30522 30523 30524 30525 30526 30527 30528 30529 30530 30531 30532 30533 30534 30535 30536 30537 30538 30539 30540 30541 30542 30543 30544 30545 30546 30547 30548 30549 30550 30551 30552 30553 30554 30555 30556 30557 30558 30559 30560 30561 30562 30563 30564 30565 30566 30567 30568 30569 30570 30571 30572 30573 30574 30575 30576 30577 30578 30579 30580 30581 30582 30583 30584 30585 30586 30587 30588 30589 30590 30591 30592 30593 30594 30595 30596 30597 30598 30599 30600 30601 30602 30603 30604 30605 30606 30607 30608 30609 30610 30611 30612 30613 30614 30615 30616 30617 30618 30619 30620 30621 30622 30623 30624 30625 30626 30627 30628 30629 30630 30631 30632 30633 30634 30635 30636 30637 30638 30639 30640 30641 30642 30643 30644 30645 30646 30647 30648 30649 30650 30651 30652 30653 30654 30655 30656 30657 30658 30659 30660 30661 30662 30663 30664 30665 30666 30667 30668 30669 30670 30671 30672 30673 30674 30675 30676 30677 30678 30679 30680 30681 30682 30683 30684 30685 30686 30687 30688 30689 30690 30691 30692 30693 30694 30695 30696 30697 30698 30699 30700 30701 30702 30703 30704 30705 30706 30707 30708 30709 30710 30711 30712 30713 30714 30715 30716 30717 30718 30719 30720 30721 30722 30723 30724 30725 30726 30727 30728 30729 30730 30731 30732 30733 30734 30735 30736 30737 30738 30739 30740 30741 30742 30743 30744 30745 30746 30747 30748 30749 30750 30751 30752 30753 30754 30755 30756 30757 30758 30759 30760 30761 30762 30763 30764 30765 30766 30767 30768 30769 30770 30771 30772 30773 30774 30775 30776 30777 30778 30779 30780 30781 30782 30783 30784 30785 30786 30787 30788 30789 30790 30791 30792 30793 30794 30795 30796 30797 30798 30799 30800 30801 30802 30803 30804 30805 30806 30807 30808 30809 30810 30811 30812 30813 30814 30815 30816 30817 30818 30819 30820 30821 30822 30823 30824 30825 30826 30827 30828 30829 30830 30831 30832 30833 30834 30835 30836 30837 30838 30839 30840 30841 30842 30843 30844 30845 30846 30847 30848 30849 30850 30851 30852 30853 30854 30855 30856 30857 30858 30859 30860 30861 30862 30863 30864 30865 30866 30867 30868 30869 30870 30871 30872 30873 30874 30875 30876 30877 30878 30879 30880 30881 30882 30883 30884 30885 30886 30887 30888 30889 30890 30891 30892 30893 30894 30895 30896 30897 30898 30899 30900 30901 30902 30903 30904 30905 30906 30907 30908 30909 30910 30911 30912 30913 30914 30915 30916 30917 30918 30919 30920 30921 30922 30923 30924 30925 30926 30927 30928 30929 30930 30931 30932 30933 30934 30935 30936 30937 30938 30939 30940 30941 30942 30943 30944 30945 30946 30947 30948 30949 30950 30951 30952 30953 30954 30955 30956 30957 30958 30959 30960 30961 30962 30963 30964 30965 30966 30967 30968 30969 30970 30971 30972 30973 30974 30975 30976 30977 30978 30979 30980 30981 30982 30983 30984 30985 30986 30987 30988 30989 30990 30991 30992 30993 30994 30995 30996 30997 30998 30999 31000 31001 31002 31003 31004 31005 31006 31007 31008 31009 31010 31011 31012 31013 31014 31015 31016 31017 31018 31019 31020 31021 31022 31023 31024 31025 31026 31027 31028 31029 31030 31031 31032 31033 31034 31035 31036 31037 31038 31039 31040 31041 31042 31043 31044 31045 31046 31047 31048 31049 31050 31051 31052 31053 31054 31055 31056 31057 31058 31059 31060 31061 31062 31063 31064 31065 31066 31067 31068 31069 31070 31071 31072 31073 31074 31075 31076 31077 31078 31079 31080 31081 31082 31083 31084 31085 31086 31087 31088 31089 31090 31091 31092 31093 31094 31095 31096 31097 31098 31099 31100 31101 31102 31103 31104 31105 31106 31107 31108 31109 31110 31111 31112 31113 31114 31115 31116 31117 31118 31119 31120 31121 31122 31123 31124 31125 31126 31127 31128 31129 31130 31131 31132 31133 31134 31135 31136 31137 31138 31139 31140 31141 31142 31143 31144 31145 31146 31147 31148 31149 31150 31151 31152 31153 31154 31155 31156 31157 31158 31159 31160 31161 31162 31163 31164 31165 31166 31167 31168 31169 31170 31171 31172 31173 31174 31175 31176 31177 31178 31179 31180 31181 31182 31183 31184 31185 31186 31187 31188 31189 31190 31191 31192 31193 31194 31195 31196 31197 31198 31199 31200 31201 31202 31203 31204 31205 31206 31207 31208 31209 31210 31211 31212 31213 31214 31215 31216 31217 31218 31219 31220 31221 31222 31223 31224 31225 31226 31227 31228 31229 31230 31231 31232 31233 31234 31235 31236 31237 31238 31239 31240 31241 31242 31243 31244 31245 31246 31247 31248 31249 31250 31251 31252 31253 31254 31255 31256 31257 31258 31259 31260 31261 31262 31263 31264 31265 31266 31267 31268 31269 31270 31271 31272 31273 31274 31275 31276 31277 31278 31279 31280 31281 31282 31283 31284 31285 31286 31287 31288 31289 31290 31291 31292 31293 31294 31295 31296 31297 31298 31299 31300 31301 31302 31303 31304 31305 31306 31307 31308 31309 31310 31311 31312 31313 31314 31315 31316 31317 31318 31319 31320 31321 31322 31323 31324 31325 31326 31327 31328 31329 31330 31331 31332 31333 31334 31335 31336 31337 31338 31339 31340 31341 31342 31343 31344 31345 31346 31347 31348 31349 31350 31351 31352 31353 31354 31355 31356 31357 31358 31359 31360 31361 31362 31363 31364 31365 31366 31367 31368 31369 31370 31371 31372 31373 31374 31375 31376 31377 31378 31379 31380 31381 31382 31383 31384 31385 31386 31387 31388 31389 31390 31391 31392 31393 31394 31395 31396 31397 31398 31399 31400 31401 31402 31403 31404 31405 31406 31407 31408 31409 31410 31411 31412 31413 31414 31415 31416 31417 31418 31419 31420 31421 31422 31423 31424 31425 31426 31427 31428 31429 31430 31431 31432 31433 31434 31435 31436 31437 31438 31439 31440 31441 31442 31443 31444 31445 31446 31447 31448 31449 31450 31451 31452 31453 31454 31455 31456 31457 31458 31459 31460 31461 31462 31463 31464 31465 31466 31467 31468 31469 31470 31471 31472 31473 31474 31475 31476 31477 31478 31479 31480 31481 31482 31483 31484 31485 31486 31487 31488 31489 31490 31491 31492 31493 31494 31495 31496 31497 31498 31499 31500 31501 31502 31503 31504 31505 31506 31507 31508 31509 31510 31511 31512 31513 31514 31515 31516 31517 31518 31519 31520 31521 31522 31523 31524 31525 31526 31527 31528 31529 31530 31531 31532 31533 31534 31535 31536 31537 31538 31539 31540 31541 31542 31543 31544 31545 31546 31547 31548 31549 31550 31551 31552 31553 31554 31555 31556 31557 31558 31559 31560 31561 31562 31563 31564 31565 31566 31567 31568 31569 31570 31571 31572 31573 31574 31575 31576 31577 31578 31579 31580 31581 31582 31583 31584 31585 31586 31587 31588 31589 31590 31591 31592 31593 31594 31595 31596 31597 31598 31599 31600 31601 31602 31603 31604 31605 31606 31607 31608 31609 31610 31611 31612 31613 31614 31615 31616 31617 31618 31619 31620 31621 31622 31623 31624 31625 31626 31627 31628 31629 31630 31631 31632 31633 31634 31635 31636 31637 31638 31639 31640 31641 31642 31643 31644 31645 31646 31647 31648 31649 31650 31651 31652 31653 31654 31655 31656 31657 31658 31659 31660 31661 31662 31663 31664 31665 31666 31667 31668 31669 31670 31671 31672 31673 31674 31675 31676 31677 31678 31679 31680 31681 31682 31683 31684 31685 31686 31687 31688 31689 31690 31691 31692 31693 31694 31695 31696 31697 31698 31699 31700 31701 31702 31703 31704 31705 31706 31707 31708 31709 31710 31711 31712 31713 31714 31715 31716 31717 31718 31719 31720 31721 31722 31723 31724 31725 31726 31727 31728 31729 31730 31731 31732 31733 31734 31735 31736 31737 31738 31739 31740 31741 31742 31743 31744 31745 31746 31747 31748 31749 31750 31751 31752 31753 31754 31755 31756 31757 31758 31759 31760 31761 31762 31763 31764 31765 31766 31767 31768 31769 31770 31771 31772 31773 31774 31775 31776 31777 31778 31779 31780 31781 31782 31783 31784 31785 31786 31787 31788 31789 31790 31791 31792 31793 31794 31795 31796 31797 31798 31799 31800 31801 31802 31803 31804 31805 31806 31807 31808 31809 31810 31811 31812 31813 31814 31815 31816 31817 31818 31819 31820 31821 31822 31823 31824 31825 31826 31827 31828 31829 31830 31831 31832 31833 31834 31835 31836 31837 31838 31839 31840 31841 31842 31843 31844 31845 31846 31847 31848 31849 31850 31851 31852 31853 31854 31855 31856 31857 31858 31859 31860 31861 31862 31863 31864 31865 31866 31867 31868 31869 31870 31871 31872 31873 31874 31875 31876 31877 31878 31879 31880 31881 31882 31883 31884 31885 31886 31887 31888 31889 31890 31891 31892 31893 31894 31895 31896 31897 31898 31899 31900 31901 31902 31903 31904 31905 31906 31907 31908 31909 31910 31911 31912 31913 31914 31915 31916 31917 31918 31919 31920 31921 31922 31923 31924 31925 31926 31927 31928 31929 31930 31931 31932 31933 31934 31935 31936 31937 31938 31939 31940 31941 31942 31943 31944 31945 31946 31947 31948 31949 31950 31951 31952 31953 31954 31955 31956 31957 31958 31959 31960 31961 31962 31963 31964 31965 31966 31967 31968 31969 31970 31971 31972 31973 31974 31975 31976 31977 31978 31979 31980 31981 31982 31983 31984 31985 31986 31987 31988 31989 31990 31991 31992 31993 31994 31995 31996 31997 31998 31999 32000 32001 32002 32003 32004 32005 32006 32007 32008 32009 32010 32011 32012 32013 32014 32015 32016 32017 32018 32019 32020 32021 32022 32023 32024 32025 32026 32027 32028 32029 32030 32031 32032 32033 32034 32035 32036 32037 32038 32039 32040 32041 32042 32043 32044 32045 32046 32047 32048 32049 32050 32051 32052 32053 32054 32055 32056 32057 32058 32059 32060 32061 32062 32063 32064 32065 32066 32067 32068 32069 32070 32071 32072 32073 32074 32075 32076 32077 32078 32079 32080 32081 32082 32083 32084 32085 32086 32087 32088 32089 32090 32091 32092 32093 32094 32095 32096 32097 32098 32099 32100 32101 32102 32103 32104 32105 32106 32107 32108 32109 32110 32111 32112 32113 32114 32115 32116 32117 32118 32119 32120 32121 32122 32123 32124 32125 32126 32127 32128 32129 32130 32131 32132 32133 32134 32135 32136 32137 32138 32139 32140 32141 32142 32143 32144 32145 32146 32147 32148 32149 32150 32151 32152 32153 32154 32155 32156 32157 32158 32159 32160 32161 32162 32163 32164 32165 32166 32167 32168 32169 32170 32171 32172 32173 32174 32175 32176 32177 32178 32179 32180 32181 32182 32183 32184 32185 32186 32187 32188 32189 32190 32191 32192 32193 32194 32195 32196 32197 32198 32199 32200 32201 32202 32203 32204 32205 32206 32207 32208 32209 32210 32211 32212 32213 32214 32215 32216 32217 32218 32219 32220 32221 32222 32223 32224 32225 32226 32227 32228 32229 32230 32231 32232 32233 32234 32235 32236 32237 32238 32239 32240 32241 32242 32243 32244 32245 32246 32247 32248 32249 32250 32251 32252 32253 32254 32255 32256 32257 32258 32259 32260 32261 32262 32263 32264 32265 32266 32267 32268 32269 32270 32271 32272 32273 32274 32275 32276 32277 32278 32279 32280 32281 32282 32283 32284 32285 32286 32287 32288 32289 32290 32291 32292 32293 32294 32295 32296 32297 32298 32299 32300 32301 32302 32303 32304 32305 32306 32307 32308 32309 32310 32311 32312 32313 32314 32315 32316 32317 32318 32319 32320 32321 32322 32323 32324 32325 32326 32327 32328 32329 32330 32331 32332 32333 32334 32335 32336 32337 32338 32339 32340 32341 32342 32343 32344 32345 32346 32347 32348 32349 32350 32351 32352 32353 32354 32355 32356 32357 32358 32359 32360 32361 32362 32363 32364 32365 32366 32367 32368 32369 32370 32371 32372 32373 32374 32375 32376 32377 32378 32379 32380 32381 32382 32383 32384 32385 32386 32387 32388 32389 32390 32391 32392 32393 32394 32395 32396 32397 32398 32399 32400 32401 32402 32403 32404 32405 32406 32407 32408 32409 32410 32411 32412 32413 32414 32415 32416 32417 32418 32419 32420 32421 32422 32423 32424 32425 32426 32427 32428 32429 32430 32431 32432 32433 32434 32435 32436 32437 32438 32439 32440 32441 32442 32443 32444 32445 32446 32447 32448 32449 32450 32451 32452 32453 32454 32455 32456 32457 32458 32459 32460 32461 32462 32463 32464 32465 32466 32467 32468 32469 32470 32471 32472 32473 32474 32475 32476 32477 32478 32479 32480 32481 32482 32483 32484 32485 32486 32487 32488 32489 32490 32491 32492 32493 32494 32495 32496 32497 32498 32499 32500 32501 32502 32503 32504 32505 32506 32507 32508 32509 32510 32511 32512 32513 32514 32515 32516 32517 32518 32519 32520 32521 32522 32523 32524 32525 32526 32527 32528 32529 32530 32531 32532 32533 32534 32535 32536 32537 32538 32539 32540 32541 32542 32543 32544 32545 32546 32547 32548 32549 32550 32551 32552 32553 32554 32555 32556 32557 32558 32559 32560 32561 32562 32563 32564 32565 32566 32567 32568 32569 32570 32571 32572 32573 32574 32575 32576 32577 32578 32579 32580 32581 32582 32583 32584 32585 32586 32587 32588 32589 32590 32591 32592 32593 32594 32595 32596 32597 32598 32599 32600 32601 32602 32603 32604 32605 32606 32607 32608 32609 32610 32611 32612 32613 32614 32615 32616 32617 32618 32619 32620 32621 32622 32623 32624 32625 32626 32627 32628 32629 32630 32631 32632 32633 32634 32635 32636 32637 32638 32639 32640 32641 32642 32643 32644 32645 32646 32647 32648 32649 32650 32651 32652 32653 32654 32655 32656 32657 32658 32659 32660 32661 32662 32663 32664 32665 32666 32667 32668 32669 32670 32671 32672 32673 32674 32675 32676 32677 32678 32679 32680 32681 32682 32683 32684 32685 32686 32687 32688 32689 32690 32691 32692 32693 32694 32695 32696 32697 32698 32699 32700 32701 32702 32703 32704 32705 32706 32707 32708 32709 32710 32711 32712 32713 32714 32715 32716 32717 32718 32719 32720 32721 32722 32723 32724 32725 32726 32727 32728 32729 32730 32731 32732 32733 32734 32735 32736 32737 32738 32739 32740 32741 32742 32743 32744 32745 32746 32747 32748 32749 32750 32751 32752 32753 32754 32755 32756 32757 32758 32759 32760 32761 32762 32763 32764 32765 32766 32767 32768 32769 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779 32780 32781 32782 32783 32784 32785 32786 32787 32788 32789 32790 32791 32792 32793 32794 32795 32796 32797 32798 32799 32800 32801 32802 32803 32804 32805 32806 32807 32808 32809 32810 32811 32812 32813 32814 32815 32816 32817 32818 32819 32820 32821 32822 32823 32824 32825 32826 32827 32828 32829 32830 32831 32832 32833 32834 32835 32836 32837 32838 32839 32840 32841 32842 32843 32844 32845 32846 32847 32848 32849 32850 32851 32852 32853 32854 32855 32856 32857 32858 32859 32860 32861 32862 32863 32864 32865 32866 32867 32868 32869 32870 32871 32872 32873 32874 32875 32876 32877 32878 32879 32880 32881 32882 32883 32884 32885 32886 32887 32888 32889 32890 32891 32892 32893 32894 32895 32896 32897 32898 32899 32900 32901 32902 32903 32904 32905 32906 32907 32908 32909 32910 32911 32912 32913 32914 32915 32916 32917 32918 32919 32920 32921 32922 32923 32924 32925 32926 32927 32928 32929 32930 32931 32932 32933 32934 32935 32936 32937 32938 32939 32940 32941 32942 32943 32944 32945 32946 32947 32948 32949 32950 32951 32952 32953 32954 32955 32956 32957 32958 32959 32960 32961 32962 32963 32964 32965 32966 32967 32968 32969 32970 32971 32972 32973 32974 32975 32976 32977 32978 32979 32980 32981 32982 32983 32984 32985 32986 32987 32988 32989 32990 32991 32992 32993 32994 32995 32996 32997 32998 32999 33000 33001 33002 33003 33004 33005 33006 33007 33008 33009 33010 33011 33012 33013 33014 33015 33016 33017 33018 33019 33020 33021 33022 33023 33024 33025 33026 33027 33028 33029 33030 33031 33032 33033 33034 33035 33036 33037 33038 33039 33040 33041 33042 33043 33044 33045 33046 33047 33048 33049 33050 33051 33052 33053 33054 33055 33056 33057 33058 33059 33060 33061 33062 33063 33064 33065 33066 33067 33068 33069 33070 33071 33072 33073 33074 33075 33076 33077 33078 33079 33080 33081 33082 33083 33084 33085 33086 33087 33088 33089 33090 33091 33092 33093 33094 33095 33096 33097 33098 33099 33100 33101 33102 33103 33104 33105 33106 33107 33108 33109 33110 33111 33112 33113 33114 33115 33116 33117 33118 33119 33120 33121 33122 33123 33124 33125 33126 33127 33128 33129 33130 33131 33132 33133 33134 33135 33136 33137 33138 33139 33140 33141 33142 33143 33144 33145 33146 33147 33148 33149 33150 33151 33152 33153 33154 33155 33156 33157 33158 33159 33160 33161 33162 33163 33164 33165 33166 33167 33168 33169 33170 33171 33172 33173 33174 33175 33176 33177 33178 33179 33180 33181 33182 33183 33184 33185 33186 33187 33188 33189 33190 33191 33192 33193 33194 33195 33196 33197 33198 33199 33200 33201 33202 33203 33204 33205 33206 33207 33208 33209 33210 33211 33212 33213 33214 33215 33216 33217 33218 33219 33220 33221 33222 33223 33224 33225 33226 33227 33228 33229 33230 33231 33232 33233 33234 33235 33236 33237 33238 33239 33240 33241 33242 33243 33244 33245 33246 33247 33248 33249 33250 33251 33252 33253 33254 33255 33256 33257 33258 33259 33260 33261 33262 33263 33264 33265 33266 33267 33268 33269 33270 33271 33272 33273 33274 33275 33276 33277 33278 33279 33280 33281 33282 33283 33284 33285 33286 33287 33288 33289 33290 33291 33292 33293 33294 33295 33296 33297 33298 33299 33300 33301 33302 33303 33304 33305 33306 33307 33308 33309 33310 33311 33312 33313 33314 33315 33316 33317 33318 33319 33320 33321 33322 33323 33324 33325 33326 33327 33328 33329 33330 33331 33332 33333 33334 33335 33336 33337 33338 33339 33340 33341 33342 33343 33344 33345 33346 33347 33348 33349 33350 33351 33352 33353 33354 33355 33356 33357 33358 33359 33360 33361 33362 33363 33364 33365 33366 33367 33368 33369 33370 33371 33372 33373 33374 33375 33376 33377 33378 33379 33380 33381 33382 33383 33384 33385 33386 33387 33388 33389 33390 33391 33392 33393 33394 33395 33396 33397 33398 33399 33400 33401 33402 33403 33404 33405 33406 33407 33408 33409 33410 33411 33412 33413 33414 33415 33416 33417 33418 33419 33420 33421 33422 33423 33424 33425 33426 33427 33428 33429 33430 33431 33432 33433 33434 33435 33436 33437 33438 33439 33440 33441 33442 33443 33444 33445 33446 33447 33448 33449 33450 33451 33452 33453 33454 33455 33456 33457 33458 33459 33460 33461 33462 33463 33464 33465 33466 33467 33468 33469 33470 33471 33472 33473 33474 33475 33476 33477 33478 33479 33480 33481 33482 33483 33484 33485 33486 33487 33488 33489 33490 33491 33492 33493 33494 33495 33496 33497 33498 33499 33500 33501 33502 33503 33504 33505 33506 33507 33508 33509 33510 33511 33512 33513 33514 33515 33516 33517 33518 33519 33520 33521 33522 33523 33524 33525 33526 33527 33528 33529 33530 33531 33532 33533 33534 33535 33536 33537 33538 33539 33540 33541 33542 33543 33544 33545 33546 33547 33548 33549 33550 33551 33552 33553 33554 33555 33556 33557 33558 33559 33560 33561 33562 33563 33564 33565 33566 33567 33568 33569 33570 33571 33572 33573 33574 33575 33576 33577 33578 33579 33580 33581 33582 33583 33584 33585 33586 33587 33588 33589 33590 33591 33592 33593 33594 33595 33596 33597 33598 33599 33600 33601 33602 33603 33604 33605 33606 33607 33608 33609 33610 33611 33612 33613 33614 33615 33616 33617 33618 33619 33620 33621 33622 33623 33624 33625 33626 33627 33628 33629 33630 33631 33632 33633 33634 33635 33636 33637 33638 33639 33640 33641 33642 33643 33644 33645 33646 33647 33648 33649 33650 33651 33652 33653 33654 33655 33656 33657 33658 33659 33660 33661 33662 33663 33664 33665 33666 33667 33668 33669 33670 33671 33672 33673 33674 33675 33676 33677 33678 33679 33680 33681 33682 33683 33684 33685 33686 33687 33688 33689 33690 33691 33692 33693 33694 33695 33696 33697 33698 33699 33700 33701 33702 33703 33704 33705 33706 33707 33708 33709 33710 33711 33712 33713 33714 33715 33716 33717 33718 33719 33720 33721 33722 33723 33724 33725 33726 33727 33728 33729 33730 33731 33732 33733 33734 33735 33736 33737 33738 33739 33740 33741 33742 33743 33744 33745 33746 33747 33748 33749 33750 33751 33752 33753 33754 33755 33756 33757 33758 33759 33760 33761 33762 33763 33764 33765 33766 33767 33768 33769 33770 33771 33772 33773 33774 33775 33776 33777 33778 33779 33780 33781 33782 33783 33784 33785 33786 33787 33788 33789 33790 33791 33792 33793 33794 33795 33796 33797 33798 33799 33800 33801 33802 33803 33804 33805 33806 33807 33808 33809 33810 33811 33812 33813 33814 33815 33816 33817 33818 33819 33820 33821 33822 33823 33824 33825 33826 33827 33828 33829 33830 33831 33832 33833 33834 33835 33836 33837 33838 33839 33840 33841 33842 33843 33844 33845 33846 33847 33848 33849 33850 33851 33852 33853 33854 33855 33856 33857 33858 33859 33860 33861 33862 33863 33864 33865 33866 33867 33868 33869 33870 33871 33872 33873 33874 33875 33876 33877 33878 33879 33880 33881 33882 33883 33884 33885 33886 33887 33888 33889 33890 33891 33892 33893 33894 33895 33896 33897 33898 33899 33900 33901 33902 33903 33904 33905 33906 33907 33908 33909 33910 33911 33912 33913 33914 33915 33916 33917 33918 33919 33920 33921 33922 33923 33924 33925 33926 33927 33928 33929 33930 33931 33932 33933 33934 33935 33936 33937 33938 33939 33940 33941 33942 33943 33944 33945 33946 33947 33948 33949 33950 33951 33952 33953 33954 33955 33956 33957 33958 33959 33960 33961 33962 33963 33964 33965 33966 33967 33968 33969 33970 33971 33972 33973 33974 33975 33976 33977 33978 33979 33980 33981 33982 33983 33984 33985 33986 33987 33988 33989 33990 33991 33992 33993 33994 33995 33996 33997 33998 33999 34000 34001 34002 34003 34004 34005 34006 34007 34008 34009 34010 34011 34012 34013 34014 34015 34016 34017 34018 34019 34020 34021 34022 34023 34024 34025 34026 34027 34028 34029 34030 34031 34032 34033 34034 34035 34036 34037 34038 34039 34040 34041 34042 34043 34044 34045 34046 34047 34048 34049 34050 34051 34052 34053 34054 34055 34056 34057 34058 34059 34060 34061 34062 34063 34064 34065 34066 34067 34068 34069 34070 34071 34072 34073 34074 34075 34076 34077 34078 34079 34080 34081 34082 34083 34084 34085 34086 34087 34088 34089 34090 34091 34092 34093 34094 34095 34096 34097 34098 34099 34100 34101 34102 34103 34104 34105 34106 34107 34108 34109 34110 34111 34112 34113 34114 34115 34116 34117 34118 34119 34120 34121 34122 34123 34124 34125 34126 34127 34128 34129 34130 34131 34132 34133 34134 34135 34136 34137 34138 34139 34140 34141 34142 34143 34144 34145 34146 34147 34148 34149 34150 34151 34152 34153 34154 34155 34156 34157 34158 34159 34160 34161 34162 34163 34164 34165 34166 34167 34168 34169 34170 34171 34172 34173 34174 34175 34176 34177 34178 34179 34180 34181 34182 34183 34184 34185 34186 34187 34188 34189 34190 34191 34192 34193 34194 34195 34196 34197 34198 34199 34200 34201 34202 34203 34204 34205 34206 34207 34208 34209 34210 34211 34212 34213 34214 34215 34216 34217 34218 34219 34220 34221 34222 34223 34224 34225 34226 34227 34228 34229 34230 34231 34232 34233 34234 34235 34236 34237 34238 34239 34240 34241 34242 34243 34244 34245 34246 34247 34248 34249 34250 34251 34252 34253 34254 34255 34256 34257 34258 34259 34260 34261 34262 34263 34264 34265 34266 34267 34268 34269 34270 34271 34272 34273 34274 34275 34276 34277 34278 34279 34280 34281 34282 34283 34284 34285 34286 34287 34288 34289 34290 34291 34292 34293 34294 34295 34296 34297 34298 34299 34300 34301 34302 34303 34304 34305 34306 34307 34308 34309 34310 34311 34312 34313 34314 34315 34316 34317 34318 34319 34320 34321 34322 34323 34324 34325 34326 34327 34328 34329 34330 34331 34332 34333 34334 34335 34336 34337 34338 34339 34340 34341 34342 34343 34344 34345 34346 34347 34348 34349 34350 34351 34352 34353 34354 34355 34356 34357 34358 34359 34360 34361 34362 34363 34364 34365 34366 34367 34368 34369 34370 34371 34372 34373 34374 34375 34376 34377 34378 34379 34380 34381 34382 34383 34384 34385 34386 34387 34388 34389 34390 34391 34392 34393 34394 34395 34396 34397 34398 34399 34400 34401 34402 34403 34404 34405 34406 34407 34408 34409 34410 34411 34412 34413 34414 34415 34416 34417 34418 34419 34420 34421 34422 34423 34424 34425 34426 34427 34428 34429 34430 34431 34432 34433 34434 34435 34436 34437 34438 34439 34440 34441 34442 34443 34444 34445 34446 34447 34448 34449 34450 34451 34452 34453 34454 34455 34456 34457 34458 34459 34460 34461 34462 34463 34464 34465 34466 34467 34468 34469 34470 34471 34472 34473 34474 34475 34476 34477 34478 34479 34480 34481 34482 34483 34484 34485 34486 34487 34488 34489 34490 34491 34492 34493 34494 34495 34496 34497 34498 34499 34500 34501 34502 34503 34504 34505 34506 34507 34508 34509 34510 34511 34512 34513 34514 34515 34516 34517 34518 34519 34520 34521 34522 34523 34524 34525 34526 34527 34528 34529 34530 34531 34532 34533 34534 34535 34536 34537 34538 34539 34540 34541 34542 34543 34544 34545 34546 34547 34548 34549 34550 34551 34552 34553 34554 34555 34556 34557 34558 34559 34560 34561 34562 34563 34564 34565 34566 34567 34568 34569 34570 34571 34572 34573 34574 34575 34576 34577 34578 34579 34580 34581 34582 34583 34584 34585 34586 34587 34588 34589 34590 34591 34592 34593 34594 34595 34596 34597 34598 34599 34600 34601 34602 34603 34604 34605 34606 34607 34608 34609 34610 34611 34612 34613 34614 34615 34616 34617 34618 34619 34620 34621 34622 34623 34624 34625 34626 34627 34628 34629 34630 34631 34632 34633 34634 34635 34636 34637 34638 34639 34640 34641 34642 34643 34644 34645 34646 34647 34648 34649 34650 34651 34652 34653 34654 34655 34656 34657 34658 34659 34660 34661 34662 34663 34664 34665 34666 34667 34668 34669 34670 34671 34672 34673 34674 34675 34676 34677 34678 34679 34680 34681 34682 34683 34684 34685 34686 34687 34688 34689 34690 34691 34692 34693 34694 34695 34696 34697 34698 34699 34700 34701 34702 34703 34704 34705 34706 34707 34708 34709 34710 34711 34712 34713 34714 34715 34716 34717 34718 34719 34720 34721 34722 34723 34724 34725 34726 34727 34728 34729 34730 34731 34732 34733 34734 34735 34736 34737 34738 34739 34740 34741 34742 34743 34744 34745 34746 34747 34748 34749 34750 34751 34752 34753 34754 34755 34756 34757 34758 34759 34760 34761 34762 34763 34764 34765 34766 34767 34768 34769 34770 34771 34772 34773 34774 34775 34776 34777 34778 34779 34780 34781 34782 34783 34784 34785 34786 34787 34788 34789 34790 34791 34792 34793 34794 34795 34796 34797 34798 34799 34800 34801 34802 34803 34804 34805 34806 34807 34808 34809 34810 34811 34812 34813 34814 34815 34816 34817 34818 34819 34820 34821 34822 34823 34824 34825 34826 34827 34828 34829 34830 34831 34832 34833 34834 34835 34836 34837 34838 34839 34840 34841 34842 34843 34844 34845 34846 34847 34848 34849 34850 34851 34852 34853 34854 34855 34856 34857 34858 34859 34860 34861 34862 34863 34864 34865 34866 34867 34868 34869 34870 34871 34872 34873 34874 34875 34876 34877 34878 34879 34880 34881 34882 34883 34884 34885 34886 34887 34888 34889 34890 34891 34892 34893 34894 34895 34896 34897 34898 34899 34900 34901 34902 34903 34904 34905 34906 34907 34908 34909 34910 34911 34912 34913 34914 34915 34916 34917 34918 34919 34920 34921 34922 34923 34924 34925 34926 34927 34928 34929 34930 34931 34932 34933 34934 34935 34936 34937 34938 34939 34940 34941 34942 34943 34944 34945 34946 34947 34948 34949 34950 34951 34952 34953 34954 34955 34956 34957 34958 34959 34960 34961 34962 34963 34964 34965 34966 34967 34968 34969 34970 34971 34972 34973 34974 34975 34976 34977 34978 34979 34980 34981 34982 34983 34984 34985 34986 34987 34988 34989 34990 34991 34992 34993 34994 34995 34996 34997 34998 34999 35000 35001 35002 35003 35004 35005 35006 35007 35008 35009 35010 35011 35012 35013 35014 35015 35016 35017 35018 35019 35020 35021 35022 35023 35024 35025 35026 35027 35028 35029 35030 35031 35032 35033 35034 35035 35036 35037 35038 35039 35040 35041 35042 35043 35044 35045 35046 35047 35048 35049 35050 35051 35052 35053 35054 35055 35056 35057 35058 35059 35060 35061 35062 35063 35064 35065 35066 35067 35068 35069 35070 35071 35072 35073 35074 35075 35076 35077 35078 35079 35080 35081 35082 35083 35084 35085 35086 35087 35088 35089 35090 35091 35092 35093 35094 35095 35096 35097 35098 35099 35100 35101 35102 35103 35104 35105 35106 35107 35108 35109 35110 35111 35112 35113 35114 35115 35116 35117 35118 35119 35120 35121 35122 35123 35124 35125 35126 35127 35128 35129 35130 35131 35132 35133 35134 35135 35136 35137 35138 35139 35140 35141 35142 35143 35144 35145 35146 35147 35148 35149 35150 35151 35152 35153 35154 35155 35156 35157 35158 35159 35160 35161 35162 35163 35164 35165 35166 35167 35168 35169 35170 35171 35172 35173 35174 35175 35176 35177 35178 35179 35180 35181 35182 35183 35184 35185 35186 35187 35188 35189 35190 35191 35192 35193 35194 35195 35196 35197 35198 35199 35200 35201 35202 35203 35204 35205 35206 35207 35208 35209 35210 35211 35212 35213 35214 35215 35216 35217 35218 35219 35220 35221 35222 35223 35224 35225 35226 35227 35228 35229 35230 35231 35232 35233 35234 35235 35236 35237 35238 35239 35240 35241 35242 35243 35244 35245 35246 35247 35248 35249 35250 35251 35252 35253 35254 35255 35256 35257 35258 35259 35260 35261 35262 35263 35264 35265 35266 35267 35268 35269 35270 35271 35272 35273 35274 35275 35276 35277 35278 35279 35280 35281 35282 35283 35284 35285 35286 35287 35288 35289 35290 35291 35292 35293 35294 35295 35296 35297 35298 35299 35300 35301 35302 35303 35304 35305 35306 35307 35308 35309 35310 35311 35312 35313 35314 35315 35316 35317 35318 35319 35320 35321 35322 35323 35324 35325 35326 35327 35328 35329 35330 35331 35332 35333 35334 35335 35336 35337 35338 35339 35340 35341 35342 35343 35344 35345 35346 35347 35348 35349 35350 35351 35352 35353 35354 35355 35356 35357 35358 35359 35360 35361 35362 35363 35364 35365 35366 35367 35368 35369 35370 35371 35372 35373 35374 35375 35376 35377 35378 35379 35380 35381 35382 35383 35384 35385 35386 35387 35388 35389 35390 35391 35392 35393 35394 35395 35396 35397 35398 35399 35400 35401 35402 35403 35404 35405 35406 35407 35408 35409 35410 35411 35412 35413 35414 35415 35416 35417 35418 35419 35420 35421 35422 35423 35424 35425 35426 35427 35428 35429 35430 35431 35432 35433 35434 35435 35436 35437 35438 35439 35440 35441 35442 35443 35444 35445 35446 35447 35448 35449 35450 35451 35452 35453 35454 35455 35456 35457 35458 35459 35460 35461 35462 35463 35464 35465 35466 35467 35468 35469 35470 35471 35472 35473 35474 35475 35476 35477 35478 35479 35480 35481 35482 35483 35484 35485 35486 35487 35488 35489 35490 35491 35492 35493 35494 35495 35496 35497 35498 35499 35500 35501 35502 35503 35504 35505 35506 35507 35508 35509 35510 35511 35512 35513 35514 35515 35516 35517 35518 35519 35520 35521 35522 35523 35524 35525 35526 35527 35528 35529 35530 35531 35532 35533 35534 35535 35536 35537 35538 35539 35540 35541 35542 35543 35544 35545 35546 35547 35548 35549 35550 35551 35552 35553 35554 35555 35556 35557 35558 35559 35560 35561 35562 35563 35564 35565 35566 35567 35568 35569 35570 35571 35572 35573 35574 35575 35576 35577 35578 35579 35580 35581 35582 35583 35584 35585 35586 35587 35588 35589 35590 35591 35592 35593 35594 35595 35596 35597 35598 35599 35600 35601 35602 35603 35604 35605 35606 35607 35608 35609 35610 35611 35612 35613 35614 35615 35616 35617 35618 35619 35620 35621 35622 35623 35624 35625 35626 35627 35628 35629 35630 35631 35632 35633 35634 35635 35636 35637 35638 35639 35640 35641 35642 35643 35644 35645 35646 35647 35648 35649 35650 35651 35652 35653 35654 35655 35656 35657 35658 35659 35660 35661 35662 35663 35664 35665 35666 35667 35668 35669 35670 35671 35672 35673 35674 35675 35676 35677 35678 35679 35680 35681 35682 35683 35684 35685 35686 35687 35688 35689 35690 35691 35692 35693 35694 35695 35696 35697 35698 35699 35700 35701 35702 35703 35704 35705 35706 35707 35708 35709 35710 35711 35712 35713 35714 35715 35716 35717 35718 35719 35720 35721 35722 35723 35724 35725 35726 35727 35728 35729 35730 35731 35732 35733 35734 35735 35736 35737 35738 35739 35740 35741 35742 35743 35744 35745 35746 35747 35748 35749 35750 35751 35752 35753 35754 35755 35756 35757 35758 35759 35760 35761 35762 35763 35764 35765 35766 35767 35768 35769 35770 35771 35772 35773 35774 35775 35776 35777 35778 35779 35780 35781 35782 35783 35784 35785 35786 35787 35788 35789 35790 35791 35792 35793 35794 35795 35796 35797 35798 35799 35800 35801 35802 35803 35804 35805 35806 35807 35808 35809 35810 35811 35812 35813 35814 35815 35816 35817 35818 35819 35820 35821 35822 35823 35824 35825 35826 35827 35828 35829 35830 35831 35832 35833 35834 35835 35836 35837 35838 35839 35840 35841 35842 35843 35844 35845 35846 35847 35848 35849 35850 35851 35852 35853 35854 35855 35856 35857 35858 35859 35860 35861 35862 35863 35864 35865 35866 35867 35868 35869 35870 35871 35872 35873 35874 35875 35876 35877 35878 35879 35880 35881 35882 35883 35884 35885 35886 35887 35888 35889 35890 35891 35892 35893 35894 35895 35896 35897 35898 35899 35900 35901 35902 35903 35904 35905 35906 35907 35908 35909 35910 35911 35912 35913 35914 35915 35916 35917 35918 35919 35920 35921 35922 35923 35924 35925 35926 35927 35928 35929 35930 35931 35932 35933 35934 35935 35936 35937 35938 35939 35940 35941 35942 35943 35944 35945 35946 35947 35948 35949 35950 35951 35952 35953 35954 35955 35956 35957 35958 35959 35960 35961 35962 35963 35964 35965 35966 35967 35968 35969 35970 35971 35972 35973 35974 35975 35976 35977 35978 35979 35980 35981 35982 35983 35984 35985 35986 35987 35988 35989 35990 35991 35992 35993 35994 35995 35996 35997 35998 35999 36000 36001 36002 36003 36004 36005 36006 36007 36008 36009 36010 36011 36012 36013 36014 36015 36016 36017 36018 36019 36020 36021 36022 36023 36024 36025 36026 36027 36028 36029 36030 36031 36032 36033 36034 36035 36036 36037 36038 36039 36040 36041 36042 36043 36044 36045 36046 36047 36048 36049 36050 36051 36052 36053 36054 36055 36056 36057 36058 36059 36060 36061 36062 36063 36064 36065 36066 36067 36068 36069 36070 36071 36072 36073 36074 36075 36076 36077 36078 36079 36080 36081 36082 36083 36084 36085 36086 36087 36088 36089 36090 36091 36092 36093 36094 36095 36096 36097 36098 36099 36100 36101 36102 36103 36104 36105 36106 36107 36108 36109 36110 36111 36112 36113 36114 36115 36116 36117 36118 36119 36120 36121 36122 36123 36124 36125 36126 36127 36128 36129 36130 36131 36132 36133 36134 36135 36136 36137 36138 36139 36140 36141 36142 36143 36144 36145 36146 36147 36148 36149 36150 36151 36152 36153 36154 36155 36156 36157 36158 36159 36160 36161 36162 36163 36164 36165 36166 36167 36168 36169 36170 36171 36172 36173 36174 36175 36176 36177 36178 36179 36180 36181 36182 36183 36184 36185 36186 36187 36188 36189 36190 36191 36192 36193 36194 36195 36196 36197 36198 36199 36200 36201 36202 36203 36204 36205 36206 36207 36208 36209 36210 36211 36212 36213 36214 36215 36216 36217 36218 36219 36220 36221 36222 36223 36224 36225 36226 36227 36228 36229 36230 36231 36232 36233 36234 36235 36236 36237 36238 36239 36240 36241 36242 36243 36244 36245 36246 36247 36248 36249 36250 36251 36252 36253 36254 36255 36256 36257 36258 36259 36260 36261 36262 36263 36264 36265 36266 36267 36268 36269 36270 36271 36272 36273 36274 36275 36276 36277 36278 36279 36280 36281 36282 36283 36284 36285 36286 36287 36288 36289 36290 36291 36292 36293 36294 36295 36296 36297 36298 36299 36300 36301 36302 36303 36304 36305 36306 36307 36308 36309 36310 36311 36312 36313 36314 36315 36316 36317 36318 36319 36320 36321 36322 36323 36324 36325 36326 36327 36328 36329 36330 36331 36332 36333 36334 36335 36336 36337 36338 36339 36340 36341 36342 36343 36344 36345 36346 36347 36348 36349 36350 36351 36352 36353 36354 36355 36356 36357 36358 36359 36360 36361 36362 36363 36364 36365 36366 36367 36368 36369 36370 36371 36372 36373 36374 36375 36376 36377 36378 36379 36380 36381 36382 36383 36384 36385 36386 36387 36388 36389 36390 36391 36392 36393 36394 36395 36396 36397 36398 36399 36400 36401 36402 36403 36404 36405 36406 36407 36408 36409 36410 36411 36412 36413 36414 36415 36416 36417 36418 36419 36420 36421 36422 36423 36424 36425 36426 36427 36428 36429 36430 36431 36432 36433 36434 36435 36436 36437 36438 36439 36440 36441 36442 36443 36444 36445 36446 36447 36448 36449 36450 36451 36452 36453 36454 36455 36456 36457 36458 36459 36460 36461 36462 36463 36464 36465 36466 36467 36468 36469 36470 36471 36472 36473 36474 36475 36476 36477 36478 36479 36480 36481 36482 36483 36484 36485 36486 36487 36488 36489 36490 36491 36492 36493 36494 36495 36496 36497 36498 36499 36500 36501 36502 36503 36504 36505 36506 36507 36508 36509 36510 36511 36512 36513 36514 36515 36516 36517 36518 36519 36520 36521 36522 36523 36524 36525 36526 36527 36528 36529 36530 36531 36532 36533 36534 36535 36536 36537 36538 36539 36540 36541 36542 36543 36544 36545 36546 36547 36548 36549 36550 36551 36552 36553 36554 36555 36556 36557 36558 36559 36560 36561 36562 36563 36564 36565 36566 36567 36568 36569 36570 36571 36572 36573 36574 36575 36576 36577 36578 36579 36580 36581 36582 36583 36584 36585 36586 36587 36588 36589 36590 36591 36592 36593 36594 36595 36596 36597 36598 36599 36600 36601 36602 36603 36604 36605 36606 36607 36608 36609 36610 36611 36612 36613 36614 36615 36616 36617 36618 36619 36620 36621 36622 36623 36624 36625 36626 36627 36628 36629 36630 36631 36632 36633 36634 36635 36636 36637 36638 36639 36640 36641 36642 36643 36644 36645 36646 36647 36648 36649 36650 36651 36652 36653 36654 36655 36656 36657 36658 36659 36660 36661 36662 36663 36664 36665 36666 36667 36668 36669 36670 36671 36672 36673 36674 36675 36676 36677 36678 36679 36680 36681 36682 36683 36684 36685 36686 36687 36688 36689 36690 36691 36692 36693 36694 36695 36696 36697 36698 36699 36700 36701 36702 36703 36704 36705 36706 36707 36708 36709 36710 36711 36712 36713 36714 36715 36716 36717 36718 36719 36720 36721 36722 36723 36724 36725 36726 36727 36728 36729 36730 36731 36732 36733 36734 36735 36736 36737 36738 36739 36740 36741 36742 36743 36744 36745 36746 36747 36748 36749 36750 36751 36752 36753 36754 36755 36756 36757 36758 36759 36760 36761 36762 36763 36764 36765 36766 36767 36768 36769 36770 36771 36772 36773 36774 36775 36776 36777 36778 36779 36780 36781 36782 36783 36784 36785 36786 36787 36788 36789 36790 36791 36792 36793 36794 36795 36796 36797 36798 36799 36800 36801 36802 36803 36804 36805 36806 36807 36808 36809 36810 36811 36812 36813 36814 36815 36816 36817 36818 36819 36820 36821 36822 36823 36824 36825 36826 36827 36828 36829 36830 36831 36832 36833 36834 36835 36836 36837 36838 36839 36840 36841 36842 36843 36844 36845 36846 36847 36848 36849 36850 36851 36852 36853 36854 36855 36856 36857 36858 36859 36860 36861 36862 36863 36864 36865 36866 36867 36868 36869 36870 36871 36872 36873 36874 36875 36876 36877 36878 36879 36880 36881 36882 36883 36884 36885 36886 36887 36888 36889 36890 36891 36892 36893 36894 36895 36896 36897 36898 36899 36900 36901 36902 36903 36904 36905 36906 36907 36908 36909 36910 36911 36912 36913 36914 36915 36916 36917 36918 36919 36920 36921 36922 36923 36924 36925 36926 36927 36928 36929 36930 36931 36932 36933 36934 36935 36936 36937 36938 36939 36940 36941 36942 36943 36944 36945 36946 36947 36948 36949 36950 36951 36952 36953 36954 36955 36956 36957 36958 36959 36960 36961 36962 36963 36964 36965 36966 36967 36968 36969 36970 36971 36972 36973 36974 36975 36976 36977 36978 36979 36980 36981 36982 36983 36984 36985 36986 36987 36988 36989 36990 36991 36992 36993 36994 36995 36996 36997 36998 36999 37000 37001 37002 37003 37004 37005 37006 37007 37008 37009 37010 37011 37012 37013 37014 37015 37016 37017 37018 37019 37020 37021 37022 37023 37024 37025 37026 37027 37028 37029 37030 37031 37032 37033 37034 37035 37036 37037 37038 37039 37040 37041 37042 37043 37044 37045 37046 37047 37048 37049 37050 37051 37052 37053 37054 37055 37056 37057 37058 37059 37060 37061 37062 37063 37064 37065 37066 37067 37068 37069 37070 37071 37072 37073 37074 37075 37076 37077 37078 37079 37080 37081 37082 37083 37084 37085 37086 37087 37088 37089 37090 37091 37092 37093 37094 37095 37096 37097 37098 37099 37100 37101 37102 37103 37104 37105 37106 37107 37108 37109 37110 37111 37112 37113 37114 37115 37116 37117 37118 37119 37120 37121 37122 37123 37124 37125 37126 37127 37128 37129 37130 37131 37132 37133 37134 37135 37136 37137 37138 37139 37140 37141 37142 37143 37144 37145 37146 37147 37148 37149 37150 37151 37152 37153 37154 37155 37156 37157 37158 37159 37160 37161 37162 37163 37164 37165 37166 37167 37168 37169 37170 37171 37172 37173 37174 37175 37176 37177 37178 37179 37180 37181 37182 37183 37184 37185 37186 37187 37188 37189 37190 37191 37192 37193 37194 37195 37196 37197 37198 37199 37200 37201 37202 37203 37204 37205 37206 37207 37208 37209 37210 37211 37212 37213 37214 37215 37216 37217 37218 37219 37220 37221 37222 37223 37224 37225 37226 37227 37228 37229 37230 37231 37232 37233 37234 37235 37236 37237 37238 37239 37240 37241 37242 37243 37244 37245 37246 37247 37248 37249 37250 37251 37252 37253 37254 37255 37256 37257 37258 37259 37260 37261 37262 37263 37264 37265 37266 37267 37268 37269 37270 37271 37272 37273 37274 37275 37276 37277 37278 37279 37280 37281 37282 37283 37284 37285 37286 37287 37288 37289 37290 37291 37292 37293 37294 37295 37296 37297 37298 37299 37300 37301 37302 37303 37304 37305 37306 37307 37308 37309 37310 37311 37312 37313 37314 37315 37316 37317 37318 37319 37320 37321 37322 37323 37324 37325 37326 37327 37328 37329 37330 37331 37332 37333 37334 37335 37336 37337 37338 37339 37340 37341 37342 37343 37344 37345 37346 37347 37348 37349 37350 37351 37352 37353 37354 37355 37356 37357 37358 37359 37360 37361 37362 37363 37364 37365 37366 37367 37368 37369 37370 37371 37372 37373 37374 37375 37376 37377 37378 37379 37380 37381 37382 37383 37384 37385 37386 37387 37388 37389 37390 37391 37392 37393 37394 37395 37396 37397 37398 37399 37400 37401 37402 37403 37404 37405 37406 37407 37408 37409 37410 37411 37412 37413 37414 37415 37416 37417 37418 37419 37420 37421 37422 37423 37424 37425 37426 37427 37428 37429 37430 37431 37432 37433 37434 37435 37436 37437 37438 37439 37440 37441 37442 37443 37444 37445 37446 37447 37448 37449 37450 37451 37452 37453 37454 37455 37456 37457 37458 37459 37460 37461 37462 37463 37464 37465 37466 37467 37468 37469 37470 37471 37472 37473 37474 37475 37476 37477 37478 37479 37480 37481 37482 37483 37484 37485 37486 37487 37488 37489 37490 37491 37492 37493 37494 37495 37496 37497 37498 37499 37500 37501 37502 37503 37504 37505 37506 37507 37508 37509 37510 37511 37512 37513 37514 37515 37516 37517 37518 37519 37520 37521 37522 37523 37524 37525 37526 37527 37528 37529 37530 37531 37532 37533 37534 37535 37536 37537 37538 37539 37540 37541 37542 37543 37544 37545 37546 37547 37548 37549 37550 37551 37552 37553 37554 37555 37556 37557 37558 37559 37560 37561 37562 37563 37564 37565 37566 37567 37568 37569 37570 37571 37572 37573 37574 37575 37576 37577 37578 37579 37580 37581 37582 37583 37584 37585 37586 37587 37588 37589 37590 37591 37592 37593 37594 37595 37596 37597 37598 37599 37600 37601 37602 37603 37604 37605 37606 37607 37608 37609 37610 37611 37612 37613 37614 37615 37616 37617 37618 37619 37620 37621 37622 37623 37624 37625 37626 37627 37628 37629 37630 37631 37632 37633 37634 37635 37636 37637 37638 37639 37640 37641 37642 37643 37644 37645 37646 37647 37648 37649 37650 37651 37652 37653 37654 37655 37656 37657 37658 37659 37660 37661 37662 37663 37664 37665 37666 37667 37668 37669 37670 37671 37672 37673 37674 37675 37676 37677 37678 37679 37680 37681 37682 37683 37684 37685 37686 37687 37688 37689 37690 37691 37692 37693 37694 37695 37696 37697 37698 37699 37700 37701 37702 37703 37704 37705 37706 37707 37708 37709 37710 37711 37712 37713 37714 37715 37716 37717 37718 37719 37720 37721 37722 37723 37724 37725 37726 37727 37728 37729 37730 37731 37732 37733 37734 37735 37736 37737 37738 37739 37740 37741 37742 37743 37744 37745 37746 37747 37748 37749 37750 37751 37752 37753 37754 37755 37756 37757 37758 37759 37760 37761 37762 37763 37764 37765 37766 37767 37768 37769 37770 37771 37772 37773 37774 37775 37776 37777 37778 37779 37780 37781 37782 37783 37784 37785 37786 37787 37788 37789 37790 37791 37792 37793 37794 37795 37796 37797 37798 37799 37800 37801 37802 37803 37804 37805 37806 37807 37808 37809 37810 37811 37812 37813 37814 37815 37816 37817 37818 37819 37820 37821 37822 37823 37824 37825 37826 37827 37828 37829 37830 37831 37832 37833 37834 37835 37836 37837 37838 37839 37840 37841 37842 37843 37844 37845 37846 37847 37848 37849 37850 37851 37852 37853 37854 37855 37856 37857 37858 37859 37860 37861 37862 37863 37864 37865 37866 37867 37868 37869 37870 37871 37872 37873 37874 37875 37876 37877 37878 37879 37880 37881 37882 37883 37884 37885 37886 37887 37888 37889 37890 37891 37892 37893 37894 37895 37896 37897 37898 37899 37900 37901 37902 37903 37904 37905 37906 37907 37908 37909 37910 37911 37912 37913 37914 37915 37916 37917 37918 37919 37920 37921 37922 37923 37924 37925 37926 37927 37928 37929 37930 37931 37932 37933 37934 37935 37936 37937 37938 37939 37940 37941 37942 37943 37944 37945 37946 37947 37948 37949 37950 37951 37952 37953 37954 37955 37956 37957 37958 37959 37960 37961 37962 37963 37964 37965 37966 37967 37968 37969 37970 37971 37972 37973 37974 37975 37976 37977 37978 37979 37980 37981 37982 37983 37984 37985 37986 37987 37988 37989 37990 37991 37992 37993 37994 37995 37996 37997 37998 37999 38000 38001 38002 38003 38004 38005 38006 38007 38008 38009 38010 38011 38012 38013 38014 38015 38016 38017 38018 38019 38020 38021 38022 38023 38024 38025 38026 38027 38028 38029 38030 38031 38032 38033 38034 38035 38036 38037 38038 38039 38040 38041 38042 38043 38044 38045 38046 38047 38048 38049 38050 38051 38052 38053 38054 38055 38056 38057 38058 38059 38060 38061 38062 38063 38064 38065 38066 38067 38068 38069 38070 38071 38072 38073 38074 38075 38076 38077 38078 38079 38080 38081 38082 38083 38084 38085 38086 38087 38088 38089 38090 38091 38092 38093 38094 38095 38096 38097 38098 38099 38100 38101 38102 38103 38104 38105 38106 38107 38108 38109 38110 38111 38112 38113 38114 38115 38116 38117 38118 38119 38120 38121 38122 38123 38124 38125 38126 38127 38128 38129 38130 38131 38132 38133 38134 38135 38136 38137 38138 38139 38140 38141 38142 38143 38144 38145 38146 38147 38148 38149 38150 38151 38152 38153 38154 38155 38156 38157 38158 38159 38160 38161 38162 38163 38164 38165 38166 38167 38168 38169 38170 38171 38172 38173 38174 38175 38176 38177 38178 38179 38180 38181 38182 38183 38184 38185 38186 38187 38188 38189 38190 38191 38192 38193 38194 38195 38196 38197 38198 38199 38200 38201 38202 38203 38204 38205 38206 38207 38208 38209 38210 38211 38212 38213 38214 38215 38216 38217 38218 38219 38220 38221 38222 38223 38224 38225 38226 38227 38228 38229 38230 38231 38232 38233 38234 38235 38236 38237 38238 38239 38240 38241 38242 38243 38244 38245 38246 38247 38248 38249 38250 38251 38252 38253 38254 38255 38256 38257 38258 38259 38260 38261 38262 38263 38264 38265 38266 38267 38268 38269 38270 38271 38272 38273 38274 38275 38276 38277 38278 38279 38280 38281 38282 38283 38284 38285 38286 38287 38288 38289 38290 38291 38292 38293 38294 38295 38296 38297 38298 38299 38300 38301 38302 38303 38304 38305 38306 38307 38308 38309 38310 38311 38312 38313 38314 38315 38316 38317 38318 38319 38320 38321 38322 38323 38324 38325 38326 38327 38328 38329 38330 38331 38332 38333 38334 38335 38336 38337 38338 38339 38340 38341 38342 38343 38344 38345 38346 38347 38348 38349 38350 38351 38352 38353 38354 38355 38356 38357 38358 38359 38360 38361 38362 38363 38364 38365 38366 38367 38368 38369 38370 38371 38372 38373 38374 38375 38376 38377 38378 38379 38380 38381 38382 38383 38384 38385 38386 38387 38388 38389 38390 38391 38392 38393 38394 38395 38396 38397 38398 38399 38400 38401 38402 38403 38404 38405 38406 38407 38408 38409 38410 38411 38412 38413 38414 38415 38416 38417 38418 38419 38420 38421 38422 38423 38424 38425 38426 38427 38428 38429 38430 38431 38432 38433 38434 38435 38436 38437 38438 38439 38440 38441 38442 38443 38444 38445 38446 38447 38448 38449 38450 38451 38452 38453 38454 38455 38456 38457 38458 38459 38460 38461 38462 38463 38464 38465 38466 38467 38468 38469 38470 38471 38472 38473 38474 38475 38476 38477 38478 38479 38480 38481 38482 38483 38484 38485 38486 38487 38488 38489 38490 38491 38492 38493 38494 38495 38496 38497 38498 38499 38500 38501 38502 38503 38504 38505 38506 38507 38508 38509 38510 38511 38512 38513 38514 38515 38516 38517 38518 38519 38520 38521 38522 38523 38524 38525 38526 38527 38528 38529 38530 38531 38532 38533 38534 38535 38536 38537 38538 38539 38540 38541 38542 38543 38544 38545 38546 38547 38548 38549 38550 38551 38552 38553 38554 38555 38556 38557 38558 38559 38560 38561 38562 38563 38564 38565 38566 38567 38568 38569 38570 38571 38572 38573 38574 38575 38576 38577 38578 38579 38580 38581 38582 38583 38584 38585 38586 38587 38588 38589 38590 38591 38592 38593 38594 38595 38596 38597 38598 38599 38600 38601 38602 38603 38604 38605 38606 38607 38608 38609 38610 38611 38612 38613 38614 38615 38616 38617 38618 38619 38620 38621 38622 38623 38624 38625 38626 38627 38628 38629 38630 38631 38632 38633 38634 38635 38636 38637 38638 38639 38640 38641 38642 38643 38644 38645 38646 38647 38648 38649 38650 38651 38652 38653 38654 38655 38656 38657 38658 38659 38660 38661 38662 38663 38664 38665 38666 38667 38668 38669 38670 38671 38672 38673 38674 38675 38676 38677 38678 38679 38680 38681 38682 38683 38684 38685 38686 38687 38688 38689 38690 38691 38692 38693 38694 38695 38696 38697 38698 38699 38700 38701 38702 38703 38704 38705 38706 38707 38708 38709 38710 38711 38712 38713 38714 38715 38716 38717 38718 38719 38720 38721 38722 38723 38724 38725 38726 38727 38728 38729 38730 38731 38732 38733 38734 38735 38736 38737 38738 38739 38740 38741 38742 38743 38744 38745 38746 38747 38748 38749 38750 38751 38752 38753 38754 38755 38756 38757 38758 38759 38760 38761 38762 38763 38764 38765 38766 38767 38768 38769 38770 38771 38772 38773 38774 38775 38776 38777 38778 38779 38780 38781 38782 38783 38784 38785 38786 38787 38788 38789 38790 38791 38792 38793 38794 38795 38796 38797 38798 38799 38800 38801 38802 38803 38804 38805 38806 38807 38808 38809 38810 38811 38812 38813 38814 38815 38816 38817 38818 38819 38820 38821 38822 38823 38824 38825 38826 38827 38828 38829 38830 38831 38832 38833 38834 38835 38836 38837 38838 38839 38840 38841 38842 38843 38844 38845 38846 38847 38848 38849 38850 38851 38852 38853 38854 38855 38856 38857 38858 38859 38860 38861 38862 38863 38864 38865 38866 38867 38868 38869 38870 38871 38872 38873 38874 38875 38876 38877 38878 38879 38880 38881 38882 38883 38884 38885 38886 38887 38888 38889 38890 38891 38892 38893 38894 38895 38896 38897 38898 38899 38900 38901 38902 38903 38904 38905 38906 38907 38908 38909 38910 38911 38912 38913 38914 38915 38916 38917 38918 38919 38920 38921 38922 38923 38924 38925 38926 38927 38928 38929 38930 38931 38932 38933 38934 38935 38936 38937 38938 38939 38940 38941 38942 38943 38944 38945 38946 38947 38948 38949 38950 38951 38952 38953 38954 38955 38956 38957 38958 38959 38960 38961 38962 38963 38964 38965 38966 38967 38968 38969 38970 38971 38972 38973 38974 38975 38976 38977 38978 38979 38980 38981 38982 38983 38984 38985 38986 38987 38988 38989 38990 38991 38992 38993 38994 38995 38996 38997 38998 38999 39000 39001 39002 39003 39004 39005 39006 39007 39008 39009 39010 39011 39012 39013 39014 39015 39016 39017 39018 39019 39020 39021 39022 39023 39024 39025 39026 39027 39028 39029 39030 39031 39032 39033 39034 39035 39036 39037 39038 39039 39040 39041 39042 39043 39044 39045 39046 39047 39048 39049 39050 39051 39052 39053 39054 39055 39056 39057 39058 39059 39060 39061 39062 39063 39064 39065 39066 39067 39068 39069 39070 39071 39072 39073 39074 39075 39076 39077 39078 39079 39080 39081 39082 39083 39084 39085 39086 39087 39088 39089 39090 39091 39092 39093 39094 39095 39096 39097 39098 39099 39100 39101 39102 39103 39104 39105 39106 39107 39108 39109 39110 39111 39112 39113 39114 39115 39116 39117 39118 39119 39120 39121 39122 39123 39124 39125 39126 39127 39128 39129 39130 39131 39132 39133 39134 39135 39136 39137 39138 39139 39140 39141 39142 39143 39144 39145 39146 39147 39148 39149 39150 39151 39152 39153 39154 39155 39156 39157 39158 39159 39160 39161 39162 39163 39164 39165 39166 39167 39168 39169 39170 39171 39172 39173 39174 39175 39176 39177 39178 39179 39180 39181 39182 39183 39184 39185 39186 39187 39188 39189 39190 39191 39192 39193 39194 39195 39196 39197 39198 39199 39200 39201 39202 39203 39204 39205 39206 39207 39208 39209 39210 39211 39212 39213 39214 39215 39216 39217 39218 39219 39220 39221 39222 39223 39224 39225 39226 39227 39228 39229 39230 39231 39232 39233 39234 39235 39236 39237 39238 39239 39240 39241 39242 39243 39244 39245 39246 39247 39248 39249 39250 39251 39252 39253 39254 39255 39256 39257 39258 39259 39260 39261 39262 39263 39264 39265 39266 39267 39268 39269 39270 39271 39272 39273 39274 39275 39276 39277 39278 39279 39280 39281 39282 39283 39284 39285 39286 39287 39288 39289 39290 39291 39292 39293 39294 39295 39296 39297 39298 39299 39300 39301 39302 39303 39304 39305 39306 39307 39308 39309 39310 39311 39312 39313 39314 39315 39316 39317 39318 39319 39320 39321 39322 39323 39324 39325 39326 39327 39328 39329 39330 39331 39332 39333 39334 39335 39336 39337 39338 39339 39340 39341 39342 39343 39344 39345 39346 39347 39348 39349 39350 39351 39352 39353 39354 39355 39356 39357 39358 39359 39360 39361 39362 39363 39364 39365 39366 39367 39368 39369 39370 39371 39372 39373 39374 39375 39376 39377 39378 39379 39380 39381 39382 39383 39384 39385 39386 39387 39388 39389 39390 39391 39392 39393 39394 39395 39396 39397 39398 39399 39400 39401 39402 39403 39404 39405 39406 39407 39408 39409 39410 39411 39412 39413 39414 39415 39416 39417 39418 39419 39420 39421 39422 39423 39424 39425 39426 39427 39428 39429 39430 39431 39432 39433 39434 39435 39436 39437 39438 39439 39440 39441 39442 39443 39444 39445 39446 39447 39448 39449 39450 39451 39452 39453 39454 39455 39456 39457 39458 39459 39460 39461 39462 39463 39464 39465 39466 39467 39468 39469 39470 39471 39472 39473 39474 39475 39476 39477 39478 39479 39480 39481 39482 39483 39484 39485 39486 39487 39488 39489 39490 39491 39492 39493 39494 39495 39496 39497 39498 39499 39500 39501 39502 39503 39504 39505 39506 39507 39508 39509 39510 39511 39512 39513 39514 39515 39516 39517 39518 39519 39520 39521 39522 39523 39524 39525 39526 39527 39528 39529 39530 39531 39532 39533 39534 39535 39536 39537 39538 39539 39540 39541 39542 39543 39544 39545 39546 39547 39548 39549 39550 39551 39552 39553 39554 39555 39556 39557 39558 39559 39560 39561 39562 39563 39564 39565 39566 39567 39568 39569 39570 39571 39572 39573 39574 39575 39576 39577 39578 39579 39580 39581 39582 39583 39584 39585 39586 39587 39588 39589 39590 39591 39592 39593 39594 39595 39596 39597 39598 39599 39600 39601 39602 39603 39604 39605 39606 39607 39608 39609 39610 39611 39612 39613 39614 39615 39616 39617 39618 39619 39620 39621 39622 39623 39624 39625 39626 39627 39628 39629 39630 39631 39632 39633 39634 39635 39636 39637 39638 39639 39640 39641 39642 39643 39644 39645 39646 39647 39648 39649 39650 39651 39652 39653 39654 39655 39656 39657 39658 39659 39660 39661 39662 39663 39664 39665 39666 39667 39668 39669 39670 39671 39672 39673 39674 39675 39676 39677 39678 39679 39680 39681 39682 39683 39684 39685 39686 39687 39688 39689 39690 39691 39692 39693 39694 39695 39696 39697 39698 39699 39700 39701 39702 39703 39704 39705 39706 39707 39708 39709 39710 39711 39712 39713 39714 39715 39716 39717 39718 39719 39720 39721 39722 39723 39724 39725 39726 39727 39728 39729 39730 39731 39732 39733 39734 39735 39736 39737 39738 39739 39740 39741 39742 39743 39744 39745 39746 39747 39748 39749 39750 39751 39752 39753 39754 39755 39756 39757 39758 39759 39760 39761 39762 39763 39764 39765 39766 39767 39768 39769 39770 39771 39772 39773 39774 39775 39776 39777 39778 39779 39780 39781 39782 39783 39784 39785 39786 39787 39788 39789 39790 39791 39792 39793 39794 39795 39796 39797 39798 39799 39800 39801 39802 39803 39804 39805 39806 39807 39808 39809 39810 39811 39812 39813 39814 39815 39816 39817 39818 39819 39820 39821 39822 39823 39824 39825 39826 39827 39828 39829 39830 39831 39832 39833 39834 39835 39836 39837 39838 39839 39840 39841 39842 39843 39844 39845 39846 39847 39848 39849 39850 39851 39852 39853 39854 39855 39856 39857 39858 39859 39860 39861 39862 39863 39864 39865 39866 39867 39868 39869 39870 39871 39872 39873 39874 39875 39876 39877 39878 39879 39880 39881 39882 39883 39884 39885 39886 39887 39888 39889 39890 39891 39892 39893 39894 39895 39896 39897 39898 39899 39900 39901 39902 39903 39904 39905 39906 39907 39908 39909 39910 39911 39912 39913 39914 39915 39916 39917 39918 39919 39920 39921 39922 39923 39924 39925 39926 39927 39928 39929 39930 39931 39932 39933 39934 39935 39936 39937 39938 39939 39940 39941 39942 39943 39944 39945 39946 39947 39948 39949 39950 39951 39952 39953 39954 39955 39956 39957 39958 39959 39960 39961 39962 39963 39964 39965 39966 39967 39968 39969 39970 39971 39972 39973 39974 39975 39976 39977 39978 39979 39980 39981 39982 39983 39984 39985 39986 39987 39988 39989 39990 39991 39992 39993 39994 39995 39996 39997 39998 39999 40000 40001 40002 40003 40004 40005 40006 40007 40008 40009 40010 40011 40012 40013 40014 40015 40016 40017 40018 40019 40020 40021 40022 40023 40024 40025 40026 40027 40028 40029 40030 40031 40032 40033 40034 40035 40036 40037 40038 40039 40040 40041 40042 40043 40044 40045 40046 40047 40048 40049 40050 40051 40052 40053 40054 40055 40056 40057 40058 40059 40060 40061 40062 40063 40064 40065 40066 40067 40068 40069 40070 40071 40072 40073 40074 40075 40076 40077 40078 40079 40080 40081 40082 40083 40084 40085 40086 40087 40088 40089 40090 40091 40092 40093 40094 40095 40096 40097 40098 40099 40100 40101 40102 40103 40104 40105 40106 40107 40108 40109 40110 40111 40112 40113 40114 40115 40116 40117 40118 40119 40120 40121 40122 40123 40124 40125 40126 40127 40128 40129 40130 40131 40132 40133 40134 40135 40136 40137 40138 40139 40140 40141 40142 40143 40144 40145 40146 40147 40148 40149 40150 40151 40152 40153 40154 40155 40156 40157 40158 40159 40160 40161 40162 40163 40164 40165 40166 40167 40168 40169 40170 40171 40172 40173 40174 40175 40176 40177 40178 40179 40180 40181 40182 40183 40184 40185 40186 40187 40188 40189 40190 40191 40192 40193 40194 40195 40196 40197 40198 40199 40200 40201 40202 40203 40204 40205 40206 40207 40208 40209 40210 40211 40212 40213 40214 40215 40216 40217 40218 40219 40220 40221 40222 40223 40224 40225 40226 40227 40228 40229 40230 40231 40232 40233 40234 40235 40236 40237 40238 40239 40240 40241 40242 40243 40244 40245 40246 40247 40248 40249 40250 40251 40252 40253 40254 40255 40256 40257 40258 40259 40260 40261 40262 40263 40264 40265 40266 40267 40268 40269 40270 40271 40272 40273 40274 40275 40276 40277 40278 40279 40280 40281 40282 40283 40284 40285 40286 40287 40288 40289 40290 40291 40292 40293 40294 40295 40296 40297 40298 40299 40300 40301 40302 40303 40304 40305 40306 40307 40308 40309 40310 40311 40312 40313 40314 40315 40316 40317 40318 40319 40320 40321 40322 40323 40324 40325 40326 40327 40328 40329 40330 40331 40332 40333 40334 40335 40336 40337 40338 40339 40340 40341 40342 40343 40344 40345 40346 40347 40348 40349 40350 40351 40352 40353 40354 40355 40356 40357 40358 40359 40360 40361 40362 40363 40364 40365 40366 40367 40368 40369 40370 40371 40372 40373 40374 40375 40376 40377 40378 40379 40380 40381 40382 40383 40384 40385 40386 40387 40388 40389 40390 40391 40392 40393 40394 40395 40396 40397 40398 40399 40400 40401 40402 40403 40404 40405 40406 40407 40408 40409 40410 40411 40412 40413 40414 40415 40416 40417 40418 40419 40420 40421 40422 40423 40424 40425 40426 40427 40428 40429 40430 40431 40432 40433 40434 40435 40436 40437 40438 40439 40440 40441 40442 40443 40444 40445 40446 40447 40448 40449 40450 40451 40452 40453 40454 40455 40456 40457 40458 40459 40460 40461 40462 40463 40464 40465 40466 40467 40468 40469 40470 40471 40472 40473 40474 40475 40476 40477 40478 40479 40480 40481 40482 40483 40484 40485 40486 40487 40488 40489 40490 40491 40492 40493 40494 40495 40496 40497 40498 40499 40500 40501 40502 40503 40504 40505 40506 40507 40508 40509 40510 40511 40512 40513 40514 40515 40516 40517 40518 40519 40520 40521 40522 40523 40524 40525 40526 40527 40528 40529 40530 40531 40532 40533 40534 40535 40536 40537 40538 40539 40540 40541 40542 40543 40544 40545 40546 40547 40548 40549 40550 40551 40552 40553 40554 40555 40556 40557 40558 40559 40560 40561 40562 40563 40564 40565 40566 40567 40568 40569 40570 40571 40572 40573 40574 40575 40576 40577 40578 40579 40580 40581 40582 40583 40584 40585 40586 40587 40588 40589 40590 40591 40592 40593 40594 40595 40596 40597 40598 40599 40600 40601 40602 40603 40604 40605 40606 40607 40608 40609 40610 40611 40612 40613 40614 40615 40616 40617 40618 40619 40620 40621 40622 40623 40624 40625 40626 40627 40628 40629 40630 40631 40632 40633 40634 40635 40636 40637 40638 40639 40640 40641 40642 40643 40644 40645 40646 40647 40648 40649 40650 40651 40652 40653 40654 40655 40656 40657 40658 40659 40660 40661 40662 40663 40664 40665 40666 40667 40668 40669 40670 40671 40672 40673 40674 40675 40676 40677 40678 40679 40680 40681 40682 40683 40684 40685 40686 40687 40688 40689 40690 40691 40692 40693 40694 40695 40696 40697 40698 40699 40700 40701 40702 40703 40704 40705 40706 40707 40708 40709 40710 40711 40712 40713 40714 40715 40716 40717 40718 40719 40720 40721 40722 40723 40724 40725 40726 40727 40728 40729 40730 40731 40732 40733 40734 40735 40736 40737 40738 40739 40740 40741 40742 40743 40744 40745 40746 40747 40748 40749 40750 40751 40752 40753 40754 40755 40756 40757 40758 40759 40760 40761 40762 40763 40764 40765 40766 40767 40768 40769 40770 40771 40772 40773 40774 40775 40776 40777 40778 40779 40780 40781 40782 40783 40784 40785 40786 40787 40788 40789 40790 40791 40792 40793 40794 40795 40796 40797 40798 40799 40800 40801 40802 40803 40804 40805 40806 40807 40808 40809 40810 40811 40812 40813 40814 40815 40816 40817 40818 40819 40820 40821 40822 40823 40824 40825 40826 40827 40828 40829 40830 40831 40832 40833 40834 40835 40836 40837 40838 40839 40840 40841 40842 40843 40844 40845 40846 40847 40848 40849 40850 40851 40852 40853 40854 40855 40856 40857 40858 40859 40860 40861 40862 40863 40864 40865 40866 40867 40868 40869 40870 40871 40872 40873 40874 40875 40876 40877 40878 40879 40880 40881 40882 40883 40884 40885 40886 40887 40888 40889 40890 40891 40892 40893 40894 40895 40896 40897 40898 40899 40900 40901 40902 40903 40904 40905 40906 40907 40908 40909 40910 40911 40912 40913 40914 40915 40916 40917 40918 40919 40920 40921 40922 40923 40924 40925 40926 40927 40928 40929 40930 40931 40932 40933 40934 40935 40936 40937 40938 40939 40940 40941 40942 40943 40944 40945 40946 40947 40948 40949 40950 40951 40952 40953 40954 40955 40956 40957 40958
|
diff --git a/Android/Gradle/api/brltty-component.gradle b/Android/Gradle/api/brltty-component.gradle
new file mode 100644
index 000000000..d9bcac0e7
--- /dev/null
+++ b/Android/Gradle/api/brltty-component.gradle
@@ -0,0 +1,17 @@
+brltty.buildComponent(
+ [ componentName: "api",
+ project: project,
+ makeSubdirectory: brltty.native.javaSubdirectory,
+ jars: ["brlapi"],
+
+ libraries: [
+ "brlapi_java",
+ "brlapi"
+ ],
+
+ librarySubdirectories: [
+ brltty.native.javaSubdirectory,
+ brltty.native.coreSubdirectory
+ ],
+ ]
+)
diff --git a/Android/Gradle/api/brltty.gradle b/Android/Gradle/api/brltty.gradle
deleted file mode 100644
index 84a48e94d..000000000
--- a/Android/Gradle/api/brltty.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-brltty.addTasks([
- project: project,
- componentName: "api",
- makeSubdirectory: brltty.native.javaSubdirectory,
- jars: ["brlapi"],
-
- libraries: [
- "brlapi_java",
- "brlapi"
- ],
-
- librarySubdirectories: [
- brltty.native.javaSubdirectory,
- brltty.native.coreSubdirectory
- ],
-])
diff --git a/Android/Gradle/api/build.gradle b/Android/Gradle/api/build.gradle
index 998d73747..681db6160 100644
--- a/Android/Gradle/api/build.gradle
+++ b/Android/Gradle/api/build.gradle
@@ -7,13 +7,15 @@ description = """
"${project.name}" provides the Java client bindings for "${rootProject.name}" code.
"""
-apply from: "brltty.gradle"
+apply from: "brltty-component.gradle"
dependencies {
api files("src/main/libs/brlapi.jar")
}
android {
+ namespace "org.a11y.brlapi"
+
compileSdkVersion "android-34"
buildToolsVersion "29.0.3"
@@ -27,7 +29,7 @@ afterEvaluate {
publishing {
publications {
release(MavenPublication) {
- from components.release
+ from components.findByName("release")
groupId = "org.a11y.brltty"
artifactId = "brlapi-android"
version = brltty.config.apiRelease
diff --git a/Android/Gradle/apitest/build.gradle b/Android/Gradle/apitest/build.gradle
index 19b4b6a0b..f1ad03d9d 100644
--- a/Android/Gradle/apitest/build.gradle
+++ b/Android/Gradle/apitest/build.gradle
@@ -9,6 +9,8 @@ A test program to verify that the Maven dependency on BrlAPI is working.
apply from: rootProject.file("brlapi-android.gradle")
android {
+ namespace "org.a11y.brlapi.android"
+
compileSdkVersion "android-34"
buildToolsVersion "29.0.3"
diff --git a/Android/Gradle/app/brltty-assets.gradle b/Android/Gradle/app/brltty-assets.gradle
index e872fb6ea..bc435b6a8 100644
--- a/Android/Gradle/app/brltty-assets.gradle
+++ b/Android/Gradle/app/brltty-assets.gradle
@@ -79,5 +79,9 @@ task brlttyRemoveMessages (type: Delete) {
brltty.addAssembleTask project, brlttyAddMessages
brltty.addAssembleTask project, brlttyAddTables
+
+brltty.addConsumerTask(brlttyAddTables, "mergeDebugAssets")
+brltty.addConsumerTask(brlttyAddTables, "mergeReleaseAssets")
+
clean.dependsOn brlttyRemoveMessages
clean.dependsOn brlttyRemoveTables
diff --git a/Android/Gradle/app/build.gradle b/Android/Gradle/app/build.gradle
index 941e48126..8ae4fd226 100644
--- a/Android/Gradle/app/build.gradle
+++ b/Android/Gradle/app/build.gradle
@@ -1,6 +1,6 @@
plugins {
id "com.android.application"
- id "com.github.triplet.play" version "3.4.0"
+ id "com.github.triplet.play" version "3.12.0"
}
description = """
@@ -16,6 +16,8 @@ dependencies {
}
android {
+ namespace "org.a11y.brltty.android"
+
compileSdkVersion "android-34"
buildToolsVersion "29.0.3"
@@ -23,8 +25,8 @@ android {
//ndkVersion "22.1.7171670" // r22b - stable
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
@@ -32,6 +34,10 @@ android {
error "Untranslatable"
}
+ buildFeatures {
+ buildConfig = true
+ }
+
defaultConfig {
targetSdkVersion 34
minSdkVersion 16
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/APITests.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/APITests.java
index deebb3026..475062ea7 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/APITests.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/APITests.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/AccessibilityButtonCallbacks.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/AccessibilityButtonCallbacks.java
index 6e2bfb798..5f48fea36 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/AccessibilityButtonCallbacks.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/AccessibilityButtonCallbacks.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationParameters.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationParameters.java
index 0dca8efd8..7762acb7f 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationParameters.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationParameters.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationSettings.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationSettings.java
index 58035b729..8eaf4bd9b 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationSettings.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationSettings.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationUtilities.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationUtilities.java
index b084b575f..ca04a3a8f 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationUtilities.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ApplicationUtilities.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BluetoothConnection.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BluetoothConnection.java
index f5ff4448c..b64641008 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BluetoothConnection.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BluetoothConnection.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleApplication.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleApplication.java
index 1cda41deb..3ce0e44d9 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleApplication.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleApplication.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleMessage.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleMessage.java
index 4bcb96b52..b69f3ad1b 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleMessage.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleMessage.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleNotification.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleNotification.java
index 8892ce1eb..f67839347 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleNotification.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleNotification.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -20,22 +20,29 @@ package org.a11y.brltty.android;
import org.a11y.brltty.android.activities.ActionsActivity;
import org.a11y.brltty.android.settings.DeviceManager;
+import android.util.Log;
+
import android.content.Context;
import android.content.Intent;
import android.app.PendingIntent;
+
import android.app.Activity;
+import android.app.MissingForegroundServiceTypeException;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.NotificationChannel;
public abstract class BrailleNotification {
+ private final static String LOG_TAG = BrailleNotification.class.getName();
+
private BrailleNotification () {
}
private final static Integer NOTIFICATION_IDENTIFIER = 1;
private final static String NOTIFICATION_CHANNEL = "braille";
+ private static boolean isCreated = false;
private static Context applicationContext = null;
private static NotificationManager notificationManager = null;
private static Notification.Builder notificationBuilder = null;
@@ -76,49 +83,48 @@ public abstract class BrailleNotification {
return notificationManager;
}
- private static boolean isActive () {
- return notificationBuilder != null;
- }
-
private static void makeBuilder () {
- Context context = getContext();
-
- if (APITests.haveOreo) {
- NotificationManager nm = getManager();
- NotificationChannel channel = nm.getNotificationChannel(NOTIFICATION_CHANNEL);
-
- if (channel == null) {
- channel = new NotificationChannel(
- NOTIFICATION_CHANNEL,
- getString(R.string.braille_channel_name),
- NotificationManager.IMPORTANCE_LOW
- );
-
- nm.createNotificationChannel(channel);
+ if (notificationBuilder == null) {
+ Context context = getContext();
+ Notification.Builder builder;
+
+ if (APITests.haveOreo) {
+ NotificationManager nm = getManager();
+ NotificationChannel channel = nm.getNotificationChannel(NOTIFICATION_CHANNEL);
+
+ if (channel == null) {
+ channel = new NotificationChannel(
+ NOTIFICATION_CHANNEL,
+ getString(R.string.braille_channel_name),
+ NotificationManager.IMPORTANCE_LOW
+ );
+
+ nm.createNotificationChannel(channel);
+ }
+
+ builder = new Notification.Builder(context, NOTIFICATION_CHANNEL);
+ } else {
+ builder = new Notification.Builder(context)
+ .setPriority(Notification.PRIORITY_LOW)
+ ;
}
- notificationBuilder = new Notification.Builder(context, NOTIFICATION_CHANNEL);
- } else {
- notificationBuilder = new Notification.Builder(context)
- .setPriority(Notification.PRIORITY_LOW)
- ;
- }
-
- notificationBuilder
- .setOngoing(true)
- .setOnlyAlertOnce(true)
+ builder.setOngoing(true)
+ .setOnlyAlertOnce(true)
+ .setSmallIcon(R.drawable.braille_notification)
+ .setSubText(getString(R.string.braille_hint_tap))
+ .setContentIntent(newPendingIntent(ActionsActivity.class))
+ ;
- .setSmallIcon(R.drawable.braille_notification)
- .setSubText(getString(R.string.braille_hint_tap))
- .setContentIntent(newPendingIntent(ActionsActivity.class))
- ;
+ if (APITests.haveJellyBeanMR1) {
+ builder.setShowWhen(false);
+ }
- if (APITests.haveJellyBeanMR1) {
- notificationBuilder.setShowWhen(false);
- }
+ if (APITests.haveLollipop) {
+ builder.setCategory(Notification.CATEGORY_SERVICE);
+ }
- if (APITests.haveLollipop) {
- notificationBuilder.setCategory(Notification.CATEGORY_SERVICE);
+ notificationBuilder = builder;
}
}
@@ -146,7 +152,7 @@ public abstract class BrailleNotification {
public static void updateState () {
synchronized (NOTIFICATION_IDENTIFIER) {
- if (isActive()) {
+ if (isCreated) {
setState();
updateNotification();
}
@@ -161,7 +167,7 @@ public abstract class BrailleNotification {
public static void updateDevice (String device) {
synchronized (NOTIFICATION_IDENTIFIER) {
- if (isActive()) {
+ if (isCreated) {
setDevice(device);
updateNotification();
}
@@ -170,27 +176,33 @@ public abstract class BrailleNotification {
public static void create () {
synchronized (NOTIFICATION_IDENTIFIER) {
- if (isActive()) {
- throw new IllegalStateException("already active");
- }
-
- makeBuilder();
- setState();
- setDevice(DeviceManager.getSelectedDevice());
+ if (!isCreated) {
+ makeBuilder();
- BrailleService.getBrailleService()
- .startForeground(NOTIFICATION_IDENTIFIER, buildNotification());
+ setState();
+ setDevice(DeviceManager.getSelectedDevice());
+
+ try {
+ BrailleService.getBrailleService()
+ .startForeground(NOTIFICATION_IDENTIFIER, buildNotification());
+
+ isCreated = true;
+ Log.i(LOG_TAG, "has become foreground service");
+ } catch (MissingForegroundServiceTypeException exception) {
+ Log.w(LOG_TAG, ("foreground service type not specified: " + exception.getMessage()));
+ } catch (SecurityException exception) {
+ Log.w(LOG_TAG, ("can't become foreground service: " + exception.getMessage()));
+ }
+ }
}
}
public static void destroy () {
synchronized (NOTIFICATION_IDENTIFIER) {
- if (!isActive()) {
- throw new IllegalStateException("not active");
+ if (isCreated) {
+ getManager().cancel(NOTIFICATION_IDENTIFIER);
+ isCreated = false;
}
-
- notificationBuilder = null;
- getManager().cancel(NOTIFICATION_IDENTIFIER);
}
}
}
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleRenderer.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleRenderer.java
index bf60137f4..4f3706b55 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleRenderer.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleRenderer.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleService.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleService.java
index 70243b3ba..f07414481 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleService.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/BrailleService.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/Characters.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/Characters.java
index 0ede477b1..b3607f4f8 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/Characters.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/Characters.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ChooserWindow.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ChooserWindow.java
index 873ff1238..d3de7b46b 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ChooserWindow.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ChooserWindow.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ChromeRole.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ChromeRole.java
index eebba60d3..0e056df9b 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ChromeRole.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ChromeRole.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/CoreThread.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/CoreThread.java
index 3e3b094ef..6cd64520a 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/CoreThread.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/CoreThread.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/DeferredTask.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/DeferredTask.java
index 05e1ef87d..b9d8bd6bf 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/DeferredTask.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/DeferredTask.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/GridBrailleRenderer.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/GridBrailleRenderer.java
index 025efe559..4277b0fe8 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/GridBrailleRenderer.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/GridBrailleRenderer.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/InputHandlers.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/InputHandlers.java
index 763b49e9b..7fbe6e9e4 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/InputHandlers.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/InputHandlers.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/InputService.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/InputService.java
index c338409a9..53e25a9b8 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/InputService.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/InputService.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/LanguageUtilities.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/LanguageUtilities.java
index 1da17cb03..c188c9b19 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/LanguageUtilities.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/LanguageUtilities.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ListBrailleRenderer.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ListBrailleRenderer.java
index af1b9e5c3..5c6b29e79 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ListBrailleRenderer.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ListBrailleRenderer.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/LockUtilities.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/LockUtilities.java
index 81aa2ca21..9c76698cd 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/LockUtilities.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/LockUtilities.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/Logger.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/Logger.java
index 5155c784f..d4aa724c4 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/Logger.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/Logger.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/NodeComparator.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/NodeComparator.java
index 04086c771..e68721351 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/NodeComparator.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/NodeComparator.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/NodeTester.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/NodeTester.java
index 554e3487c..de4fb3f97 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/NodeTester.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/NodeTester.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/OverlayWindow.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/OverlayWindow.java
index aeaeac0e2..ae7c88541 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/OverlayWindow.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/OverlayWindow.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/PcmDevice.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/PcmDevice.java
index 708850fe3..63abdcc30 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/PcmDevice.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/PcmDevice.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/RealScreenElement.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/RealScreenElement.java
index f9f790c4e..b0533abf5 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/RealScreenElement.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/RealScreenElement.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/RenderedScreen.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/RenderedScreen.java
index a2ce37991..347721e54 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/RenderedScreen.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/RenderedScreen.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenDriver.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenDriver.java
index 78f7182b9..afa3f47bd 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenDriver.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenDriver.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenElement.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenElement.java
index c9d81158e..5ed10fe82 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenElement.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenElement.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenElementList.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenElementList.java
index eebcc6f30..42de41828 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenElementList.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenElementList.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenLogger.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenLogger.java
index 4ffe69c3c..e27b51733 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenLogger.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenLogger.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenUtilities.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenUtilities.java
index d82e5650a..d1b599def 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenUtilities.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenUtilities.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenWindow.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenWindow.java
index 3123cce4e..9df2a229c 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenWindow.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/ScreenWindow.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/SingletonReference.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/SingletonReference.java
index baa72bdbb..cbd48caeb 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/SingletonReference.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/SingletonReference.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/StatusIndicators.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/StatusIndicators.java
index 2482e85f7..9741d195c 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/StatusIndicators.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/StatusIndicators.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/StructuralMotion.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/StructuralMotion.java
index c648b71b0..07f337573 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/StructuralMotion.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/StructuralMotion.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/SystemServiceReference.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/SystemServiceReference.java
index 00a242518..4d2fc8057 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/SystemServiceReference.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/SystemServiceReference.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/TextField.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/TextField.java
index 6e6c04df5..d46dcf29d 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/TextField.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/TextField.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/UsbHelper.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/UsbHelper.java
index 2645af8ab..faf65485b 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/UsbHelper.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/UsbHelper.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -59,6 +59,7 @@ public class UsbHelper {
if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
Log.i(LOG_TAG, "permission granted for USB device: " + device);
+ BrailleNotification.create();
} else {
Log.w(LOG_TAG, "permission denied for USB device: " + device);
}
@@ -71,7 +72,12 @@ public class UsbHelper {
{
IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
- usbContext.registerReceiver(permissionReceiver, filter);
+
+ if (APITests.haveUpsideDownCake) {
+ usbContext.registerReceiver(permissionReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+ } else {
+ usbContext.registerReceiver(permissionReceiver, filter);
+ }
}
permissionIntent = PendingIntent.getBroadcast(
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/VirtualScreenElement.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/VirtualScreenElement.java
index 78a8cda0b..0d586a7c2 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/VirtualScreenElement.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/VirtualScreenElement.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/AboutActivity.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/AboutActivity.java
index aebe52375..b0908fde4 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/AboutActivity.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/AboutActivity.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/ActionsActivity.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/ActionsActivity.java
index c226b2f7d..f7b61873b 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/ActionsActivity.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/ActionsActivity.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -21,6 +21,7 @@ import org.a11y.brltty.android.*;
import org.a11y.brltty.android.settings.SettingsActivity;
import android.os.Bundle;
+import android.content.pm.PackageManager;
import android.view.View;
import android.widget.Button;
@@ -31,12 +32,31 @@ import android.net.Uri;
import java.io.File;
public class ActionsActivity extends InternalActivity {
+ private final static int BLUETOOTH_PERMISSIONS_REQUEST_CODE = 0;
+
+ @Override
+ public void onRequestPermissionsResult (int code, String[] permissions, int[] results) {
+ if (code == BLUETOOTH_PERMISSIONS_REQUEST_CODE) {
+ for (int i=0; i<results.length; i+=1) {
+ if (results[i] == PackageManager.PERMISSION_GRANTED) {
+ BrailleNotification.create();
+ break;
+ }
+ }
+
+ return;
+ }
+ }
+
public void switchInputMethod (View view) {
InputService.switchInputMethod();
}
public void allowBluetoothConnections (View view) {
- requestPermissions(BluetoothConnection.requiredPermissions, 0);
+ requestPermissions(
+ BluetoothConnection.requiredPermissions,
+ BLUETOOTH_PERMISSIONS_REQUEST_CODE
+ );
}
public void launchSettingsActivity (View view) {
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/FileDownloader.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/FileDownloader.java
index 619b9dcb7..5a30c9c6f 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/FileDownloader.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/FileDownloader.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/InternalActivity.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/InternalActivity.java
index 1a6ccec62..3e764a5bd 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/InternalActivity.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/InternalActivity.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/PackageInstaller.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/PackageInstaller.java
index 14b4d7021..4c800d648 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/PackageInstaller.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/PackageInstaller.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/UpgradeComponent.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/UpgradeComponent.java
index 3a6c01644..7589357f7 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/UpgradeComponent.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/activities/UpgradeComponent.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/AdvancedSettings.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/AdvancedSettings.java
index 9d1644391..e09317869 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/AdvancedSettings.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/AdvancedSettings.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/AttributesTableSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/AttributesTableSetting.java
index f1d5fbbdd..1bc2e020b 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/AttributesTableSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/AttributesTableSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/BluetoothDeviceCollection.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/BluetoothDeviceCollection.java
index 4889ece36..fa7fd3d4b 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/BluetoothDeviceCollection.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/BluetoothDeviceCollection.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/CheckBoxSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/CheckBoxSetting.java
index 98c6c9428..de70443f0 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/CheckBoxSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/CheckBoxSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ContractionTableSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ContractionTableSetting.java
index 22fafc896..50753c56d 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ContractionTableSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ContractionTableSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceCollection.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceCollection.java
index a3e8cc8c0..477289923 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceCollection.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceCollection.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceDescriptor.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceDescriptor.java
index 88d1d1820..f015e141d 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceDescriptor.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceDescriptor.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceManager.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceManager.java
index 320e05923..9f83af39d 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceManager.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/DeviceManager.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/GeneralSettings.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/GeneralSettings.java
index b725e2eff..56bb2ed79 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/GeneralSettings.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/GeneralSettings.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/KeyboardTableSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/KeyboardTableSetting.java
index 1082f3081..4f600d567 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/KeyboardTableSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/KeyboardTableSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogAccessibilityEventsSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogAccessibilityEventsSetting.java
index 4b2b23430..7e9ff6e8a 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogAccessibilityEventsSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogAccessibilityEventsSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogCategoriesSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogCategoriesSetting.java
index b77093cc8..4326aee95 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogCategoriesSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogCategoriesSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogKeyboardEventsSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogKeyboardEventsSetting.java
index 05697226d..d66f4276d 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogKeyboardEventsSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogKeyboardEventsSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogLevelSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogLevelSetting.java
index 68365d7bb..b553108e2 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogLevelSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogLevelSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogRenderedScreenSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogRenderedScreenSetting.java
index f77e7f24f..272e0c019 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogRenderedScreenSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogRenderedScreenSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogUnhandledEventsSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogUnhandledEventsSetting.java
index 7384eec98..506005b66 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogUnhandledEventsSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/LogUnhandledEventsSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/MessageSettings.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/MessageSettings.java
index 7e8111bf5..73ff99a7f 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/MessageSettings.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/MessageSettings.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/MultipleSelectionSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/MultipleSelectionSetting.java
index 51dfc4857..eb2927290 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/MultipleSelectionSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/MultipleSelectionSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/NavigationModeSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/NavigationModeSetting.java
index 829705c94..de57ebad1 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/NavigationModeSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/NavigationModeSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceButton.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceButton.java
index 6ee6fc356..cb043a2fb 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceButton.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceButton.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceSetting.java
index 1191e85be..7cafbd4a7 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceWrapper.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceWrapper.java
index f03160533..38d7c50b1 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceWrapper.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/PreferenceWrapper.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ReleaseBrailleDeviceSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ReleaseBrailleDeviceSetting.java
index 8a4424765..d6c75b74d 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ReleaseBrailleDeviceSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ReleaseBrailleDeviceSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SelectionSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SelectionSetting.java
index e3ba54ce9..c672a3703 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SelectionSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SelectionSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SerialDeviceCollection.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SerialDeviceCollection.java
index 261583997..1d06ce1b9 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SerialDeviceCollection.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SerialDeviceCollection.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SettingsActivity.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SettingsActivity.java
index 63a6ee652..6b6dd0e82 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SettingsActivity.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SettingsActivity.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SettingsFragment.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SettingsFragment.java
index e45875ba2..0da94eace 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SettingsFragment.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SettingsFragment.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowAlertsSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowAlertsSetting.java
index bd7bd0aad..7b5f9a0e7 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowAlertsSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowAlertsSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowAnnouncementsSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowAnnouncementsSetting.java
index 0571c4162..d398e432f 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowAnnouncementsSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowAnnouncementsSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowNotificationsSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowNotificationsSetting.java
index 7bd36967b..e1c1272b8 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowNotificationsSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/ShowNotificationsSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SingleSelectionSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SingleSelectionSetting.java
index 50cdcc704..395bdd826 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SingleSelectionSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SingleSelectionSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SpeechSupportSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SpeechSupportSetting.java
index bfdc133e4..e887609b2 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SpeechSupportSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/SpeechSupportSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/TextSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/TextSetting.java
index 6a26bfa15..9a5f840ca 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/TextSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/TextSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/TextTableSetting.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/TextTableSetting.java
index bb4e1b640..54a56ce8d 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/TextTableSetting.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/TextTableSetting.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/UsbDeviceAttachedMonitor.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/UsbDeviceAttachedMonitor.java
index f1c19438f..380fe0fc0 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/UsbDeviceAttachedMonitor.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/UsbDeviceAttachedMonitor.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/UsbDeviceCollection.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/UsbDeviceCollection.java
index 8ccc3bd08..63fa53822 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/UsbDeviceCollection.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/settings/UsbDeviceCollection.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/NewSpeechParadigm.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/NewSpeechParadigm.java
index 060097e8b..e747caef8 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/NewSpeechParadigm.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/NewSpeechParadigm.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/OldSpeechParadigm.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/OldSpeechParadigm.java
index cb5d45180..5f03d4e97 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/OldSpeechParadigm.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/OldSpeechParadigm.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechComponent.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechComponent.java
index c3e40cfce..fad2a705d 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechComponent.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechComponent.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechDriver.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechDriver.java
index b3d062d0e..f8fab4356 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechDriver.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechDriver.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechParadigm.java b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechParadigm.java
index 7a81c72b3..0d107f44d 100644
--- a/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechParadigm.java
+++ b/Android/Gradle/app/src/main/java/org/a11y/brltty/android/speech/SpeechParadigm.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/app/src/main/play/listings/en-CA/full-description.txt b/Android/Gradle/app/src/main/play/listings/en-CA/full-description.txt
index 45be53a62..b8624da82 100644
--- a/Android/Gradle/app/src/main/play/listings/en-CA/full-description.txt
+++ b/Android/Gradle/app/src/main/play/listings/en-CA/full-description.txt
@@ -1,3 +1,4 @@
+This app uses Android's AccessibilityService API. See below for the details.
BRLTTY is an accessibility app. It's a screen reader that's been primarily designed for those who use a refreshable braille display (although it also includes support for speech). Detailed documentation for using it on Android is at: https://brltty.app/doc/Android.html
Bluetooth and USB braille devices are supported (USB devices require the use of an OTG cable). Both computer and literary (contracted) braille are supported. Braille tables for many languages are included.
diff --git a/Android/Gradle/app/src/main/res/values/text-table.xml b/Android/Gradle/app/src/main/res/values/text-table.xml
index fd55a276a..0da93b6a3 100644
--- a/Android/Gradle/app/src/main/res/values/text-table.xml
+++ b/Android/Gradle/app/src/main/res/values/text-table.xml
@@ -42,6 +42,7 @@
<string name="TEXT_TABLE_LABEL_gon" translatable="true">Gondi</string>
<string name="TEXT_TABLE_LABEL_gu" translatable="true">Gujarati</string>
<string name="TEXT_TABLE_LABEL_he" translatable="true">Hebrew</string>
+ <string name="TEXT_TABLE_LABEL_he_IL" translatable="true">Hebrew (Israel)</string>
<string name="TEXT_TABLE_LABEL_hi" translatable="true">Hindi</string>
<string name="TEXT_TABLE_LABEL_hr" translatable="true">Croatian</string>
<string name="TEXT_TABLE_LABEL_hu" translatable="true">Hungarian</string>
@@ -133,6 +134,7 @@
<item>@string/TEXT_TABLE_LABEL_gon</item>
<item>@string/TEXT_TABLE_LABEL_gu</item>
<item>@string/TEXT_TABLE_LABEL_he</item>
+ <item>@string/TEXT_TABLE_LABEL_he_IL</item>
<item>@string/TEXT_TABLE_LABEL_hi</item>
<item>@string/TEXT_TABLE_LABEL_hr</item>
<item>@string/TEXT_TABLE_LABEL_hu</item>
@@ -225,6 +227,7 @@
<item>gon</item>
<item>gu</item>
<item>he</item>
+ <item>he_IL</item>
<item>hi</item>
<item>hr</item>
<item>hu</item>
diff --git a/Android/Gradle/brltty-build.gradle b/Android/Gradle/brltty-build.gradle
index 48404ee7f..d0b7cc972 100644
--- a/Android/Gradle/brltty-build.gradle
+++ b/Android/Gradle/brltty-build.gradle
@@ -24,8 +24,18 @@ Map getABI (Map properties) {
return getABI(properties.ABI)
}
+brltty.addConsumerTask = { Task producerTask, String consumerName ->
+ gradle.projectsEvaluated {
+ def consumerTask = producerTask.project.tasks.findByName(consumerName)
+
+ if (consumerTask != null) {
+ consumerTask.mustRunAfter producerTask
+ }
+ }
+}
+
Task newTask (Project project, String name, Class<DefaultTask> type=DefaultTask, Closure closure) {
- Task task = project.tasks.register(name, type, closure).get()
+ def task = project.tasks.register(name, type, closure).get()
task.configure {
group "build"
@@ -93,7 +103,7 @@ Task newMakeComponentsTask (Map properties) {
}
Task newAddJarsTask (Map properties) {
- return newTask(properties, "brlttyAddJars", Copy) {
+ def task = newTask(properties, "brlttyAddJars", Copy) {
description "Add the ${properties.componentName}'s ${properties.ABI} jars to the build."
dependsOn properties.makeComponentsTask
into getJarsPath(properties)
@@ -106,10 +116,15 @@ Task newAddJarsTask (Map properties) {
include "${jar}.jar"
}
}
+
+ brltty.addConsumerTask(task, "mergeDebugJavaResource")
+ brltty.addConsumerTask(task, "copyDebugJniLibsProjectAndLocalJars")
+
+ return task
}
Task newAddLibrariesTask (Map properties) {
- return newTask(properties, "brlttyAddLibraries", Copy) {
+ def task = newTask(properties, "brlttyAddLibraries", Copy) {
description "Add the ${properties.componentName}'s ${properties.ABI} libraries to the build."
dependsOn properties.makeComponentsTask
into getABIPath(properties)
@@ -122,6 +137,11 @@ Task newAddLibrariesTask (Map properties) {
include "lib${library}.so"
}
}
+
+ brltty.addConsumerTask(task, "mergeDebugJniLibFolders")
+ brltty.addConsumerTask(task, "mergeReleaseJniLibFolders")
+
+ return task
}
Task newMakeCleanTask (Map properties) {
@@ -205,7 +225,7 @@ brltty.addAssembleTask = { Project project, Task assembleTask ->
}
}
-brltty.addTasks = { Map properties ->
+brltty.buildComponent = { Map properties ->
addTasks(properties)
brltty.addAssembleTask(properties.project, properties.assembleTask)
clean.dependsOn properties.cleanTask
diff --git a/Android/Gradle/build.gradle b/Android/Gradle/build.gradle
index 82894a8ef..1d668f41f 100644
--- a/Android/Gradle/build.gradle
+++ b/Android/Gradle/build.gradle
@@ -6,7 +6,7 @@ buildscript {
}
dependencies {
- classpath "com.android.tools.build:gradle:4.1.3"
+ classpath "com.android.tools.build:gradle:8.3.0"
}
}
diff --git a/Android/Gradle/core/brltty-component.gradle b/Android/Gradle/core/brltty-component.gradle
new file mode 100644
index 000000000..834b8569e
--- /dev/null
+++ b/Android/Gradle/core/brltty-component.gradle
@@ -0,0 +1,30 @@
+brltty.buildComponent(
+ [ componentName: "core",
+ project: project,
+ makeSubdirectory: brltty.native.coreSubdirectory,
+
+ makeTargets: [
+ brltty.native.coreLibrary,
+ brltty.native.coreWrapper,
+ brltty.native.coreBindings,
+
+ "braille-drivers",
+ "speech-drivers",
+ "screen-drivers",
+ ],
+
+ libraries: [
+ "brltty_core",
+ "brltty_jni",
+
+ "brlttyb??",
+ "brlttys??",
+ "brlttyx??"
+ ],
+
+ librarySubdirectories: [
+ brltty.native.coreSubdirectory,
+ brltty.native.driversSubdirectory
+ ],
+ ]
+)
diff --git a/Android/Gradle/core/brltty.gradle b/Android/Gradle/core/brltty.gradle
deleted file mode 100644
index bcec98ba1..000000000
--- a/Android/Gradle/core/brltty.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-brltty.addTasks([
- project: project,
- componentName: "core",
- makeSubdirectory: brltty.native.coreSubdirectory,
-
- makeTargets: [
- brltty.native.coreLibrary,
- brltty.native.coreWrapper,
- brltty.native.coreBindings,
-
- "braille-drivers",
- "speech-drivers",
- "screen-drivers",
- ],
-
- libraries: [
- "brltty_core",
- "brltty_jni",
-
- "brlttyb??",
- "brlttys??",
- "brlttyx??"
- ],
-
- librarySubdirectories: [
- brltty.native.coreSubdirectory,
- brltty.native.driversSubdirectory
- ],
-])
diff --git a/Android/Gradle/core/build.gradle b/Android/Gradle/core/build.gradle
index e506b9130..b65e83597 100644
--- a/Android/Gradle/core/build.gradle
+++ b/Android/Gradle/core/build.gradle
@@ -6,9 +6,11 @@ description = """
"${project.name}" is a Java wrapper for the native "${rootProject.name}" code.
"""
-apply from: "brltty.gradle"
+apply from: "brltty-component.gradle"
android {
+ namespace "org.a11y.brltty.core"
+
compileSdkVersion "android-34"
buildToolsVersion "29.0.3"
diff --git a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/ArgumentsBuilder.java b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/ArgumentsBuilder.java
index c057899e8..22f61aa2c 100644
--- a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/ArgumentsBuilder.java
+++ b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/ArgumentsBuilder.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/Braille.java b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/Braille.java
index ff75c1dbc..14035a0b5 100644
--- a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/Braille.java
+++ b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/Braille.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/CoreWrapper.java b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/CoreWrapper.java
index 5eb23864a..e3a4cbfe9 100644
--- a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/CoreWrapper.java
+++ b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/CoreWrapper.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/LogLevel.java b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/LogLevel.java
index 842f65d8a..76ecc679d 100644
--- a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/LogLevel.java
+++ b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/LogLevel.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/ProgramExitStatus.java b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/ProgramExitStatus.java
index 30668c2f1..e64d638c6 100644
--- a/Android/Gradle/core/src/main/java/org/a11y/brltty/core/ProgramExitStatus.java
+++ b/Android/Gradle/core/src/main/java/org/a11y/brltty/core/ProgramExitStatus.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Android/Gradle/gradle/wrapper/gradle-wrapper.properties b/Android/Gradle/gradle/wrapper/gradle-wrapper.properties
index f5293ee73..a2e522259 100644
--- a/Android/Gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/Android/Gradle/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
diff --git a/Android/Gradle/publish.mk b/Android/Gradle/publish.mk
index 8c7cd1724..870a42f9e 100644
--- a/Android/Gradle/publish.mk
+++ b/Android/Gradle/publish.mk
@@ -19,7 +19,7 @@ promote-to-production:
$(GRADLE_PROMOTE_COMMAND) --from-track beta --promote-track production --release-status completed
download-listing:
- $(GRADLE_WRAPPER_COMMAND) bootstrap
+ $(GRADLE_WRAPPER_COMMAND) bootstrapListing
publish-listing:
$(GRADLE_WRAPPER_COMMAND) publishListing
diff --git a/Android/Tools/mksettings b/Android/Tools/mksettings
index 4e7a33aa1..1d8ea9524 100755
--- a/Android/Tools/mksettings
+++ b/Android/Tools/mksettings
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Android/Tools/newstrings b/Android/Tools/newstrings
index 6f090a2f2..e26307477 100755
--- a/Android/Tools/newstrings
+++ b/Android/Tools/newstrings
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Android/Tools/prologue.tcl b/Android/Tools/prologue.tcl
index 7076d5fed..f99c09681 100644
--- a/Android/Tools/prologue.tcl
+++ b/Android/Tools/prologue.tcl
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Android/Tools/rebuild b/Android/Tools/rebuild
index 44fcdc0ca..19c84aef4 100755
--- a/Android/Tools/rebuild
+++ b/Android/Tools/rebuild
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Authorization/Polkit/Makefile.in b/Authorization/Polkit/Makefile.in
index 74d240579..88e97ccdf 100644
--- a/Authorization/Polkit/Makefile.in
+++ b/Authorization/Polkit/Makefile.in
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/AppStream/Makefile.in b/Autostart/AppStream/Makefile.in
index b3c0d037a..43df2815c 100644
--- a/Autostart/AppStream/Makefile.in
+++ b/Autostart/AppStream/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/AppStream/org.a11y.brltty.metainfo.xml b/Autostart/AppStream/org.a11y.brltty.metainfo.xml
index 0d9e787df..b7f201433 100644
--- a/Autostart/AppStream/org.a11y.brltty.metainfo.xml
+++ b/Autostart/AppStream/org.a11y.brltty.metainfo.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (C) 1995-2024 by The BRLTTY Developers.
+ Copyright (C) 1995-2025 by The BRLTTY Developers.
This file is provided, free of charge and as-is, under the terms of the
All Permissive License as published by the Free Software Foundation.
diff --git a/Autostart/Hotplug/brltty b/Autostart/Hotplug/brltty
index d1b35f9f2..88a5fdf67 100755
--- a/Autostart/Hotplug/brltty
+++ b/Autostart/Hotplug/brltty
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Hotplug/brltty.usermap b/Autostart/Hotplug/brltty.usermap
index f17e31c34..4a9464d01 100644
--- a/Autostart/Hotplug/brltty.usermap
+++ b/Autostart/Hotplug/brltty.usermap
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Systemd/Makefile.in b/Autostart/Systemd/Makefile.in
index fbc41111e..3295eba9c 100644
--- a/Autostart/Systemd/Makefile.in
+++ b/Autostart/Systemd/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -34,8 +34,8 @@ install-units: install-units-directory
$(INSTALL_DATA) $(SRC_DIR)/brltty@.path $(SYSTEMD_UNITS_DIRECTORY)
$(INSTALL_DATA) $(SRC_DIR)/brltty.path $(SYSTEMD_UNITS_DIRECTORY)
-install-wrapper: install-commands-directory
- $(INSTALL_SCRIPT) $(SRC_DIR)/systemd-wrapper $(INSTALL_COMMANDS_DIRECTORY)
+install-wrapper: install-helpers-directory
+ $(INSTALL_SCRIPT) $(SRC_DIR)/systemd-wrapper $(INSTALL_HELPERS_DIRECTORY)
install-users-directory:
$(INSTALL_DIRECTORY) $(SYSTEMD_USERS_DIRECTORY)
@@ -53,7 +53,7 @@ uninstall:
-rm -f $(SYSTEMD_UNITS_DIRECTORY)/$(PACKAGE_TARNAME).*
-rm -f $(SYSTEMD_UNITS_DIRECTORY)/$(PACKAGE_TARNAME)@.*
-rm -f $(SYSTEMD_UNITS_DIRECTORY)/$(PACKAGE_TARNAME)-*
- -rm -f $(INSTALL_COMMANDS_DIRECTORY)/systemd-*
+ -rm -f $(INSTALL_HELPERS_DIRECTORY)/systemd-*
-rm -f $(SYSTEMD_USERS_FILE)
-rm -f $(SYSTEMD_FILES_FILE)
diff --git a/Autostart/Systemd/brltty-device@.service b/Autostart/Systemd/brltty-device@.service
index 108915606..044601a4c 100644
--- a/Autostart/Systemd/brltty-device@.service
+++ b/Autostart/Systemd/brltty-device@.service
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Systemd/brltty.path b/Autostart/Systemd/brltty.path
index 61c6ba916..d837187a2 100644
--- a/Autostart/Systemd/brltty.path
+++ b/Autostart/Systemd/brltty.path
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Systemd/brltty@.path b/Autostart/Systemd/brltty@.path
index 4c0d0a500..3dbccca05 100644
--- a/Autostart/Systemd/brltty@.path
+++ b/Autostart/Systemd/brltty@.path
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Systemd/brltty@.service.in b/Autostart/Systemd/brltty@.service.in
index 6a7364e4f..be3a65ec4 100644
--- a/Autostart/Systemd/brltty@.service.in
+++ b/Autostart/Systemd/brltty@.service.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -49,7 +49,7 @@ Environment="BRLTTY_PID_FILE=%t/brltty/brltty-%i.pid"
Type=@SYSTEMD_SERVICE_TYPE@
Environment="BRLTTY_EXECUTABLE_ARGUMENTS=@SYSTEMD_SERVICE_ARGUMENTS@"
-ExecStart=@COMMANDS_DIRECTORY@/systemd-wrapper
+ExecStart=@HELPERS_DIRECTORY@/systemd-wrapper
TimeoutStartSec=5
TimeoutStopSec=10
diff --git a/Autostart/Systemd/systemd-wrapper b/Autostart/Systemd/systemd-wrapper
index 929ce8575..f1b3a621d 100755
--- a/Autostart/Systemd/systemd-wrapper
+++ b/Autostart/Systemd/systemd-wrapper
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Systemd/sysusers b/Autostart/Systemd/sysusers
index 620ffe7d8..9a7e53cf3 100644
--- a/Autostart/Systemd/sysusers
+++ b/Autostart/Systemd/sysusers
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Systemd/tmpfiles.in b/Autostart/Systemd/tmpfiles.in
index 2cc4cc136..9407e3f3c 100644
--- a/Autostart/Systemd/tmpfiles.in
+++ b/Autostart/Systemd/tmpfiles.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Udev/Makefile.in b/Autostart/Udev/Makefile.in
index 33ff5ff67..b32dc0253 100644
--- a/Autostart/Udev/Makefile.in
+++ b/Autostart/Udev/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -44,8 +44,8 @@ usb-generic:
cp $(UDEV_NAME_USB_TEMPLATE) $(UDEV_NAME_USB_GENERIC)
$(UPDUSBDEVS) -onlygeneric udev:$(UDEV_NAME_USB_GENERIC)
-install-wrapper: install-commands-directory
- $(INSTALL_SCRIPT) $(SRC_DIR)/udev-wrapper $(INSTALL_COMMANDS_DIRECTORY)
+install-wrapper: install-helpers-directory
+ $(INSTALL_SCRIPT) $(SRC_DIR)/udev-wrapper $(INSTALL_HELPERS_DIRECTORY)
install-rules-directory:
$(INSTALL_DIRECTORY) $(UDEV_RULES_DIRECTORY)
@@ -71,7 +71,7 @@ install: install-wrapper install-rules
uninstall:
-rm -f $(UDEV_RULES_DIRECTORY)/?*-$(PACKAGE_TARNAME).$(UDEV_RULES_EXTENSION)
-rm -f $(UDEV_RULES_DIRECTORY)/?*-$(PACKAGE_TARNAME)-*.$(UDEV_RULES_EXTENSION)
- -rm -f $(INSTALL_COMMANDS_DIRECTORY)/udev-*
+ -rm -f $(INSTALL_HELPERS_DIRECTORY)/udev-*
clean::
-rm -f $(UDEV_NAME_USB_CUSTOMIZED)
diff --git a/Autostart/Udev/hid.rules b/Autostart/Udev/hid.rules
index 7947c50be..dfd8bc237 100644
--- a/Autostart/Udev/hid.rules
+++ b/Autostart/Udev/hid.rules
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Udev/udev-wrapper b/Autostart/Udev/udev-wrapper
index 966de7d23..0ecdb7552 100755
--- a/Autostart/Udev/udev-wrapper
+++ b/Autostart/Udev/udev-wrapper
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Udev/uinput.rules b/Autostart/Udev/uinput.rules
index 62044df92..0ded3cc88 100644
--- a/Autostart/Udev/uinput.rules
+++ b/Autostart/Udev/uinput.rules
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Autostart/Udev/usb-template.rules.in b/Autostart/Udev/usb-template.rules.in
index 060b19e7f..a530eaf23 100644
--- a/Autostart/Udev/usb-template.rules.in
+++ b/Autostart/Udev/usb-template.rules.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -47,11 +47,11 @@ ACTION=="remove", GOTO="brltty_udev_remove"
GOTO="brltty_device_end"
LABEL="brltty_udev_add"
-RUN+="@COMMANDS_DIRECTORY@/udev-wrapper"
+RUN+="@HELPERS_DIRECTORY@/udev-wrapper"
GOTO="brltty_device_end"
LABEL="brltty_udev_remove"
-RUN+="@COMMANDS_DIRECTORY@/udev-wrapper -C"
+RUN+="@HELPERS_DIRECTORY@/udev-wrapper -C"
GOTO="brltty_device_end"
LABEL="brltty_upstart"
diff --git a/Autostart/X11/Makefile.in b/Autostart/X11/Makefile.in
index 8c7ec6b74..0b8e36cf8 100644
--- a/Autostart/X11/Makefile.in
+++ b/Autostart/X11/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Emacs/Makefile.in b/Bindings/Emacs/Makefile.in
index 58055c1a3..696654b31 100644
--- a/Bindings/Emacs/Makefile.in
+++ b/Bindings/Emacs/Makefile.in
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Emacs/apitest b/Bindings/Emacs/apitest
index 39e0efbfb..9eaf41dc8 100755
--- a/Bindings/Emacs/apitest
+++ b/Bindings/Emacs/apitest
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Emacs/bindings.c b/Bindings/Emacs/bindings.c
index 690b75fa6..b483c7ef6 100644
--- a/Bindings/Emacs/bindings.c
+++ b/Bindings/Emacs/bindings.c
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+ * Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
*
* libbrlapi comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Bindings/Emacs/bindings.m4 b/Bindings/Emacs/bindings.m4
index 30a3b4f6e..306586b63 100644
--- a/Bindings/Emacs/bindings.m4
+++ b/Bindings/Emacs/bindings.m4
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Java/APIError.java b/Bindings/Java/APIError.java
index fd1c25d0e..be2cf959a 100644
--- a/Bindings/Java/APIError.java
+++ b/Bindings/Java/APIError.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/APIException.java b/Bindings/Java/APIException.java
index 5d76984da..e511fc1d4 100644
--- a/Bindings/Java/APIException.java
+++ b/Bindings/Java/APIException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/APIVersion.java b/Bindings/Java/APIVersion.java
index c0b38d920..d454efb6c 100644
--- a/Bindings/Java/APIVersion.java
+++ b/Bindings/Java/APIVersion.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/AuthenticationException.java b/Bindings/Java/AuthenticationException.java
index ca5255e49..6d014eb08 100644
--- a/Bindings/Java/AuthenticationException.java
+++ b/Bindings/Java/AuthenticationException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/BitMask.java b/Bindings/Java/BitMask.java
index 83e1d03dd..0335bdf1a 100644
--- a/Bindings/Java/BitMask.java
+++ b/Bindings/Java/BitMask.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Client.java b/Bindings/Java/Client.java
index f205379ac..afe03c626 100644
--- a/Bindings/Java/Client.java
+++ b/Bindings/Java/Client.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/CommandKeycode.java b/Bindings/Java/CommandKeycode.java
index 15a6e3e2f..538078b6a 100644
--- a/Bindings/Java/CommandKeycode.java
+++ b/Bindings/Java/CommandKeycode.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Component.java b/Bindings/Java/Component.java
index e44d7d218..15c26157b 100644
--- a/Bindings/Java/Component.java
+++ b/Bindings/Java/Component.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/ConnectException.java b/Bindings/Java/ConnectException.java
index 7e9a2fb86..a8f28c69e 100644
--- a/Bindings/Java/ConnectException.java
+++ b/Bindings/Java/ConnectException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Connection.java b/Bindings/Java/Connection.java
index 899e8be46..62a8f64ad 100644
--- a/Bindings/Java/Connection.java
+++ b/Bindings/Java/Connection.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/ConnectionBase.java b/Bindings/Java/ConnectionBase.java
index 2a643b322..ffb8dd13c 100644
--- a/Bindings/Java/ConnectionBase.java
+++ b/Bindings/Java/ConnectionBase.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/ConnectionSettings.java b/Bindings/Java/ConnectionSettings.java
index 403bcd417..e557f4a16 100644
--- a/Bindings/Java/ConnectionSettings.java
+++ b/Bindings/Java/ConnectionSettings.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/CursorPositionUsage.java b/Bindings/Java/CursorPositionUsage.java
index 7641ad2b8..1d7ed897f 100644
--- a/Bindings/Java/CursorPositionUsage.java
+++ b/Bindings/Java/CursorPositionUsage.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/DisplayNumberUsage.java b/Bindings/Java/DisplayNumberUsage.java
index be674d97a..9077a93ec 100644
--- a/Bindings/Java/DisplayNumberUsage.java
+++ b/Bindings/Java/DisplayNumberUsage.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/DisplaySize.java b/Bindings/Java/DisplaySize.java
index 97f991d4a..1ba20d785 100644
--- a/Bindings/Java/DisplaySize.java
+++ b/Bindings/Java/DisplaySize.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/DriverKeycode.java b/Bindings/Java/DriverKeycode.java
index cc966c0ad..627de0294 100644
--- a/Bindings/Java/DriverKeycode.java
+++ b/Bindings/Java/DriverKeycode.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/ExitException.java b/Bindings/Java/ExitException.java
index ec7339bb0..7c3201dfd 100644
--- a/Bindings/Java/ExitException.java
+++ b/Bindings/Java/ExitException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/ExternalException.java b/Bindings/Java/ExternalException.java
index dccf0174a..05dde5feb 100644
--- a/Bindings/Java/ExternalException.java
+++ b/Bindings/Java/ExternalException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/GlobalParameter.java b/Bindings/Java/GlobalParameter.java
index 906b38229..e9d66fb83 100644
--- a/Bindings/Java/GlobalParameter.java
+++ b/Bindings/Java/GlobalParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/HostException.java b/Bindings/Java/HostException.java
index 5677179e7..29228df92 100644
--- a/Bindings/Java/HostException.java
+++ b/Bindings/Java/HostException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Keycode.java b/Bindings/Java/Keycode.java
index 88089f274..725094755 100644
--- a/Bindings/Java/Keycode.java
+++ b/Bindings/Java/Keycode.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/KeywordMap.java b/Bindings/Java/KeywordMap.java
index 2adbe433f..3cc8fdf24 100644
--- a/Bindings/Java/KeywordMap.java
+++ b/Bindings/Java/KeywordMap.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/LocalParameter.java b/Bindings/Java/LocalParameter.java
index 10aa3c836..609d4d3cd 100644
--- a/Bindings/Java/LocalParameter.java
+++ b/Bindings/Java/LocalParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/LostConnectionException.java b/Bindings/Java/LostConnectionException.java
index eecad5458..6df9c86c8 100644
--- a/Bindings/Java/LostConnectionException.java
+++ b/Bindings/Java/LostConnectionException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Makefile.in b/Bindings/Java/Makefile.in
index ffbb97dc9..5c25b7c83 100644
--- a/Bindings/Java/Makefile.in
+++ b/Bindings/Java/Makefile.in
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by
+# Copyright (C) 2006-2025 by
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
# Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
#
diff --git a/Bindings/Java/NativeComponent.java b/Bindings/Java/NativeComponent.java
index 8297fa431..f8b9a9a7a 100644
--- a/Bindings/Java/NativeComponent.java
+++ b/Bindings/Java/NativeComponent.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/OperandException.java b/Bindings/Java/OperandException.java
index 8de02a838..3ee9d581a 100644
--- a/Bindings/Java/OperandException.java
+++ b/Bindings/Java/OperandException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/OperandUsage.java b/Bindings/Java/OperandUsage.java
index c79ef3474..277233303 100644
--- a/Bindings/Java/OperandUsage.java
+++ b/Bindings/Java/OperandUsage.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Parameter.java b/Bindings/Java/Parameter.java
index fd006478d..53a3b005e 100644
--- a/Bindings/Java/Parameter.java
+++ b/Bindings/Java/Parameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
@@ -54,6 +54,10 @@ public abstract class Parameter extends ParameterComponent {
public abstract int getParameter ();
public abstract boolean isGlobal ();
+ public boolean hasSubparam () {
+ return false;
+ }
+
public boolean isHidable () {
return false;
}
diff --git a/Bindings/Java/ParameterComponent.java b/Bindings/Java/ParameterComponent.java
index d9672a02d..695b7b8af 100644
--- a/Bindings/Java/ParameterComponent.java
+++ b/Bindings/Java/ParameterComponent.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/ParameterWatcher.java b/Bindings/Java/ParameterWatcher.java
index 47f10f6d7..826dd2227 100644
--- a/Bindings/Java/ParameterWatcher.java
+++ b/Bindings/Java/ParameterWatcher.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Parameters.java b/Bindings/Java/Parameters.java
index 283175464..b53626859 100644
--- a/Bindings/Java/Parameters.java
+++ b/Bindings/Java/Parameters.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Parse.java b/Bindings/Java/Parse.java
index 67bbaf952..5688ba767 100644
--- a/Bindings/Java/Parse.java
+++ b/Bindings/Java/Parse.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Program.java b/Bindings/Java/Program.java
index 5a08d3791..29ca592f7 100644
--- a/Bindings/Java/Program.java
+++ b/Bindings/Java/Program.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/ProgramComponent.java b/Bindings/Java/ProgramComponent.java
index 8a903500e..116e0839e 100644
--- a/Bindings/Java/ProgramComponent.java
+++ b/Bindings/Java/ProgramComponent.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/ProgramException.java b/Bindings/Java/ProgramException.java
index 89d4e7c3c..0fa9ca265 100644
--- a/Bindings/Java/ProgramException.java
+++ b/Bindings/Java/ProgramException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/RowCells.java b/Bindings/Java/RowCells.java
index 1891db25f..61688da1d 100644
--- a/Bindings/Java/RowCells.java
+++ b/Bindings/Java/RowCells.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/SemanticException.java b/Bindings/Java/SemanticException.java
index 57c481201..c71e95488 100644
--- a/Bindings/Java/SemanticException.java
+++ b/Bindings/Java/SemanticException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/Strings.java b/Bindings/Java/Strings.java
index 6587b1e80..42e208750 100644
--- a/Bindings/Java/Strings.java
+++ b/Bindings/Java/Strings.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/SyntaxException.java b/Bindings/Java/SyntaxException.java
index 1c3baf7aa..4d3780ac6 100644
--- a/Bindings/Java/SyntaxException.java
+++ b/Bindings/Java/SyntaxException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/TooManyParametersException.java b/Bindings/Java/TooManyParametersException.java
index 284a0c90d..8a1f53551 100644
--- a/Bindings/Java/TooManyParametersException.java
+++ b/Bindings/Java/TooManyParametersException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/UnavailableServiceException.java b/Bindings/Java/UnavailableServiceException.java
index da7179321..b5e246c90 100644
--- a/Bindings/Java/UnavailableServiceException.java
+++ b/Bindings/Java/UnavailableServiceException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/UnknownHostException.java b/Bindings/Java/UnknownHostException.java
index 17cc87229..55f42fecd 100644
--- a/Bindings/Java/UnknownHostException.java
+++ b/Bindings/Java/UnknownHostException.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/WriteArguments.java b/Bindings/Java/WriteArguments.java
index c535154c7..a10e72314 100644
--- a/Bindings/Java/WriteArguments.java
+++ b/Bindings/Java/WriteArguments.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/apitool b/Bindings/Java/apitool
index 6d2daed0a..9d9c42b30 100755
--- a/Bindings/Java/apitool
+++ b/Bindings/Java/apitool
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by
+# Copyright (C) 2006-2025 by
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
# Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
#
diff --git a/Bindings/Java/bindings.c b/Bindings/Java/bindings.c
index d8e48e816..45e666c55 100644
--- a/Bindings/Java/bindings.c
+++ b/Bindings/Java/bindings.c
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/bindings.h b/Bindings/Java/bindings.h
index abf3c4f7c..721dfe866 100644
--- a/Bindings/Java/bindings.h
+++ b/Bindings/Java/bindings.h
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/bindings.m4 b/Bindings/Java/bindings.m4
index d9b2458b6..0d3996e8d 100644
--- a/Bindings/Java/bindings.m4
+++ b/Bindings/Java/bindings.m4
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by
+# Copyright (C) 2006-2025 by
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
# Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
#
diff --git a/Bindings/Java/clients/ApiErrorClient.java b/Bindings/Java/clients/ApiErrorClient.java
index 2cb9a9bb7..6612bf80e 100644
--- a/Bindings/Java/clients/ApiErrorClient.java
+++ b/Bindings/Java/clients/ApiErrorClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/ApiExceptionClient.java b/Bindings/Java/clients/ApiExceptionClient.java
index b9ecc112f..867a9128f 100644
--- a/Bindings/Java/clients/ApiExceptionClient.java
+++ b/Bindings/Java/clients/ApiExceptionClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/BoundCommandsClient.java b/Bindings/Java/clients/BoundCommandsClient.java
index 85e622515..ef8be51a6 100644
--- a/Bindings/Java/clients/BoundCommandsClient.java
+++ b/Bindings/Java/clients/BoundCommandsClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/ComputerBrailleClient.java b/Bindings/Java/clients/ComputerBrailleClient.java
index bd34cc3f7..c8a95f16c 100644
--- a/Bindings/Java/clients/ComputerBrailleClient.java
+++ b/Bindings/Java/clients/ComputerBrailleClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/DriverKeysClient.java b/Bindings/Java/clients/DriverKeysClient.java
index 94d598b5b..542dd638d 100644
--- a/Bindings/Java/clients/DriverKeysClient.java
+++ b/Bindings/Java/clients/DriverKeysClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/EchoClient.java b/Bindings/Java/clients/EchoClient.java
index 327e99ba9..efe34b8eb 100644
--- a/Bindings/Java/clients/EchoClient.java
+++ b/Bindings/Java/clients/EchoClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/GetDriverClient.java b/Bindings/Java/clients/GetDriverClient.java
index f2d4cb5f8..dc5ac007b 100644
--- a/Bindings/Java/clients/GetDriverClient.java
+++ b/Bindings/Java/clients/GetDriverClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/GetModelClient.java b/Bindings/Java/clients/GetModelClient.java
index dd8f75e26..27d4011f9 100644
--- a/Bindings/Java/clients/GetModelClient.java
+++ b/Bindings/Java/clients/GetModelClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/GetSizeClient.java b/Bindings/Java/clients/GetSizeClient.java
index 629f80a42..d96fb606f 100644
--- a/Bindings/Java/clients/GetSizeClient.java
+++ b/Bindings/Java/clients/GetSizeClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/ListParametersClient.java b/Bindings/Java/clients/ListParametersClient.java
index db1f2b1b8..66ec577fa 100644
--- a/Bindings/Java/clients/ListParametersClient.java
+++ b/Bindings/Java/clients/ListParametersClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
@@ -53,6 +53,8 @@ public class ListParametersClient extends Client {
for (Parameter parameter : parameterArray) {
if (parameter.isHidable()) continue;
+ if (parameter.hasSubparam()) continue;
+
String value = parameter.toString();
if (value != null) printf("%s: %s\n", parameter.getLabel(), value);
}
@@ -61,8 +63,16 @@ public class ListParametersClient extends Client {
String value;
if (subparamValue == null) {
+ if (parameter.hasSubparam()) {
+ throw new SemanticException("subparam not specified: %s", parameter.getName());
+ }
+
value = parameter.toString();
} else {
+ if (!parameter.hasSubparam()) {
+ throw new SemanticException("has no subparam: %s", parameter.getName());
+ }
+
long subparam = subparamValue;
value = parameter.toString(subparam);
}
diff --git a/Bindings/Java/clients/PauseClient.java b/Bindings/Java/clients/PauseClient.java
index 138620bad..2385c9a7b 100644
--- a/Bindings/Java/clients/PauseClient.java
+++ b/Bindings/Java/clients/PauseClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/SetParameterClient.java b/Bindings/Java/clients/SetParameterClient.java
index 26b373ca3..d937b365d 100644
--- a/Bindings/Java/clients/SetParameterClient.java
+++ b/Bindings/Java/clients/SetParameterClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/WriteArgumentsClient.java b/Bindings/Java/clients/WriteArgumentsClient.java
index 4400abd72..6d11b91ec 100644
--- a/Bindings/Java/clients/WriteArgumentsClient.java
+++ b/Bindings/Java/clients/WriteArgumentsClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/WriteDotsClient.java b/Bindings/Java/clients/WriteDotsClient.java
index 3662880a1..2d1964723 100644
--- a/Bindings/Java/clients/WriteDotsClient.java
+++ b/Bindings/Java/clients/WriteDotsClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/clients/WriteTextClient.java b/Bindings/Java/clients/WriteTextClient.java
index 7ef4642c1..76368f687 100644
--- a/Bindings/Java/clients/WriteTextClient.java
+++ b/Bindings/Java/clients/WriteTextClient.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/commands/ApiToolCommand.java b/Bindings/Java/commands/ApiToolCommand.java
index d30449b8b..c4ce4fe29 100644
--- a/Bindings/Java/commands/ApiToolCommand.java
+++ b/Bindings/Java/commands/ApiToolCommand.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/constants.awk b/Bindings/Java/constants.awk
index f3955f40d..692639668 100644
--- a/Bindings/Java/constants.awk
+++ b/Bindings/Java/constants.awk
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by
+# Copyright (C) 2006-2025 by
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
# Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
#
diff --git a/Bindings/Java/parameters/AudibleAlertsParameter.java b/Bindings/Java/parameters/AudibleAlertsParameter.java
index 692df308c..2c1f1ba69 100644
--- a/Bindings/Java/parameters/AudibleAlertsParameter.java
+++ b/Bindings/Java/parameters/AudibleAlertsParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/BoundCommandKeycodesParameter.java b/Bindings/Java/parameters/BoundCommandKeycodesParameter.java
index ba2e68928..1665fd51b 100644
--- a/Bindings/Java/parameters/BoundCommandKeycodesParameter.java
+++ b/Bindings/Java/parameters/BoundCommandKeycodesParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/ClientPriorityParameter.java b/Bindings/Java/parameters/ClientPriorityParameter.java
index 82bd82076..c0534429e 100644
--- a/Bindings/Java/parameters/ClientPriorityParameter.java
+++ b/Bindings/Java/parameters/ClientPriorityParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/ClipboardContentParameter.java b/Bindings/Java/parameters/ClipboardContentParameter.java
index 08a4f66f4..4d642a8b7 100644
--- a/Bindings/Java/parameters/ClipboardContentParameter.java
+++ b/Bindings/Java/parameters/ClipboardContentParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/CommandKeycodeNameParameter.java b/Bindings/Java/parameters/CommandKeycodeNameParameter.java
index ff843f224..01760b9ac 100644
--- a/Bindings/Java/parameters/CommandKeycodeNameParameter.java
+++ b/Bindings/Java/parameters/CommandKeycodeNameParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
@@ -30,6 +30,11 @@ public class CommandKeycodeNameParameter extends GlobalParameter {
return Constants.PARAM_COMMAND_KEYCODE_NAME;
}
+ @Override
+ public boolean hasSubparam () {
+ return true;
+ }
+
@Override
public final String get (long code) {
return asString(getValue(code));
diff --git a/Bindings/Java/parameters/CommandKeycodeSummaryParameter.java b/Bindings/Java/parameters/CommandKeycodeSummaryParameter.java
index b32b6e4b7..62a57ede4 100644
--- a/Bindings/Java/parameters/CommandKeycodeSummaryParameter.java
+++ b/Bindings/Java/parameters/CommandKeycodeSummaryParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
@@ -30,6 +30,11 @@ public class CommandKeycodeSummaryParameter extends GlobalParameter {
return Constants.PARAM_COMMAND_KEYCODE_SUMMARY;
}
+ @Override
+ public boolean hasSubparam () {
+ return true;
+ }
+
@Override
public final String get (long code) {
return asString(getValue(code));
diff --git a/Bindings/Java/parameters/ComputerBrailleCellSizeParameter.java b/Bindings/Java/parameters/ComputerBrailleCellSizeParameter.java
index 07c227e2f..36688fdb2 100644
--- a/Bindings/Java/parameters/ComputerBrailleCellSizeParameter.java
+++ b/Bindings/Java/parameters/ComputerBrailleCellSizeParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/ComputerBrailleRowCellsParameter.java b/Bindings/Java/parameters/ComputerBrailleRowCellsParameter.java
index c04c68073..671017251 100644
--- a/Bindings/Java/parameters/ComputerBrailleRowCellsParameter.java
+++ b/Bindings/Java/parameters/ComputerBrailleRowCellsParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
@@ -30,6 +30,11 @@ public class ComputerBrailleRowCellsParameter extends GlobalParameter {
return Constants.PARAM_COMPUTER_BRAILLE_ROW_CELLS;
}
+ @Override
+ public boolean hasSubparam () {
+ return true;
+ }
+
@Override
public final RowCells get (long row) {
return asRowCells(getValue(row));
diff --git a/Bindings/Java/parameters/ComputerBrailleRowsMaskParameter.java b/Bindings/Java/parameters/ComputerBrailleRowsMaskParameter.java
index fcf9ad6e9..791372587 100644
--- a/Bindings/Java/parameters/ComputerBrailleRowsMaskParameter.java
+++ b/Bindings/Java/parameters/ComputerBrailleRowsMaskParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/ComputerBrailleTableParameter.java b/Bindings/Java/parameters/ComputerBrailleTableParameter.java
index fd3bd78b7..5f93ce70f 100644
--- a/Bindings/Java/parameters/ComputerBrailleTableParameter.java
+++ b/Bindings/Java/parameters/ComputerBrailleTableParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/CursorBlinkPercentageParameter.java b/Bindings/Java/parameters/CursorBlinkPercentageParameter.java
index 1524ba99b..553281b58 100644
--- a/Bindings/Java/parameters/CursorBlinkPercentageParameter.java
+++ b/Bindings/Java/parameters/CursorBlinkPercentageParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/CursorBlinkPeriodParameter.java b/Bindings/Java/parameters/CursorBlinkPeriodParameter.java
index bef702633..01e39f608 100644
--- a/Bindings/Java/parameters/CursorBlinkPeriodParameter.java
+++ b/Bindings/Java/parameters/CursorBlinkPeriodParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/CursorDotsParameter.java b/Bindings/Java/parameters/CursorDotsParameter.java
index 53da65e04..a9c7fb5fd 100644
--- a/Bindings/Java/parameters/CursorDotsParameter.java
+++ b/Bindings/Java/parameters/CursorDotsParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DefinedDriverKeycodesParameter.java b/Bindings/Java/parameters/DefinedDriverKeycodesParameter.java
index 7de34e7db..899ad2406 100644
--- a/Bindings/Java/parameters/DefinedDriverKeycodesParameter.java
+++ b/Bindings/Java/parameters/DefinedDriverKeycodesParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DeviceCellSizeParameter.java b/Bindings/Java/parameters/DeviceCellSizeParameter.java
index d767bbe39..7abae65c6 100644
--- a/Bindings/Java/parameters/DeviceCellSizeParameter.java
+++ b/Bindings/Java/parameters/DeviceCellSizeParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DeviceIdentifierParameter.java b/Bindings/Java/parameters/DeviceIdentifierParameter.java
index a2dc1733a..774115fe0 100644
--- a/Bindings/Java/parameters/DeviceIdentifierParameter.java
+++ b/Bindings/Java/parameters/DeviceIdentifierParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DeviceModelParameter.java b/Bindings/Java/parameters/DeviceModelParameter.java
index 94bfbd26d..409e5fa75 100644
--- a/Bindings/Java/parameters/DeviceModelParameter.java
+++ b/Bindings/Java/parameters/DeviceModelParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DeviceOnlineParameter.java b/Bindings/Java/parameters/DeviceOnlineParameter.java
index fe5f540ff..5c690a77a 100644
--- a/Bindings/Java/parameters/DeviceOnlineParameter.java
+++ b/Bindings/Java/parameters/DeviceOnlineParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DeviceSpeedParameter.java b/Bindings/Java/parameters/DeviceSpeedParameter.java
index c52d6fe72..ccb5f16da 100644
--- a/Bindings/Java/parameters/DeviceSpeedParameter.java
+++ b/Bindings/Java/parameters/DeviceSpeedParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DisplaySizeParameter.java b/Bindings/Java/parameters/DisplaySizeParameter.java
index cbbb1251b..37843ebf3 100644
--- a/Bindings/Java/parameters/DisplaySizeParameter.java
+++ b/Bindings/Java/parameters/DisplaySizeParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DriverCodeParameter.java b/Bindings/Java/parameters/DriverCodeParameter.java
index aca571114..e59bf6dd9 100644
--- a/Bindings/Java/parameters/DriverCodeParameter.java
+++ b/Bindings/Java/parameters/DriverCodeParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DriverKeycodeNameParameter.java b/Bindings/Java/parameters/DriverKeycodeNameParameter.java
index d79c4f074..875eb5215 100644
--- a/Bindings/Java/parameters/DriverKeycodeNameParameter.java
+++ b/Bindings/Java/parameters/DriverKeycodeNameParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
@@ -30,6 +30,11 @@ public class DriverKeycodeNameParameter extends GlobalParameter {
return Constants.PARAM_DRIVER_KEYCODE_NAME;
}
+ @Override
+ public boolean hasSubparam () {
+ return true;
+ }
+
@Override
public final String get (long code) {
return asString(getValue(code));
diff --git a/Bindings/Java/parameters/DriverKeycodeSummaryParameter.java b/Bindings/Java/parameters/DriverKeycodeSummaryParameter.java
index 8645854b7..4a851dc4f 100644
--- a/Bindings/Java/parameters/DriverKeycodeSummaryParameter.java
+++ b/Bindings/Java/parameters/DriverKeycodeSummaryParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
@@ -30,6 +30,11 @@ public class DriverKeycodeSummaryParameter extends GlobalParameter {
return Constants.PARAM_DRIVER_KEYCODE_SUMMARY;
}
+ @Override
+ public boolean hasSubparam () {
+ return true;
+ }
+
@Override
public final String get (long code) {
return asString(getValue(code));
diff --git a/Bindings/Java/parameters/DriverNameParameter.java b/Bindings/Java/parameters/DriverNameParameter.java
index 981052c4d..c1104d1ad 100644
--- a/Bindings/Java/parameters/DriverNameParameter.java
+++ b/Bindings/Java/parameters/DriverNameParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/DriverPropertyValueParameter.java b/Bindings/Java/parameters/DriverPropertyValueParameter.java
index feb1608df..8bda4cc36 100644
--- a/Bindings/Java/parameters/DriverPropertyValueParameter.java
+++ b/Bindings/Java/parameters/DriverPropertyValueParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
@@ -30,6 +30,11 @@ public class DriverPropertyValueParameter extends GlobalParameter implements Par
return Constants.PARAM_DRIVER_PROPERTY_VALUE;
}
+ @Override
+ public boolean hasSubparam () {
+ return true;
+ }
+
@Override
public final Long get (long subparam) {
return asLong(getValue(subparam));
diff --git a/Bindings/Java/parameters/DriverVersionParameter.java b/Bindings/Java/parameters/DriverVersionParameter.java
index 12f0d7118..d42ef4c35 100644
--- a/Bindings/Java/parameters/DriverVersionParameter.java
+++ b/Bindings/Java/parameters/DriverVersionParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/LiteraryBrailleParameter.java b/Bindings/Java/parameters/LiteraryBrailleParameter.java
index 36d715dc0..fdb6d32e4 100644
--- a/Bindings/Java/parameters/LiteraryBrailleParameter.java
+++ b/Bindings/Java/parameters/LiteraryBrailleParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/LiteraryBrailleTableParameter.java b/Bindings/Java/parameters/LiteraryBrailleTableParameter.java
index dda7bdfc6..1aa03f160 100644
--- a/Bindings/Java/parameters/LiteraryBrailleTableParameter.java
+++ b/Bindings/Java/parameters/LiteraryBrailleTableParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/MessageLocaleParameter.java b/Bindings/Java/parameters/MessageLocaleParameter.java
index 998917f97..529eabcda 100644
--- a/Bindings/Java/parameters/MessageLocaleParameter.java
+++ b/Bindings/Java/parameters/MessageLocaleParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/RenderedCellsParameter.java b/Bindings/Java/parameters/RenderedCellsParameter.java
index f9c3b1eee..ccd601b55 100644
--- a/Bindings/Java/parameters/RenderedCellsParameter.java
+++ b/Bindings/Java/parameters/RenderedCellsParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/RetainDotsParameter.java b/Bindings/Java/parameters/RetainDotsParameter.java
index 84c4d8d17..73ba95040 100644
--- a/Bindings/Java/parameters/RetainDotsParameter.java
+++ b/Bindings/Java/parameters/RetainDotsParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/ServerVersionParameter.java b/Bindings/Java/parameters/ServerVersionParameter.java
index 64e47d416..f4842490c 100644
--- a/Bindings/Java/parameters/ServerVersionParameter.java
+++ b/Bindings/Java/parameters/ServerVersionParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/parameters/SkipIdenticalLinesParameter.java b/Bindings/Java/parameters/SkipIdenticalLinesParameter.java
index 370814c95..31e639324 100644
--- a/Bindings/Java/parameters/SkipIdenticalLinesParameter.java
+++ b/Bindings/Java/parameters/SkipIdenticalLinesParameter.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Java/programs/VersionProgram.java b/Bindings/Java/programs/VersionProgram.java
index 16a25ca74..d288dfac6 100644
--- a/Bindings/Java/programs/VersionProgram.java
+++ b/Bindings/Java/programs/VersionProgram.java
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by
+ * Copyright (C) 2006-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Bindings/Lisp/Makefile.in b/Bindings/Lisp/Makefile.in
index 6161737f8..b1ec4397c 100644
--- a/Bindings/Lisp/Makefile.in
+++ b/Bindings/Lisp/Makefile.in
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Mario Lang <mlang@delysid.org>
+# Copyright (C) 2006-2025 by Mario Lang <mlang@delysid.org>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Lisp/apisetup.lisp b/Bindings/Lisp/apisetup.lisp
index 9d9adf250..e63387c79 100644
--- a/Bindings/Lisp/apisetup.lisp
+++ b/Bindings/Lisp/apisetup.lisp
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; libbrlapi - A library providing access to braille terminals for applications.
;
-; Copyright (C) 2006-2024 by Mario Lang <mlang@delysid.org>
+; Copyright (C) 2006-2025 by Mario Lang <mlang@delysid.org>
;
; libbrlapi comes with ABSOLUTELY NO WARRANTY.
;
diff --git a/Bindings/Lisp/apitest b/Bindings/Lisp/apitest
index 1396ca54b..91bc358f5 100755
--- a/Bindings/Lisp/apitest
+++ b/Bindings/Lisp/apitest
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Lisp/apitest.lisp b/Bindings/Lisp/apitest.lisp
index 70102ff38..b7526abd6 100644
--- a/Bindings/Lisp/apitest.lisp
+++ b/Bindings/Lisp/apitest.lisp
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; libbrlapi - A library providing access to braille terminals for applications.
;
-; Copyright (C) 2006-2024 by Mario Lang <mlang@delysid.org>
+; Copyright (C) 2006-2025 by Mario Lang <mlang@delysid.org>
;
; libbrlapi comes with ABSOLUTELY NO WARRANTY.
;
diff --git a/Bindings/Lisp/bindings.m4 b/Bindings/Lisp/bindings.m4
index 1f2acc13b..da6daf901 100644
--- a/Bindings/Lisp/bindings.m4
+++ b/Bindings/Lisp/bindings.m4
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Lisp/brlapi.asd.in b/Bindings/Lisp/brlapi.asd.in
index 43b6b5ffe..0e28a246d 100644
--- a/Bindings/Lisp/brlapi.asd.in
+++ b/Bindings/Lisp/brlapi.asd.in
@@ -2,7 +2,7 @@
;;;; libbrlapi - A library providing access to braille terminals for applications.
;;;;
-;;;; Copyright (C) 2006-2024 by Mario Lang <mlang@blind.guru>
+;;;; Copyright (C) 2006-2025 by Mario Lang <mlang@blind.guru>
;;;;
;;;; libbrlapi comes with ABSOLUTELY NO WARRANTY.
;;;;
diff --git a/Bindings/Lisp/brlapi.lisp b/Bindings/Lisp/brlapi.lisp
index a928174c4..e6d87cd04 100644
--- a/Bindings/Lisp/brlapi.lisp
+++ b/Bindings/Lisp/brlapi.lisp
@@ -1,6 +1,6 @@
;;;; libbrlapi - A library providing access to braille terminals for applications.
;;;;
-;;;; Copyright (C) 2006-2024 by Mario Lang <mlang@delysid.org>
+;;;; Copyright (C) 2006-2025 by Mario Lang <mlang@delysid.org>
;;;;
;;;; libbrlapi comes with ABSOLUTELY NO WARRANTY.
;;;;
diff --git a/Bindings/Lisp/brlapi_config.lisp.in b/Bindings/Lisp/brlapi_config.lisp.in
index b40e0de2d..09fae4b3d 100644
--- a/Bindings/Lisp/brlapi_config.lisp.in
+++ b/Bindings/Lisp/brlapi_config.lisp.in
@@ -2,7 +2,7 @@
;;;; libbrlapi - A library providing access to braille terminals for applications.
;;;;
-;;;; Copyright (C) 2006-2024 by Mario Lang <mlang@delysid.org>
+;;;; Copyright (C) 2006-2025 by Mario Lang <mlang@delysid.org>
;;;;
;;;; libbrlapi comes with ABSOLUTELY NO WARRANTY.
;;;;
diff --git a/Bindings/Lisp/brlapi_prologue.lisp b/Bindings/Lisp/brlapi_prologue.lisp
index 12c5373ef..572e6baef 100644
--- a/Bindings/Lisp/brlapi_prologue.lisp
+++ b/Bindings/Lisp/brlapi_prologue.lisp
@@ -1,6 +1,6 @@
;;;; libbrlapi - A library providing access to braille terminals for applications.
;;;;
-;;;; Copyright (C) 2006-2024 by Mario Lang <mlang@delysid.org>
+;;;; Copyright (C) 2006-2025 by Mario Lang <mlang@delysid.org>
;;;;
;;;; libbrlapi comes with ABSOLUTELY NO WARRANTY.
;;;;
diff --git a/Bindings/Lua/Makefile.in b/Bindings/Lua/Makefile.in
index e16791691..fdd15256d 100644
--- a/Bindings/Lua/Makefile.in
+++ b/Bindings/Lua/Makefile.in
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Lua/apitest b/Bindings/Lua/apitest
index 85cf8cf8d..72e1742df 100755
--- a/Bindings/Lua/apitest
+++ b/Bindings/Lua/apitest
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Lua/apitest.lua b/Bindings/Lua/apitest.lua
index aa3e8065e..6b791fd10 100644
--- a/Bindings/Lua/apitest.lua
+++ b/Bindings/Lua/apitest.lua
@@ -1,7 +1,7 @@
--[[
libbrlapi - A library providing access to braille terminals for applications.
- Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+ Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
libbrlapi comes with ABSOLUTELY NO WARRANTY.
diff --git a/Bindings/Lua/bindings.c b/Bindings/Lua/bindings.c
index e3552f6dd..a04e58c93 100644
--- a/Bindings/Lua/bindings.c
+++ b/Bindings/Lua/bindings.c
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+ * Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
*
* libbrlapi comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Bindings/Lua/bindings.m4 b/Bindings/Lua/bindings.m4
index acb9ff58d..21ebbc674 100644
--- a/Bindings/Lua/bindings.m4
+++ b/Bindings/Lua/bindings.m4
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Lua/constants.awk b/Bindings/Lua/constants.awk
index 77ab463e2..6388187b5 100644
--- a/Bindings/Lua/constants.awk
+++ b/Bindings/Lua/constants.awk
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by
+# Copyright (C) 2006-2025 by
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
# Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
#
diff --git a/Bindings/OCaml/Makefile.in b/Bindings/OCaml/Makefile.in
index 9aace5849..e90215d4b 100644
--- a/Bindings/OCaml/Makefile.in
+++ b/Bindings/OCaml/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -21,6 +21,7 @@ include $(SRC_TOP)bindings.mk
OCAML_OK = @OCAML_OK@
OCAMLC = @OCAMLC@
OCAMLOPT = @OCAMLOPT@
+OCAMLFLAGS = -I +unix
OCAMLMKLIB = @OCAMLMKLIB@
OCAMLMKLIB_FLAGS = -dllib dll$(API_NAME)_stubs.so -cclib -l$(API_NAME)_stubs -cclib -l$(API_NAME)
OCAMLMKLIBOPT_FLAGS = -cclib -l$(API_NAME)_stubs -cclib -l$(API_NAME)
@@ -64,13 +65,13 @@ $(OCAML_NCLIB): $(OCAML_CLIBS) brlapi.cmx
$(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
brlapi.cmi: brlapi.mli
- $(OCAMLC) -cc $(CC) -ccopt "$(LIBCFLAGS)" -o $@ -c brlapi.mli
+ $(OCAMLC) $(OCAMLFLAGS) -cc $(CC) -ccopt "$(LIBCFLAGS)" -o $@ -c brlapi.mli
brlapi.cmo: brlapi.ml brlapi.cmi
- $(OCAMLC) -cc $(CC) -ccopt "$(LIBCFLAGS)" -o $@ -c brlapi.ml
+ $(OCAMLC) $(OCAMLFLAGS) -cc $(CC) -ccopt "$(LIBCFLAGS)" -o $@ -c brlapi.ml
brlapi.cmx: brlapi.ml brlapi.cmi
- $(OCAMLOPT) -cc $(CC) -ccopt "$(LIBCFLAGS)" -o $@ -c brlapi.cmx brlapi.ml
+ $(OCAMLOPT) $(OCAMLFLAGS) -cc $(CC) -ccopt "$(LIBCFLAGS)" -o $@ -c brlapi.cmx brlapi.ml
brlapi_stubs.$O: $(SRC_DIR)/brlapi_stubs.c
$(OCAMLC) -cc $(CC) -ccopt "$(LIBCFLAGS)" -I $(BLD_TOP)$(PGM_DIR) -I $(SRC_TOP)$(PGM_DIR) -c $(SRC_DIR)/brlapi_stubs.c
@@ -82,7 +83,7 @@ brlapi.ml: $(SRC_DIR)/main.ml constants.ml
cat $(SRC_DIR)/main.ml constants.ml > $@
constants.mli: constants.ml
- $(OCAMLC) -o /dev/null -c -i constants.ml > $@
+ $(OCAMLC) $(OCAMLFLAGS) -o /dev/null -c -i constants.ml > $@
constants.ml: $(CONSTANTS_DEPENDENCIES)
$(AWK) $(CONSTANTS_ARGUMENTS) >$@
diff --git a/Bindings/OCaml/brlapi_stubs.c b/Bindings/OCaml/brlapi_stubs.c
index bae24842a..3d8b9de81 100644
--- a/Bindings/OCaml/brlapi_stubs.c
+++ b/Bindings/OCaml/brlapi_stubs.c
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2005-2024 by
+ * Copyright (C) 2005-2025 by
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* All rights reserved.
diff --git a/Bindings/OCaml/constants.awk b/Bindings/OCaml/constants.awk
index 04f2567c6..23c734d25 100644
--- a/Bindings/OCaml/constants.awk
+++ b/Bindings/OCaml/constants.awk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/OCaml/main.ml b/Bindings/OCaml/main.ml
index 7f12cd265..392f6e72c 100644
--- a/Bindings/OCaml/main.ml
+++ b/Bindings/OCaml/main.ml
@@ -1,7 +1,7 @@
(*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2002-2024 by
+ * Copyright (C) 2002-2025 by
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* All rights reserved.
diff --git a/Bindings/OCaml/main.mli b/Bindings/OCaml/main.mli
index 348a0daf3..831b8a668 100644
--- a/Bindings/OCaml/main.mli
+++ b/Bindings/OCaml/main.mli
@@ -1,7 +1,7 @@
(*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2002-2024 by
+ * Copyright (C) 2002-2025 by
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* All rights reserved.
diff --git a/Bindings/Python/Makefile.in b/Bindings/Python/Makefile.in
index c6d43f55d..fd65ad736 100644
--- a/Bindings/Python/Makefile.in
+++ b/Bindings/Python/Makefile.in
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2025 by
# Alexis Robert <alexissoft@free.fr>
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
#
diff --git a/Bindings/Python/apitest b/Bindings/Python/apitest
index e9980dbf2..69505e7ec 100755
--- a/Bindings/Python/apitest
+++ b/Bindings/Python/apitest
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Python/apitest.py b/Bindings/Python/apitest.py
index 78e6ebd64..c2f862639 100755
--- a/Bindings/Python/apitest.py
+++ b/Bindings/Python/apitest.py
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Python/bindings.c b/Bindings/Python/bindings.c
index 208a2493b..4b019257f 100644
--- a/Bindings/Python/bindings.c
+++ b/Bindings/Python/bindings.c
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2005-2024 by
+ * Copyright (C) 2005-2025 by
* Alexis Robert <alexissoft@free.fr>
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
*
diff --git a/Bindings/Python/bindings.h b/Bindings/Python/bindings.h
index ffd677704..15f66af89 100644
--- a/Bindings/Python/bindings.h
+++ b/Bindings/Python/bindings.h
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2005-2024 by
+ * Copyright (C) 2005-2025 by
* Alexis Robert <alexissoft@free.fr>
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
*
diff --git a/Bindings/Python/bindings.m4 b/Bindings/Python/bindings.m4
index 040dedfc1..3b10a4adf 100644
--- a/Bindings/Python/bindings.m4
+++ b/Bindings/Python/bindings.m4
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2025 by
# Alexis Robert <alexissoft@free.fr>
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
#
diff --git a/Bindings/Python/brlapi.pyx b/Bindings/Python/brlapi.pyx
index dbc889073..38a035eb1 100644
--- a/Bindings/Python/brlapi.pyx
+++ b/Bindings/Python/brlapi.pyx
@@ -5,6 +5,8 @@ The reference C API documentation is available online http://brltty.app/doc/BrlA
This documentation is only a python helper, you should also read C manual pages.
+A general introduction guide is available online https://brltty.app/doc/Manual-BrlAPI/English/BrlAPI.html
+
Example :
import brlapi
import errno
@@ -110,7 +112,7 @@ except brlapi.ConnectionError as e:
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2025 by
# Alexis Robert <alexissoft@free.fr>
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
#
@@ -540,7 +542,9 @@ cdef class Connection:
* tty : If tty >= 0, application takes control of the specified tty
If tty == TTY_DEFAULT, the library first tries to get the tty number from the WINDOWID environment variable (form xterm case), then the CONTROLVT variable, and at last reads /proc/self/stat (on linux)
- * driver : Tells how the application wants readKey() to return key presses. None or "" means BrlTTY commands are required, whereas a driver name means that raw key codes returned by this driver are expected."""
+ * driver : Tells how the application wants readKey() to return key presses. None or "" means BrlTTY commands are required, whereas a driver name means that raw key codes returned by this driver are expected.
+
+ If the application does not want to take control of a particular tty, but keep control on all ttys, brlapi_enterTtyModeWithPath should be called instead with path equal to []. This is usually what a screen reader wants to use."""
cdef int retval
cdef int c_tty
cdef char *c_driver
diff --git a/Bindings/Python/c_brlapi.pxd b/Bindings/Python/c_brlapi.pxd
index 90a7dac97..e6720f76c 100644
--- a/Bindings/Python/c_brlapi.pxd
+++ b/Bindings/Python/c_brlapi.pxd
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2025 by
# Alexis Robert <alexissoft@free.fr>
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
#
diff --git a/Bindings/Python/constants.awk b/Bindings/Python/constants.awk
index 89f1347e2..1f7d2420b 100644
--- a/Bindings/Python/constants.awk
+++ b/Bindings/Python/constants.awk
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2025 by
# Alexis Robert <alexissoft@free.fr>
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
#
diff --git a/Bindings/Python/mkdoc.py b/Bindings/Python/mkdoc.py
index 36ea74e9e..aba31cd8c 100644
--- a/Bindings/Python/mkdoc.py
+++ b/Bindings/Python/mkdoc.py
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2025 by
# Alexis Robert <alexissoft@free.fr>
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
#
diff --git a/Bindings/Python/setup.py.in b/Bindings/Python/setup.py.in
index 1f604dc4a..9adee4fb7 100644
--- a/Bindings/Python/setup.py.in
+++ b/Bindings/Python/setup.py.in
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2025 by
# Alexis Robert <alexissoft@free.fr>
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
#
diff --git a/Bindings/Tcl/Makefile.in b/Bindings/Tcl/Makefile.in
index 6e802f0c4..a260c9e66 100644
--- a/Bindings/Tcl/Makefile.in
+++ b/Bindings/Tcl/Makefile.in
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Tcl/apishell b/Bindings/Tcl/apishell
index 61f609b0a..d2342c3f2 100755
--- a/Bindings/Tcl/apishell
+++ b/Bindings/Tcl/apishell
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Tcl/apitest b/Bindings/Tcl/apitest
index a44afa15c..006555fa6 100755
--- a/Bindings/Tcl/apitest
+++ b/Bindings/Tcl/apitest
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Tcl/apitest.tcl b/Bindings/Tcl/apitest.tcl
index 2fef09a70..9ddc64d62 100755
--- a/Bindings/Tcl/apitest.tcl
+++ b/Bindings/Tcl/apitest.tcl
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bindings/Tcl/bindings.c b/Bindings/Tcl/bindings.c
index 9be12ee69..3310fcf80 100644
--- a/Bindings/Tcl/bindings.c
+++ b/Bindings/Tcl/bindings.c
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+ * Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
*
* libbrlapi comes with ABSOLUTELY NO WARRANTY.
*
@@ -19,12 +19,19 @@
#include <unistd.h>
#include <string.h>
+#include "brl_dots.h"
+
#define BRLAPI_NO_DEPRECATED
#define BRLAPI_NO_SINGLE_SESSION
#include "brlapi.h"
#include <tcl.h>
-#include "brl_dots.h"
+
+#ifndef TCL_SIZE_MAX
+typedef int Tcl_Size;
+#define TCL_SIZE_MAX ((int)(((unsigned int)-1)>>1))
+#define TCL_SIZE_MODIFIER ""
+#endif /* TCL_SIZE_MAX */
#define allocateMemory(size) ((void *)ckalloc((size)))
#define deallocateMemory(address) ckfree((void *)(address))
@@ -74,15 +81,11 @@ setStringResult (Tcl_Interp *interp, const char *string, int length) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), string, length);
}
-static void
-setStringsResult (Tcl_Interp *interp, ...) {
- Tcl_ResetResult(interp);
-
- va_list arguments;
- va_start(arguments, interp);
- Tcl_AppendStringsToObjVA(Tcl_GetObjResult(interp), arguments);
- va_end(arguments);
-}
+#define setStringsResult(interp, ...) \
+ do { \
+ Tcl_ResetResult(interp); \
+ Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), __VA_ARGS__); \
+ } while (0)
static void
setByteArrayResult (Tcl_Interp *interp, const unsigned char *bytes, int count) {
@@ -428,7 +431,7 @@ FUNCTION_HANDLER(session, enterTtyModeWithPath) {
END_OPTIONS(2, 0, 0, "")
Tcl_Obj **elements;
- int count;
+ Tcl_Size count;
if (options.path) {
TEST_TCL_OK(Tcl_ListObjGetElements(interp, options.path, &count, &elements));
@@ -650,7 +653,7 @@ FUNCTION_HANDLER(session, parameter) {
default: {
Tcl_Obj **elements;
- int count;
+ Tcl_Size count;
TEST_TCL_OK(Tcl_ListObjGetElements(interp, value, &count, &elements));
if (count) {
@@ -835,7 +838,7 @@ FUNCTION_HANDLER(session, readKey) {
BrlapiSession *session = data;
TEST_FUNCTION_ARGUMENTS(1, 0, "<wait>");
- int length;
+ Tcl_Size length;
const char *operand = Tcl_GetStringFromObj(objv[2], &length);
if (!operand) return TCL_ERROR;
@@ -854,7 +857,7 @@ FUNCTION_HANDLER(session, readKeyWithTimeout) {
BrlapiSession *session = data;
TEST_FUNCTION_ARGUMENTS(1, 0, "{infinite | <seconds>}");
- int length;
+ Tcl_Size length;
const char *operand = Tcl_GetStringFromObj(objv[2], &length);
if (!operand) return TCL_ERROR;
int timeout;
@@ -908,7 +911,7 @@ FUNCTION_HANDLER(session, sendRaw) {
BrlapiSession *session = data;
TEST_FUNCTION_ARGUMENTS(1, 0, "<packet>");
- int count;
+ Tcl_Size count;
const unsigned char *bytes = Tcl_GetByteArrayFromObj(objv[2], &count);
TEST_BRLAPI_OK(brlapi__sendRaw(session->handle, bytes, count));
@@ -943,8 +946,8 @@ typedef struct {
Tcl_Obj *textObject;
int textLength;
- int andLength;
- int orLength;
+ Tcl_Size andLength;
+ Tcl_Size orLength;
unsigned numericCursor:1;
unsigned numericDisplay:1;
@@ -1240,7 +1243,7 @@ FUNCTION_HANDLER(session, writeDots) {
TEST_TCL_OK(getCellCount(interp, session, &size));
unsigned char buffer[size];
- int count;
+ Tcl_Size count;
const unsigned char *cells = Tcl_GetByteArrayFromObj(objv[2], &count);
if (count < size) {
@@ -1293,7 +1296,7 @@ changeKeys (
}
Tcl_Obj **codeElements;
- int codeCount;
+ Tcl_Size codeCount;
TEST_TCL_OK(Tcl_ListObjGetElements(interp, codeList, &codeCount, &codeElements));
if (codeCount) {
@@ -1335,7 +1338,7 @@ changeKeyRanges (
TEST_FUNCTION_ARGUMENTS(1, 0, "<keyRangeList>");
Tcl_Obj **rangeElements;
- int rangeCount;
+ Tcl_Size rangeCount;
TEST_TCL_OK(Tcl_ListObjGetElements(interp, objv[2], &rangeCount, &rangeElements));
if (rangeCount) {
@@ -1344,7 +1347,7 @@ changeKeyRanges (
for (int rangeIndex=0; rangeIndex<rangeCount; rangeIndex+=1) {
brlapi_range_t *range = &ranges[rangeIndex];
Tcl_Obj **codeElements;
- int codeCount;
+ Tcl_Size codeCount;
TEST_TCL_OK(Tcl_ListObjGetElements(interp, rangeElements[rangeIndex], &codeCount, &codeElements));
if (codeCount != 2) {
@@ -1532,7 +1535,7 @@ FUNCTION_HANDLER(general, makeDots) {
TEST_FUNCTION_ARGUMENTS(1, 0, "<dotNumbersList>");
Tcl_Obj **elements;
- int elementCount;
+ Tcl_Size elementCount;
TEST_TCL_OK(Tcl_ListObjGetElements(interp, objv[2], &elementCount, &elements));
if (elementCount) {
@@ -1543,7 +1546,7 @@ FUNCTION_HANDLER(general, makeDots) {
BrlDots *cell = &cells[elementIndex];
*cell = 0;
- int numberCount;
+ Tcl_Size numberCount;
const char *numbers = Tcl_GetStringFromObj(element, &numberCount);
if (!numbers) return TCL_ERROR;
diff --git a/Bindings/Tcl/bindings.m4 b/Bindings/Tcl/bindings.m4
index edb59a72e..5b8ad2aa1 100644
--- a/Bindings/Tcl/bindings.m4
+++ b/Bindings/Tcl/bindings.m4
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
@@ -51,8 +51,20 @@ fi
${TCL_OK} && {
test -n "${TCL_PACKAGE_PATH}" && {
- for directory in ${TCL_PACKAGE_PATH}
+ directories="${TCL_PACKAGE_PATH}"
+
+ test "${directories#*:}" = "${directories}" && {
+ # There's no colon so it's an old-style (before tcl-8.6.15) path.
+ # Replace each sequence of one or more spaces with a single colon.
+ directories="${directories// /:}"
+ }
+
+ while test "${#directories}" -gt 0
do
+ directory="${directories%%:*}"
+ directories="${directories#*:}"
+ test "${#directory}" -eq 0 && continue
+
test `expr "${directory}" : '.*/lib'` -eq 0 || {
TCL_DIR="${directory}"
break
diff --git a/Bindings/Tcl/constants.awk b/Bindings/Tcl/constants.awk
index 21bba3027..bba3bb5a9 100644
--- a/Bindings/Tcl/constants.awk
+++ b/Bindings/Tcl/constants.awk
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by
+# Copyright (C) 2006-2025 by
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
# Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
#
diff --git a/Bindings/Tcl/prologue.tcl b/Bindings/Tcl/prologue.tcl
index 548cea1af..7bb5e6dc5 100644
--- a/Bindings/Tcl/prologue.tcl
+++ b/Bindings/Tcl/prologue.tcl
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bootdisks/README.RedHat.fd b/Bootdisks/README.RedHat.fd
index 10a706688..8e11f1686 100644
--- a/Bootdisks/README.RedHat.fd
+++ b/Bootdisks/README.RedHat.fd
@@ -8,9 +8,9 @@ installation boot disk so that BRLTTY can be used during the installation
process.
History:
--Initial draft from Stphane Doyon <s.doyon@videotron.ca>
+-Initial draft from Stéphane Doyon <s.doyon@videotron.ca>
-Additions from Nicolas Pitre <nico@fluxnic.net>
--April 7, 2002: Mostly rewritten by Stphane Doyon to take into account
+-April 7, 2002: Mostly rewritten by Stéphane Doyon to take into account
the INIT_PATH hack
-September 26, 2002: Amended by Dave Mielke <dave@mielke.cc> due to change from
make file editing to autoconf in 3.1.
diff --git a/Bootdisks/bp2cf b/Bootdisks/bp2cf
index 57f6ffd0e..9ec72625f 100755
--- a/Bootdisks/bp2cf
+++ b/Bootdisks/bp2cf
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Bootdisks/rhmkiso b/Bootdisks/rhmkiso
index 52d25f8a8..26a42c78d 100755
--- a/Bootdisks/rhmkiso
+++ b/Bootdisks/rhmkiso
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Build/Logs/Windows-libusb-1.0.log b/Build/Logs/Windows-libusb-1.0.log
index 05d12fabc..7e625f267 100644
--- a/Build/Logs/Windows-libusb-1.0.log
+++ b/Build/Logs/Windows-libusb-1.0.log
@@ -27,20 +27,20 @@ c:\Program Files (x86)\Python311-32\include/cpython/pytime.h:190:12: warning: 's
190 | struct timeval *tv,
| ^~~~~~~
brlapi.auto.c: In function '__Pyx_ImportType_3_0_4':
-brlapi.auto.c:33203:13: warning: unknown conversion type character 'z' in format [-Wformat=]
-33203 | "%s.%s size changed, may indicate binary incompatibility. "
+brlapi.auto.c:33284:13: warning: unknown conversion type character 'z' in format [-Wformat=]
+33284 | "%s.%s size changed, may indicate binary incompatibility. "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-brlapi.auto.c:33204:24: note: format string is defined here
-33204 | "Expected %zd from C header, got %zd from PyObject",
+brlapi.auto.c:33285:24: note: format string is defined here
+33285 | "Expected %zd from C header, got %zd from PyObject",
| ^
-brlapi.auto.c:33203:13: warning: unknown conversion type character 'z' in format [-Wformat=]
-33203 | "%s.%s size changed, may indicate binary incompatibility. "
+brlapi.auto.c:33284:13: warning: unknown conversion type character 'z' in format [-Wformat=]
+33284 | "%s.%s size changed, may indicate binary incompatibility. "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-brlapi.auto.c:33204:47: note: format string is defined here
-33204 | "Expected %zd from C header, got %zd from PyObject",
+brlapi.auto.c:33285:47: note: format string is defined here
+33285 | "Expected %zd from C header, got %zd from PyObject",
| ^
-brlapi.auto.c:33203:13: warning: too many arguments for format [-Wformat-extra-args]
-33203 | "%s.%s size changed, may indicate binary incompatibility. "
+brlapi.auto.c:33284:13: warning: too many arguments for format [-Wformat-extra-args]
+33284 | "%s.%s size changed, may indicate binary incompatibility. "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mkwin: building documents
linuxdoc is not installed - document will not be made
diff --git a/Build/Logs/Windows-libusb.log b/Build/Logs/Windows-libusb.log
index 8f07a5d84..29d2088f4 100644
--- a/Build/Logs/Windows-libusb.log
+++ b/Build/Logs/Windows-libusb.log
@@ -27,20 +27,20 @@ c:\Program Files (x86)\Python311-32\include/cpython/pytime.h:190:12: warning: 's
190 | struct timeval *tv,
| ^~~~~~~
brlapi.auto.c: In function '__Pyx_ImportType_3_0_4':
-brlapi.auto.c:33203:13: warning: unknown conversion type character 'z' in format [-Wformat=]
-33203 | "%s.%s size changed, may indicate binary incompatibility. "
+brlapi.auto.c:33284:13: warning: unknown conversion type character 'z' in format [-Wformat=]
+33284 | "%s.%s size changed, may indicate binary incompatibility. "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-brlapi.auto.c:33204:24: note: format string is defined here
-33204 | "Expected %zd from C header, got %zd from PyObject",
+brlapi.auto.c:33285:24: note: format string is defined here
+33285 | "Expected %zd from C header, got %zd from PyObject",
| ^
-brlapi.auto.c:33203:13: warning: unknown conversion type character 'z' in format [-Wformat=]
-33203 | "%s.%s size changed, may indicate binary incompatibility. "
+brlapi.auto.c:33284:13: warning: unknown conversion type character 'z' in format [-Wformat=]
+33284 | "%s.%s size changed, may indicate binary incompatibility. "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-brlapi.auto.c:33204:47: note: format string is defined here
-33204 | "Expected %zd from C header, got %zd from PyObject",
+brlapi.auto.c:33285:47: note: format string is defined here
+33285 | "Expected %zd from C header, got %zd from PyObject",
| ^
-brlapi.auto.c:33203:13: warning: too many arguments for format [-Wformat-extra-args]
-33203 | "%s.%s size changed, may indicate binary incompatibility. "
+brlapi.auto.c:33284:13: warning: too many arguments for format [-Wformat-extra-args]
+33284 | "%s.%s size changed, may indicate binary incompatibility. "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mkwin: building documents
linuxdoc is not installed - document will not be made
diff --git a/Build/mk-android b/Build/mk-android
index bb624f6fd..d3dbac4a9 100755
--- a/Build/mk-android
+++ b/Build/mk-android
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Build/mk-dos b/Build/mk-dos
index a60cdb4b7..1075b013a 100755
--- a/Build/mk-dos
+++ b/Build/mk-dos
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Build/mk-prologue.sh b/Build/mk-prologue.sh
index 18b389303..2101b65de 100644
--- a/Build/mk-prologue.sh
+++ b/Build/mk-prologue.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Build/mk-windows b/Build/mk-windows
index a8092a085..3dd5444f5 100755
--- a/Build/mk-windows
+++ b/Build/mk-windows
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/DOS/mkdosarc b/DOS/mkdosarc
index a2a727447..10fd92583 100755
--- a/DOS/mkdosarc
+++ b/DOS/mkdosarc
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/DOS/mkdostools b/DOS/mkdostools
index faab3de64..d9fe5b448 100755
--- a/DOS/mkdostools
+++ b/DOS/mkdostools
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Documents/ChangeLog b/Documents/ChangeLog
index adfa8c66b..813d5cdd5 100644
--- a/Documents/ChangeLog
+++ b/Documents/ChangeLog
@@ -1,6 +1,56 @@
Note: this file is in reversed chronological order (bottom to top).
+October 15, 2024:
+ - BRLTTY 6.7 released:
+ General changes:
+ The -g [--gui-keyboard=] command line option has been added.
+ The -G (--gui-keyboard-table) command line option has been added.
+ The Speak Empty Line preference (default is yes) has been added.
+ The ASPK_EMP_LINE toggle command has been added.
+ BrailleMemo braille driver changes:
+ The KGS Next Touch models are now supported.
+ FreedomScientific braille driver changes:
+ Bluetooth service discovery is now used to find the serial channel.
+ HandyTech braille driver changes:
+ The Activator Pro models are now supported.
+ USB support for the Basic Braille Plus models has been enabled.
+ HIMS braille driver changes:
+ The eMotion is now supported.
+ USB detection of the BrailleSense 6 has been fixed.
+ Linux screen driver changes:
+ Keyboard input when in graphical mode is now supported.
+ Modifying a character with the Left Alt key is now supported.
+ The CapsLock key is now supported as a modifier (for Orca's laptop mode).
+ Shifted keys have been added to the XT key entry table.
+ AtSpi screen driver changes:
+ The Enter key is now mapped to the Return key rather than to Keypad Enter.
+ FileViewer screen driver changes:
+ The show=yes,no parameter has been added.
+ Typing any character now beeps as that's invalid on a read-only screen.
+ Home/End now go to the start/end of the current line.
+ Home/End with the Control modifier now go to the start/end of the file.
+ Speech FIFO changes:
+ A single write may now contain several packets.
+ Packet options for each of the autospeak echo settings have been added.
+ A packet option allowing a tune to be written has been added.
+ BrlAPI changes:
+ The version is now 0.8.6 (it was 0.8.5).
+ Setting a subparameter value has been fixed.
+ The BRLAPI_PARAM_DRIVER_PROPERTY_VALUE parameter has been added.
+ The WM_COMMAND window manager property is now monitored for changes.
+ The --write-window and --write-command options have been added to xbrlapi.
+ Key table changes:
+ The assignGlobal directive has been added.
+ Windows changes:
+ The winsetup script now supports the python-location symbolic link.
+ Android changes:
+ The release version is no longer allowed to upgrade itself.
+ Translations for the Ukrainian language have been added.
+ Language changes:
+ The German contraction table has been updated.
+ A message catalog for the Georgian language has been added.
+
July 22, 2023:
- BRLTTY 6.6 released:
General changes:
diff --git a/Documents/Makefile.in b/Documents/Makefile.in
index 45f981f99..4f2c52e13 100644
--- a/Documents/Makefile.in
+++ b/Documents/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Documents/Manual-BRLTTY/English/BRLTTY.sgml b/Documents/Manual-BRLTTY/English/BRLTTY.sgml
index 2956ad513..e50fac659 100644
--- a/Documents/Manual-BRLTTY/English/BRLTTY.sgml
+++ b/Documents/Manual-BRLTTY/English/BRLTTY.sgml
@@ -20,9 +20,9 @@
<name>Stphane Doyon <tt><htmlurl url="mailto:s.doyon@videotron.ca" name="<s.doyon@videotron.ca>"></tt>
<and>
<name>Dave Mielke <tt><htmlurl url="mailto:dave@mielke.cc" name="<dave@mielke.cc>"></tt>
- <date>Version 6.6, July 2023
+ <date>Version 6.7, October 2024
<abstract>
- Copyright © 1995-2024 by The BRLTTY Developers.
+ Copyright © 1995-2025 by The BRLTTY Developers.
BRLTTY is free software,
and comes with ABSOLUTELY NO WARRANTY.
It is placed under the terms of version 2 or later of
diff --git a/Documents/Manual-BRLTTY/English/Makefile.in b/Documents/Manual-BRLTTY/English/Makefile.in
index 3092be1bb..a6596e564 100644
--- a/Documents/Manual-BRLTTY/English/Makefile.in
+++ b/Documents/Manual-BRLTTY/English/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Documents/Manual-BRLTTY/English/text-tables.sgml b/Documents/Manual-BRLTTY/English/text-tables.sgml
index bc9e37518..7d7429f56 100644
--- a/Documents/Manual-BRLTTY/English/text-tables.sgml
+++ b/Documents/Manual-BRLTTY/English/text-tables.sgml
@@ -37,6 +37,7 @@ gd|Gaelic@
gon|Gondi@
gu|Gujarati@
he|Hebrew@
+he_IL|Hebrew (Israel)@
hi|Hindi@
hr|Croatian@
hu|Hungarian@
diff --git a/Documents/Manual-BRLTTY/French/BRLTTY.sgml b/Documents/Manual-BRLTTY/French/BRLTTY.sgml
index 5ede39812..6c09a04aa 100644
--- a/Documents/Manual-BRLTTY/French/BRLTTY.sgml
+++ b/Documents/Manual-BRLTTY/French/BRLTTY.sgml
@@ -44,9 +44,9 @@
<tt><htmlurl url="mailto:texou@accelibreinfo.eu" name="<texou@accelibreinfo.eu>"></tt>
pour
<tt><htmlurl url="http://www.traduc.org/" name="Traduc.org"></tt>
- <date>Version 6.6, juillet 2023
+ <date>Version 6.7, octobre 2024
<abstract>
- Copyright © 1995-2024 by Les Dveloppeurs de BRLTTY.
+ Copyright © 1995-2025 by Les Dveloppeurs de BRLTTY.
BRLTTY est un logiciel libre, et n'est fourni avec AUCUNE
GARANTIE. Il est plac sous les termes de la version 2 ou
ultrieure de la <bf>GNU General Public License</bf> publie par
diff --git a/Documents/Manual-BRLTTY/French/Makefile.in b/Documents/Manual-BRLTTY/French/Makefile.in
index 79fa838b0..5a2e0b9ba 100644
--- a/Documents/Manual-BRLTTY/French/Makefile.in
+++ b/Documents/Manual-BRLTTY/French/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Documents/Manual-BRLTTY/French/text-tables.sgml b/Documents/Manual-BRLTTY/French/text-tables.sgml
index d632cf8c3..4677a26e7 100644
--- a/Documents/Manual-BRLTTY/French/text-tables.sgml
+++ b/Documents/Manual-BRLTTY/French/text-tables.sgml
@@ -37,6 +37,7 @@ gd|Ga
gon|Gondi@
gu|Gujrati@
he|Hbreux@
+he_IL|Hbreux (Isral)@
hi|Hindi@
hr|Croate@
hu|Hongrois@
diff --git a/Documents/Manual-BrlAPI/English/BrlAPI.sgml b/Documents/Manual-BrlAPI/English/BrlAPI.sgml
index 28af57282..1ef914ee1 100644
--- a/Documents/Manual-BrlAPI/English/BrlAPI.sgml
+++ b/Documents/Manual-BrlAPI/English/BrlAPI.sgml
@@ -313,9 +313,9 @@ or reading braille keys any more, it has to leave the tty, so
that either <em/brltty/ can continue its job, or another client can
take control of it.
-<sect3>Parameter handling
+<sect3>Parameter handling.
-The server exposes some parameters to the client. Some parameters are global to
+<p>The server exposes some parameters to the client. Some parameters are global to
all clients (e.g. the braille display size), while others are local per client
(e.g. retaindots, i.e. whether to send Perkins presses as dot patterns or as
letters). Some parameters are read-only (e.g. the braille display size), while
diff --git a/Documents/Manual-BrlAPI/English/Makefile.in b/Documents/Manual-BrlAPI/English/Makefile.in
index 3cf377a24..4c1576e85 100644
--- a/Documents/Manual-BrlAPI/English/Makefile.in
+++ b/Documents/Manual-BrlAPI/English/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Documents/README.Linux b/Documents/README.Linux
index 3dd02f74e..2eb94acde 100644
--- a/Documents/README.Linux
+++ b/Documents/README.Linux
@@ -332,7 +332,7 @@ Privilege parameters control how BRLTTY establishes
its `safer execution environment`_.
From highest to lowest precedence, they can be specified via:
-* The ``--privilege-parameters`` (or ``-z``) command line option.
+* The ``--privilege-parameters`` (or ``-Z``) command line option.
* The ``privilege-parameters`` |configuration directive|.
* The ``BRLTTY_PRIVILEGE_PARAMETERS`` |environment variable|.
* The ``--with-privilege-parameters`` |configure option|.
@@ -388,7 +388,7 @@ The following privilege parameters are supported for Linux:
Staying Privileged
~~~~~~~~~~~~~~~~~~
-If the ``--stay-privileged`` (or ``-Z``) command line option is specified
+If the ``--stay-privileged`` (or ``-z``) command line option is specified
then BRLTTY will retain all of the privileges
that it had when it was invoked.
It won't:
diff --git a/Documents/android-permissions.rst b/Documents/android-permissions.rst
index 24b5ea1b1..f53b36b1e 100644
--- a/Documents/android-permissions.rst
+++ b/Documents/android-permissions.rst
@@ -5,7 +5,7 @@
* For Android to accept input via BRLTTY from your braille device's keyboard.
``FOREGROUND_SERVICE``
- * For creating a foreground notification.
+ * To prevent Android from pausing, killing, etc BRLTTY if there's a resource shortage.
``WAKE_LOCK``
* For resetting the Android device's lock timer
diff --git a/Documents/brltty.1.in b/Documents/brltty.1.in
index 5f525f50d..f9bdb4d12 100644
--- a/Documents/brltty.1.in
+++ b/Documents/brltty.1.in
@@ -3,7 +3,7 @@
.\" BRLTTY - A background process providing access to the console screen (when in
.\" text mode) for a blind person using a refreshable braille display.
.\"
-.\" Copyright (C) 1995-2024 by The BRLTTY Developers.
+.\" Copyright (C) 1995-2025 by The BRLTTY Developers.
.\"
.\" BRLTTY comes with ABSOLUTELY NO WARRANTY.
.\"
@@ -16,7 +16,7 @@
.\"
.\" This software is maintained by Dave Mielke <dave@mielke.cc>.
.\"
-.TH "BRLTTY" "1" "July 2023" "@PACKAGE_TARNAME@ @PACKAGE_VERSION@" "@PACKAGE_NAME@ User's Manual"
+.TH "BRLTTY" "1" "October 2024" "@PACKAGE_TARNAME@ @PACKAGE_VERSION@" "@PACKAGE_NAME@ User's Manual"
.SH NAME
brltty \- refreshable braille display driver for Linux/Unix
.SH SYNOPSIS
diff --git a/Documents/brltty.conf.in b/Documents/brltty.conf.in
index f537d127a..ea4091860 100644
--- a/Documents/brltty.conf.in
+++ b/Documents/brltty.conf.in
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -167,6 +167,7 @@
#text-table gon # Gondi
#text-table gu # Gujarati
#text-table he # Hebrew
+#text-table he_IL # Hebrew (Israel)
#text-table hi # Hindi
#text-table hr # Croatian
#text-table hu # Hungarian
@@ -299,6 +300,9 @@
# DotPad Braille Driver Parameters
#brailledd-parameters dp:Display=default # [default,text,graphic]
+#brailledd-parameters dp:StatusCells=yes # [yes,no]
+#brailledd-parameters dp:HorizontalSpacing=1 # [0-10] (dots)
+#brailledd-parameters dp:VerticalSpacing=2 # [0-10] (dots)
# EuroBraille Braille Driver Parameters
#braille-parameters eu:Protocol= # [auto,azerbraille,clio,eurobraille,notebraille,pupibraille,scriba,esys,esytime,iris,esysiris]
@@ -428,10 +432,11 @@
#speech-parameters mp:Pitch=0 # [-10-10]
# SpeechDispatcher Speech Driver Parameters
+#speech-parameters sd:Address= # [address of speech-dispatcher's server]
+#speech-parameters sd:Autospawn= # [yes,no]
#speech-parameters sd:Language= # [two-letter language code]
#speech-parameters sd:Module= # [flite,festival,epos-generic,dtk-generic,...]
#speech-parameters sd:Name= #
-#speech-parameters sd:Port=6560 # [1-65535]
#speech-parameters sd:Voice= # [male1,female1,male2,female2,male3,female3,child_male,child_female]
# Swift Speech Driver Parameters
@@ -618,6 +623,12 @@
# (can be overridden with the --drivers-directory= [-D] option)
#drivers-directory @DRIVERS_DIRECTORY@
+# The helpers-directory directive specifies the absolute path to the
+# directory which contains the helper commands. If not
+# specified, @HELPERS_DIRECTORY@ will be used.
+# (can be overridden with the --helpers-directory= [-H] option)
+#helpers-directory @HELPERS_DIRECTORY@
+
# The tables-directory directive specifies the absolute path to the directory
# which contains the text, contraction, attributes, keyboard, and input tables.
# If not specified, "@TABLES_DIRECTORY@" will be used.
@@ -742,6 +753,7 @@
#screen-parameters lx:Charset=name+... # []
#screen-parameters lx:FallbackText=text # ""
#screen-parameters lx:HFB=auto # [auto,vga,fb,0-7]
+#screen-parameters lx:LargeScreenBug=no # [no,yes]
#screen-parameters lx:LogSFM=no # [no,yes]
#screen-parameters lx:RpiSpacesBug=no # [no,yes]
#screen-parameters lx:Unicode=yes # [yes,no]
diff --git a/Documents/text-table.csv b/Documents/text-table.csv
index 8498ec234..07d436f3f 100644
--- a/Documents/text-table.csv
+++ b/Documents/text-table.csv
@@ -37,6 +37,7 @@
"gon","Gondi"
"gu","Gujarati"
"he","Hebrew"
+"he_IL","Hebrew (Israel)"
"hi","Hindi"
"hr","Croatian"
"hu","Hungarian"
diff --git a/Documents/xbrlapi.1.in b/Documents/xbrlapi.1.in
index 1a08e8055..42f0425fb 100644
--- a/Documents/xbrlapi.1.in
+++ b/Documents/xbrlapi.1.in
@@ -1,4 +1,4 @@
-.TH "XBRLAPI" "1" "July 2023" "@api_name@ @api_release@" "@api_name@ User's Manual"
+.TH "XBRLAPI" "1" "October 2024" "@api_name@ @api_release@" "@api_name@ User's Manual"
.SH NAME
xbrlapi \- X11 BrlAPI helper for Linux/Unix
.SH SYNOPSIS
diff --git a/Drivers/Braille/Albatross/Makefile.in b/Drivers/Braille/Albatross/Makefile.in
index e7ee46eec..5ac4a4c44 100644
--- a/Drivers/Braille/Albatross/Makefile.in
+++ b/Drivers/Braille/Albatross/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Albatross/braille.c b/Drivers/Braille/Albatross/braille.c
index ebf94781c..864a01ac5 100644
--- a/Drivers/Braille/Albatross/braille.c
+++ b/Drivers/Braille/Albatross/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Albatross/brldefs-at.h b/Drivers/Braille/Albatross/brldefs-at.h
index 633e2c623..e9699ab6c 100644
--- a/Drivers/Braille/Albatross/brldefs-at.h
+++ b/Drivers/Braille/Albatross/brldefs-at.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Alva/Makefile.in b/Drivers/Braille/Alva/Makefile.in
index fdc17216b..a13426c76 100644
--- a/Drivers/Braille/Alva/Makefile.in
+++ b/Drivers/Braille/Alva/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Alva/braille.c b/Drivers/Braille/Alva/braille.c
index e4cb0af4b..01cae58eb 100644
--- a/Drivers/Braille/Alva/braille.c
+++ b/Drivers/Braille/Alva/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Alva/braille.h b/Drivers/Braille/Alva/braille.h
index cea1303c5..114b64dc2 100644
--- a/Drivers/Braille/Alva/braille.h
+++ b/Drivers/Braille/Alva/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Alva/brldefs-al.h b/Drivers/Braille/Alva/brldefs-al.h
index 7fc998879..c5a7bd2da 100644
--- a/Drivers/Braille/Alva/brldefs-al.h
+++ b/Drivers/Braille/Alva/brldefs-al.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/B2G/Makefile.in b/Drivers/Braille/B2G/Makefile.in
index c3af4b68e..4740f8793 100644
--- a/Drivers/Braille/B2G/Makefile.in
+++ b/Drivers/Braille/B2G/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/B2G/braille.c b/Drivers/Braille/B2G/braille.c
index c91b9ea80..8898f7d2e 100644
--- a/Drivers/Braille/B2G/braille.c
+++ b/Drivers/Braille/B2G/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/B2G/brldefs-bg.h b/Drivers/Braille/B2G/brldefs-bg.h
index e55334b4f..0d9f68870 100644
--- a/Drivers/Braille/B2G/brldefs-bg.h
+++ b/Drivers/Braille/B2G/brldefs-bg.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Baum/Makefile.in b/Drivers/Braille/Baum/Makefile.in
index 5773e041c..9fd0b5caa 100644
--- a/Drivers/Braille/Baum/Makefile.in
+++ b/Drivers/Braille/Baum/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Baum/braille.c b/Drivers/Braille/Baum/braille.c
index be9c6e004..5e33bd5fe 100644
--- a/Drivers/Braille/Baum/braille.c
+++ b/Drivers/Braille/Baum/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Baum/brldefs-bm.h b/Drivers/Braille/Baum/brldefs-bm.h
index cbf7f8c4c..7a9308dfd 100644
--- a/Drivers/Braille/Baum/brldefs-bm.h
+++ b/Drivers/Braille/Baum/brldefs-bm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/BrailComm/Makefile.in b/Drivers/Braille/BrailComm/Makefile.in
index 6ecf6d18d..5ac9bee70 100644
--- a/Drivers/Braille/BrailComm/Makefile.in
+++ b/Drivers/Braille/BrailComm/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/BrailComm/braille.c b/Drivers/Braille/BrailComm/braille.c
index 60fdb3e5a..61cbd7497 100644
--- a/Drivers/Braille/BrailComm/braille.c
+++ b/Drivers/Braille/BrailComm/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/BrailComm/brl-out.h b/Drivers/Braille/BrailComm/brl-out.h
index cc6446d5d..ef551cea3 100644
--- a/Drivers/Braille/BrailComm/brl-out.h
+++ b/Drivers/Braille/BrailComm/brl-out.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/BrailleLite/Makefile.in b/Drivers/Braille/BrailleLite/Makefile.in
index 3dec76607..fa81b86dd 100644
--- a/Drivers/Braille/BrailleLite/Makefile.in
+++ b/Drivers/Braille/BrailleLite/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/BrailleLite/README b/Drivers/Braille/BrailleLite/README
index 80c341bc8..73cc2900e 100644
--- a/Drivers/Braille/BrailleLite/README
+++ b/Drivers/Braille/BrailleLite/README
@@ -4,7 +4,7 @@ This is a beta driver for the Blazie Engineering Braille Lite.
written by Nikhil Nair,
with additions from Nicolas Pitre <nico@fluxnic.net>
and Pete De Vasto,
-further modifications by Stphane Doyon <s.doyon@videotron.ca>,
+further modifications by Stéphane Doyon <s.doyon@videotron.ca>,
starting August 2001.
Both BrailleLite 18 and 40 should work, and there is now code that should
@@ -27,44 +27,44 @@ when the unit is in its internal notetaker mode.
See help.src for a description of the key bindings.
History:
-Stphane Doyon, April 2002, version 0.5.10:
+Stéphane Doyon, April 2002, version 0.5.10:
-Act as if kbemu was off in any context other than CMDS_SCREEN (in
particular typing a key won't throw you out of preferences menu
anymore).
-Stphane Doyon, March 2002, version 0.5.9:
+Stéphane Doyon, March 2002, version 0.5.9:
-Added "kbemu" driver parameter, so can start with kbemu already active.
-Stphane Doyon, February 2002, version 0.5.8:
+Stéphane Doyon, February 2002, version 0.5.8:
-Added CMD_LEARN, CMD_NXPROMPT/CMD_PRPROMPT and CMD_SIXDOTS. Several
VAL_PASSKEY effects were done through special cases: moved them
back into cmdtrans. Identified special/reserved and free bindings.
Cleaned out some #if 0s.
-Stphane Doyon, January 2002, version 0.5.7:
+Stéphane Doyon, January 2002, version 0.5.7:
-Added bindings for CR_CUTAPPEND and CR_CUTLINE. Replaced CMD_CUT_BEG,
CMD_CUT_END and CMD_CSRJMP by CR_ equivalents. Added CR_SETMARK and
CR_GOTOMARK. These are a bit nasty: they reuse existing command dot
patterns from within o-chord. Well practically all the patterns are
taken!
-Stphane Doyon, January 2002, version 0.5.6:
+Stéphane Doyon, January 2002, version 0.5.6:
-Fixed dot combinations with dots 7-8 on BL40 (for typing caps and ctrl).
-Stphane Doyon, December 2001, version 0.5.5:
+Stéphane Doyon, December 2001, version 0.5.5:
-META is back. Now use VPC modifiers on VALPASSCHAR when TEXTTRANS
not defined. Fixed uppercase that always locked active. Sub-commands
of 35-chord no longer need to be chorded.
-Stphane Doyon, November 2001, version 0.5.4:
+Stéphane Doyon, November 2001, version 0.5.4:
-Now using new generic VAL_PASS* mechanism for typing in keys, rather
than having the driver itself insert stuff into the console. We
no longer have the META function though, but we have ESCAPE.
-Stphane Doyon and Dave Mielke, September 2001, version 0.5.3:
+Stéphane Doyon and Dave Mielke, September 2001, version 0.5.3:
-closebrl: don't clear display, use TCSADRAIN.
-Slight API and name changes for BRLTTY 3.0. Commands can no longer be
assumed to be chars, changed type of cmdtrans.
-Fixed binding for switching virtual terminal with o-chord... it was wrong.
-Stphane Doyon, September 2001, version 0.5.2:
+Stéphane Doyon, September 2001, version 0.5.2:
-Added baudrate parameter. Fixed up initialization, in particular a bug
with use of qbase buffer unitialized.
-Stphane Doyon, September 2001, version 0.5.1:
+Stéphane Doyon, September 2001, version 0.5.1:
-Added bindings for CMD_BACK and CR_MSGATTRIB.
-Stphane Doyon, August 2001
+Stéphane Doyon, August 2001
-Added a version number, as many people have been playing with this
driver. Arbitrarily started at 0.5.
-Made the help more compact, and remove the duplication of the key
diff --git a/Drivers/Braille/BrailleLite/bindings.h b/Drivers/Braille/BrailleLite/bindings.h
index 7465a4f03..98fc5b8d6 100644
--- a/Drivers/Braille/BrailleLite/bindings.h
+++ b/Drivers/Braille/BrailleLite/bindings.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/BrailleLite/braille.c b/Drivers/Braille/BrailleLite/braille.c
index 522f5737d..622da395d 100644
--- a/Drivers/Braille/BrailleLite/braille.c
+++ b/Drivers/Braille/BrailleLite/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -21,7 +21,7 @@
* Author: Nikhil Nair <nn201@cus.cam.ac.uk>
* Copyright (C) 1998 by Nikhil Nair.
* Some additions by: Nicolas Pitre <nico@fluxnic.net>
- * Some modifications copyright 2001 by Stphane Doyon <s.doyon@videotron.ca>.
+ * Some modifications copyright 2001 by Stéphane Doyon <s.doyon@videotron.ca>.
* Some additions by: Dave Mielke <dave@mielke.cc>
*/
diff --git a/Drivers/Braille/BrailleLite/braille.h b/Drivers/Braille/BrailleLite/braille.h
index f08616319..6472f791e 100644
--- a/Drivers/Braille/BrailleLite/braille.h
+++ b/Drivers/Braille/BrailleLite/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/BrailleMemo/Makefile.in b/Drivers/Braille/BrailleMemo/Makefile.in
index ce5aa9664..6eca6d6cf 100644
--- a/Drivers/Braille/BrailleMemo/Makefile.in
+++ b/Drivers/Braille/BrailleMemo/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/BrailleMemo/braille.c b/Drivers/Braille/BrailleMemo/braille.c
index 3da10d5fa..1eee10c6d 100644
--- a/Drivers/Braille/BrailleMemo/braille.c
+++ b/Drivers/Braille/BrailleMemo/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/BrailleMemo/brldefs-mm.h b/Drivers/Braille/BrailleMemo/brldefs-mm.h
index 33f207ccc..97881eb63 100644
--- a/Drivers/Braille/BrailleMemo/brldefs-mm.h
+++ b/Drivers/Braille/BrailleMemo/brldefs-mm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/BrailleNote/Makefile.in b/Drivers/Braille/BrailleNote/Makefile.in
index 0a2a4b9df..cfcd42b8d 100644
--- a/Drivers/Braille/BrailleNote/Makefile.in
+++ b/Drivers/Braille/BrailleNote/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/BrailleNote/braille.c b/Drivers/Braille/BrailleNote/braille.c
index 8d0595fad..c79139d2e 100644
--- a/Drivers/Braille/BrailleNote/braille.c
+++ b/Drivers/Braille/BrailleNote/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/BrailleNote/brldefs-bn.h b/Drivers/Braille/BrailleNote/brldefs-bn.h
index b6597a6bd..58832a7b2 100644
--- a/Drivers/Braille/BrailleNote/brldefs-bn.h
+++ b/Drivers/Braille/BrailleNote/brldefs-bn.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Braudi/Makefile.in b/Drivers/Braille/Braudi/Makefile.in
index ef4f44732..058ffd9ac 100644
--- a/Drivers/Braille/Braudi/Makefile.in
+++ b/Drivers/Braille/Braudi/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Braudi/braille.c b/Drivers/Braille/Braudi/braille.c
index 54847e8cf..0edb18259 100644
--- a/Drivers/Braille/Braudi/braille.c
+++ b/Drivers/Braille/Braudi/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/BrlAPI/Makefile.in b/Drivers/Braille/BrlAPI/Makefile.in
index a765ca821..1de44ccf2 100644
--- a/Drivers/Braille/BrlAPI/Makefile.in
+++ b/Drivers/Braille/BrlAPI/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/BrlAPI/braille.c b/Drivers/Braille/BrlAPI/braille.c
index ddea0a69e..c38a8785c 100644
--- a/Drivers/Braille/BrlAPI/braille.c
+++ b/Drivers/Braille/BrlAPI/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -127,11 +127,16 @@ static void brl_destruct(BrailleDisplay *brl)
static int
setClientPriority (BrailleDisplay *brl) {
- unsigned char worst = ARRAY_COUNT(qualityPriorities) - 1;
- unsigned char quality = MIN(brl->quality, worst);
+ unsigned char best = ARRAY_COUNT(qualityPriorities) - 1;
+ unsigned char quality = MIN(brl->quality, best);
brlapi_param_clientPriority_t priority = qualityPriorities[quality];
if (priority != currentPriority) {
+ logMessage(LOG_CATEGORY(BRAILLE_DRIVER),
+ "changing client priority: %u",
+ priority
+ );
+
int result = brlapi_setParameter(
BRLAPI_PARAM_CLIENT_PRIORITY, 0,
BRLAPI_PARAMF_LOCAL, &priority, sizeof(priority)
diff --git a/Drivers/Braille/Canute/Makefile.in b/Drivers/Braille/Canute/Makefile.in
index 51696c2c0..dbe9c5bb9 100644
--- a/Drivers/Braille/Canute/Makefile.in
+++ b/Drivers/Braille/Canute/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Canute/braille.c b/Drivers/Braille/Canute/braille.c
index 7b79b8a6b..c35e7676c 100644
--- a/Drivers/Braille/Canute/braille.c
+++ b/Drivers/Braille/Canute/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Canute/brldefs-cn.h b/Drivers/Braille/Canute/brldefs-cn.h
index 972d591ad..9ea7a444d 100644
--- a/Drivers/Braille/Canute/brldefs-cn.h
+++ b/Drivers/Braille/Canute/brldefs-cn.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Cebra/Makefile.in b/Drivers/Braille/Cebra/Makefile.in
index 4d5343734..b29b27518 100644
--- a/Drivers/Braille/Cebra/Makefile.in
+++ b/Drivers/Braille/Cebra/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Cebra/braille.c b/Drivers/Braille/Cebra/braille.c
index 9f8be2e3d..ffc3bd9d0 100644
--- a/Drivers/Braille/Cebra/braille.c
+++ b/Drivers/Braille/Cebra/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Cebra/brldefs-ce.h b/Drivers/Braille/Cebra/brldefs-ce.h
index d36399d48..c4fd36635 100644
--- a/Drivers/Braille/Cebra/brldefs-ce.h
+++ b/Drivers/Braille/Cebra/brldefs-ce.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/CombiBraille/Makefile.in b/Drivers/Braille/CombiBraille/Makefile.in
index 2d2bbbbda..a07010995 100644
--- a/Drivers/Braille/CombiBraille/Makefile.in
+++ b/Drivers/Braille/CombiBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/CombiBraille/braille.c b/Drivers/Braille/CombiBraille/braille.c
index 20bff8c38..a92349298 100644
--- a/Drivers/Braille/CombiBraille/braille.c
+++ b/Drivers/Braille/CombiBraille/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/CombiBraille/braille.h b/Drivers/Braille/CombiBraille/braille.h
index f567ff3bf..0684c2a28 100644
--- a/Drivers/Braille/CombiBraille/braille.h
+++ b/Drivers/Braille/CombiBraille/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/CombiBraille/brldefs-cb.h b/Drivers/Braille/CombiBraille/brldefs-cb.h
index b19c8bd2e..a1f848e68 100644
--- a/Drivers/Braille/CombiBraille/brldefs-cb.h
+++ b/Drivers/Braille/CombiBraille/brldefs-cb.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/DotPad/Makefile.in b/Drivers/Braille/DotPad/Makefile.in
index e5e53f641..f4b37ff4e 100644
--- a/Drivers/Braille/DotPad/Makefile.in
+++ b/Drivers/Braille/DotPad/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/DotPad/README b/Drivers/Braille/DotPad/README
new file mode 100644
index 000000000..9e07fbcae
--- /dev/null
+++ b/Drivers/Braille/DotPad/README
@@ -0,0 +1,139 @@
+The DotPad Braille Driver
+=========================
+
+.. contents::
+
+Driver Properties
+-----------------
+
+There are a number of properties which control how the driver renders text.
+Each of these:
+
+* has a built-in default.
+* can have its built-in default overridden via a driver parameter.
+* can be changed and queried at run-time via BrlAPI.
+
+.. topic:: Specifying a Driver Parameter
+
+ The general format of a driver parameter specification is::
+
+ [driver:]name=value
+
+ The name, as well as the value (if it's a word), can be abbreviated.
+ The optional *driver* component is the two-letter code
+ of the driver whose parameter is being specified.
+ It's a good idea to include it in order to avoid
+ any ambiguity with the names of the parameters of other drivers.
+ The DotPad's driver code is ``dp``.
+
+ In decreasing order of precedence, the parameter can be specified via:
+
+ * The ``--braille-parameters=`` (``-B``) command line option.
+ * The ``BRLTTY_BRAILLE_PARAMETERS`` environment variable (if enabled).
+ * The ``braille-parameters`` configuration directive.
+
+.. topic:: Changing a Driver Property
+
+ A driver property is changed by setting the ``DRIVER_PROPERTY_VALUE`` BrlAPI parameter.
+ This is done by calling the ``brlapi_setParameter()`` function
+ with its ``subparam`` argument set to the driver property.
+ The DotPad's driver properties are defined within the ``brldefs-dp.h`` header.
+
+ To set the display to the graphic area, for example, you'd do::
+
+ brlapi_param_t parameter = BRLAPI_PARAM_DRIVER_PROPERTY_VALUE;
+ brlapi_param_subparam_t subparam = DP_SELECT_DISPLAY;
+ brlapi_param_flags_t flags = 0;
+ brlapi_param_driverPropertyValue_t newSetting = DP_DISPLAY_GRAPHIC;
+ int result = brlapi_setParameter(
+ parameter, subparam, flags,
+ &newSetting, sizeof(newSetting)
+ );
+
+.. topic:: Querying a Driver Property
+
+ Querying a driver property is similar to changing it (see above), except that:
+
+ * You call the ``brlapi_getParameter()`` function.
+ * The property's current value is returned within the data area.
+
+ To query the display property, for example, you'd do::
+
+ brlapi_param_t parameter = BRLAPI_PARAM_DRIVER_PROPERTY_VALUE;
+ brlapi_param_subparam_t subparam = DP_SELECT_DISPLAY;
+ brlapi_param_flags_t flags = 0;
+ brlapi_param_driverPropertyValue_t currentSetting;
+ ssize_t length = brlapi_getParameter(
+ parameter, subparam, flags,
+ ¤tSetting, sizeof(currentSetting)
+ );
+
+Display Selection
+~~~~~~~~~~~~~~~~~
+
+Select whether text is written to the text area or to the graphic area.
+If text is written to the graphic area then a multi-line display is emulated.
+
+The driver parameter is ``display=``.
+It can be set to one of the following:
+
+``default``
+ Use the graphic area if the device has one,
+ else use the text area.
+
+``text``
+ Explicitly use the text area.
+ It's an error if the device doesn't have one.
+
+``graphic``
+ Explicitly use the graphic area.
+ It's an error if the device doesn't have one.
+
+The driver property is ``DP_SELECT_DISPLAY``.
+It can be set to one of the following:
+
+``DP_DISPLAY_TEXT``
+ Switch to the text area.
+ It's an error if the device doesn't have one.
+
+``DP_DISPLAY_GRAPHIC``
+ Switch to the graphic area.
+ It's an error if the device doesn't have one.
+
+Status Cells
+~~~~~~~~~~~~
+
+When emulating a multi-line display within the graphic area,
+specify whether or not status information is to be written to the actual text area.
+The default is to write it.
+
+The driver parameter is ``statusCells=``.
+It may be specified as either ``yes`` (the default) or as ``no``.
+
+The driver property is ``DP_STATUS_CELLS``.
+It may be set to either 0 for ``no`` or to 1 for ``yes``.
+
+Horizontal Spacing
+~~~~~~~~~~~~~~~~~~
+
+When emulating a multi-line display within the graphic area,
+specify how many columns of dots separate the characters from one another.
+It must be an integer within the range 0-10 (inclusive).
+The default is 1.
+
+The driver parameter is ``horizontalSpacing=``.
+
+The driver property is ``DP_HORIZONTAL_SPACING``.
+
+Vertical Spacing
+~~~~~~~~~~~~~~~~
+
+When emulating a multi-line display within the graphic area,
+specify how many rows of dots separate the lines from one another.
+It must be an integer within the range 0-10 (inclusive).
+The default is 2.
+
+The driver parameter is ``verticalSpacing=``.
+
+The driver property is ``DP_VERTICAL_SPACING``.
+
diff --git a/Drivers/Braille/DotPad/braille.c b/Drivers/Braille/DotPad/braille.c
index 392548d02..8f57fb23f 100644
--- a/Drivers/Braille/DotPad/braille.c
+++ b/Drivers/Braille/DotPad/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -31,18 +31,18 @@
typedef enum {
PARM_DISPLAY,
+ PARM_STATUS_CELLS,
+ PARM_HORIZONTAL_SPACING,
+ PARM_VERTICAL_SPACING,
} DP_DriverParameter;
-#define BRLPARMS "display"
+#define BRLPARMS "display", "statuscells", "horizontalspacing", "verticalspacing"
#include "brl_driver.h"
#include "brldefs-dp.h"
#define PROBE_RETRY_LIMIT 2
#define PROBE_INPUT_TIMEOUT 1000
-#define GRAPHIC_HORIZONTAL_SPACING 1
-#define GRAPHIC_VERTICAL_SPACING 2
-
#define KEY_ENTRY(s,t,k,n) {.value = {.group=DP_GRP_##s, .number=DP_##t##_##k}, .name=n}
#define SCROLL_KEY_ENTRY(k,n) KEY_ENTRY(ScrollKeys, SCL, k, n)
#define KEYBOARD_KEY_ENTRY(k,n) KEY_ENTRY(PerkinsKeys, KBD, k, n)
@@ -142,6 +142,13 @@ struct BrailleDataStruct {
unsigned char deviceName[10];
const KeyNameEntry *keyNameTable[7];
+ struct {
+ unsigned char selectedDisplay;
+ unsigned char statusCells;
+ unsigned char horizontalSpacing;
+ unsigned char verticalSpacing;
+ } properties;
+
struct {
unsigned char scroll[4];
unsigned char perkins[4];
@@ -174,9 +181,135 @@ struct BrailleDataStruct {
InternalRowEntry *internalRows;
unsigned char *statusCells;
- } arrays;;
+ } arrays;
};
+static ExternalRowEntry *
+getExternalRow (BrailleDisplay *brl, unsigned int index) {
+ return &brl->data->arrays.externalRows[index];
+}
+
+static void
+initializeExternalRows (BrailleDisplay *brl) {
+ unsigned char *cells = brl->data->arrays.externalCells;
+ unsigned char destination = brl->data->display.destination;
+
+ for (unsigned int index=0; index<brl->data->display.externalRows; index+=1) {
+ ExternalRowEntry *row = getExternalRow(brl, index);
+
+ row->cells = cells;
+ cells += brl->data->display.externalColumns;
+
+ row->destination = destination;
+ destination += 1;
+ }
+}
+
+static InternalRowEntry *
+getInternalRow (BrailleDisplay *brl, unsigned int index) {
+ return &brl->data->arrays.internalRows[index];
+}
+
+static void
+initializeInternalRows (BrailleDisplay *brl) {
+ unsigned char *cells = brl->data->arrays.internalCells + brl->data->display.verticalSpacing;
+
+ const unsigned char cellHeight = brl->data->display.cellHeight;
+ const unsigned char rowHeight = cellHeight + brl->data->display.verticalSpacing;
+ const unsigned char cellMask = (1 << cellHeight) - 1;
+
+ for (unsigned int index=0; index<brl->data->display.internalRows; index+=1) {
+ InternalRowEntry *row = getInternalRow(brl, index);
+
+ row->cells = cells;
+ cells += brl->data->display.internalColumns;
+
+ {
+ unsigned char offset = rowHeight * index;
+ row->upperRow = getExternalRow(brl, (offset / cellHeight));
+ row->upperShift = offset % cellHeight;
+ row->upperMask = (cellMask << row->upperShift) & cellMask;
+ row->upperMask |= row->upperMask << 4;
+
+ offset += 3;
+ row->lowerRow = getExternalRow(brl, (offset / cellHeight));
+ row->lowerShift = cellHeight - (offset % cellHeight) - 1;
+ row->lowerMask = cellMask >> row->lowerShift;
+ row->lowerMask |= row->lowerMask << 4;
+ }
+
+ row->hasChanged = 1;
+ }
+}
+
+static int
+makeArrays (BrailleDisplay *brl) {
+ if ((brl->data->arrays.externalCells = calloc(brl->data->display.externalRows, brl->data->display.externalColumns))) {
+ if ((brl->data->arrays.internalCells = calloc(brl->data->display.internalRows, brl->data->display.internalColumns))) {
+ if ((brl->data->arrays.externalRows = malloc(ARRAY_SIZE(brl->data->arrays.externalRows, brl->data->display.externalRows)))) {
+ if ((brl->data->arrays.internalRows = malloc(ARRAY_SIZE(brl->data->arrays.internalRows, brl->data->display.internalRows)))) {
+ int statusCellsAllocated = !brl->statusColumns;
+
+ if (!statusCellsAllocated) {
+ if ((brl->data->arrays.statusCells = calloc(brl->statusColumns, 1))) {
+ statusCellsAllocated = 1;
+ }
+ }
+
+ if (statusCellsAllocated) {
+ initializeExternalRows(brl);
+ initializeInternalRows(brl);
+ return 1;
+ }
+
+ free(brl->data->arrays.internalRows);
+ brl->data->arrays.internalRows = NULL;
+ }
+
+ free(brl->data->arrays.externalRows);
+ brl->data->arrays.externalRows = NULL;
+ }
+
+ free(brl->data->arrays.internalCells);
+ brl->data->arrays.internalCells = NULL;
+ }
+
+ free(brl->data->arrays.externalCells);
+ brl->data->arrays.externalCells = NULL;
+ }
+
+ logMallocError();
+ return 0;
+}
+
+static void
+deallocateArrays (BrailleDisplay *brl) {
+ if (brl->data->arrays.statusCells) {
+ free(brl->data->arrays.statusCells);
+ brl->data->arrays.statusCells = NULL;
+ }
+
+ if (brl->data->arrays.internalRows) {
+ free(brl->data->arrays.internalRows);
+ brl->data->arrays.internalRows = NULL;
+ }
+
+ if (brl->data->arrays.internalCells) {
+ free(brl->data->arrays.internalCells);
+ brl->data->arrays.internalCells = NULL;
+ }
+
+ if (brl->data->arrays.externalRows) {
+ free(brl->data->arrays.externalRows);
+ brl->data->arrays.externalRows = NULL;
+ }
+
+ if (brl->data->arrays.externalCells) {
+ free(brl->data->arrays.externalCells);
+ brl->data->arrays.externalCells = NULL;
+ }
+}
+
static void
setExternalDisplayProperties (BrailleDisplay *brl, const DP_DisplayDescriptor *display) {
{
@@ -261,8 +394,8 @@ useGraphicDisplay (BrailleDisplay *brl) {
brl->data->display.destination = 1;
}
- brl->data->display.horizontalSpacing = GRAPHIC_HORIZONTAL_SPACING;
- brl->data->display.verticalSpacing = GRAPHIC_VERTICAL_SPACING;
+ brl->data->display.horizontalSpacing = brl->data->properties.horizontalSpacing;
+ brl->data->display.verticalSpacing = brl->data->properties.verticalSpacing;
setExternalDisplayProperties(brl, &brl->data->boardInformation.graphic);
setInternalDisplayProperties(brl);
@@ -274,24 +407,37 @@ useGraphicDisplay (BrailleDisplay *brl) {
}
static int
-selectDisplay (BrailleDisplay *brl, const char *parameter) {
+configureDisplay (BrailleDisplay *brl) {
+ typedef void (*UseDisplayMethod) (BrailleDisplay *brl);
+
+ static const UseDisplayMethod useDisplayMethods[] = {
+ [DP_DISPLAY_TEXT] = useTextDisplay,
+ [DP_DISPLAY_GRAPHIC] = useGraphicDisplay,
+ };
+
+ useDisplayMethods[brl->data->properties.selectedDisplay](brl);
+ return makeArrays(brl);
+}
+
+static int
+parseDisplayParameter (BrailleDisplay *brl, const char *parameter) {
typedef struct {
const char *name; // must be first
- void (*useDisplay) (BrailleDisplay *brl);
unsigned char featureBit;
+ unsigned char displayValue;
} ChoiceEntry;
static const ChoiceEntry choiceTable[] = {
{ .name = "default" },
{ .name = "text",
- .useDisplay = useTextDisplay,
.featureBit = DP_HAS_TEXT_DISPLAY,
+ .displayValue = DP_DISPLAY_TEXT,
},
{ .name = "graphic",
- .useDisplay = useGraphicDisplay,
.featureBit = DP_HAS_GRAPHIC_DISPLAY,
+ .displayValue = DP_DISPLAY_GRAPHIC,
},
{ .name = NULL }
@@ -304,7 +450,7 @@ selectDisplay (BrailleDisplay *brl, const char *parameter) {
const ChoiceEntry *choice = &choiceTable[choiceIndex];
if (features & choice->featureBit) {
- choice->useDisplay(brl);
+ brl->data->properties.selectedDisplay = choice->displayValue;
return 1;
}
@@ -316,9 +462,9 @@ selectDisplay (BrailleDisplay *brl, const char *parameter) {
}
if (features & DP_HAS_GRAPHIC_DISPLAY) {
- useGraphicDisplay(brl);
+ brl->data->properties.selectedDisplay = DP_DISPLAY_GRAPHIC;
} else if (features & DP_HAS_TEXT_DISPLAY) {
- useTextDisplay(brl);
+ brl->data->properties.selectedDisplay = DP_DISPLAY_TEXT;
} else {
logMessage(LOG_WARNING, "no supported display");
return 0;
@@ -328,114 +474,176 @@ selectDisplay (BrailleDisplay *brl, const char *parameter) {
}
static int
-processParameters (BrailleDisplay *brl, char **parameters) {
- if (!selectDisplay(brl, parameters[PARM_DISPLAY])) return 0;
- return 1;
-}
+parseDriverParameters (BrailleDisplay *brl, char **parameters) {
+ if (!parseDisplayParameter(brl, parameters[PARM_DISPLAY])) return 0;
-static ExternalRowEntry *
-getExternalRow (BrailleDisplay *brl, unsigned int index) {
- return &brl->data->arrays.externalRows[index];
-}
+ {
+ unsigned int value = DP_DEFAULT_STATUS_CELLS;
+ const char *parameter = parameters[PARM_STATUS_CELLS];
-static void
-initializeExternalRows (BrailleDisplay *brl) {
- unsigned char *cells = brl->data->arrays.externalCells;
- unsigned char destination = brl->data->display.destination;
+ if (parameter && *parameter) {
+ if (!validateYesNo(&value, parameter)) {
+ logMessage(LOG_WARNING, "invalid status cells setting: %s", parameter);
+ }
+ }
- for (unsigned int index=0; index<brl->data->display.externalRows; index+=1) {
- ExternalRowEntry *row = getExternalRow(brl, index);
+ brl->data->properties.statusCells = value;
+ }
- row->cells = cells;
- cells += brl->data->display.externalColumns;
+ {
+ int value = DP_DEFAULT_HORIZONTAL_SPACING;
+ const char *parameter = parameters[PARM_HORIZONTAL_SPACING];
- row->destination = destination;
- destination += 1;
+ if (parameter && *parameter) {
+ static const int minimum = 0;
+ static const int maximum = DP_MAXIMUM_HORIZONTAL_SPACING;
+
+ if (!validateInteger(&value, parameter, &minimum, &maximum)) {
+ logMessage(LOG_WARNING, "invalid horizontal spacing setting: %s", parameter);
+ }
+ }
+
+ brl->data->properties.horizontalSpacing = value;
}
-}
-static InternalRowEntry *
-getInternalRow (BrailleDisplay *brl, unsigned int index) {
- return &brl->data->arrays.internalRows[index];
+ {
+ int value = DP_DEFAULT_VERTICAL_SPACING;
+ const char *parameter = parameters[PARM_VERTICAL_SPACING];
+
+ if (parameter && *parameter) {
+ static const int minimum = 0;
+ static const int maximum = DP_MAXIMUM_VERTICAL_SPACING;
+
+ if (!validateInteger(&value, parameter, &minimum, &maximum)) {
+ logMessage(LOG_WARNING, "invalid vertical spacing setting: %s", parameter);
+ }
+ }
+
+ brl->data->properties.verticalSpacing = value;
+ }
+
+ return 1;
}
-static void
-initializeInternalRows (BrailleDisplay *brl) {
- unsigned char *cells = brl->data->arrays.internalCells + brl->data->display.verticalSpacing;
+static int
+reconfigureDisplay (BrailleDisplay *brl) {
+ deallocateArrays(brl);
+ int reconfigured = configureDisplay(brl);
- const unsigned char cellHeight = brl->data->display.cellHeight;
- const unsigned char rowHeight = cellHeight + brl->data->display.verticalSpacing;
- const unsigned char cellMask = (1 << cellHeight) - 1;
+ if (reconfigured) {
+ brl->resizeRequired = 1;
+ } else {
+ brl->hasFailed = 1;
+ }
- for (unsigned int index=0; index<brl->data->display.internalRows; index+=1) {
- InternalRowEntry *row = getInternalRow(brl, index);
+ return reconfigured;
+}
- row->cells = cells;
- cells += brl->data->display.internalColumns;
+static int
+usingGraphicDisplay (BrailleDisplay *brl) {
+ return brl->data->properties.selectedDisplay != DP_DISPLAY_TEXT;
+}
- {
- unsigned char offset = rowHeight * index;
- row->upperRow = getExternalRow(brl, (offset / cellHeight));
- row->upperShift = offset % cellHeight;
- row->upperMask = (cellMask << row->upperShift) & cellMask;
- row->upperMask |= row->upperMask << 4;
+static int
+verifyDisplayProperty (BrailleDisplay *brl, uint64_t value) {
+ unsigned char features = brl->data->boardInformation.features;
- offset += 3;
- row->lowerRow = getExternalRow(brl, (offset / cellHeight));
- row->lowerShift = cellHeight - (offset % cellHeight) - 1;
- row->lowerMask = cellMask >> row->lowerShift;
- row->lowerMask |= row->lowerMask << 4;
- }
+ switch (value) {
+ case DP_DISPLAY_TEXT:
+ if (features & DP_HAS_TEXT_DISPLAY) return 1;
+ logMessage(LOG_WARNING, "no text display");
+ break;
- row->hasChanged = 1;
+ case DP_DISPLAY_GRAPHIC:
+ if (features & DP_HAS_GRAPHIC_DISPLAY) return 1;
+ logMessage(LOG_WARNING, "no graphic display");
+ break;
+
+ default:
+ logMessage(LOG_WARNING, "unrecognized display value: %"PRIu64, value);
+ break;
}
+
+ return 0;
}
static int
-makeArrays (BrailleDisplay *brl) {
- if ((brl->data->arrays.externalCells = calloc(brl->data->display.externalRows, brl->data->display.externalColumns))) {
- if ((brl->data->arrays.internalCells = calloc(brl->data->display.internalRows, brl->data->display.internalColumns))) {
- if ((brl->data->arrays.externalRows = malloc(ARRAY_SIZE(brl->data->arrays.externalRows, brl->data->display.externalRows)))) {
- if ((brl->data->arrays.internalRows = malloc(ARRAY_SIZE(brl->data->arrays.internalRows, brl->data->display.internalRows)))) {
- int statusCellsAllocated = !brl->statusColumns;
+setDriverProperty (BrailleDisplay *brl, uint64_t property, uint64_t value) {
+ switch (property) {
+ case DP_PROP_SELECTED_DISPLAY: {
+ if (!verifyDisplayProperty(brl, value)) break;
+
+ if (value != brl->data->properties.selectedDisplay) {
+ brl->data->properties.selectedDisplay = value;
+ reconfigureDisplay(brl);
+ }
- if (!statusCellsAllocated) {
- if ((brl->data->arrays.statusCells = calloc(brl->statusColumns, 1))) {
- statusCellsAllocated = 1;
- }
- }
+ return 1;
+ }
- if (statusCellsAllocated) {
- initializeExternalRows(brl);
- initializeInternalRows(brl);
- return 1;
- }
+ case DP_PROP_STATUS_CELLS: {
+ if (value > 1) break;
- free(brl->data->arrays.internalRows);
- }
+ if (value != brl->data->properties.statusCells) {
+ brl->data->properties.statusCells = value;
+ }
- free(brl->data->arrays.externalRows);
+ return 1;
+ }
+
+ case DP_PROP_HORIZONTAL_SPACING: {
+ if (value > DP_MAXIMUM_HORIZONTAL_SPACING) break;
+
+ if (value != brl->data->properties.horizontalSpacing) {
+ brl->data->properties.horizontalSpacing = value;
+ if (usingGraphicDisplay(brl)) reconfigureDisplay(brl);
}
- free(brl->data->arrays.internalCells);
+ return 1;
}
- free(brl->data->arrays.externalCells);
+ case DP_PROP_VERTICAL_SPACING: {
+ if (value > DP_MAXIMUM_VERTICAL_SPACING) break;
+
+ if (value != brl->data->properties.verticalSpacing) {
+ brl->data->properties.verticalSpacing = value;
+ if (usingGraphicDisplay(brl)) reconfigureDisplay(brl);
+ }
+
+ return 1;
+ }
+
+ default:
+ logMessage(LOG_WARNING, "cannot set unrecognized driver property: %"PRIu64, property);
+ return 0;
}
- logMallocError();
+ logMessage(LOG_WARNING, "cannot set unsupported driver property value: %"PRIu64"=%"PRIu64, property, value);
return 0;
}
-static void
-deallocateArrays (BrailleDisplay *brl) {
- free(brl->data->arrays.statusCells);
+static int
+getDriverProperty (BrailleDisplay *brl, uint64_t property, uint64_t *value) {
+ switch (property) {
+ case DP_PROP_SELECTED_DISPLAY:
+ *value = brl->data->properties.selectedDisplay;
+ return 1;
- free(brl->data->arrays.internalRows);
- free(brl->data->arrays.internalCells);
+ case DP_PROP_STATUS_CELLS:
+ *value = brl->data->properties.statusCells;
+ return 1;
- free(brl->data->arrays.externalRows);
- free(brl->data->arrays.externalCells);
+ case DP_PROP_HORIZONTAL_SPACING:
+ *value = brl->data->properties.horizontalSpacing;
+ return 1;
+
+ case DP_PROP_VERTICAL_SPACING:
+ *value = brl->data->properties.verticalSpacing;
+ return 1;
+ }
+
+ logMessage(LOG_WARNING, "cannot get unrecognized driver property: %"PRIu64, property);
+ return 0;
}
static uint16_t
@@ -652,8 +860,15 @@ refreshCells (BrailleDisplay *brl) {
row += 1;
}
- if (!brl->statusColumns) return 1;
- return writeStatusCells(brl);
+ if (brl->data->properties.statusCells) {
+ if (brl->statusColumns) {
+ if (!writeStatusCells(brl)) {
+ return 0;
+ }
+ }
+ }
+
+ return 1;
}
static unsigned int
@@ -770,7 +985,7 @@ brl_writeWindow (BrailleDisplay *brl, const wchar_t *text) {
}
static int
-getDataSize (const DP_Packet *packet) {
+getPacketDataSize (const DP_Packet *packet) {
return getUint16(packet->fields.length)
- 1 // checksum
- (packet->fields.data - &packet->fields.destination) // header
@@ -817,11 +1032,11 @@ reportDisplayError (unsigned char code) {
}
static void
-saveField (
+saveTextField (
const DP_Packet *packet, const char *label,
unsigned char *field, int fieldSize
) {
- int dataSize = getDataSize(packet);
+ int dataSize = getPacketDataSize(packet);
if (dataSize > fieldSize) dataSize = fieldSize;
memcpy(field, packet->fields.data, dataSize);
@@ -853,7 +1068,7 @@ updateKeyGroup (
BrailleDisplay *brl, const DP_Packet *packet, KeyGroup keyGroup,
unsigned char *array, size_t arraySize
) {
- int dataSize = getDataSize(packet);
+ int dataSize = getPacketDataSize(packet);
if (dataSize > 0) {
unsigned char data[arraySize];
@@ -883,7 +1098,7 @@ brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) {
while ((size = readPacket(brl, packet.bytes, sizeof(packet)))) {
switch (getUint16(packet.fields.command)) {
case DP_RSP_FIRMWARE_VERSION: {
- saveField(
+ saveTextField(
&packet, "Firmware Version",
brl->data->firmwareVersion,
sizeof(brl->data->firmwareVersion)
@@ -894,7 +1109,7 @@ brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) {
}
case DP_RSP_DEVICE_NAME: {
- saveField(
+ saveTextField(
&packet, "Device Name",
brl->data->deviceName,
sizeof(brl->data->deviceName)
@@ -915,9 +1130,10 @@ brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) {
continue;
}
- case DP_NTF_DISPLAY_LINE:
+ case DP_NTF_DISPLAY_LINE: {
acknowledgeBrailleMessage(brl);
continue;
+ }
case DP_NTF_KEYS_SCROLL: {
updateKeyGroup(
@@ -1135,8 +1351,8 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) {
);
if (probed) {
- if (processParameters(brl, parameters)) {
- if (makeArrays(brl)) {
+ if (parseDriverParameters(brl, parameters)) {
+ if (configureDisplay(brl)) {
brl->acknowledgements.missing.timeout = (brl->data->display.refreshTime * 100) + 1000;
if (writeRequest(brl, DP_REQ_FIRMWARE_VERSION, 0, NULL, 0)) {
@@ -1149,6 +1365,9 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) {
);
brl->refreshBrailleDisplay = refreshCells;
+ brl->getDriverProperty = getDriverProperty;
+ brl->setDriverProperty = setDriverProperty;
+
return 1;
}
}
diff --git a/Drivers/Braille/DotPad/brldefs-dp.h b/Drivers/Braille/DotPad/brldefs-dp.h
index 68af255fa..ba3b883f8 100644
--- a/Drivers/Braille/DotPad/brldefs-dp.h
+++ b/Drivers/Braille/DotPad/brldefs-dp.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -169,4 +169,22 @@ typedef union {
DP_PacketFields fields;
} DP_Packet;
+typedef enum {
+ DP_PROP_SELECTED_DISPLAY,
+ DP_PROP_STATUS_CELLS,
+ DP_PROP_HORIZONTAL_SPACING,
+ DP_PROP_VERTICAL_SPACING,
+} DP_DriverProperty;
+
+#define DP_DISPLAY_TEXT 0
+#define DP_DISPLAY_GRAPHIC 1
+
+#define DP_DEFAULT_STATUS_CELLS 1 // 0=no, 1=yes
+
+#define DP_DEFAULT_HORIZONTAL_SPACING 1
+#define DP_MAXIMUM_HORIZONTAL_SPACING 10
+
+#define DP_DEFAULT_VERTICAL_SPACING 2
+#define DP_MAXIMUM_VERTICAL_SPACING 10
+
#endif /* BRLTTY_INCLUDED_DP_BRLDEFS */
diff --git a/Drivers/Braille/EcoBraille/Makefile.in b/Drivers/Braille/EcoBraille/Makefile.in
index 267e14137..ff87929ea 100644
--- a/Drivers/Braille/EcoBraille/Makefile.in
+++ b/Drivers/Braille/EcoBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/EcoBraille/braille.c b/Drivers/Braille/EcoBraille/braille.c
index 2b910259d..b3f2dd4b1 100644
--- a/Drivers/Braille/EcoBraille/braille.c
+++ b/Drivers/Braille/EcoBraille/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/EcoBraille/braille.h b/Drivers/Braille/EcoBraille/braille.h
index 311eff56e..aa2904dac 100644
--- a/Drivers/Braille/EcoBraille/braille.h
+++ b/Drivers/Braille/EcoBraille/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/EuroBraille/Makefile.in b/Drivers/Braille/EuroBraille/Makefile.in
index 343e7b99a..d64961a25 100644
--- a/Drivers/Braille/EuroBraille/Makefile.in
+++ b/Drivers/Braille/EuroBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/EuroBraille/brldefs-eu.h b/Drivers/Braille/EuroBraille/brldefs-eu.h
index 9edc1096d..94352464d 100644
--- a/Drivers/Braille/EuroBraille/brldefs-eu.h
+++ b/Drivers/Braille/EuroBraille/brldefs-eu.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/EuroBraille/eu_braille.c b/Drivers/Braille/EuroBraille/eu_braille.c
index cc7b82aae..c2317122f 100644
--- a/Drivers/Braille/EuroBraille/eu_braille.c
+++ b/Drivers/Braille/EuroBraille/eu_braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/EuroBraille/eu_clio.c b/Drivers/Braille/EuroBraille/eu_clio.c
index 0f3e80cc0..2e088a322 100644
--- a/Drivers/Braille/EuroBraille/eu_clio.c
+++ b/Drivers/Braille/EuroBraille/eu_clio.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/EuroBraille/eu_esysiris.c b/Drivers/Braille/EuroBraille/eu_esysiris.c
index 290d0e711..b365072e8 100644
--- a/Drivers/Braille/EuroBraille/eu_esysiris.c
+++ b/Drivers/Braille/EuroBraille/eu_esysiris.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/EuroBraille/eu_protocol.h b/Drivers/Braille/EuroBraille/eu_protocol.h
index 635bd22d3..ac517de4e 100644
--- a/Drivers/Braille/EuroBraille/eu_protocol.h
+++ b/Drivers/Braille/EuroBraille/eu_protocol.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/FrankAudiodata/Makefile.in b/Drivers/Braille/FrankAudiodata/Makefile.in
index 0fb60b7a4..37d246701 100644
--- a/Drivers/Braille/FrankAudiodata/Makefile.in
+++ b/Drivers/Braille/FrankAudiodata/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/FrankAudiodata/braille.c b/Drivers/Braille/FrankAudiodata/braille.c
index 2d0c43d9c..ea72349fd 100644
--- a/Drivers/Braille/FrankAudiodata/braille.c
+++ b/Drivers/Braille/FrankAudiodata/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/FrankAudiodata/brldefs-fa.h b/Drivers/Braille/FrankAudiodata/brldefs-fa.h
index 5b47970fe..30eb80ec1 100644
--- a/Drivers/Braille/FrankAudiodata/brldefs-fa.h
+++ b/Drivers/Braille/FrankAudiodata/brldefs-fa.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/FreedomScientific/Makefile.in b/Drivers/Braille/FreedomScientific/Makefile.in
index cfa15c48b..2aa1e3294 100644
--- a/Drivers/Braille/FreedomScientific/Makefile.in
+++ b/Drivers/Braille/FreedomScientific/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/FreedomScientific/braille.c b/Drivers/Braille/FreedomScientific/braille.c
index 18d96cdfb..d4e9b34f5 100644
--- a/Drivers/Braille/FreedomScientific/braille.c
+++ b/Drivers/Braille/FreedomScientific/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/FreedomScientific/brldefs-fs.h b/Drivers/Braille/FreedomScientific/brldefs-fs.h
index a04ab15c0..b5bced5ff 100644
--- a/Drivers/Braille/FreedomScientific/brldefs-fs.h
+++ b/Drivers/Braille/FreedomScientific/brldefs-fs.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/HIMS/Makefile.in b/Drivers/Braille/HIMS/Makefile.in
index fc8e1585e..ef54496df 100644
--- a/Drivers/Braille/HIMS/Makefile.in
+++ b/Drivers/Braille/HIMS/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/HIMS/braille.c b/Drivers/Braille/HIMS/braille.c
index 52375ae7e..0eabdee6f 100644
--- a/Drivers/Braille/HIMS/braille.c
+++ b/Drivers/Braille/HIMS/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/HIMS/brldefs-hm.h b/Drivers/Braille/HIMS/brldefs-hm.h
index 3f59a63ec..11cdaf33a 100644
--- a/Drivers/Braille/HIMS/brldefs-hm.h
+++ b/Drivers/Braille/HIMS/brldefs-hm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/HandyTech/Makefile.in b/Drivers/Braille/HandyTech/Makefile.in
index 85431f7db..51e91ae30 100644
--- a/Drivers/Braille/HandyTech/Makefile.in
+++ b/Drivers/Braille/HandyTech/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/HandyTech/braille.c b/Drivers/Braille/HandyTech/braille.c
index 0f672f2b7..301a8a8a9 100644
--- a/Drivers/Braille/HandyTech/braille.c
+++ b/Drivers/Braille/HandyTech/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -270,6 +270,13 @@ BEGIN_KEY_NAME_TABLES(ac4)
KEY_NAME_TABLE(joystick),
END_KEY_NAME_TABLES
+BEGIN_KEY_NAME_TABLES(acp)
+ KEY_NAME_TABLE(routing),
+ KEY_NAME_TABLE(dots),
+ KEY_NAME_TABLE(navigation),
+ KEY_NAME_TABLE(brailleStar),
+END_KEY_NAME_TABLES
+
typedef enum {
HT_BWK_Backward = 0X01,
HT_BWK_Forward = 0X08,
@@ -307,6 +314,7 @@ DEFINE_KEY_TABLE(bb)
DEFINE_KEY_TABLE(bbp)
DEFINE_KEY_TABLE(alo)
DEFINE_KEY_TABLE(ac4)
+DEFINE_KEY_TABLE(acp)
DEFINE_KEY_TABLE(bkwm)
BEGIN_KEY_TABLE_LIST
@@ -327,6 +335,7 @@ BEGIN_KEY_TABLE_LIST
&KEY_TABLE_DEFINITION(bbp),
&KEY_TABLE_DEFINITION(alo),
&KEY_TABLE_DEFINITION(ac4),
+ &KEY_TABLE_DEFINITION(acp),
&KEY_TABLE_DEFINITION(bkwm),
END_KEY_TABLE_LIST
@@ -556,7 +565,7 @@ static const ModelEntry modelTable[] = {
.name = "Activator Pro 64",
.textCells = 64,
.statusCells = 0,
- .keyTableDefinition = &KEY_TABLE_DEFINITION(ac4),
+ .keyTableDefinition = &KEY_TABLE_DEFINITION(acp),
.interpretByte = interpretByte_key,
.writeCells = writeCells_Evolution,
.setBrailleFirmness = setBrailleFirmness,
@@ -570,7 +579,7 @@ static const ModelEntry modelTable[] = {
.name = "Activator Pro 80",
.textCells = 80,
.statusCells = 0,
- .keyTableDefinition = &KEY_TABLE_DEFINITION(ac4),
+ .keyTableDefinition = &KEY_TABLE_DEFINITION(acp),
.interpretByte = interpretByte_key,
.writeCells = writeCells_Evolution,
.setBrailleFirmness = setBrailleFirmness,
diff --git a/Drivers/Braille/HandyTech/brldefs-ht.h b/Drivers/Braille/HandyTech/brldefs-ht.h
index d409ed952..7d4902725 100644
--- a/Drivers/Braille/HandyTech/brldefs-ht.h
+++ b/Drivers/Braille/HandyTech/brldefs-ht.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Hedo/Makefile.in b/Drivers/Braille/Hedo/Makefile.in
index 7544cf8a9..c7b4965ea 100644
--- a/Drivers/Braille/Hedo/Makefile.in
+++ b/Drivers/Braille/Hedo/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Hedo/braille.c b/Drivers/Braille/Hedo/braille.c
index 0021d2c09..e94640845 100644
--- a/Drivers/Braille/Hedo/braille.c
+++ b/Drivers/Braille/Hedo/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Hedo/brldefs-hd.h b/Drivers/Braille/Hedo/brldefs-hd.h
index af9ab0965..c7b9fd6f0 100644
--- a/Drivers/Braille/Hedo/brldefs-hd.h
+++ b/Drivers/Braille/Hedo/brldefs-hd.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/HumanWare/Makefile.in b/Drivers/Braille/HumanWare/Makefile.in
index 786a0315d..c51afb4e6 100644
--- a/Drivers/Braille/HumanWare/Makefile.in
+++ b/Drivers/Braille/HumanWare/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/HumanWare/braille.c b/Drivers/Braille/HumanWare/braille.c
index a2c1d9f35..74d283332 100644
--- a/Drivers/Braille/HumanWare/braille.c
+++ b/Drivers/Braille/HumanWare/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/HumanWare/brldefs-hw.h b/Drivers/Braille/HumanWare/brldefs-hw.h
index 39803a762..01b13d4ed 100644
--- a/Drivers/Braille/HumanWare/brldefs-hw.h
+++ b/Drivers/Braille/HumanWare/brldefs-hw.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Inceptor/Makefile.in b/Drivers/Braille/Inceptor/Makefile.in
index 2a32778e0..691f55ef1 100644
--- a/Drivers/Braille/Inceptor/Makefile.in
+++ b/Drivers/Braille/Inceptor/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Inceptor/braille.c b/Drivers/Braille/Inceptor/braille.c
index 2f7101d77..05ecae3d3 100644
--- a/Drivers/Braille/Inceptor/braille.c
+++ b/Drivers/Braille/Inceptor/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Inceptor/brldefs-ic.h b/Drivers/Braille/Inceptor/brldefs-ic.h
index 0db5cc03f..f15e8b8da 100644
--- a/Drivers/Braille/Inceptor/brldefs-ic.h
+++ b/Drivers/Braille/Inceptor/brldefs-ic.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Iris/Makefile.in b/Drivers/Braille/Iris/Makefile.in
index 82722c535..cfbac6682 100644
--- a/Drivers/Braille/Iris/Makefile.in
+++ b/Drivers/Braille/Iris/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Iris/braille.c b/Drivers/Braille/Iris/braille.c
index b594a3ed7..08af40db0 100644
--- a/Drivers/Braille/Iris/braille.c
+++ b/Drivers/Braille/Iris/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Iris/brldefs-ir.h b/Drivers/Braille/Iris/brldefs-ir.h
index 2d18cb187..727db5223 100644
--- a/Drivers/Braille/Iris/brldefs-ir.h
+++ b/Drivers/Braille/Iris/brldefs-ir.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Libbraille/Makefile.in b/Drivers/Braille/Libbraille/Makefile.in
index f9770db78..12ce670cb 100644
--- a/Drivers/Braille/Libbraille/Makefile.in
+++ b/Drivers/Braille/Libbraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -20,7 +20,7 @@ DRIVER_CODE = lb
DRIVER_NAME = Libbraille
DRIVER_USAGE = Libbraille
DRIVER_VERSION =
-DRIVER_DEVELOPERS = Sbastien Sabl <sable@users.sourceforge.net>
+DRIVER_DEVELOPERS = Sébastien Sablé <sable@users.sourceforge.net>
BRL_OBJS = @braille_libraries_lb@
include $(SRC_TOP)braille.mk
diff --git a/Drivers/Braille/Libbraille/braille.c b/Drivers/Braille/Libbraille/braille.c
index aec4fb42b..40210e4a1 100644
--- a/Drivers/Braille/Libbraille/braille.c
+++ b/Drivers/Braille/Libbraille/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/LogText/Makefile.in b/Drivers/Braille/LogText/Makefile.in
index 3032ae6e1..45b6108ac 100644
--- a/Drivers/Braille/LogText/Makefile.in
+++ b/Drivers/Braille/LogText/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/LogText/README b/Drivers/Braille/LogText/README
index 74615f7d4..f035e93fe 100644
--- a/Drivers/Braille/LogText/README
+++ b/Drivers/Braille/LogText/README
@@ -1,7 +1,7 @@
This directory contains the BRLTTY driver for the LogText, which is
manufactured by Tactilog of Denmark. It was implemented, and is being
maintained, by Dave Mielke <dave@mielke.cc>. Thanks to Hans Schou
-<chlor@schou.dk> for his help and advice, and to Thomas Srensen
+<chlor@schou.dk> for his help and advice, and to Thomas Sørensen
<thomassoerens@wanadoo.dk> for testing. As a component of BRLTTY, this driver
is released under the terms of the GNU Public License.
diff --git a/Drivers/Braille/LogText/braille.c b/Drivers/Braille/LogText/braille.c
index 98f246bb6..5440f8b5c 100644
--- a/Drivers/Braille/LogText/braille.c
+++ b/Drivers/Braille/LogText/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/LogText/braille.h b/Drivers/Braille/LogText/braille.h
index dab06b6e3..c64debe85 100644
--- a/Drivers/Braille/LogText/braille.h
+++ b/Drivers/Braille/LogText/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/LogText/brl-out.h b/Drivers/Braille/LogText/brl-out.h
index 1afbe0d31..9219356aa 100644
--- a/Drivers/Braille/LogText/brl-out.h
+++ b/Drivers/Braille/LogText/brl-out.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/MDV/Makefile.in b/Drivers/Braille/MDV/Makefile.in
index fe1037369..d20b27fb8 100644
--- a/Drivers/Braille/MDV/Makefile.in
+++ b/Drivers/Braille/MDV/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/MDV/README b/Drivers/Braille/MDV/README
index b252b4889..8ac5705f8 100644
--- a/Drivers/Braille/MDV/README
+++ b/Drivers/Braille/MDV/README
@@ -1,6 +1,6 @@
Braille display driver for MDV displays
-Written by Stphane Doyon (s.doyon@videotron.ca) in collaboration with
+Written by Stéphane Doyon (s.doyon@videotron.ca) in collaboration with
Simone Dal Maso <sdalmaso@protec.it>.
This is version 0.8 (August 2000) of this driver.
diff --git a/Drivers/Braille/MDV/braille.c b/Drivers/Braille/MDV/braille.c
index c8257ac10..1333deb4a 100644
--- a/Drivers/Braille/MDV/braille.c
+++ b/Drivers/Braille/MDV/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/MDV/brldefs-md.h b/Drivers/Braille/MDV/brldefs-md.h
index 0c1c10c4e..992430169 100644
--- a/Drivers/Braille/MDV/brldefs-md.h
+++ b/Drivers/Braille/MDV/brldefs-md.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Metec/Makefile.in b/Drivers/Braille/Metec/Makefile.in
index 6f7e4e839..3d41972d9 100644
--- a/Drivers/Braille/Metec/Makefile.in
+++ b/Drivers/Braille/Metec/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Metec/braille.c b/Drivers/Braille/Metec/braille.c
index b10ab8a96..fd8cc0da2 100644
--- a/Drivers/Braille/Metec/braille.c
+++ b/Drivers/Braille/Metec/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Metec/brldefs-mt.h b/Drivers/Braille/Metec/brldefs-mt.h
index 83cc5a8d9..a681a117f 100644
--- a/Drivers/Braille/Metec/brldefs-mt.h
+++ b/Drivers/Braille/Metec/brldefs-mt.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/MiniBraille/Makefile.in b/Drivers/Braille/MiniBraille/Makefile.in
index e5f1373a7..2f89ab89a 100644
--- a/Drivers/Braille/MiniBraille/Makefile.in
+++ b/Drivers/Braille/MiniBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/MiniBraille/braille.c b/Drivers/Braille/MiniBraille/braille.c
index 938027d42..a27f4a4e2 100644
--- a/Drivers/Braille/MiniBraille/braille.c
+++ b/Drivers/Braille/MiniBraille/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/MultiBraille/Makefile.in b/Drivers/Braille/MultiBraille/Makefile.in
index c4ef3f474..636ea622f 100644
--- a/Drivers/Braille/MultiBraille/Makefile.in
+++ b/Drivers/Braille/MultiBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/MultiBraille/braille.c b/Drivers/Braille/MultiBraille/braille.c
index 295673a00..0786ba5f8 100644
--- a/Drivers/Braille/MultiBraille/braille.c
+++ b/Drivers/Braille/MultiBraille/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/MultiBraille/braille.h b/Drivers/Braille/MultiBraille/braille.h
index cd4e46035..ff8a09003 100644
--- a/Drivers/Braille/MultiBraille/braille.h
+++ b/Drivers/Braille/MultiBraille/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/MultiBraille/tables.h b/Drivers/Braille/MultiBraille/tables.h
index 48b1fdb47..83b8f5bda 100644
--- a/Drivers/Braille/MultiBraille/tables.h
+++ b/Drivers/Braille/MultiBraille/tables.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/NinePoint/Makefile.in b/Drivers/Braille/NinePoint/Makefile.in
index 5882a21b7..b3fe5f969 100644
--- a/Drivers/Braille/NinePoint/Makefile.in
+++ b/Drivers/Braille/NinePoint/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/NinePoint/braille.c b/Drivers/Braille/NinePoint/braille.c
index 5a42c9ff8..58ecbd9f8 100644
--- a/Drivers/Braille/NinePoint/braille.c
+++ b/Drivers/Braille/NinePoint/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/NinePoint/brldefs-np.h b/Drivers/Braille/NinePoint/brldefs-np.h
index a4c3d4bb5..d7ed1c203 100644
--- a/Drivers/Braille/NinePoint/brldefs-np.h
+++ b/Drivers/Braille/NinePoint/brldefs-np.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Papenmeier/Makefile.in b/Drivers/Braille/Papenmeier/Makefile.in
index c699a0d79..de4324ded 100644
--- a/Drivers/Braille/Papenmeier/Makefile.in
+++ b/Drivers/Braille/Papenmeier/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Papenmeier/braille.c b/Drivers/Braille/Papenmeier/braille.c
index 2a2897607..d3c33495f 100644
--- a/Drivers/Braille/Papenmeier/braille.c
+++ b/Drivers/Braille/Papenmeier/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -17,21 +17,21 @@
*/
/* This Driver was written as a project in the
- * HTL W1, Abteilung Elektrotechnik, Wien - sterreich
+ * HTL W1, Abteilung Elektrotechnik, Wien - Österreich
* (Technical High School, Department for electrical engineering,
* Vienna, Austria) http://www.ee.htlw16.ac.at
* by
* Tibor Becker
* Michael Burger
* Herbert Gruber
- * Heimo Schn
+ * Heimo Schön
* Teacher:
- * August Hrandl <august.hoerandl@gmx.at>
+ * August Hörandl <august.hoerandl@gmx.at>
*/
/*
* Support for all Papenmeier Terminal + config file
- * Heimo.Schn <heimo.schoen@gmx.at>
- * August Hrandl <august.hoerandl@gmx.at>
+ * Heimo.Schön <heimo.schoen@gmx.at>
+ * August Hörandl <august.hoerandl@gmx.at>
*/
#include "prologue.h"
diff --git a/Drivers/Braille/Papenmeier/brldefs-pm.h b/Drivers/Braille/Papenmeier/brldefs-pm.h
index d39920be8..c3ad3482a 100644
--- a/Drivers/Braille/Papenmeier/brldefs-pm.h
+++ b/Drivers/Braille/Papenmeier/brldefs-pm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Papenmeier/models.h b/Drivers/Braille/Papenmeier/models.h
index 6f7658dec..ceaf34a44 100644
--- a/Drivers/Braille/Papenmeier/models.h
+++ b/Drivers/Braille/Papenmeier/models.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Pegasus/Makefile.in b/Drivers/Braille/Pegasus/Makefile.in
index 9a438c46d..3c25c79b3 100644
--- a/Drivers/Braille/Pegasus/Makefile.in
+++ b/Drivers/Braille/Pegasus/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Pegasus/braille.c b/Drivers/Braille/Pegasus/braille.c
index efe44ee15..de9981cb1 100644
--- a/Drivers/Braille/Pegasus/braille.c
+++ b/Drivers/Braille/Pegasus/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Pegasus/brldefs-pg.h b/Drivers/Braille/Pegasus/brldefs-pg.h
index efc8e1204..9a9df4228 100644
--- a/Drivers/Braille/Pegasus/brldefs-pg.h
+++ b/Drivers/Braille/Pegasus/brldefs-pg.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Seika/Makefile.in b/Drivers/Braille/Seika/Makefile.in
index 2762ac1b4..c99062c57 100644
--- a/Drivers/Braille/Seika/Makefile.in
+++ b/Drivers/Braille/Seika/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Seika/braille.c b/Drivers/Braille/Seika/braille.c
index abc0f8ba1..f01e704f6 100644
--- a/Drivers/Braille/Seika/braille.c
+++ b/Drivers/Braille/Seika/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Seika/brldefs-sk.h b/Drivers/Braille/Seika/brldefs-sk.h
index 151101e2b..90485bab7 100644
--- a/Drivers/Braille/Seika/brldefs-sk.h
+++ b/Drivers/Braille/Seika/brldefs-sk.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Skeleton/Makefile.in b/Drivers/Braille/Skeleton/Makefile.in
index 411abb3ae..036d6b7fd 100644
--- a/Drivers/Braille/Skeleton/Makefile.in
+++ b/Drivers/Braille/Skeleton/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Skeleton/braille.c b/Drivers/Braille/Skeleton/braille.c
index 824e591d6..d37568e80 100644
--- a/Drivers/Braille/Skeleton/braille.c
+++ b/Drivers/Braille/Skeleton/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Skeleton/brldefs-xx.h b/Drivers/Braille/Skeleton/brldefs-xx.h
index 2d724e8ab..caaab4b4a 100644
--- a/Drivers/Braille/Skeleton/brldefs-xx.h
+++ b/Drivers/Braille/Skeleton/brldefs-xx.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/TSI/Makefile.in b/Drivers/Braille/TSI/Makefile.in
index c393cfea1..1ba60b7a6 100644
--- a/Drivers/Braille/TSI/Makefile.in
+++ b/Drivers/Braille/TSI/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/TSI/README b/Drivers/Braille/TSI/README
index eebeb07f8..5d6a760df 100644
--- a/Drivers/Braille/TSI/README
+++ b/Drivers/Braille/TSI/README
@@ -2,7 +2,7 @@ This is the BRLTTY driver for TSI braille displays,
Version 2.74 April 2004
Author and maintainer:
- Stphane Doyon
+ Stéphane Doyon
E-Mail: s.doyon@videotron.ca
This driver contains the code to support most of Telesensory Systems' braille
diff --git a/Drivers/Braille/TSI/braille.c b/Drivers/Braille/TSI/braille.c
index 5f56de56f..324982061 100644
--- a/Drivers/Braille/TSI/braille.c
+++ b/Drivers/Braille/TSI/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -18,7 +18,7 @@
/* TSI/braille.c - Braille display driver for TSI displays
*
- * Written by Stphane Doyon (s.doyon@videotron.ca)
+ * Written by Stéphane Doyon (s.doyon@videotron.ca)
*
* It attempts full support for Navigator 20/40/80 and Powerbraille 40/65/80.
* It is designed to be compiled into BRLTTY version 3.5.
diff --git a/Drivers/Braille/TSI/braille.h b/Drivers/Braille/TSI/braille.h
index 63d361fc4..3b61ed0b7 100644
--- a/Drivers/Braille/TSI/braille.h
+++ b/Drivers/Braille/TSI/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -18,7 +18,7 @@
/* TSI/braille.h - Configuration file for the TSI braille
* display driver (brl.c)
- * Written by Stphane Doyon (s.doyon@videotron.ca)
+ * Written by Stéphane Doyon (s.doyon@videotron.ca)
*
* This file is intended for version 2.2beta3 of the driver.
*/
diff --git a/Drivers/Braille/TSI/brldefs-ts.h b/Drivers/Braille/TSI/brldefs-ts.h
index c79c226b3..fe8dd0f9b 100644
--- a/Drivers/Braille/TSI/brldefs-ts.h
+++ b/Drivers/Braille/TSI/brldefs-ts.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/TTY/Makefile.in b/Drivers/Braille/TTY/Makefile.in
index f7d22f56e..124782e42 100644
--- a/Drivers/Braille/TTY/Makefile.in
+++ b/Drivers/Braille/TTY/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/TTY/braille.c b/Drivers/Braille/TTY/braille.c
index 6dda9b97d..c8cba4999 100644
--- a/Drivers/Braille/TTY/braille.c
+++ b/Drivers/Braille/TTY/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/TTY/braille.h b/Drivers/Braille/TTY/braille.h
index 792395042..30c4c348d 100644
--- a/Drivers/Braille/TTY/braille.h
+++ b/Drivers/Braille/TTY/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/TechniBraille/Makefile.in b/Drivers/Braille/TechniBraille/Makefile.in
index 17e5a557d..ab923db14 100644
--- a/Drivers/Braille/TechniBraille/Makefile.in
+++ b/Drivers/Braille/TechniBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/TechniBraille/braille.c b/Drivers/Braille/TechniBraille/braille.c
index 697cc5749..fb7511868 100644
--- a/Drivers/Braille/TechniBraille/braille.c
+++ b/Drivers/Braille/TechniBraille/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/VideoBraille/Makefile.in b/Drivers/Braille/VideoBraille/Makefile.in
index c7a8bc91a..8bf9ba5f1 100644
--- a/Drivers/Braille/VideoBraille/Makefile.in
+++ b/Drivers/Braille/VideoBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/VideoBraille/README.it b/Drivers/Braille/VideoBraille/README.it
index dcfd6a3ba..8574c480f 100644
--- a/Drivers/Braille/VideoBraille/README.it
+++ b/Drivers/Braille/VideoBraille/README.it
@@ -1,23 +1,23 @@
Introduzione
-Questo il driver per il display braille Videobraille, distribuito dalla Tiflosoft.
+Questo è il driver per il display braille Videobraille, distribuito dalla Tiflosoft.
Questo driver funziona SOLO con il modello VB 40 e non funziona con l'aggiornamento PRO 9600.
-Potrei eventualmente aggiungere anche il supporto per il modello PRO 9600 se mi fosse richiesto, poich si tratta solo di qualche breve modifica al codice; non ho implementato ancora il supporto per questo modello semplicemente perch non avrei avuto modo di testarlo.
+Potrei eventualmente aggiungere anche il supporto per il modello PRO 9600 se mi fosse richiesto, poiché si tratta solo di qualche breve modifica al codice; non ho implementato ancora il supporto per questo modello semplicemente perché non avrei avuto modo di testarlo.
Implementazione
-Questo driver non perfetto. Ho riscontrato vari problemi relativi soprattutto alla temporizzazione, e ho dovuto implementare una funzione di scrittura che scrive ogni riga due volte sul display braille, non chiedetermi perch: solo questione di test.
+Questo driver non è perfetto. Ho riscontrato vari problemi relativi soprattutto alla temporizzazione, e ho dovuto implementare una funzione di scrittura che scrive ogni riga due volte sul display braille, non chiedetermi perché: è solo questione di test.
Per implementare il driver, ho contattato direttamente chi ha progettato questo display (Acquistapace) per ottenere della documentazione.
-Se volete contattarmi per qualunque problema o suggerimento, il mio indirizzo e-mail christian_comaschi@libero.it
-Per, prima di contattarmi e scrivere che il driver non funziona, controllate che:
-- la vostra Videobraille non PRO 9600 (se lo e volete il driver, chiedete);
-- nel file braille.h LPTPORT impostato correttamente: 0x378 per LPT1, 0x278 per LPT2,...
-Se tutto giusto, provate a modificare in braille.h i valori VBDELAY, VBCLOCK e VBREFRESHDELAY: questi valori dipendono dalla velocit del computer, devono quindi essere adattati al vostro processore. Non penso che questo sia un buon modo di impostare i tempi di attesa, ma ho voluto rispettare l'implementazione originale, perch quando ho usato altri tipi di temporizzazione ho riscontrato problemi.
+Se volete contattarmi per qualunque problema o suggerimento, il mio indirizzo e-mail è christian_comaschi@libero.it
+Però, prima di contattarmi e scrivere che il driver non funziona, controllate che:
+- la vostra Videobraille non è PRO 9600 (se lo è e volete il driver, chiedete);
+- nel file braille.h LPTPORT è impostato correttamente: 0x378 per LPT1, 0x278 per LPT2,...
+Se tutto è giusto, provate a modificare in braille.h i valori VBDELAY, VBCLOCK e VBREFRESHDELAY: questi valori dipendono dalla velocità del computer, devono quindi essere adattati al vostro processore. Non penso che questo sia un buon modo di impostare i tempi di attesa, ma ho voluto rispettare l'implementazione originale, perché quando ho usato altri tipi di temporizzazione ho riscontrato problemi.
Implementazione della funzione taglia/incolla
Ho aggiornato in seguito il driver per implementare la funzione taglia/incolla in questo modo: si seleziona l'inizio di un blocco tenendo premuto uno dei 40 tastini dell'aggancio cursore e premendo Edit; si contrassegna la fine di un blocco tenendo premuto uno dei 40 tastini e premendo Menu.
Il tastino da premere va selezionato come nella procedura di aggancio cursore.
Quindi, per incollare il testo, basta premere contemporaneamente i tasti Attr e Menu.
-Per questa implementazione ho dovuto inventare le combinazioni dei tasti perch la funzione copia/incolla non esisteva nel driver DOS originale.
+Per questa implementazione ho dovuto inventare le combinazioni dei tasti perché la funzione copia/incolla non esisteva nel driver DOS originale.
diff --git a/Drivers/Braille/VideoBraille/braille.c b/Drivers/Braille/VideoBraille/braille.c
index ec59e17a6..a28b82601 100644
--- a/Drivers/Braille/VideoBraille/braille.c
+++ b/Drivers/Braille/VideoBraille/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/VideoBraille/braille.h b/Drivers/Braille/VideoBraille/braille.h
index 7e971f90a..f0a0c4094 100644
--- a/Drivers/Braille/VideoBraille/braille.h
+++ b/Drivers/Braille/VideoBraille/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Virtual/Makefile.in b/Drivers/Braille/Virtual/Makefile.in
index 635f2e561..7f3723555 100644
--- a/Drivers/Braille/Virtual/Makefile.in
+++ b/Drivers/Braille/Virtual/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Virtual/braille.c b/Drivers/Braille/Virtual/braille.c
index e8ae172f4..3c85d8a2c 100644
--- a/Drivers/Braille/Virtual/braille.c
+++ b/Drivers/Braille/Virtual/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/Virtual/braille.h b/Drivers/Braille/Virtual/braille.h
index 06c660e14..c1a613bbe 100644
--- a/Drivers/Braille/Virtual/braille.h
+++ b/Drivers/Braille/Virtual/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/VisioBraille/Makefile.in b/Drivers/Braille/VisioBraille/Makefile.in
index fdbd1fd71..34dc864bc 100644
--- a/Drivers/Braille/VisioBraille/Makefile.in
+++ b/Drivers/Braille/VisioBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/VisioBraille/braille.c b/Drivers/Braille/VisioBraille/braille.c
index 13b64dacd..a97ee9f5a 100644
--- a/Drivers/Braille/VisioBraille/braille.c
+++ b/Drivers/Braille/VisioBraille/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/VisioBraille/braille.h b/Drivers/Braille/VisioBraille/braille.h
index 4654d6c84..0715cbd92 100644
--- a/Drivers/Braille/VisioBraille/braille.h
+++ b/Drivers/Braille/VisioBraille/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/VisioBraille/brl-out.h b/Drivers/Braille/VisioBraille/brl-out.h
index 7a8d5ce32..6bfa8685b 100644
--- a/Drivers/Braille/VisioBraille/brl-out.h
+++ b/Drivers/Braille/VisioBraille/brl-out.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/VisioBraille/brldefs-vs.h b/Drivers/Braille/VisioBraille/brldefs-vs.h
index fdf4315c8..452584e0a 100644
--- a/Drivers/Braille/VisioBraille/brldefs-vs.h
+++ b/Drivers/Braille/VisioBraille/brldefs-vs.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/VisioBraille/vstp.h b/Drivers/Braille/VisioBraille/vstp.h
index 011e8527a..693f5a167 100644
--- a/Drivers/Braille/VisioBraille/vstp.h
+++ b/Drivers/Braille/VisioBraille/vstp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2024 S&S
+ * Copyright (C) 2006-2025 S&S
* Samuel Thibault <samuel.thibault@ens-lyon.org>
* Sébastien Hinderer <sebastien.hinderer@ens-lyon.org>
*
diff --git a/Drivers/Braille/VisioBraille/vstp_main.c b/Drivers/Braille/VisioBraille/vstp_main.c
index 95e32bcd0..d1744ac17 100644
--- a/Drivers/Braille/VisioBraille/vstp_main.c
+++ b/Drivers/Braille/VisioBraille/vstp_main.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2024 S&S
+ * Copyright (C) 2006-2025 S&S
* Samuel Thibault <samuel.thibault@ens-lyon.org>
* Sébastien Hinderer <sebastien.hinderer@ens-lyon.org>
*
diff --git a/Drivers/Braille/VisioBraille/vstp_transfer.c b/Drivers/Braille/VisioBraille/vstp_transfer.c
index 2fed5af95..60f4fc41f 100644
--- a/Drivers/Braille/VisioBraille/vstp_transfer.c
+++ b/Drivers/Braille/VisioBraille/vstp_transfer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2024 S&S
+ * Copyright (C) 2006-2025 S&S
* Samuel Thibault <samuel.thibault@ens-lyon.org>
* Sébastien Hinderer <sebastien.hinderer@ens-lyon.org>
*
diff --git a/Drivers/Braille/Voyager/Makefile.in b/Drivers/Braille/Voyager/Makefile.in
index b3e97d9e7..c0744571e 100644
--- a/Drivers/Braille/Voyager/Makefile.in
+++ b/Drivers/Braille/Voyager/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/Voyager/README b/Drivers/Braille/Voyager/README
index 2a3c6bee8..87ca6a145 100644
--- a/Drivers/Braille/Voyager/README
+++ b/Drivers/Braille/Voyager/README
@@ -2,7 +2,7 @@ BRLTTY Driver for the Tieman Voyager Braille Display
This is the user-space-only version of the driver.
Version 0.10 (March 2004)
-Copyright 2004 by Stphane Doyon <s.doyon@videotron.ca>
+Copyright 2004 by Stéphane Doyon <s.doyon@videotron.ca>
This is a partial rewrite of the driver which functions entirely from
user-space (whereas the previous driver depended on a kernel driver for
@@ -25,7 +25,7 @@ projects and are so supportive.
Thanks to Andor Demarteau <ademarte@students.cs.uu.nl> who got this whole
project started and beta-tested all our early buggy attempts.
-Thanks to Stphane Dalton who wrote the initial version of the old kernel
+Thanks to Stéphane Dalton who wrote the initial version of the old kernel
driver. Without his initiative this project would not have been a success.
This rewrite of the driver should allow more flexibility, but is as of yet
diff --git a/Drivers/Braille/Voyager/braille.c b/Drivers/Braille/Voyager/braille.c
index ccb30ee88..86bf3c9dc 100644
--- a/Drivers/Braille/Voyager/braille.c
+++ b/Drivers/Braille/Voyager/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -18,7 +18,7 @@
/* Voyager/braille.c - Braille display driver for Tieman Voyager displays.
*
- * Written by Stphane Doyon <s.doyon@videotron.ca>
+ * Written by Stéphane Doyon <s.doyon@videotron.ca>
*
* It is being tested on Voyager 44, should also support Voyager 70.
* It is designed to be compiled in BRLTTY version 4.1.
diff --git a/Drivers/Braille/Voyager/brldefs-vo.h b/Drivers/Braille/Voyager/brldefs-vo.h
index 16f455e71..007f1b483 100644
--- a/Drivers/Braille/Voyager/brldefs-vo.h
+++ b/Drivers/Braille/Voyager/brldefs-vo.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Braille/XWindow/Makefile.in b/Drivers/Braille/XWindow/Makefile.in
index b4d131538..577a0d712 100644
--- a/Drivers/Braille/XWindow/Makefile.in
+++ b/Drivers/Braille/XWindow/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Braille/XWindow/braille.c b/Drivers/Braille/XWindow/braille.c
index 53761d4bb..9c7e16eff 100644
--- a/Drivers/Braille/XWindow/braille.c
+++ b/Drivers/Braille/XWindow/braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -750,7 +750,15 @@ static int generateToplevel(void)
#elif defined(USE_XM)
"popup()"
#endif /* USE_ */
- "\n";
+ "\n"
+ "Mod2<Btn3Down>: "
+#if defined(USE_XAW)
+ "XawPositionSimpleMenu(menu) MenuPopup(menu)"
+#elif defined(USE_XM)
+ "popup()"
+#endif /* USE_ */
+ "\n"
+ ;
Widget tmp_vbox;
char *disp;
#ifdef USE_XAW
diff --git a/Drivers/Braille/XWindow/braille.h b/Drivers/Braille/XWindow/braille.h
index 792395042..30c4c348d 100644
--- a/Drivers/Braille/XWindow/braille.h
+++ b/Drivers/Braille/XWindow/braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/BrlAPI/WindowEyes/Makefile.in b/Drivers/BrlAPI/WindowEyes/Makefile.in
index b7ae98fea..d75724b1a 100644
--- a/Drivers/BrlAPI/WindowEyes/Makefile.in
+++ b/Drivers/BrlAPI/WindowEyes/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/BrlAPI/WindowEyes/test.c b/Drivers/BrlAPI/WindowEyes/test.c
index 832e912b0..da60987ba 100644
--- a/Drivers/BrlAPI/WindowEyes/test.c
+++ b/Drivers/BrlAPI/WindowEyes/test.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 2009-2024 by The BRLTTY Developers.
+ * Copyright (C) 2009-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/BrlAPI/WindowEyes/webrloem.c b/Drivers/BrlAPI/WindowEyes/webrloem.c
index 7ada6384b..acdc62f34 100644
--- a/Drivers/BrlAPI/WindowEyes/webrloem.c
+++ b/Drivers/BrlAPI/WindowEyes/webrloem.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/BrlAPI/WindowEyes/webrloem.h b/Drivers/BrlAPI/WindowEyes/webrloem.h
index c6e38b0f1..9760dc3bd 100644
--- a/Drivers/BrlAPI/WindowEyes/webrloem.h
+++ b/Drivers/BrlAPI/WindowEyes/webrloem.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/Android/Makefile.in b/Drivers/Screen/Android/Makefile.in
index 54755bfa8..0be926d5d 100644
--- a/Drivers/Screen/Android/Makefile.in
+++ b/Drivers/Screen/Android/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/Android/screen.c b/Drivers/Screen/Android/screen.c
index cd76ad92a..c5d1b96aa 100644
--- a/Drivers/Screen/Android/screen.c
+++ b/Drivers/Screen/Android/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/AtSpi/Makefile.in b/Drivers/Screen/AtSpi/Makefile.in
index 32efa9925..b55c7755c 100644
--- a/Drivers/Screen/AtSpi/Makefile.in
+++ b/Drivers/Screen/AtSpi/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/AtSpi/screen.c b/Drivers/Screen/AtSpi/screen.c
index 680de1802..4833adfbd 100644
--- a/Drivers/Screen/AtSpi/screen.c
+++ b/Drivers/Screen/AtSpi/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/AtSpi2/Makefile.in b/Drivers/Screen/AtSpi2/Makefile.in
index b6ab645e9..9a9dcc552 100644
--- a/Drivers/Screen/AtSpi2/Makefile.in
+++ b/Drivers/Screen/AtSpi2/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/AtSpi2/a2_screen.c b/Drivers/Screen/AtSpi2/a2_screen.c
index f0f7aa5f6..bb20b9c04 100644
--- a/Drivers/Screen/AtSpi2/a2_screen.c
+++ b/Drivers/Screen/AtSpi2/a2_screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -71,6 +71,7 @@
#include "async_io.h"
#include "async_alarm.h"
#include "async_event.h"
+#include "unicode.h"
typedef enum {
PARM_RELEASE,
@@ -98,7 +99,8 @@ static ScreenContentQuality curQuality;
static long curNumRows, curNumCols;
static wchar_t **curRows;
static long *curRowLengths;
-static long curCaret,curPosX,curPosY;
+static long curCaret; /* In unicode codepoints */
+static long curPosX,curPosY; /* In screen offset */
static DBusConnection *bus = NULL;
@@ -371,9 +373,9 @@ send_with_reply_and_block(DBusConnection *bus, DBusMessage *msg, int timeout_ms,
return reply;
}
-static void findPosition(long position, long *px, long *py) {
- long offset=0, newoffset, x, y;
- /* XXX: I don't know what they do with necessary combining accents */
+/* px, py are counting unicode codepoints, psx is counting screen coordinate */
+static void findPosition(long position, long *px, long *py, long *psx) {
+ long offset=0, newoffset, x, y, sx;
for (y=0; y<curNumRows; y++) {
if ((newoffset = offset + curRowLengths[y]) > position)
break;
@@ -392,29 +394,62 @@ static void findPosition(long position, long *px, long *py) {
}
} else
x = position-offset;
- *px = x;
+
+ /* Process text of the line until the wanted position */
+ for (offset=0, sx=0; offset<x && offset<curRowLengths[y]; offset++) {
+ wchar_t wc = curRows[y][offset];
+
+ if (wc == '\n') continue; /* EOL, ignore */
+
+ if (wc == '\t') {
+ /* Switch to next tab */
+ sx = (sx+1+7)&~7;
+ continue;
+ }
+
+ if (getCharacterWidth(wc) != 0) sx++;
+ }
+
+ if (px) *px = x;
*py = y;
+ if (psx) *psx = sx;
}
+/* Convert from screen coordinates to unicode codepoints offset */
static long findCoordinates(long xx, long yy) {
- long offset=0, y;
- /* XXX: I don't know what they do with necessary combining accents */
+ long offset=0, x, y, sx;
if (yy >= curNumRows) {
return -1;
}
for (y=0; y<yy; y++) {
offset += curRowLengths[y];
}
- if (xx >= curRowLengths[y])
- xx = curRowLengths[y]-1;
- return offset + xx;
+
+ /* Process text of the line until the wanted position */
+ for (x=0, sx=0; sx<xx && x<curRowLengths[y]; x++) {
+ wchar_t wc = curRows[y][x];
+
+ if (wc == '\n') continue; /* EOL, ignore */
+
+ if (wc == '\t') {
+ /* Switch to next tab */
+ sx = (sx+1+7)&~7;
+ continue;
+ }
+
+ if (getCharacterWidth(wc) != 0) sx++;
+ }
+
+ if (x >= curRowLengths[y])
+ x = curRowLengths[y]-1;
+ return offset+x;
}
static void caretPosition(long caret) {
if (caret < 0) {
caret = 0;
}
- findPosition(caret,&curPosX,&curPosY);
+ findPosition(caret,NULL,&curPosY,&curPosX);
curCaret = caret;
}
@@ -695,7 +730,6 @@ static void restartTerm(const char *sender, const char *path) {
/* Switched to a new object, check whether we want to read it, and if so, restart with it */
static void tryRestartTerm(const char *sender, const char *path) {
if (curPath) finiTerm();
- restartTerm(sender, path);
curRole = getRole(sender, path);
logMessage(LOG_CATEGORY(SCREEN_DRIVER),
@@ -715,6 +749,9 @@ static void tryRestartTerm(const char *sender, const char *path) {
}
if (requested) curQuality = SCQ_GOOD;
+
+ if (curQuality != SCQ_NONE)
+ restartTerm(sender, path);
}
/* Get the state of an object */
@@ -1018,7 +1055,7 @@ static void AtSpi2HandleEvent(const char *interface, DBusMessage *message)
if (toDelete <= 0) {
return;
}
- findPosition(detail1,&x,&y);
+ findPosition(detail1,&x,&y,NULL);
if (dbus_message_iter_get_arg_type(&iter_variant) != DBUS_TYPE_STRING) {
logMessage(LOG_CATEGORY(SCREEN_DRIVER),
"ergl, not string but '%c'", dbus_message_iter_get_arg_type(&iter_variant));
@@ -1078,7 +1115,7 @@ static void AtSpi2HandleEvent(const char *interface, DBusMessage *message)
if (!curSender || strcmp(sender, curSender) || strcmp(path, curPath)) return;
logMessage(LOG_CATEGORY(SCREEN_DRIVER),
"insert %d from %d",detail2,detail1);
- findPosition(detail1,&x,&y);
+ findPosition(detail1,&x,&y,NULL);
if (dbus_message_iter_get_arg_type(&iter_variant) != DBUS_TYPE_STRING) {
logMessage(LOG_CATEGORY(SCREEN_DRIVER),
"ergl, not string but '%c'", dbus_message_iter_get_arg_type(&iter_variant));
@@ -1652,11 +1689,34 @@ readCharacters_AtSpi2Screen (const ScreenBox *box, ScreenCharacter *buffer) {
if (!validateScreenBox(box, cols, curNumRows)) return 0;
for (unsigned int y=0; y<box->height; y+=1) {
- if (curRowLengths[box->top+y]) {
- for (unsigned int x=0; x<box->width; x+=1) {
- if (box->left+x < curRowLengths[box->top+y] - (curRows[box->top+y][curRowLengths[box->top+y]-1]==WC_C('\n'))) {
- buffer[y*box->width+x].text = curRows[box->top+y][box->left+x];
+ unsigned length = curRowLengths[box->top+y];
+ unsigned offset; /* Position in unicode codepoints */
+ unsigned sx; /* Position in screen offset */
+ unsigned right = box->left+box->width;
+
+ if (length && curRows[box->top+y][length-1] == WC_C('\n'))
+ /* Do not show trailing \n */
+ length--;
+
+ /* Process text of the line while peeking characters */
+ for (offset=0, sx=0; offset < length && sx<right; offset+=1) {
+ wchar_t wc = curRows[box->top+y][offset];
+
+ if (wc == '\t') {
+ /* Complete with spaces up to next tab */
+ unsigned nexttab = (sx+1+7)&~7;
+ for ( ; sx<nexttab; sx+=1) {
+ if (sx >= box->left && sx<right)
+ buffer[y*box->width+sx-box->left].text = WC_C(' ');
}
+ continue;
+ }
+
+ /* XXX: Ignoring combining characters */
+ if (getCharacterWidth(wc) != 0) {
+ if (sx >= box->left && sx<right)
+ buffer[y*box->width+sx-box->left].text = wc;
+ sx+=1;
}
}
}
@@ -1824,6 +1884,9 @@ setSelection_AtSpi2Screen (int beginOffset, int endOffset) {
dbus_int32_t begin = beginOffset;
dbus_int32_t end = endOffset;
+ if (!curSender)
+ return 0;
+
msg = new_method_call(curSender, curPath, SPI2_DBUS_INTERFACE_TEXT, "SetSelection");
if (!msg)
return 0;
diff --git a/Drivers/Screen/FileViewer/Makefile.in b/Drivers/Screen/FileViewer/Makefile.in
index f86930c70..69eaa58b6 100644
--- a/Drivers/Screen/FileViewer/Makefile.in
+++ b/Drivers/Screen/FileViewer/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/FileViewer/screen.c b/Drivers/Screen/FileViewer/screen.c
index d03c89641..a49ba34f2 100644
--- a/Drivers/Screen/FileViewer/screen.c
+++ b/Drivers/Screen/FileViewer/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/Grub/Makefile.in b/Drivers/Screen/Grub/Makefile.in
index 66523bbff..7212d8c9b 100644
--- a/Drivers/Screen/Grub/Makefile.in
+++ b/Drivers/Screen/Grub/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/Grub/screen.c b/Drivers/Screen/Grub/screen.c
index 5ac018651..be2282f44 100644
--- a/Drivers/Screen/Grub/screen.c
+++ b/Drivers/Screen/Grub/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/Hurd/Makefile.in b/Drivers/Screen/Hurd/Makefile.in
index ebe4c39c0..f2385f2d7 100644
--- a/Drivers/Screen/Hurd/Makefile.in
+++ b/Drivers/Screen/Hurd/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/Hurd/screen.c b/Drivers/Screen/Hurd/screen.c
index c644dba3f..1b629b67b 100644
--- a/Drivers/Screen/Hurd/screen.c
+++ b/Drivers/Screen/Hurd/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/Hurd/screen.h b/Drivers/Screen/Hurd/screen.h
index b4b2a4a96..ba2fec70e 100644
--- a/Drivers/Screen/Hurd/screen.h
+++ b/Drivers/Screen/Hurd/screen.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/Linux/Makefile.in b/Drivers/Screen/Linux/Makefile.in
index 3015090a6..97c920fd9 100644
--- a/Drivers/Screen/Linux/Makefile.in
+++ b/Drivers/Screen/Linux/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/Linux/bin/chvt-test b/Drivers/Screen/Linux/bin/chvt-test
new file mode 100755
index 000000000..f64682924
--- /dev/null
+++ b/Drivers/Screen/Linux/bin/chvt-test
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+console="$(fgconsole)"
+
+index=0
+while ((++index <= 1000))
+do
+ vt=0
+ while ((++vt <= 6))
+ do
+ /usr/bin/chvt $vt
+ sleep 0.001
+ done
+done
+
+chvt "${console}"
+exit 0
diff --git a/Drivers/Screen/Linux/bin/mode-test b/Drivers/Screen/Linux/bin/mode-test
new file mode 100755
index 000000000..4f79d6f0c
--- /dev/null
+++ b/Drivers/Screen/Linux/bin/mode-test
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+
+say() {
+ espeak-ng "${*}" &
+}
+
+run() {
+ say "$((++counter))"
+ echo "${*}"
+ "${@}"
+ sleep 5
+}
+
+console="$(fgconsole)"
+counter=0
+
+run chvt 1
+run systemctl start gdm
+run systemctl stop gdm
+run systemctl start getty@tty1
+
+say "done"
+chvt "${console}"
+exit 0
diff --git a/Drivers/Screen/Linux/screen.c b/Drivers/Screen/Linux/screen.c
index c712d3c90..76b66d1f0 100644
--- a/Drivers/Screen/Linux/screen.c
+++ b/Drivers/Screen/Linux/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -25,6 +25,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
+#include <sys/sysmacros.h>
#include <linux/tty.h>
#include <linux/vt.h>
#include <linux/kd.h>
@@ -35,6 +36,25 @@
#define VT_GETHIFONTMASK 0X560D
#endif /* VT_GETHIFONTMASK */
+#ifndef VT_GETCONSIZECSRPOS
+#define VT_GETCONSIZECSRPOS _IOR('V', 0x10, struct vt_consizecsrpos)
+
+struct vt_consizecsrpos {
+ __u16 con_rows;
+ __u16 con_cols;
+ __u16 csr_row;
+ __u16 csr_col;
+};
+#endif /* VT_GETCONSIZECSRPOS */
+
+#ifndef TIOCL_GETFGCONSOLE
+#define TIOCL_GETFGCONSOLE 16
+#endif /* TIOCL_GETFGCONSOLE */
+
+#ifndef TIOCL_GETBRACKETEDPASTE
+#define TIOCL_GETBRACKETEDPASTE 18
+#endif /* TIOCL_GETBRACKETEDPASTE */
+
#include "log.h"
#include "report.h"
#include "message.h"
@@ -56,24 +76,39 @@ typedef enum {
PARM_CHARSET,
PARM_FALLBACK_TEXT,
PARM_HIGH_FONT_BIT,
+ PARM_LARGE_SCREEN_BUG,
PARM_LOG_SCREEN_FONT_MAP,
PARM_RPI_SPACES_BUG,
PARM_UNICODE,
PARM_VIRTUAL_TERMINAL_NUMBER,
PARM_WIDECHAR_PADDING,
} ScreenParameters;
-#define SCRPARMS "charset", "fallbacktext", "hfb", "logsfm", "rpispacesbug", "unicode", "vt", "widecharpadding"
+#define SCRPARMS "charset", "fallbacktext", "hfb", "largescreenbug", "logsfm", "rpispacesbug", "unicode", "vt", "widecharpadding"
#include "scr_driver.h"
#include "screen.h"
+static void
+logKernelLimitation (unsigned char *alreadyLogged, int major, int minor, const char *message) {
+ if (alreadyLogged) {
+ if (*alreadyLogged) return;
+ *alreadyLogged = 1;
+ }
+
+ logMessage(LOG_WARNING,
+ "pre-%d.%d kernel limitation: %s",
+ major, minor, message
+ );
+}
+
static const char *problemText;
static const char *fallbackText;
+static unsigned int largeScreenBug;
static unsigned int logScreenFontMap;
static unsigned int rpiSpacesBug;
static unsigned int unicodeEnabled;
-static int virtualTerminalNumber;
+static int selectedVirtualTerminal;
static unsigned int widecharPadding;
#define UNICODE_ROW_DIRECT 0XF000
@@ -327,13 +362,72 @@ convertCharacter (const wchar_t *character) {
return WEOF;
}
+static void
+logTruncatedData (size_t expected, size_t actual, const char *type) {
+ logMessage(LOG_ERR,
+ "truncated %s data: expected %"PRIsize " bytes but only read %"PRIsize,
+ type, expected, actual
+ );
+}
+
+static void
+logUnexpectedSize (size_t expected, size_t actual, const char *type) {
+ logMessage(LOG_WARNING,
+ "%s %s read: expected %"PRIsize " bytes but read %"PRIsize,
+ (actual < expected)? "short": "long",
+ type, expected, actual
+ );
+}
+
static int
-setDeviceName (const char **name, const char *const *names, int strict, const char *description) {
- return (*name = resolveDeviceName(names, strict, description)) != NULL;
+extendCacheBuffer (void **buffer, size_t *size, size_t newSize, const char *type) {
+ logMessage(LOG_CATEGORY(SCREEN_DRIVER),
+ "extending %s buffer: %"PRIsize " -> %"PRIsize,
+ type, *size, newSize
+ );
+
+ void *newBuffer = malloc(newSize);
+
+ if (!newBuffer) {
+ logMallocError();
+ return 0;
+ }
+
+ if (*buffer) free(*buffer);
+ *buffer = newBuffer;
+ *size = newSize;
+
+ return 1;
+}
+
+static size_t
+readCache (
+ off_t offset, void *buffer, size_t size,
+ const unsigned char *cache, size_t used, const char *type
+) {
+ if (offset > used) {
+ logMessage(LOG_ERR,
+ "invalid %s cache offset: %"PRIsize " > %"PRIsize,
+ type, offset, used
+ );
+ } else {
+ size_t left = used - offset;
+ if (size > left) size = left;
+
+ memcpy(buffer, &cache[offset], size);
+ return size;
+ }
+
+ return 0;
+}
+
+static int
+setDeviceName (const char **name, const char *const *names, int strict, const char *type) {
+ return (*name = resolveDeviceName(names, strict, type)) != NULL;
}
static char *
-vtName (const char *name, unsigned char vt) {
+vtName (const char *name, int vt) {
char *string;
if (vt) {
@@ -341,7 +435,7 @@ vtName (const char *name, unsigned char vt) {
if (name[length-1] == '0') length -= 1;
char buffer[length+4];
- snprintf(buffer, sizeof(buffer), "%.*s%u", length, name, vt);
+ snprintf(buffer, sizeof(buffer), "%.*s%d", length, name, vt);
string = strdup(buffer);
} else {
@@ -361,16 +455,20 @@ setConsoleName (void) {
}
static void
-closeConsole (int *fd) {
+closeConsole (int *fd, const char *type) {
if (*fd != -1) {
- logMessage(LOG_CATEGORY(SCREEN_DRIVER), "closing console: fd=%d", *fd);
+ logMessage(LOG_CATEGORY(SCREEN_DRIVER),
+ "closing %s console: fd=%d",
+ type, *fd
+ );
+
if (close(*fd) == -1) logSystemError("close[console]");
*fd = -1;
}
}
static int
-openConsole (int *fd, int vt) {
+openConsole (int *fd, int vt, const char *type) {
int opened = 0;
char *name = vtName(consoleName, vt);
@@ -379,9 +477,11 @@ openConsole (int *fd, int vt) {
if (console != -1) {
logMessage(LOG_CATEGORY(SCREEN_DRIVER),
- "console opened: %s: fd=%d", name, console);
+ "%s console opened: %s: fd=%d",
+ type, name, console
+ );
- closeConsole(fd);
+ closeConsole(fd, type);
*fd = console;
opened = 1;
}
@@ -393,7 +493,7 @@ openConsole (int *fd, int vt) {
}
static int
-controlConsole (int *fd, int vt, int operation, void *argument) {
+controlConsole (int *fd, int vt, const char *type, int operation, void *argument) {
int result = ioctl(*fd, operation, argument);
if (result == -1) {
@@ -402,7 +502,7 @@ controlConsole (int *fd, int vt, int operation, void *argument) {
"console control error %d: fd=%d vt=%d op=0X%04X: %s",
errno, *fd, vt, operation, strerror(errno));
- if (openConsole(fd, vt)) {
+ if (openConsole(fd, vt, type)) {
result = ioctl(*fd, operation, argument);
}
}
@@ -411,22 +511,72 @@ controlConsole (int *fd, int vt, int operation, void *argument) {
return result;
}
-static int consoleDescriptor;
+static const char mainConsoleType[] = "main";
+static int mainConsoleDescriptor;
+
+static const int NO_CONSOLE = 0;
+static const int MAIN_CONSOLE = 0;
static void
-closeCurrentConsole (void) {
- closeConsole(&consoleDescriptor);
+closeMainConsole (void) {
+ closeConsole(&mainConsoleDescriptor, mainConsoleType);
+}
+
+static int
+openMainConsole (void) {
+ return openConsole(&mainConsoleDescriptor, MAIN_CONSOLE, mainConsoleType);
}
static int
-openCurrentConsole (void) {
- return openConsole(&consoleDescriptor, virtualTerminalNumber);
+controlMainConsole (int operation, void *argument) {
+ return controlConsole(&mainConsoleDescriptor, MAIN_CONSOLE, mainConsoleType, operation, argument);
+}
+
+static int
+getConsoleState (struct vt_stat *state) {
+ if (controlMainConsole(VT_GETSTATE, state) != -1) return 1;
+ logSystemError("ioctl[VT_GETSTATE]");
+ return 0;
+}
+
+static int
+getForegroundConsoleNumber (int *vt) {
+ {
+ unsigned char subcode = TIOCL_GETFGCONSOLE;
+ int result = controlMainConsole(TIOCLINUX, &subcode);
+
+ if (result != -1) {
+ *vt = result + 1;
+ return 1;
+ } else {
+ logSystemError("ioctl[TIOCLINUX(TIOCL_GETFGCONSOLE)]");
+ }
+ }
+
+ {
+ struct vt_stat state;
+
+ if (getConsoleState(&state)) {
+ *vt = state.v_active;
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+static const char currentConsoleType[] = "current";
+static int currentConsoleDescriptor;
+
+static inline int
+isCurrentConsoleOpen (void) {
+ return currentConsoleDescriptor != -1;
}
static int
controlCurrentConsole (int operation, void *argument) {
- if (consoleDescriptor != -1) {
- return controlConsole(&consoleDescriptor, virtualTerminalNumber, operation, argument);
+ if (isCurrentConsoleOpen()) {
+ return controlConsole(¤tConsoleDescriptor, selectedVirtualTerminal, currentConsoleType, operation, argument);
}
switch (operation) {
@@ -467,39 +617,82 @@ controlCurrentConsole (int operation, void *argument) {
break;
}
+ logMessage(LOG_WARNING, "current console not open");
errno = EAGAIN;
return -1;
}
-static const int NO_CONSOLE = 0;
-static const int MAIN_CONSOLE = 0;
-static int mainConsoleDescriptor;
-
static void
-closeMainConsole (void) {
- closeConsole(&mainConsoleDescriptor);
+closeCurrentConsole (void) {
+ closeConsole(¤tConsoleDescriptor, currentConsoleType);
}
static int
-openMainConsole (void) {
- return openConsole(&mainConsoleDescriptor, MAIN_CONSOLE);
-}
+openCurrentConsole (int *vt) {
+ if (openConsole(¤tConsoleDescriptor, selectedVirtualTerminal, currentConsoleType)) {
+ if (selectedVirtualTerminal) return 1;
+ unsigned int device;
-static int
-controlMainConsole (int operation, void *argument) {
- return controlConsole(&mainConsoleDescriptor, MAIN_CONSOLE, operation, argument);
+ if (controlCurrentConsole(TIOCGDEV, &device) != -1) {
+ unsigned int ttyNumber = minor(device);
+
+ {
+ const unsigned int expected = TTY_MAJOR;
+ unsigned int actual = major(device);
+
+ if (actual != expected) {
+ logMessage(LOG_WARNING,
+ "unexpected foreground tty device type (expected %u, got %u)",
+ expected, actual
+ );
+
+ return 0;
+ }
+ }
+
+ {
+ const unsigned int ttyNumberMask = 0X3F;
+
+ if ((ttyNumber & ttyNumberMask) != ttyNumber) {
+ logMessage(LOG_WARNING,
+ "unexpected foreground tty device group (expected %d, got %u)",
+ *vt, ttyNumber
+ );
+
+ return 0;
+ }
+ }
+
+ if (ttyNumber != *vt) {
+ logMessage(LOG_WARNING,
+ "unexpected foreground tty number (expecting %d, got %u) - assuming VT switch",
+ *vt, ttyNumber
+ );
+
+ *vt = ttyNumber;
+ }
+
+ return 1;
+ } else {
+ logSystemError("ioctl[TIOCGDEV]");
+ }
+ }
+
+ return 0;
}
-static const char *unicodeName = NULL;
+static const char unicodeDeviceType[] = "unicode";
+static const char *unicodeDeviceName = NULL;
+static int unicodeDescriptor;
static int
-setUnicodeName (void) {
+setUnicodeDeviceName (void) {
static const char *const names[] = {"vcsu", "vcsu0", NULL};
- return setDeviceName(&unicodeName, names, 1, "unicode");
+ return setDeviceName(&unicodeDeviceName, names, 1, unicodeDeviceType);
}
static void
-closeUnicode (int *fd) {
+closeUnicodeDevice (int *fd) {
if (*fd != -1) {
logMessage(LOG_CATEGORY(SCREEN_DRIVER), "closing unicode: fd=%d", *fd);
if (close(*fd) == -1) logSystemError("close[unicode]");
@@ -508,25 +701,25 @@ closeUnicode (int *fd) {
}
static int
-openUnicode (int *fd, int vt) {
- if (!unicodeName) return 0;
+openUnicodeDevice (int *fd, int vt) {
+ if (!unicodeDeviceName) return 0;
if (*fd != -1) return 1;
int opened = 0;
- char *name = vtName(unicodeName, vt);
+ char *name = vtName(unicodeDeviceName, vt);
if (name) {
int unicode = openCharacterDevice(name, O_RDWR, VCS_MAJOR, 0X40|vt);
if (unicode != -1) {
logMessage(LOG_CATEGORY(SCREEN_DRIVER),
- "unicode opened: %s: fd=%d", name, unicode);
+ "unicode device opened: %s: fd=%d", name, unicode);
- closeUnicode(fd);
*fd = unicode;
opened = 1;
} else {
- unicodeName = NULL;
+ logMessage(LOG_ERR, "unicode device open error: %s: %s", name, strerror(errno));
+ unicodeDeviceName = NULL;
}
free(name);
@@ -535,22 +728,20 @@ openUnicode (int *fd, int vt) {
return opened;
}
-static int unicodeDescriptor;
-
static void
-closeCurrentUnicode (void) {
- closeUnicode(&unicodeDescriptor);
+closeCurrentUnicodeDevice (void) {
+ closeUnicodeDevice(&unicodeDescriptor);
}
static int
-openCurrentUnicode (void) {
+openCurrentUnicodeDevice (void) {
if (!unicodeEnabled) return 0;
- return openUnicode(&unicodeDescriptor, virtualTerminalNumber);
+ return openUnicodeDevice(&unicodeDescriptor, selectedVirtualTerminal);
}
static size_t
readUnicodeDevice (off_t offset, void *buffer, size_t size) {
- if (openCurrentUnicode()) {
+ if (openCurrentUnicodeDevice()) {
const ssize_t count = pread(unicodeDescriptor, buffer, size, offset);
if (count != -1) {
@@ -577,40 +768,27 @@ readUnicodeDevice (off_t offset, void *buffer, size_t size) {
return count;
}
- if (errno != ENODATA) logSystemError("unicode read");
+ if (errno != ENODATA) logSystemError("unicode device read");
}
return 0;
}
-static unsigned char *unicodeCacheBuffer;
+static void *unicodeCacheBuffer;
static size_t unicodeCacheSize;
static size_t unicodeCacheUsed;
static size_t
readUnicodeCache (off_t offset, void *buffer, size_t size) {
- if (offset <= unicodeCacheUsed) {
- size_t left = unicodeCacheUsed - offset;
- if (size > left) size = left;
-
- memcpy(buffer, &unicodeCacheBuffer[offset], size);
- return size;
- } else {
- logMessage(LOG_ERR, "invalid unicode cache offset: %u", (unsigned int)offset);
- }
-
- return 0;
+ return readCache(offset, buffer, size, unicodeCacheBuffer, unicodeCacheUsed, unicodeDeviceType);
}
static int
readUnicodeData (off_t offset, void *buffer, size_t size) {
- size_t count = (unicodeCacheBuffer? readUnicodeCache: readUnicodeDevice)(offset, buffer, size);
+ size_t count = (unicodeCacheUsed? readUnicodeCache: readUnicodeDevice)(offset, buffer, size);
if (count == size) return 1;
- logMessage(LOG_ERR,
- "truncated unicode data: expected %zu bytes but read %zu",
- size, count);
-
+ logTruncatedData(size, count, unicodeDeviceType);
return 0;
}
@@ -622,31 +800,23 @@ readUnicodeContent (off_t offset, uint32_t *buffer, size_t count) {
}
static int
-refreshUnicodeCache (size_t size) {
- size *= 4;
+refreshUnicodeCache (unsigned int characters) {
+ const size_t expectedSize = characters * sizeof(uint32_t);
- if (size > unicodeCacheSize) {
- const unsigned int bits = 10;
- const unsigned int mask = (1 << bits) - 1;
-
- size |= mask;
- size += 1;
- unsigned char *buffer = malloc(size);
-
- if (!buffer) {
- logMallocError();
+ if (expectedSize > unicodeCacheSize) {
+ if (!extendCacheBuffer(&unicodeCacheBuffer, &unicodeCacheSize, expectedSize, unicodeDeviceType)) {
return 0;
}
-
- if (unicodeCacheBuffer) free(unicodeCacheBuffer);
- unicodeCacheBuffer = buffer;
- unicodeCacheSize = size;
}
unicodeCacheUsed = readUnicodeDevice(0, unicodeCacheBuffer, unicodeCacheSize);
- return 1;
+ if (unicodeCacheUsed == expectedSize) return 1;
+
+ logUnexpectedSize(expectedSize, unicodeCacheUsed, unicodeDeviceType);
+ return 0;
}
+static const char screenDeviceType[] = "screen";
static const char *screenName = NULL;
static int screenDescriptor;
@@ -660,18 +830,19 @@ static int inTextMode;
static TimePeriod mappingRecalculationTimer;
typedef struct {
- unsigned char rows;
- unsigned char columns;
+ unsigned short int columns;
+ unsigned short int rows;
} ScreenSize;
typedef struct {
- unsigned char column;
- unsigned char row;
+ unsigned short int column;
+ unsigned short int row;
} ScreenLocation;
typedef struct {
ScreenSize size;
- ScreenLocation location;
+ ScreenLocation cursor;
+ unsigned char hideCursor:1;
} ScreenHeader;
#ifdef HAVE_SYS_POLL_H
@@ -697,7 +868,7 @@ canMonitorScreen (void) {
static int
setScreenName (void) {
static const char *const names[] = {"vcsa", "vcsa0", "vcc/a", NULL};
- return setDeviceName(&screenName, names, 0, "screen");
+ return setDeviceName(&screenName, names, 0, screenDeviceType);
}
static int
@@ -714,6 +885,8 @@ openScreenDevice (int *fd, int vt) {
*fd = screen;
opened = 1;
+ } else {
+ logMessage(LOG_ERR, "screen open error: %s: %s", name, strerror(errno));
}
free(name);
@@ -739,15 +912,16 @@ closeCurrentScreen (void) {
}
static int
-setCurrentScreen (unsigned char vt) {
+setCurrentScreen (int vt) {
int screen;
if (!openScreenDevice(&screen, vt)) return 0;
closeCurrentConsole();
- closeCurrentUnicode();
+ closeCurrentUnicodeDevice();
closeCurrentScreen();
+
screenDescriptor = screen;
- virtualTerminalNumber = vt;
+ selectedVirtualTerminal = vt;
isMonitorable = canMonitorScreen();
logMessage(LOG_CATEGORY(SCREEN_DRIVER),
@@ -760,7 +934,7 @@ setCurrentScreen (unsigned char vt) {
}
static size_t
-readScreenDevice (off_t offset, void *buffer, size_t size) {
+vcsaReadDevice (off_t offset, void *buffer, size_t size) {
const ssize_t count = pread(screenDescriptor, buffer, size, offset);
if (count != -1) return count;
@@ -768,33 +942,161 @@ readScreenDevice (off_t offset, void *buffer, size_t size) {
return 0;
}
-static unsigned char *screenCacheBuffer;
-static size_t screenCacheSize;
+static int
+vcsaHasClamping (void) {
+ int major, minor;
+ if (!getKernelRelease(&major, &minor, NULL)) return 0;
+
+ if (major < 5) return 0;
+ if (major > 5) return 1;
+ return minor >= 1;
+}
+
+typedef struct {
+ struct {
+ uint8_t rows;
+ uint8_t columns;
+ } size;
+
+ struct {
+ uint8_t column;
+ uint8_t row;
+ } cursor;
+} VcsaHeader;
+
+static int
+vcsaReadHeader (ScreenHeader *header) {
+ VcsaHeader vcsa;
+
+ {
+ size_t vcsaSize = sizeof(vcsa);
+ const size_t count = vcsaReadDevice(0, &vcsa, vcsaSize);
+ if (!count) return 0;
+
+ if (count < vcsaSize) {
+ logBytes(LOG_ERR,
+ "truncated vcsa header: %"PRIsize " < %"PRIsize,
+ &vcsa, count, count, vcsaSize
+ );
+
+ return 0;
+ }
+ }
+
+ header->size.columns = vcsa.size.columns;
+ header->size.rows = vcsa.size.rows;
+ header->cursor.column = vcsa.cursor.column;
+ header->cursor.row = vcsa.cursor.row;
+
+ if (isCurrentConsoleOpen()) {
+ if ((header->size.columns == UINT8_MAX) || (header->size.rows == UINT8_MAX) || largeScreenBug) {
+ struct winsize winSize;
+
+ if (controlCurrentConsole(TIOCGWINSZ, &winSize) != -1) {
+ header->size.columns = winSize.ws_col;
+ header->size.rows = winSize.ws_row;
+ } else {
+ logSystemError("ioctl[TIOCGWINSZ]");
+ }
+ }
+ }
+
+ if (largeScreenBug) {
+ if (header->cursor.column >= header->size.columns) {
+ header->cursor.column = header->size.columns - 1;
+ }
+
+ if (header->cursor.row >= header->size.rows) {
+ header->cursor.row = header->size.rows - 1;
+ }
+ } else if ((header->cursor.column == UINT8_MAX) || (header->cursor.row == UINT8_MAX)) {
+ header->hideCursor = 1;
+
+ {
+ static unsigned char alreadyLogged = 0;
+
+ logKernelLimitation(
+ &alreadyLogged, 6, 16,
+ "screen cursor not rendered when beyond column and/or row 255"
+ );
+ }
+ }
+
+ return 1;
+}
static size_t
-readScreenCache (off_t offset, void *buffer, size_t size) {
- if (offset <= screenCacheSize) {
- size_t left = screenCacheSize - offset;
+readScreenDevice (off_t offset, void *buffer, size_t size) {
+ size_t result = 0;
+ const size_t headerSize = sizeof(ScreenHeader);
- if (size > left) size = left;
- memcpy(buffer, &screenCacheBuffer[offset], size);
- return size;
- } else {
- logMessage(LOG_ERR, "invalid screen cache offset: %u", (unsigned int)offset);
+ if (offset < headerSize) {
+ static unsigned char useGetConSizeCsrPos = 1;
+ unsigned char useVcsa = 1;
+
+ ScreenHeader header;
+ memset(&header, 0, sizeof(header));
+
+ if (useGetConSizeCsrPos && isCurrentConsoleOpen()) {
+ struct vt_consizecsrpos info;
+
+ if (controlCurrentConsole(VT_GETCONSIZECSRPOS, &info) != -1) {
+ useVcsa = 0;
+ header.size.columns = info.con_cols;
+ header.size.rows = info.con_rows;
+ header.cursor.column = info.csr_col;
+ header.cursor.row = info.csr_row;
+ } else {
+ if (errno == ENOTTY) useGetConSizeCsrPos = 0;
+ logSystemError("ioctl[VT_GETCONSIZECSRPOS]");
+ }
+ }
+
+ if (useVcsa) {
+ if (!vcsaReadHeader(&header)) {
+ goto done;
+ }
+ }
+
+ {
+ const void *from = &header + offset;
+ size_t count = headerSize - offset;
+ if (size < count) count = size;
+
+ buffer = mempcpy(buffer, from, count);
+ result += count;
+
+ if (!(size -= count)) goto done;
+ offset = headerSize;
+ }
}
- return 0;
+ offset -= headerSize;
+ offset += sizeof(VcsaHeader);
+
+ size_t count = vcsaReadDevice(offset, buffer, size);
+ if (!count) goto done;
+ result += count;
+
+done:
+ return result;
+}
+
+static void *screenCacheBuffer;
+static size_t screenCacheSize;
+static size_t screenCacheUsed;
+
+static size_t
+readScreenCache (off_t offset, void *buffer, size_t size) {
+ return readCache(offset, buffer, size, screenCacheBuffer, screenCacheUsed, screenDeviceType);
}
static int
readScreenData (off_t offset, void *buffer, size_t size) {
- size_t count = (screenCacheBuffer? readScreenCache: readScreenDevice)(offset, buffer, size);
+ size_t count = (screenCacheUsed? readScreenCache: readScreenDevice)(offset, buffer, size);
if (count == size) return 1;
- logMessage(LOG_ERR,
- "truncated screen data: expected %zu bytes but read %zu",
- size, count);
-
+ logTruncatedData(size, count, screenDeviceType);
return 0;
}
@@ -803,11 +1105,6 @@ readScreenHeader (ScreenHeader *header) {
return readScreenData(0, header, sizeof(*header));
}
-static int
-readScreenSize (ScreenSize *size) {
- return readScreenData(0, size, sizeof(*size));
-}
-
static int
readScreenContent (off_t offset, uint16_t *buffer, size_t count) {
count *= sizeof(*buffer);
@@ -816,67 +1113,81 @@ readScreenContent (off_t offset, uint16_t *buffer, size_t count) {
return readScreenData(offset, buffer, count);
}
-static size_t
-getScreenBufferSize (const ScreenSize *screenSize) {
+static inline size_t
+toScreenBufferSize (const ScreenSize *screenSize) {
return (screenSize->columns * screenSize->rows * 2) + sizeof(ScreenHeader);
}
-static size_t
-refreshScreenBuffer (unsigned char **screenBuffer, size_t *screenSize) {
- if (!*screenBuffer) {
+static void
+logTruncatedScreenHeader (const ScreenHeader *header, size_t count) {
+ logBytes(LOG_ERR,
+ "truncated screen header: %"PRIsize " < %"PRIsize,
+ header, count, count, sizeof(*header)
+ );
+}
+
+static int
+refreshScreenCache (unsigned int *characters) {
+ if (!screenCacheBuffer) {
ScreenHeader header;
+ const size_t headerSize = sizeof(header);
{
- size_t size = sizeof(header);
- size_t count = readScreenDevice(0, &header, size);
- if (!count) return 0;
+ size_t bytesRead = readScreenDevice(0, &header, headerSize);
+ if (!bytesRead) return 0;
- if (count < size) {
- logBytes(LOG_ERR, "truncated screen header", &header, count);
+ if (bytesRead < headerSize) {
+ logTruncatedScreenHeader(&header, bytesRead);
return 0;
}
}
{
- size_t size = getScreenBufferSize(&header.size);
- unsigned char *buffer = malloc(size);
+ const size_t size = toScreenBufferSize(&header.size);
+
+ logMessage(LOG_CATEGORY(SCREEN_DRIVER),
+ "allocating screen buffer: %"PRIsize,
+ size
+ );
+
+ void *buffer = malloc(size);
if (!buffer) {
logMallocError();
return 0;
}
- *screenBuffer = buffer;
- *screenSize = size;
+ screenCacheBuffer = buffer;
+ screenCacheSize = size;
}
}
+ unsigned int bufferExtensionCounter = 10;
while (1) {
- size_t count = readScreenDevice(0, *screenBuffer, *screenSize);
- if (!count) return 0;
-
- if (count < sizeof(ScreenHeader)) {
- logBytes(LOG_ERR, "truncated screen header", *screenBuffer, count);
- return 0;
- }
-
- {
- ScreenHeader *header = (void *)*screenBuffer;
- size_t size = getScreenBufferSize(&header->size);
- if (count >= size) return header->size.columns * header->size.rows;
+ screenCacheUsed = readScreenDevice(0, screenCacheBuffer, screenCacheSize);
+ if (!screenCacheUsed) return 0;
+ const ScreenHeader *header = screenCacheBuffer;
- {
- unsigned char *buffer = realloc(*screenBuffer, size);
+ if (screenCacheUsed < sizeof(*header)) {
+ logTruncatedScreenHeader(header, screenCacheUsed);
+ } else {
+ const size_t expectedSize = toScreenBufferSize(&header->size);
- if (!buffer) {
- logMallocError();
- return 0;
- }
+ if (screenCacheUsed == expectedSize) {
+ *characters = header->size.columns * header->size.rows;
+ return 1;
+ }
- *screenBuffer = buffer;
- *screenSize = size;
+ if (expectedSize <= screenCacheSize) {
+ logUnexpectedSize(expectedSize, screenCacheUsed, screenDeviceType);
+ } else if (!--bufferExtensionCounter) {
+ logMessage(LOG_WARNING, "too many screen buffer extensions");
+ } else if (extendCacheBuffer(&screenCacheBuffer, &screenCacheSize, expectedSize, screenDeviceType)) {
+ continue;
}
}
+
+ return 0;
}
}
@@ -967,10 +1278,15 @@ setVgaCharacterCount (int force) {
cfo.width, cfo.height, cfo.charcount);
vgaCharacterCount = cfo.charcount;
} else {
- if (errno == ENOSYS) isNotImplemented = 1;
+ int logLevel = LOG_WARNING;
+
+ if (errno == ENOSYS) {
+ isNotImplemented = 1;
+ logLevel = LOG_CATEGORY(SCREEN_DRIVER);
+ }
if (errno != EINVAL) {
- logMessage(LOG_WARNING, "ioctl[KDFONTOP[GET]]: %s", strerror(errno));
+ logMessage(logLevel, "ioctl[KDFONTOP(GET)]: %s", strerror(errno));
}
}
}
@@ -1041,10 +1357,12 @@ determineAttributesMasks (void) {
}
{
- ScreenSize size;
+ ScreenHeader header;
- if (readScreenSize(&size)) {
- const size_t count = size.columns * size.rows;
+ if (readScreenHeader(&header)) {
+ const ScreenSize *size = &header.size;
+
+ const size_t count = size->columns * size->rows;
unsigned short buffer[count];
if (readScreenContent(0, buffer, ARRAY_COUNT(buffer))) {
@@ -1137,7 +1455,7 @@ readScreenRow (int row, size_t size, ScreenCharacter *characters, int *offsets)
if (unicode) {
wc = *unicode++;
- if ((blanks > 0) && (wc == WC_C(' '))) {
+ if ((blanks > 0) && iswspace(wc)) {
blanks -= 1;
wc = WEOF;
} else if (widecharPadding) {
@@ -1300,6 +1618,17 @@ processParameters_LinuxScreen (char **parameters) {
}
}
+ largeScreenBug = !vcsaHasClamping();
+ {
+ const char *parameter = parameters[PARM_LARGE_SCREEN_BUG];
+
+ if (parameter && *parameter) {
+ if (!validateYesNo(&largeScreenBug, parameter)) {
+ logMessage(LOG_WARNING, "%s: %s", "invalid large screen bug setting", parameter);
+ }
+ }
+ }
+
logScreenFontMap = 0;
{
const char *parameter = parameters[PARM_LOG_SCREEN_FONT_MAP];
@@ -1333,7 +1662,7 @@ processParameters_LinuxScreen (char **parameters) {
}
}
- virtualTerminalNumber = 0;
+ selectedVirtualTerminal = 0;
{
const char *parameter = parameters[PARM_VIRTUAL_TERMINAL_NUMBER];
@@ -1341,7 +1670,7 @@ processParameters_LinuxScreen (char **parameters) {
static const int minimum = 0;
static const int maximum = MAX_NR_CONSOLES;
- if (!validateInteger(&virtualTerminalNumber, parameter, &minimum, &maximum)) {
+ if (!validateInteger(&selectedVirtualTerminal, parameter, &minimum, &maximum)) {
logMessage(LOG_WARNING, "%s: %s", "invalid virtual terminal number", parameter);
}
}
@@ -1373,13 +1702,14 @@ REPORT_LISTENER(lxBrailleDeviceOfflineListener) {
static int
construct_LinuxScreen (void) {
mainConsoleDescriptor = -1;
+ currentConsoleDescriptor = -1;
screenDescriptor = -1;
- consoleDescriptor = -1;
unicodeDescriptor = -1;
screenUpdated = 0;
screenCacheBuffer = NULL;
screenCacheSize = 0;
+ screenCacheUsed = 0;
unicodeCacheBuffer = NULL;
unicodeCacheSize = 0;
@@ -1401,17 +1731,19 @@ construct_LinuxScreen (void) {
if (setScreenName()) {
if (setConsoleName()) {
if (unicodeEnabled) {
- if (!setUnicodeName()) {
+ if (!setUnicodeDeviceName()) {
unicodeEnabled = 0;
}
}
if (openMainConsole()) {
- if (setCurrentScreen(virtualTerminalNumber)) {
+ if (setCurrentScreen(selectedVirtualTerminal)) {
openKeyboard();
brailleDeviceOfflineListener = registerReportListener(REPORT_BRAILLE_DEVICE_OFFLINE, lxBrailleDeviceOfflineListener, NULL);
return 1;
}
+ } else {
+ logSystemError("main console open");
}
}
}
@@ -1447,6 +1779,7 @@ destruct_LinuxScreen (void) {
screenCacheBuffer = NULL;
}
screenCacheSize = 0;
+ screenCacheUsed = 0;
if (unicodeCacheBuffer) {
free(unicodeCacheBuffer);
@@ -1479,57 +1812,69 @@ poll_LinuxScreen (void) {
return poll;
}
-static int
-getConsoleState (struct vt_stat *state) {
- if (controlMainConsole(VT_GETSTATE, state) != -1) return 1;
- logSystemError("ioctl[VT_GETSTATE]");
- problemText = gettext("can't get console state");
- return 0;
-}
-
static int
isUnusedConsole (int vt) {
- int isUnused = 1;
- unsigned char *buffer = NULL;
- size_t size = 0;
+ int isUnused = 0;
+ int fd;
+
+ if (openScreenDevice(&fd, vt)) {
+ const off_t start = sizeof(VcsaHeader);
+ off_t offset = start;
+ uint16_t firstCharacter;
+
+ while (1) {
+ uint16_t buffer[0X800];
+ size_t bytesRead = pread(fd, buffer, sizeof(buffer), offset);
- if (refreshScreenBuffer(&buffer, &size)) {
- const ScreenHeader *header = (void *)buffer;
- const uint16_t *from = (void *)(buffer + sizeof(*header));
- const uint16_t *to = (void *)(buffer + getScreenBufferSize(&header->size));
+ if (!bytesRead) {
+ isUnused = 1;
+ goto done;
+ }
- if (from < to) {
- const uint16_t vga = *from++;
+ const uint16_t *from = buffer;
+ const uint16_t *to = from + (bytesRead / sizeof(buffer[0]));
+ if (offset == start) firstCharacter = *from++;
while (from < to) {
- if (*from++ != vga) {
- isUnused = 0;
- break;
- }
+ if (*from != firstCharacter) goto done;
+ from += 1;
}
+
+ offset += bytesRead;
+ }
+
+ done:
+ close(fd);
+ fd = -1;
+ } else {
+ switch (errno) {
+ default:
+ logMessage(LOG_WARNING, "can't open screen %d: %s", vt, strerror(errno));
+ break;
+
+ case ENOENT: // device name not defined
+ case EPERM: // can't define device within nodev directory
+ case ENXIO: // device not defined within kernel
+ isUnused = 1;
+ break;
}
}
- if (buffer) free(buffer);
return isUnused;
}
static int
-canOpenCurrentConsole (void) {
- typedef uint16_t OpenableConsoles;
- static OpenableConsoles openableConsoles = 0;
-
- struct vt_stat state;
- if (!getConsoleState(&state)) return 0;
-
- int console = virtualTerminalNumber;
- if (!console) console = state.v_active;
- OpenableConsoles bit = 1 << console;
+canOpenConsole (int vt) {
+ static uint64_t openableConsoles = 0;
+ uint64_t bit = UINT64_C(1) << vt;
if (bit && !(openableConsoles & bit)) {
- if (console != MAIN_CONSOLE) {
+ if (vt != MAIN_CONSOLE) {
+ struct vt_stat state;
+ if (!getConsoleState(&state)) return 0;
+
if (!(state.v_state & bit)) {
- if (isUnusedConsole(console)) {
+ if (isUnusedConsole(vt)) {
return 0;
}
}
@@ -1541,92 +1886,130 @@ canOpenCurrentConsole (void) {
return 1;
}
+static int
+testTextMode (void) {
+ int mode;
+
+ if (controlCurrentConsole(KDGETMODE, &mode) == -1) {
+ logSystemError("ioctl[KDGETMODE]");
+ } else if (mode == KD_TEXT) {
+ if (afterTimePeriod(&mappingRecalculationTimer, NULL)) {
+ setTranslationTable(0);
+ }
+
+ return 1;
+ }
+
+ return 0;
+}
+
static int
getConsoleNumber (void) {
- int console;
+ int vt;
- if (virtualTerminalNumber) {
- console = virtualTerminalNumber;
- } else {
- struct vt_stat state;
- if (!getConsoleState(&state)) return NO_CONSOLE;
- console = state.v_active;
+ if (selectedVirtualTerminal) {
+ vt = selectedVirtualTerminal;
+ } else if (!getForegroundConsoleNumber(&vt)) {
+ vt = NO_CONSOLE;
}
- if (console != currentConsoleNumber) {
+ if (vt != currentConsoleNumber) {
closeCurrentConsole();
}
- if (consoleDescriptor == -1) {
- if (!canOpenCurrentConsole()) {
- problemText = gettext("console not in use");
- } else if (!openCurrentConsole()) {
- problemText = gettext("can't open console");
- }
-
- setTranslationTable(1);
- }
+ inTextMode = 1;
- return console;
-}
+ if (vt != NO_CONSOLE) {
+ if (isCurrentConsoleOpen()) {
+ inTextMode = testTextMode();
+ } else {
+ if (!canOpenConsole(vt)) {
+ problemText = gettext("console not in use");
+ } else if (!openCurrentConsole(&vt)) {
+ logSystemError("current console open");
+ problemText = gettext("can't open console");
+ } else {
+ inTextMode = testTextMode();
+ }
-static int
-testTextMode (void) {
- if (problemText) return 0;
- int mode;
+ setTranslationTable(1);
+ }
+ }
- if (controlCurrentConsole(KDGETMODE, &mode) == -1) {
- logSystemError("ioctl[KDGETMODE]");
- } else if (mode == KD_TEXT) {
- if (afterTimePeriod(&mappingRecalculationTimer, NULL)) setTranslationTable(0);
- return 1;
+ if (!inTextMode) {
+ problemText = gettext("screen not in text mode");
}
- problemText = gettext("screen not in text mode");
- return 0;
+ return vt;
}
static int
refreshCache (void) {
- size_t size = refreshScreenBuffer(&screenCacheBuffer, &screenCacheSize);
- if (!size) return 0;
+ unsigned int characters;
- if (unicodeEnabled) {
- if (!refreshUnicodeCache(size)) {
- return 0;
- }
+ if (!refreshScreenCache(&characters)) {
+ screenCacheUsed = 0;
+ } else if (!unicodeEnabled) {
+ return 1;
+ } else if (refreshUnicodeCache(characters)) {
+ return 1;
}
- return 1;
+ unicodeCacheUsed = 0;
+ return 0;
}
static int
refresh_LinuxScreen (void) {
if (screenUpdated) {
+ typedef enum {
+ REFRESH_NEEDED,
+ REFRESH_FAILED,
+ REFRESH_DONE
+ } RefreshState;
+
+ RefreshState refreshState = REFRESH_NEEDED;
+
while (1) {
problemText = NULL;
- if (!refreshCache()) {
- problemText = gettext("can't read screen content");
- goto done;
- }
-
{
- int consoleNumber = getConsoleNumber();
- if (consoleNumber == currentConsoleNumber) break;
+ int newConsoleNumber = getConsoleNumber();
- logMessage(LOG_CATEGORY(SCREEN_DRIVER),
- "console number changed: %u -> %u",
- currentConsoleNumber, consoleNumber);
+ if (newConsoleNumber != currentConsoleNumber) {
+ logMessage(LOG_CATEGORY(SCREEN_DRIVER),
+ "foreground console number changed: %d -> %d",
+ currentConsoleNumber, newConsoleNumber
+ );
- currentConsoleNumber = consoleNumber;
+ if (refreshState != REFRESH_NEEDED) {
+ refreshState = REFRESH_NEEDED;
+
+ logMessage(LOG_WARNING,
+ "foreground console changed during cache refresh - retrying"
+ );
+ }
+
+ currentConsoleNumber = newConsoleNumber;
+ }
}
- }
- inTextMode = testTextMode();
- screenUpdated = 0;
+ if (currentConsoleNumber == NO_CONSOLE) {
+ problemText = gettext("no foreground console");
+ } else if (refreshState == REFRESH_DONE) {
+ screenUpdated = 0;
+ } else if (refreshState == REFRESH_FAILED) {
+ logMessage(LOG_WARNING, "cache refresh failed");
+ problemText = gettext("can't read screen content");
+ } else {
+ // refreshState == REFRESH_NEEDED
+ refreshState = refreshCache()? REFRESH_DONE: REFRESH_FAILED;
+ continue;
+ }
+
+ break;
+ }
- done:
if (problemText) {
if (*fallbackText) {
problemText = gettext(fallbackText);
@@ -1638,35 +2021,32 @@ refresh_LinuxScreen (void) {
}
static int
-getScreenDescription (ScreenDescription *description) {
+getScreenProperties (ScreenDescription *description) {
ScreenHeader header;
+ if (!readScreenHeader(&header)) return 0;
- if (readScreenHeader(&header)) {
- description->cols = header.size.columns;
- description->rows = header.size.rows;
-
- description->posx = header.location.column;
- description->posy = header.location.row;
+ description->cols = header.size.columns;
+ description->rows = header.size.rows;
- adjustCursorColumn(&description->posx, description->posy, description->cols);
- return 1;
- }
+ description->posx = header.cursor.column;
+ description->posy = header.cursor.row;
+ if (header.hideCursor) description->hasCursor = 0;
- problemText = gettext("can't read screen header");
- return 0;
+ adjustCursorColumn(&description->posx, description->posy, description->cols);
+ return 1;
}
static void
describe_LinuxScreen (ScreenDescription *description) {
- if (!screenCacheBuffer) {
+ if (!screenCacheUsed) {
problemText = NULL;
currentConsoleNumber = getConsoleNumber();
- inTextMode = testTextMode();
}
- if ((description->number = currentConsoleNumber)) {
+ if ((description->number = currentConsoleNumber) != NO_CONSOLE) {
if (inTextMode) {
- if (getScreenDescription(description)) {
+ if (!getScreenProperties(description)) {
+ problemText = gettext("can't get screen properties");
}
}
}
@@ -1682,18 +2062,20 @@ describe_LinuxScreen (ScreenDescription *description) {
static int
readCharacters_LinuxScreen (const ScreenBox *box, ScreenCharacter *buffer) {
- ScreenSize size;
+ ScreenHeader header;
+
+ if (readScreenHeader(&header)) {
+ const ScreenSize *size = &header.size;
- if (readScreenSize(&size)) {
- if (validateScreenBox(box, size.columns, size.rows)) {
+ if (validateScreenBox(box, size->columns, size->rows)) {
if (problemText) {
setScreenMessage(box, buffer, problemText);
return 1;
}
for (unsigned int row=0; row<box->height; row+=1) {
- ScreenCharacter characters[size.columns];
- if (!readScreenRow(box->top+row, size.columns, characters, NULL)) return 0;
+ ScreenCharacter characters[size->columns];
+ if (!readScreenRow(box->top+row, size->columns, characters, NULL)) return 0;
memcpy(buffer, &characters[box->left],
(box->width * sizeof(characters[0])));
@@ -2335,6 +2717,30 @@ insertKey_LinuxScreen (ScreenKey key) {
return ok;
}
+static ScreenPasteMode
+getPasteMode_LinuxScreen (void) {
+ unsigned char subcode = TIOCL_GETBRACKETEDPASTE;
+ int result = controlCurrentConsole(TIOCLINUX, &subcode);
+
+ if (result > 0) return SPM_BRACKETED;
+ if (result == 0) return SPM_PLAIN;
+
+ if (result == -1) {
+ if (errno == EINVAL) {
+ static unsigned char alreadyLogged = 0;
+
+ logKernelLimitation(
+ &alreadyLogged, 6, 16,
+ "cannot determine current console bracketed paste state"
+ );
+ } else {
+ logSystemError("ioctl[TIOCLINUX(TIOCL_GETBRACKETEDPASTE)]");
+ }
+ }
+
+ return SPM_UNKNOWN;
+}
+
typedef struct {
char subcode;
struct tiocl_selection selection;
@@ -2382,7 +2788,7 @@ unhighlightRegion_LinuxScreen (void) {
}
static int
-validateVt (int vt) {
+validateVirtualTerminalNumber (int vt) {
if ((vt >= 1) && (vt <= MAX_NR_CONSOLES)) return 1;
logMessage(LOG_WARNING, "virtual terminal out of range: %d", vt);
return 0;
@@ -2390,14 +2796,14 @@ validateVt (int vt) {
static int
selectVirtualTerminal_LinuxScreen (int vt) {
- if (vt == virtualTerminalNumber) return 1;
- if (vt && !validateVt(vt)) return 0;
+ if (vt == selectedVirtualTerminal) return 1;
+ if (vt && !validateVirtualTerminalNumber(vt)) return 0;
return setCurrentScreen(vt);
}
static int
switchVirtualTerminal_LinuxScreen (int vt) {
- if (validateVt(vt)) {
+ if (validateVirtualTerminalNumber(vt)) {
if (selectVirtualTerminal_LinuxScreen(0)) {
if (controlMainConsole(VT_ACTIVATE, (void *)(intptr_t)vt) != -1) {
logMessage(LOG_CATEGORY(SCREEN_DRIVER),
@@ -2543,6 +2949,7 @@ scr_initialize (MainScreen *main) {
main->base.describe = describe_LinuxScreen;
main->base.readCharacters = readCharacters_LinuxScreen;
main->base.insertKey = insertKey_LinuxScreen;
+ main->base.getPasteMode = getPasteMode_LinuxScreen;
main->base.highlightRegion = highlightRegion_LinuxScreen;
main->base.unhighlightRegion = unhighlightRegion_LinuxScreen;
main->base.selectVirtualTerminal = selectVirtualTerminal_LinuxScreen;
diff --git a/Drivers/Screen/Linux/screen.h b/Drivers/Screen/Linux/screen.h
index ed008edaf..07828fd3d 100644
--- a/Drivers/Screen/Linux/screen.h
+++ b/Drivers/Screen/Linux/screen.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/PcBios/Makefile.in b/Drivers/Screen/PcBios/Makefile.in
index e39ea962a..9f3fdc480 100644
--- a/Drivers/Screen/PcBios/Makefile.in
+++ b/Drivers/Screen/PcBios/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/PcBios/screen.c b/Drivers/Screen/PcBios/screen.c
index 5150b2373..a263e954f 100644
--- a/Drivers/Screen/PcBios/screen.c
+++ b/Drivers/Screen/PcBios/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/Screen/Makefile.in b/Drivers/Screen/Screen/Makefile.in
index c43348533..3c2239b1b 100644
--- a/Drivers/Screen/Screen/Makefile.in
+++ b/Drivers/Screen/Screen/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/Screen/screen.c b/Drivers/Screen/Screen/screen.c
index ef88e205c..c6c7d2d42 100644
--- a/Drivers/Screen/Screen/screen.c
+++ b/Drivers/Screen/Screen/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/Screen/screen.h b/Drivers/Screen/Screen/screen.h
index ed9563005..78e23be65 100644
--- a/Drivers/Screen/Screen/screen.h
+++ b/Drivers/Screen/Screen/screen.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/Skeleton/Makefile.in b/Drivers/Screen/Skeleton/Makefile.in
index 8362ee19b..98ec7e00c 100644
--- a/Drivers/Screen/Skeleton/Makefile.in
+++ b/Drivers/Screen/Skeleton/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/Skeleton/screen.c b/Drivers/Screen/Skeleton/screen.c
index 5ac018651..be2282f44 100644
--- a/Drivers/Screen/Skeleton/screen.c
+++ b/Drivers/Screen/Skeleton/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Screen/TerminalEmulator/Makefile.in b/Drivers/Screen/TerminalEmulator/Makefile.in
index 9b49f4ea5..a3820935f 100644
--- a/Drivers/Screen/TerminalEmulator/Makefile.in
+++ b/Drivers/Screen/TerminalEmulator/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/TerminalEmulator/em_screen.c b/Drivers/Screen/TerminalEmulator/em_screen.c
index c44cbdaac..ed74fba20 100644
--- a/Drivers/Screen/TerminalEmulator/em_screen.c
+++ b/Drivers/Screen/TerminalEmulator/em_screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -280,7 +280,7 @@ makeDefaultEmulatorPath (void) {
static PathMaker *pathMakers[] = {
makeProgramPath,
- makeCommandPath,
+ makeHelperPath,
};
PathMaker **pathMaker = pathMakers;
diff --git a/Drivers/Screen/Windows/Makefile.in b/Drivers/Screen/Windows/Makefile.in
index 6526514c4..326e6b178 100644
--- a/Drivers/Screen/Windows/Makefile.in
+++ b/Drivers/Screen/Windows/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Screen/Windows/screen.c b/Drivers/Screen/Windows/screen.c
index 7b9701a15..1db831f98 100644
--- a/Drivers/Screen/Windows/screen.c
+++ b/Drivers/Screen/Windows/screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/Alva/Makefile.in b/Drivers/Speech/Alva/Makefile.in
index 728144556..e13334659 100644
--- a/Drivers/Speech/Alva/Makefile.in
+++ b/Drivers/Speech/Alva/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/Alva/speech.c b/Drivers/Speech/Alva/speech.c
index f4bd31b96..377ab29a1 100644
--- a/Drivers/Speech/Alva/speech.c
+++ b/Drivers/Speech/Alva/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/Alva/speech.h b/Drivers/Speech/Alva/speech.h
index 2320baaac..824a3bee5 100644
--- a/Drivers/Speech/Alva/speech.h
+++ b/Drivers/Speech/Alva/speech.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/Android/Makefile.in b/Drivers/Speech/Android/Makefile.in
index 1fe743675..baf7dfe60 100644
--- a/Drivers/Speech/Android/Makefile.in
+++ b/Drivers/Speech/Android/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/Android/speech.c b/Drivers/Speech/Android/speech.c
index 259982ea5..27ae1bf6d 100644
--- a/Drivers/Speech/Android/speech.c
+++ b/Drivers/Speech/Android/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/BrailleLite/Makefile.in b/Drivers/Speech/BrailleLite/Makefile.in
index 5175d75b7..155792ebb 100644
--- a/Drivers/Speech/BrailleLite/Makefile.in
+++ b/Drivers/Speech/BrailleLite/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/BrailleLite/speech.c b/Drivers/Speech/BrailleLite/speech.c
index 06a406cf4..b36c86a89 100644
--- a/Drivers/Speech/BrailleLite/speech.c
+++ b/Drivers/Speech/BrailleLite/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/BrailleLite/speech.h b/Drivers/Speech/BrailleLite/speech.h
index e609bd214..eaf05e339 100644
--- a/Drivers/Speech/BrailleLite/speech.h
+++ b/Drivers/Speech/BrailleLite/speech.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/CombiBraille/Makefile.in b/Drivers/Speech/CombiBraille/Makefile.in
index db362265c..110d1165d 100644
--- a/Drivers/Speech/CombiBraille/Makefile.in
+++ b/Drivers/Speech/CombiBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/CombiBraille/speech.c b/Drivers/Speech/CombiBraille/speech.c
index a48e25212..77d3037f5 100644
--- a/Drivers/Speech/CombiBraille/speech.c
+++ b/Drivers/Speech/CombiBraille/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/CombiBraille/speech.h b/Drivers/Speech/CombiBraille/speech.h
index a9b84d488..3d98a77f8 100644
--- a/Drivers/Speech/CombiBraille/speech.h
+++ b/Drivers/Speech/CombiBraille/speech.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/ExternalSpeech/Makefile.in b/Drivers/Speech/ExternalSpeech/Makefile.in
index 00e3d40af..7e02dbc10 100644
--- a/Drivers/Speech/ExternalSpeech/Makefile.in
+++ b/Drivers/Speech/ExternalSpeech/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/ExternalSpeech/README b/Drivers/Speech/ExternalSpeech/README
index d6289d5c4..c8d606b3b 100644
--- a/Drivers/Speech/ExternalSpeech/README
+++ b/Drivers/Speech/ExternalSpeech/README
@@ -1,5 +1,5 @@
ExternalSpeech
-by Stphane Doyon <s.doyon@videotron.ca>
+by Stéphane Doyon <s.doyon@videotron.ca>
Version 0.7 beta, September 2001
This speech driver interfaces with an external program that will handle
diff --git a/Drivers/Speech/ExternalSpeech/speech.c b/Drivers/Speech/ExternalSpeech/speech.c
index b1916d0ea..7731d74bb 100644
--- a/Drivers/Speech/ExternalSpeech/speech.c
+++ b/Drivers/Speech/ExternalSpeech/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -18,7 +18,7 @@
/* ExternalSpeech/speech.c - Speech library (driver)
* For external programs, using my own protocol. Features indexing.
- * Stphane Doyon <s.doyon@videotron.ca>
+ * Stéphane Doyon <s.doyon@videotron.ca>
*/
#include "prologue.h"
@@ -46,6 +46,12 @@ static const char *socketPath = NULL;
static struct sockaddr_un socketAddress;
static int socketDescriptor = -1;
+static int sendSettings (SpeechSynthesizer *spk);
+static unsigned char volumePercentage;
+static float rateMultiplier;
+static float pitchMultiplier;
+static unsigned char punctuationLevel;
+
static uint16_t totalCharacterCount;
#define TRACK_DATA_SIZE 2
static AsyncHandle trackHandle = NULL;
@@ -95,7 +101,8 @@ connectToServer (SpeechSynthesizer *spk) {
if (asyncReadSocket(&trackHandle, sd, TRACK_DATA_SIZE, xsHandleSpeechTrackingInput, spk)) {
logMessage(LOG_CATEGORY(SPEECH_DRIVER), "connected to server: fd=%d", sd);
socketDescriptor = sd;
- return 1;
+ sendSettings(spk);
+ return amConnected();
}
}
} else {
@@ -170,50 +177,15 @@ sendPacket (SpeechSynthesizer *spk, const unsigned char *packet, size_t length)
return 1;
}
-static void
-spk_say (SpeechSynthesizer *spk, const unsigned char *text, size_t length, size_t count, const unsigned char *attributes) {
- if (!attributes) count = 0;
-
- unsigned char packet[5 + length + count];
- unsigned char *p = packet;
-
- *p++ = 4;
- *p++ = length >> 8;
- *p++ = length & 0XFF;
- *p++ = count >> 8;
- *p++ = count & 0XFF;
- p = mempcpy(p, text, length);
- p = mempcpy(p, attributes, count);
-
- if (sendPacket(spk, packet, (p - packet))) {
- totalCharacterCount = count;
- }
-}
-
-static void
-spk_mute (SpeechSynthesizer *spk) {
- logMessage(LOG_CATEGORY(SPEECH_DRIVER), "mute");
-
- unsigned char packet[] = {1};
- sendPacket(spk, packet, sizeof(packet));
-}
-
-static void
-spk_setVolume (SpeechSynthesizer *spk, unsigned char setting) {
- unsigned char percentage = getIntegerSpeechVolume(setting, 100);
-
- logMessage(
- LOG_CATEGORY(SPEECH_DRIVER),
- "set volume to %u (%u%%)",
- setting, percentage
- );
+static int
+sendByteSetting (SpeechSynthesizer *spk, unsigned char code, unsigned char value) {
+ unsigned char packet[2] = {code, value};
- unsigned char packet[] = {2, percentage};
- sendPacket(spk, packet, sizeof(packet));
+ return sendPacket(spk, packet, sizeof(packet));
}
static int
-sendFloatSetting (SpeechSynthesizer *spk, unsigned char code, float value) {
+sendMultplierSetting (SpeechSynthesizer *spk, unsigned char code, float value) {
unsigned char packet[5] = {code};
const unsigned char *v = (const unsigned char *)&value;
@@ -232,30 +204,128 @@ sendFloatSetting (SpeechSynthesizer *spk, unsigned char code, float value) {
return sendPacket(spk, packet, sizeof(packet));
}
+static int
+sendVolumePercentage (SpeechSynthesizer *spk) {
+ return sendByteSetting(spk, 2, volumePercentage);
+}
+
+static int
+sendRateMultiplier (SpeechSynthesizer *spk) {
+ return sendMultplierSetting(spk, 3, (1.0 / rateMultiplier));
+}
+
+static int
+sendPitchMultiplier (SpeechSynthesizer *spk) {
+ return sendMultplierSetting(spk, 5, pitchMultiplier);
+}
+
+static int
+sendPunctuationLevel (SpeechSynthesizer *spk) {
+ return sendByteSetting(spk, 6, punctuationLevel);
+}
+
+static int
+sendSettings (SpeechSynthesizer *spk) {
+ typedef int SendSettingHandler (SpeechSynthesizer *spk);
+
+ static SendSettingHandler *const handlers[] = {
+ sendVolumePercentage,
+ sendRateMultiplier,
+ sendPitchMultiplier,
+ sendPunctuationLevel,
+ NULL
+ };
+
+ {
+ SendSettingHandler *const *handler = handlers;
+
+ while (*handler) {
+ if (!(*handler)(spk)) return 0;
+ handler += 1;
+ }
+ }
+
+ return 1;
+}
+
+static void
+spk_setVolume (SpeechSynthesizer *spk, unsigned char setting) {
+ volumePercentage = getIntegerSpeechVolume(setting, 100);
+
+ logMessage(
+ LOG_CATEGORY(SPEECH_DRIVER),
+ "set volume to %u (%u%%)",
+ setting, volumePercentage
+ );
+
+ sendVolumePercentage(spk);
+}
+
static void
spk_setRate (SpeechSynthesizer *spk, unsigned char setting) {
- float stretch = 1.0 / getFloatSpeechRate(setting);
+ rateMultiplier = getFloatSpeechRate(setting);
logMessage(
LOG_CATEGORY(SPEECH_DRIVER),
- "set rate to %u (time scale %f)",
- setting, stretch
+ "set rate to %u (multiplier %f)",
+ setting, rateMultiplier
);
- sendFloatSetting(spk, 3, stretch);
+ sendRateMultiplier(spk);
}
static void
spk_setPitch (SpeechSynthesizer *spk, unsigned char setting) {
- float multiplier = getFloatSpeechPitch(setting);
+ pitchMultiplier = getFloatSpeechPitch(setting);
logMessage(
LOG_CATEGORY(SPEECH_DRIVER),
"set pitch to %u (multiplier %f)",
- setting, multiplier
+ setting, pitchMultiplier
);
- sendFloatSetting(spk, 5, multiplier);
+ sendPitchMultiplier(spk);
+}
+
+static void
+spk_setPunctuation (SpeechSynthesizer *spk, SpeechPunctuation setting) {
+ punctuationLevel = setting;
+
+ logMessage(
+ LOG_CATEGORY(SPEECH_DRIVER),
+ "set punctuation to %u",
+ setting
+ );
+
+ sendPunctuationLevel(spk);
+}
+
+static void
+spk_mute (SpeechSynthesizer *spk) {
+ logMessage(LOG_CATEGORY(SPEECH_DRIVER), "mute");
+
+ unsigned char packet[] = {1};
+ sendPacket(spk, packet, sizeof(packet));
+}
+
+static void
+spk_say (SpeechSynthesizer *spk, const unsigned char *text, size_t length, size_t count, const unsigned char *attributes) {
+ if (!attributes) count = 0;
+
+ unsigned char packet[5 + length + count];
+ unsigned char *p = packet;
+
+ *p++ = 4;
+ *p++ = length >> 8;
+ *p++ = length & 0XFF;
+ *p++ = count >> 8;
+ *p++ = count & 0XFF;
+ p = mempcpy(p, text, length);
+ p = mempcpy(p, attributes, count);
+
+ if (sendPacket(spk, packet, (p - packet))) {
+ totalCharacterCount = count;
+ }
}
static int
@@ -263,6 +333,12 @@ spk_construct (SpeechSynthesizer *spk, char **parameters) {
spk->setVolume = spk_setVolume;
spk->setRate = spk_setRate;
spk->setPitch = spk_setPitch;
+ spk->setPunctuation = spk_setPunctuation;
+
+ volumePercentage = 100;
+ rateMultiplier = 1.0;
+ pitchMultiplier = 1.0;
+ punctuationLevel = 0;
socketPath = parameters[PARM_SOCKET_PATH];
if (!socketPath || !*socketPath) socketPath = XS_DEFAULT_SOCKET_PATH;
diff --git a/Drivers/Speech/ExternalSpeech/speech.h b/Drivers/Speech/ExternalSpeech/speech.h
index 69e7dc26c..474933bd1 100644
--- a/Drivers/Speech/ExternalSpeech/speech.h
+++ b/Drivers/Speech/ExternalSpeech/speech.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/Festival/Makefile.in b/Drivers/Speech/Festival/Makefile.in
index cb64a0d9d..529afbee2 100644
--- a/Drivers/Speech/Festival/Makefile.in
+++ b/Drivers/Speech/Festival/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/Festival/speech.c b/Drivers/Speech/Festival/speech.c
index fd8e77571..cb8034ba6 100644
--- a/Drivers/Speech/Festival/speech.c
+++ b/Drivers/Speech/Festival/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/Festival/speech.h b/Drivers/Speech/Festival/speech.h
index ab5022de6..8c70fe3a1 100644
--- a/Drivers/Speech/Festival/speech.h
+++ b/Drivers/Speech/Festival/speech.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/FestivalLite/Makefile.in b/Drivers/Speech/FestivalLite/Makefile.in
index 6be4fb47d..06689b31b 100644
--- a/Drivers/Speech/FestivalLite/Makefile.in
+++ b/Drivers/Speech/FestivalLite/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/FestivalLite/speech.c b/Drivers/Speech/FestivalLite/speech.c
index 93ff9d5aa..378476d4e 100644
--- a/Drivers/Speech/FestivalLite/speech.c
+++ b/Drivers/Speech/FestivalLite/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/GenericSay/Makefile.in b/Drivers/Speech/GenericSay/Makefile.in
index dd2570dab..278732af1 100644
--- a/Drivers/Speech/GenericSay/Makefile.in
+++ b/Drivers/Speech/GenericSay/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/GenericSay/commands/AccentSA b/Drivers/Speech/GenericSay/commands/AccentSA
index b6e692065..40f1e0d88 100755
--- a/Drivers/Speech/GenericSay/commands/AccentSA
+++ b/Drivers/Speech/GenericSay/commands/AccentSA
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/GenericSay/commands/say b/Drivers/Speech/GenericSay/commands/say
index 92ae26a63..5260c85e4 100755
--- a/Drivers/Speech/GenericSay/commands/say
+++ b/Drivers/Speech/GenericSay/commands/say
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/GenericSay/speech.c b/Drivers/Speech/GenericSay/speech.c
index cf463bebf..0c2c46495 100644
--- a/Drivers/Speech/GenericSay/speech.c
+++ b/Drivers/Speech/GenericSay/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/GenericSay/speech.h b/Drivers/Speech/GenericSay/speech.h
index 9ccf9fb1a..731e2cdff 100644
--- a/Drivers/Speech/GenericSay/speech.h
+++ b/Drivers/Speech/GenericSay/speech.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/Mikropuhe/Makefile.in b/Drivers/Speech/Mikropuhe/Makefile.in
index 1f33c8ab1..725f4ffae 100644
--- a/Drivers/Speech/Mikropuhe/Makefile.in
+++ b/Drivers/Speech/Mikropuhe/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/Mikropuhe/speech.c b/Drivers/Speech/Mikropuhe/speech.c
index 9ce460c72..8fabb2496 100644
--- a/Drivers/Speech/Mikropuhe/speech.c
+++ b/Drivers/Speech/Mikropuhe/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/MultiBraille/Makefile.in b/Drivers/Speech/MultiBraille/Makefile.in
index 02a177cda..236764d1e 100644
--- a/Drivers/Speech/MultiBraille/Makefile.in
+++ b/Drivers/Speech/MultiBraille/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/MultiBraille/speech.c b/Drivers/Speech/MultiBraille/speech.c
index 3a5bb92fa..0a0ca1498 100644
--- a/Drivers/Speech/MultiBraille/speech.c
+++ b/Drivers/Speech/MultiBraille/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/MultiBraille/speech.h b/Drivers/Speech/MultiBraille/speech.h
index 978957ce4..709472a60 100644
--- a/Drivers/Speech/MultiBraille/speech.h
+++ b/Drivers/Speech/MultiBraille/speech.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/Skeleton/Makefile.in b/Drivers/Speech/Skeleton/Makefile.in
index 0f53f10e0..9e7ae189c 100644
--- a/Drivers/Speech/Skeleton/Makefile.in
+++ b/Drivers/Speech/Skeleton/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/Skeleton/speech.c b/Drivers/Speech/Skeleton/speech.c
index 52c52656c..d3b0bd7e5 100644
--- a/Drivers/Speech/Skeleton/speech.c
+++ b/Drivers/Speech/Skeleton/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/SpeechDispatcher/Makefile.in b/Drivers/Speech/SpeechDispatcher/Makefile.in
index 4ba2574e6..dfb288f2a 100644
--- a/Drivers/Speech/SpeechDispatcher/Makefile.in
+++ b/Drivers/Speech/SpeechDispatcher/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/SpeechDispatcher/README b/Drivers/Speech/SpeechDispatcher/README
index dab227565..d765759cd 100644
--- a/Drivers/Speech/SpeechDispatcher/README
+++ b/Drivers/Speech/SpeechDispatcher/README
@@ -18,7 +18,8 @@ search paths for their internal dependencies.
This driver recognizes the following parameters:
Parameter Settings
- port 1-65535
+ address address of speech-dispatcher's server
+ autospawn yes,no
module name (flite, festival, epos-generic, dtk-generic, ...)
language two-letter language code
voice type (male1, female1, male2, female2, male3, female3,
diff --git a/Drivers/Speech/SpeechDispatcher/speech.c b/Drivers/Speech/SpeechDispatcher/speech.c
index 21ad37674..2e2d74840 100644
--- a/Drivers/Speech/SpeechDispatcher/speech.c
+++ b/Drivers/Speech/SpeechDispatcher/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -25,19 +25,21 @@
#include "parse.h"
typedef enum {
- PARM_PORT,
+ PARM_ADDRESS,
+ PARM_AUTOSPAWN,
PARM_MODULE,
PARM_LANGUAGE,
PARM_VOICE,
PARM_NAME
} DriverParameter;
-#define SPKPARMS "port", "module", "language", "voice", "name"
+#define SPKPARMS "address", "autospawn", "module", "language", "voice", "name"
#include "spk_driver.h"
#include <libspeechd.h>
static SPDConnection *connectionHandle = NULL;
+static unsigned int autospawn;
static const char *moduleName;
static const char *languageName;
static SPDVoiceType voiceType;
@@ -45,10 +47,11 @@ static const char *voiceName;
static signed int relativeVolume;
static signed int relativeRate;
static signed int relativePitch;
-static SPDPunctuation punctuationVerbosity;
+static SPDPunctuation punctuationLevel;
static void
clearSettings (void) {
+ autospawn = 1;
moduleName = NULL;
languageName = NULL;
voiceType = -1;
@@ -56,7 +59,7 @@ clearSettings (void) {
relativeVolume = 0;
relativeRate = 0;
relativePitch = 0;
- punctuationVerbosity = -1;
+ punctuationLevel = -1;
}
static void
@@ -135,16 +138,19 @@ spk_setPitch (SpeechSynthesizer *spk, unsigned char setting) {
static void
setPunctuation (const void *data) {
- if (punctuationVerbosity != -1) spd_set_punctuation(connectionHandle, punctuationVerbosity);
+ if (punctuationLevel != -1) spd_set_punctuation(connectionHandle, punctuationLevel);
}
static void
spk_setPunctuation (SpeechSynthesizer *spk, SpeechPunctuation setting) {
- punctuationVerbosity = (setting <= SPK_PUNCTUATION_NONE)? SPD_PUNCT_NONE:
- (setting >= SPK_PUNCTUATION_ALL)? SPD_PUNCT_ALL:
- SPD_PUNCT_SOME;
+ punctuationLevel = (setting <= SPK_PUNCTUATION_NONE)? SPD_PUNCT_NONE:
+ (setting >= SPK_PUNCTUATION_ALL)? SPD_PUNCT_ALL:
+ (setting == SPK_PUNCTUATION_SOME)? SPD_PUNCT_SOME:
+ (setting == SPK_PUNCTUATION_MOST)? SPD_PUNCT_MOST:
+ -1;
+
speechdAction(setPunctuation, NULL);
- logMessage(LOG_DEBUG, "set punctuation: %u -> %d", setting, punctuationVerbosity);
+ logMessage(LOG_DEBUG, "set punctuation: %u -> %d", setting, punctuationLevel);
}
static void
@@ -155,8 +161,10 @@ cancelSpeech (const void *data) {
static int
openConnection (void) {
if (!connectionHandle) {
- if (!(connectionHandle = spd_open("brltty", "main", NULL, SPD_MODE_THREADED))) {
- logMessage(LOG_ERR, "speech dispatcher open failure");
+ char **error_message = NULL;
+ if (!(connectionHandle = spd_open2("brltty", "main", NULL, SPD_MODE_THREADED, NULL, autospawn, error_message))) {
+ logMessage(LOG_ERR, "speech dispatcher open failure: %s",*error_message);
+ free(*error_message);
return 0;
}
@@ -189,17 +197,15 @@ spk_construct (SpeechSynthesizer *spk, char **parameters) {
clearSettings();
- if (parameters[PARM_PORT] && *parameters[PARM_PORT]) {
- static const int minimumPort = 0X1;
- static const int maximumPort = 0XFFFF;
- int port = 0;
+ if (parameters[PARM_ADDRESS] && *parameters[PARM_ADDRESS]) {
+ setenv("SPEECHD_ADDRESS", parameters[PARM_ADDRESS], 0);
+ }
- if (validateInteger(&port, parameters[PARM_PORT], &minimumPort, &maximumPort)) {
- char number[0X10];
- snprintf(number, sizeof(number), "%d", port);
- setenv("SPEECHD_PORT", number, 1);
- } else {
- logMessage(LOG_WARNING, "%s: %s", "invalid port number", parameters[PARM_PORT]);
+ if (parameters[PARM_AUTOSPAWN] && *parameters[PARM_AUTOSPAWN]) {
+ if (!validateYesNo(&autospawn, parameters[PARM_AUTOSPAWN])) {
+ logMessage(LOG_WARNING, "%s: %s",
+ "invalid value for the autospawn parameter",
+ parameters[PARM_AUTOSPAWN]);
}
}
diff --git a/Drivers/Speech/Swift/Makefile.in b/Drivers/Speech/Swift/Makefile.in
index d9e2f954a..a559a7b81 100644
--- a/Drivers/Speech/Swift/Makefile.in
+++ b/Drivers/Speech/Swift/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/Swift/speech.c b/Drivers/Speech/Swift/speech.c
index 17946b1af..97bb43066 100644
--- a/Drivers/Speech/Swift/speech.c
+++ b/Drivers/Speech/Swift/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/Theta/Makefile.in b/Drivers/Speech/Theta/Makefile.in
index 45742bb5e..542b92b83 100644
--- a/Drivers/Speech/Theta/Makefile.in
+++ b/Drivers/Speech/Theta/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/Theta/speech.c b/Drivers/Speech/Theta/speech.c
index 560ec609d..a49e0a1a4 100644
--- a/Drivers/Speech/Theta/speech.c
+++ b/Drivers/Speech/Theta/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/ViaVoice/Makefile.in b/Drivers/Speech/ViaVoice/Makefile.in
index 1d3de700b..ee0f56361 100644
--- a/Drivers/Speech/ViaVoice/Makefile.in
+++ b/Drivers/Speech/ViaVoice/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/ViaVoice/languages.h b/Drivers/Speech/ViaVoice/languages.h
index 308bf94e4..3170b1342 100644
--- a/Drivers/Speech/ViaVoice/languages.h
+++ b/Drivers/Speech/ViaVoice/languages.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/ViaVoice/speech.c b/Drivers/Speech/ViaVoice/speech.c
index 20ca98926..4be22fc01 100644
--- a/Drivers/Speech/ViaVoice/speech.c
+++ b/Drivers/Speech/ViaVoice/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/ViaVoice/voices.h b/Drivers/Speech/ViaVoice/voices.h
index a57a7d9b9..269e08912 100644
--- a/Drivers/Speech/ViaVoice/voices.h
+++ b/Drivers/Speech/ViaVoice/voices.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Drivers/Speech/eSpeak-NG/Makefile.in b/Drivers/Speech/eSpeak-NG/Makefile.in
index 2020fb6da..159a4bd00 100644
--- a/Drivers/Speech/eSpeak-NG/Makefile.in
+++ b/Drivers/Speech/eSpeak-NG/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/eSpeak-NG/speech.c b/Drivers/Speech/eSpeak-NG/speech.c
index 1c566aa1c..1c809b10b 100644
--- a/Drivers/Speech/eSpeak-NG/speech.c
+++ b/Drivers/Speech/eSpeak-NG/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -103,12 +103,14 @@ static void
spk_setPunctuation(SpeechSynthesizer *spk, SpeechPunctuation setting)
{
espeak_PUNCT_TYPE punct;
+
if (setting <= SPK_PUNCTUATION_NONE)
punct = espeakPUNCT_NONE;
- else if (setting >= SPK_PUNCTUATION_ALL)
- punct = espeakPUNCT_ALL;
- else
+ else if (setting == SPK_PUNCTUATION_SOME)
punct = espeakPUNCT_SOME;
+ else
+ punct = espeakPUNCT_ALL;
+
espeak_SetParameter(espeakPUNCTUATION, punct, 0);
}
diff --git a/Drivers/Speech/eSpeak/Makefile.in b/Drivers/Speech/eSpeak/Makefile.in
index fd6576d7c..595c2809b 100644
--- a/Drivers/Speech/eSpeak/Makefile.in
+++ b/Drivers/Speech/eSpeak/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Drivers/Speech/eSpeak/speech.c b/Drivers/Speech/eSpeak/speech.c
index ea0345c8e..7fcd2a781 100644
--- a/Drivers/Speech/eSpeak/speech.c
+++ b/Drivers/Speech/eSpeak/speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -108,12 +108,14 @@ static void
spk_setPunctuation(SpeechSynthesizer *spk, SpeechPunctuation setting)
{
espeak_PUNCT_TYPE punct;
+
if (setting <= SPK_PUNCTUATION_NONE)
punct = espeakPUNCT_NONE;
- else if (setting >= SPK_PUNCTUATION_ALL)
- punct = espeakPUNCT_ALL;
- else
+ else if (setting == SPK_PUNCTUATION_SOME)
punct = espeakPUNCT_SOME;
+ else
+ punct = espeakPUNCT_ALL;
+
espeak_SetParameter(espeakPUNCTUATION, punct, 0);
}
diff --git a/Headers/addresses.h b/Headers/addresses.h
index eb8ca969c..9f940ff7e 100644
--- a/Headers/addresses.h
+++ b/Headers/addresses.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/alert.h b/Headers/alert.h
index f159568fa..3841886c2 100644
--- a/Headers/alert.h
+++ b/Headers/alert.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/ascii.h b/Headers/ascii.h
index 42112819e..cf4ed5dc2 100644
--- a/Headers/ascii.h
+++ b/Headers/ascii.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_alarm.h b/Headers/async_alarm.h
index 644a57fc5..816791c60 100644
--- a/Headers/async_alarm.h
+++ b/Headers/async_alarm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_event.h b/Headers/async_event.h
index 6bd30d6ec..a3ec9ea31 100644
--- a/Headers/async_event.h
+++ b/Headers/async_event.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_handle.h b/Headers/async_handle.h
index 4cb161a8f..01a879f56 100644
--- a/Headers/async_handle.h
+++ b/Headers/async_handle.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_io.h b/Headers/async_io.h
index d261ed242..3ea606661 100644
--- a/Headers/async_io.h
+++ b/Headers/async_io.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_signal.h b/Headers/async_signal.h
index 071a35d15..6eb3a987e 100644
--- a/Headers/async_signal.h
+++ b/Headers/async_signal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_task.h b/Headers/async_task.h
index cec6713d9..d81eb9b41 100644
--- a/Headers/async_task.h
+++ b/Headers/async_task.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_types_alarm.h b/Headers/async_types_alarm.h
index d3e4a31dd..c45fced51 100644
--- a/Headers/async_types_alarm.h
+++ b/Headers/async_types_alarm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_types_event.h b/Headers/async_types_event.h
index 32a3bfea3..f6c7c4fa9 100644
--- a/Headers/async_types_event.h
+++ b/Headers/async_types_event.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_types_handle.h b/Headers/async_types_handle.h
index 9efc31266..9337194e7 100644
--- a/Headers/async_types_handle.h
+++ b/Headers/async_types_handle.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_types_io.h b/Headers/async_types_io.h
index 813cd273d..b0d82f871 100644
--- a/Headers/async_types_io.h
+++ b/Headers/async_types_io.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_types_task.h b/Headers/async_types_task.h
index e5ae2815e..1c22a8d44 100644
--- a/Headers/async_types_task.h
+++ b/Headers/async_types_task.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_types_wait.h b/Headers/async_types_wait.h
index 3c97d1bed..d0f281ef0 100644
--- a/Headers/async_types_wait.h
+++ b/Headers/async_types_wait.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/async_wait.h b/Headers/async_wait.h
index 7c3c33bc9..94b4de0b4 100644
--- a/Headers/async_wait.h
+++ b/Headers/async_wait.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/atb.h b/Headers/atb.h
index 6e2a5e592..83ad9cd6d 100644
--- a/Headers/atb.h
+++ b/Headers/atb.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/auth.h b/Headers/auth.h
index 62199a056..3df6b4203 100644
--- a/Headers/auth.h
+++ b/Headers/auth.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/beep.h b/Headers/beep.h
index 2321684e0..68db2c29a 100644
--- a/Headers/beep.h
+++ b/Headers/beep.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/bell.h b/Headers/bell.h
index 6a1f4417f..7bd0ca791 100644
--- a/Headers/bell.h
+++ b/Headers/bell.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/bitfield.h b/Headers/bitfield.h
index 7a1c0c1d5..9440a9663 100644
--- a/Headers/bitfield.h
+++ b/Headers/bitfield.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/bitmask.h b/Headers/bitmask.h
index 337df7b4d..33b292000 100644
--- a/Headers/bitmask.h
+++ b/Headers/bitmask.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/brl_base.h b/Headers/brl_base.h
index ea93ad3ed..d19966b1e 100644
--- a/Headers/brl_base.h
+++ b/Headers/brl_base.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/brl_cmds.h b/Headers/brl_cmds.h
index 44c04f261..a48188fed 100644
--- a/Headers/brl_cmds.h
+++ b/Headers/brl_cmds.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -165,7 +165,7 @@ typedef enum {
/* miscellaneous */
BRL_CMD_CSRJMP_VERT /* bring screen cursor to current line */,
- BRL_CMD_PASTE /* insert clipboard text after screen cursor */,
+ BRL_CMD_PASTE /* insert the clipboard content before the screen cursor */,
BRL_CMD_RESTARTBRL /* restart braille driver */,
BRL_CMD_RESTARTSPEECH /* restart speech driver */,
@@ -240,7 +240,7 @@ typedef enum {
BRL_CMD_TXTSEL_ALL /* select all of the text */,
BRL_CMD_HOST_COPY /* copy selected text to host clipboard */,
BRL_CMD_HOST_CUT /* cut selected text to host clipboard */,
- BRL_CMD_HOST_PASTE /* insert host clipboard text after screen cursor */,
+ BRL_CMD_HOST_PASTE /* insert the host clipboard text before the screen cursor */,
BRL_CMD_GUI_TITLE /* show the window title */,
BRL_CMD_GUI_BRL_ACTIONS /* open the braille actions window */,
@@ -270,6 +270,8 @@ typedef enum {
BRL_CMD_PREFRESET /* reset preferences to defaults */,
BRL_CMD_ASPK_EMP_LINE /* set autospeak empty line on/off */,
+ BRL_CMD_SPK_PUNCT_LEVEL /* cycle speech punctuation level */,
+ BRL_CMD_PASTE_ALTMODE /* insert the clipboard content before the screen cursor using the alternate paste mode */,
BRL_basicCommandCount /* must be last */
} BRL_BasicCommand;
@@ -297,7 +299,7 @@ typedef enum {
BRL_BLK_NXDIFCHAR /* go down to nearest line with different character */,
BRL_BLK_CLIP_COPY /* copy characters to clipboard */,
BRL_BLK_CLIP_APPEND /* append characters to clipboard */,
- BRL_BLK_PASTE_HISTORY /* insert clipboard history entry after screen cursor */,
+ BRL_BLK_PASTE_HISTORY /* insert a clipboard history entry before the screen cursor */,
BRL_BLK_SET_TEXT_TABLE /* set text table */,
BRL_BLK_SET_ATTRIBUTES_TABLE /* set attributes table */,
BRL_BLK_SET_CONTRACTION_TABLE /* set contraction table */,
@@ -308,7 +310,7 @@ typedef enum {
BRL_BLK_TXTSEL_START /* start text selection */,
BRL_BLK_TXTSEL_SET /* set text selection */,
BRL_BLK_ROUTE_SPEECH /* bring speech cursor to character */,
- BRL_BLK_1D /* (reserved) */,
+ BRL_BLK_PASTE_HISTORY_ALTMODE /* insert a clipboard history entry before the screen cursor using the alternate paste mode */,
BRL_BLK_SELECTVT /* bind to specific virtual terminal */,
BRL_BLK_ALERT /* render an alert */,
BRL_BLK_PASSKEY /* (emulate special key) */,
diff --git a/Headers/brl_custom.h b/Headers/brl_custom.h
index 5cf020a9d..65192012b 100644
--- a/Headers/brl_custom.h
+++ b/Headers/brl_custom.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/brl_dots.h b/Headers/brl_dots.h
index bef2fafd6..8fe11edd4 100644
--- a/Headers/brl_dots.h
+++ b/Headers/brl_dots.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/brl_driver.h b/Headers/brl_driver.h
index 32c10dbaf..46acaa560 100644
--- a/Headers/brl_driver.h
+++ b/Headers/brl_driver.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/brl_types.h b/Headers/brl_types.h
index d03197281..e45292dc6 100644
--- a/Headers/brl_types.h
+++ b/Headers/brl_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/brl_utils.h b/Headers/brl_utils.h
index 4be20d559..9eb37d475 100644
--- a/Headers/brl_utils.h
+++ b/Headers/brl_utils.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/charset.h b/Headers/charset.h
index efff66370..f11112193 100644
--- a/Headers/charset.h
+++ b/Headers/charset.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/cldr.h b/Headers/cldr.h
index bae7669d2..8d2cccdf8 100644
--- a/Headers/cldr.h
+++ b/Headers/cldr.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/clipboard.h b/Headers/clipboard.h
index d4c96924d..a1e147ad8 100644
--- a/Headers/clipboard.h
+++ b/Headers/clipboard.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -34,6 +34,11 @@ extern int truncateClipboardContent (ClipboardObject *cpb, size_t length);
extern int setClipboardContent (ClipboardObject *cpb, const wchar_t *characters, size_t length);
extern int appendClipboardContent (ClipboardObject *cpb, const wchar_t *characters, size_t length);
+extern int copyClipboardContent (
+ ClipboardObject *cpb, const wchar_t *characters, size_t length,
+ size_t offset, int insertCR
+);
+
extern int setClipboardContentUTF8 (ClipboardObject *cpb, const char *text);
extern int appendClipboardContentUTF8 (ClipboardObject *cpb, const char *text);
diff --git a/Headers/cmd.h b/Headers/cmd.h
index 40ad11f78..bb52bd772 100644
--- a/Headers/cmd.h
+++ b/Headers/cmd.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/cmd_enqueue.h b/Headers/cmd_enqueue.h
index ab34a332d..c450acd36 100644
--- a/Headers/cmd_enqueue.h
+++ b/Headers/cmd_enqueue.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/cmd_types.h b/Headers/cmd_types.h
index d8fdb805f..49bf0ffaa 100644
--- a/Headers/cmd_types.h
+++ b/Headers/cmd_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/cmdline.h b/Headers/cmdline.h
index 828dddde2..56ce52d58 100644
--- a/Headers/cmdline.h
+++ b/Headers/cmdline.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/cmdline_types.h b/Headers/cmdline_types.h
index 964421eeb..76e093d2a 100644
--- a/Headers/cmdline_types.h
+++ b/Headers/cmdline_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/common_java.h b/Headers/common_java.h
index b14f5e711..3742d7212 100644
--- a/Headers/common_java.h
+++ b/Headers/common_java.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/crc.h b/Headers/crc.h
index ca315e6e5..b46b49615 100644
--- a/Headers/crc.h
+++ b/Headers/crc.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/crc_algorithms.h b/Headers/crc_algorithms.h
index 58ec81cec..7ba458f9d 100644
--- a/Headers/crc_algorithms.h
+++ b/Headers/crc_algorithms.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/crc_definitions.h b/Headers/crc_definitions.h
index 71051559e..4e48ca1ab 100644
--- a/Headers/crc_definitions.h
+++ b/Headers/crc_definitions.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/crc_generate.h b/Headers/crc_generate.h
index 14d1444f5..45b2a59b6 100644
--- a/Headers/crc_generate.h
+++ b/Headers/crc_generate.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/crc_properties.h b/Headers/crc_properties.h
index ba49b4d17..d8e6c32d8 100644
--- a/Headers/crc_properties.h
+++ b/Headers/crc_properties.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/crc_verify.h b/Headers/crc_verify.h
index 8a9c9a1ea..ec9731477 100644
--- a/Headers/crc_verify.h
+++ b/Headers/crc_verify.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/ctb.h b/Headers/ctb.h
index eb866297d..505a43eb1 100644
--- a/Headers/ctb.h
+++ b/Headers/ctb.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -51,6 +51,8 @@ extern void contractText (
int cursorOffset /* Position of coursor in source */
);
+extern int *makeInverseOffsetMap (const int *fromOffsets, int fromCount);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/Headers/ctb_types.h b/Headers/ctb_types.h
index 7382639b7..9fbc09232 100644
--- a/Headers/ctb_types.h
+++ b/Headers/ctb_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/dataarea.h b/Headers/dataarea.h
index c15aca369..5b0aca18c 100644
--- a/Headers/dataarea.h
+++ b/Headers/dataarea.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/datafile.h b/Headers/datafile.h
index aee9f43e6..c935895f9 100644
--- a/Headers/datafile.h
+++ b/Headers/datafile.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/device.h b/Headers/device.h
index 38f8e59a6..7c1251e67 100644
--- a/Headers/device.h
+++ b/Headers/device.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/driver.h b/Headers/driver.h
index 3ff61dedc..439ee9fc9 100644
--- a/Headers/driver.h
+++ b/Headers/driver.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/drivers.h b/Headers/drivers.h
index 78c75135d..987d25413 100644
--- a/Headers/drivers.h
+++ b/Headers/drivers.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/dynld.h b/Headers/dynld.h
index 7fcad8d76..d57979c84 100644
--- a/Headers/dynld.h
+++ b/Headers/dynld.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/embed.h b/Headers/embed.h
index 962991c82..9ed693e7a 100644
--- a/Headers/embed.h
+++ b/Headers/embed.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/ezusb.h b/Headers/ezusb.h
index 7b6fd9e97..f5259c67d 100644
--- a/Headers/ezusb.h
+++ b/Headers/ezusb.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/file.h b/Headers/file.h
index 702a253ad..e07111e63 100644
--- a/Headers/file.h
+++ b/Headers/file.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -41,6 +41,8 @@ extern int isExplicitPath (const char *path);
extern char *joinPath (const char *const *components, unsigned int count);
extern char *makePath (const char *directory, const char *file);
+extern int anchorRelativePath (char **path, const char *anchor);
+extern char *makeHelperPath (const char *name);
extern int hasFileExtension (const char *path, const char *extension);
extern char *replaceFileExtension (const char *path, const char *extension);
@@ -59,11 +61,9 @@ extern int createDirectory (const char *path, int worldWritable);
extern int ensureDirectory (const char *path, int worldWritable);
extern int ensurePathDirectory (const char *path);
-extern void setUpdatableDirectory (const char *directory);
extern const char *getUpdatableDirectory (void);
extern char *makeUpdatablePath (const char *file);
-extern void setWritableDirectory (const char *directory);
extern const char *getWritableDirectory (void);
extern char *makeWritablePath (const char *file);
diff --git a/Headers/fm.h b/Headers/fm.h
index d542094fe..d9ac1958e 100644
--- a/Headers/fm.h
+++ b/Headers/fm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/fm_adlib.h b/Headers/fm_adlib.h
index fd2771638..e780f8407 100644
--- a/Headers/fm_adlib.h
+++ b/Headers/fm_adlib.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/get_curses.h b/Headers/get_curses.h
index 61bc48cac..84e140fcd 100644
--- a/Headers/get_curses.h
+++ b/Headers/get_curses.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/get_select.h b/Headers/get_select.h
index c783551fc..dd92e71b0 100644
--- a/Headers/get_select.h
+++ b/Headers/get_select.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/get_sockets.h b/Headers/get_sockets.h
index c33b2c5ed..f41a46752 100644
--- a/Headers/get_sockets.h
+++ b/Headers/get_sockets.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/get_thread.h b/Headers/get_thread.h
index 762cda6d7..d8c3dbc82 100644
--- a/Headers/get_thread.h
+++ b/Headers/get_thread.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/gettime.h b/Headers/gettime.h
index 5638bf054..e42bf5239 100644
--- a/Headers/gettime.h
+++ b/Headers/gettime.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/gio_types.h b/Headers/gio_types.h
index fee40bf28..a83274d4e 100644
--- a/Headers/gio_types.h
+++ b/Headers/gio_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/hid_braille.h b/Headers/hid_braille.h
index 2009dd657..200ad9af2 100644
--- a/Headers/hid_braille.h
+++ b/Headers/hid_braille.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/hid_defs.h b/Headers/hid_defs.h
index aad958d42..060e3e203 100644
--- a/Headers/hid_defs.h
+++ b/Headers/hid_defs.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/hid_inspect.h b/Headers/hid_inspect.h
index 697b88d6e..df7d5743b 100644
--- a/Headers/hid_inspect.h
+++ b/Headers/hid_inspect.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/hid_items.h b/Headers/hid_items.h
index 5bbe98408..8d75d4ba5 100644
--- a/Headers/hid_items.h
+++ b/Headers/hid_items.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/hid_tables.h b/Headers/hid_tables.h
index 683ef3c6f..4f7f2abc0 100644
--- a/Headers/hid_tables.h
+++ b/Headers/hid_tables.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/hid_types.h b/Headers/hid_types.h
index 5c9de9722..552c2f88a 100644
--- a/Headers/hid_types.h
+++ b/Headers/hid_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/hostcmd.h b/Headers/hostcmd.h
index 381b9830f..688b78e63 100644
--- a/Headers/hostcmd.h
+++ b/Headers/hostcmd.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/ihex.h b/Headers/ihex.h
index 15e60f83a..69dc33981 100644
--- a/Headers/ihex.h
+++ b/Headers/ihex.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/ihex_types.h b/Headers/ihex_types.h
index 76bdee129..585ccc784 100644
--- a/Headers/ihex_types.h
+++ b/Headers/ihex_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/io_bluetooth.h b/Headers/io_bluetooth.h
index 5e44f37e2..e44749f48 100644
--- a/Headers/io_bluetooth.h
+++ b/Headers/io_bluetooth.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/io_generic.h b/Headers/io_generic.h
index 58216ab26..000c9d6d8 100644
--- a/Headers/io_generic.h
+++ b/Headers/io_generic.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/io_hid.h b/Headers/io_hid.h
index a038b3458..d0c0c0e80 100644
--- a/Headers/io_hid.h
+++ b/Headers/io_hid.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/io_misc.h b/Headers/io_misc.h
index 3b88933f4..90a01dba0 100644
--- a/Headers/io_misc.h
+++ b/Headers/io_misc.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/io_serial.h b/Headers/io_serial.h
index 5df6e2343..7affa493b 100644
--- a/Headers/io_serial.h
+++ b/Headers/io_serial.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/io_usb.h b/Headers/io_usb.h
index d004b3409..484aa537a 100644
--- a/Headers/io_usb.h
+++ b/Headers/io_usb.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/kbd_keycodes.h b/Headers/kbd_keycodes.h
index a1e0ce3d2..68e63a723 100644
--- a/Headers/kbd_keycodes.h
+++ b/Headers/kbd_keycodes.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/ktb.h b/Headers/ktb.h
index f21169f9a..003b1b65d 100644
--- a/Headers/ktb.h
+++ b/Headers/ktb.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/ktb_types.h b/Headers/ktb_types.h
index d5783a25c..d8daba26f 100644
--- a/Headers/ktb_types.h
+++ b/Headers/ktb_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/leds.h b/Headers/leds.h
index dc2a7fca3..f09062402 100644
--- a/Headers/leds.h
+++ b/Headers/leds.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/lock.h b/Headers/lock.h
index 214d8e156..7a7cbecad 100644
--- a/Headers/lock.h
+++ b/Headers/lock.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/log.h b/Headers/log.h
index 79f61a0fa..19daff895 100644
--- a/Headers/log.h
+++ b/Headers/log.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/log_history.h b/Headers/log_history.h
index 7a870f45a..577912d5a 100644
--- a/Headers/log_history.h
+++ b/Headers/log_history.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/menu.h b/Headers/menu.h
index da5690994..4b9c39bfa 100644
--- a/Headers/menu.h
+++ b/Headers/menu.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -34,8 +34,6 @@ typedef struct {
extern Menu *newMenu (void);
extern void destroyMenu (Menu *menu);
-extern MenuItem *newTextMenuItem (Menu *menu, const MenuString *name, const char *text);
-
typedef void NumericMenuItemFormatter (
Menu *menu, unsigned char value,
char *buffer, size_t size
@@ -74,9 +72,10 @@ extern MenuItem *newFilesMenuItem (
typedef void MenuToolFunction (void);
extern MenuItem *newToolMenuItem (Menu *menu, const MenuString *name, MenuToolFunction *function);
-extern Menu *newSubmenuMenuItem (
- Menu *menu, const MenuString *name
-);
+extern MenuItem *newTextMenuItem (Menu *menu, const MenuString *name, const char *text);
+extern MenuItem *newStringOptionMenuItem (Menu *menu, const MenuString *name, char *const *option);
+extern MenuItem *newFlagOptionMenuItem (Menu *menu, const MenuString *name, int *option);
+extern Menu *newSubmenuMenuItem (Menu *menu, const MenuString *name);
typedef int MenuItemTester (void);
extern void setMenuItemTester (MenuItem *item, MenuItemTester *handler);
diff --git a/Headers/message.h b/Headers/message.h
index 29da0f1ca..d3442ff56 100644
--- a/Headers/message.h
+++ b/Headers/message.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -31,6 +31,7 @@ typedef enum {
} MessageOptions;
extern int message (const char *mode, const char *text, MessageOptions options);
+extern int sayMessage (const char *text);
extern int messageHoldTimeout;
diff --git a/Headers/messages.h b/Headers/messages.h
index a3fbc1c5c..b5b61f318 100644
--- a/Headers/messages.h
+++ b/Headers/messages.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/midi.h b/Headers/midi.h
index c7a60289b..bb1496337 100644
--- a/Headers/midi.h
+++ b/Headers/midi.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/mntfs.h b/Headers/mntfs.h
index 020e9f633..16f03f7c0 100644
--- a/Headers/mntfs.h
+++ b/Headers/mntfs.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/mntpt.h b/Headers/mntpt.h
index a3a7bc032..8878144ad 100644
--- a/Headers/mntpt.h
+++ b/Headers/mntpt.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/morse.h b/Headers/morse.h
index dc40f6c03..e6f2a6717 100644
--- a/Headers/morse.h
+++ b/Headers/morse.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/msg_queue.h b/Headers/msg_queue.h
index d844a137f..170df06d6 100644
--- a/Headers/msg_queue.h
+++ b/Headers/msg_queue.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/note_types.h b/Headers/note_types.h
index dc6d685c8..ebb3fcda7 100644
--- a/Headers/note_types.h
+++ b/Headers/note_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/notes.h b/Headers/notes.h
index 475886078..84f886301 100644
--- a/Headers/notes.h
+++ b/Headers/notes.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -58,9 +58,6 @@ extern const NoteMethods pcmNoteMethods;
extern const NoteMethods midiNoteMethods;
extern const NoteMethods fmNoteMethods;
-extern char *opt_pcmDevice;
-extern char *opt_midiDevice;
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/Headers/params.h b/Headers/params.h
index d1d2b2a7d..9296ff031 100644
--- a/Headers/params.h
+++ b/Headers/params.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/parse.h b/Headers/parse.h
index 74234cf33..4232c2688 100644
--- a/Headers/parse.h
+++ b/Headers/parse.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/pcm.h b/Headers/pcm.h
index 66cb4301c..019abf964 100644
--- a/Headers/pcm.h
+++ b/Headers/pcm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/pgmpath.h b/Headers/pgmpath.h
index 76e66bd85..82202ba94 100644
--- a/Headers/pgmpath.h
+++ b/Headers/pgmpath.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/pgmprivs.h b/Headers/pgmprivs.h
index e1e4bd1d2..07c3278a8 100644
--- a/Headers/pgmprivs.h
+++ b/Headers/pgmprivs.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/pid.h b/Headers/pid.h
index 0dbcd4fe2..a1e571b8c 100644
--- a/Headers/pid.h
+++ b/Headers/pid.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/ports.h b/Headers/ports.h
index 28176b976..18a8ea421 100644
--- a/Headers/ports.h
+++ b/Headers/ports.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/prefs.h b/Headers/prefs.h
index 396c8ccf5..811f10c8c 100644
--- a/Headers/prefs.h
+++ b/Headers/prefs.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -216,6 +216,7 @@ typedef struct {
unsigned char autoreleaseTime;
unsigned char onFirstRelease;
+ unsigned char alternatePasteModeEnabled;
unsigned char touchNavigation;
unsigned char scrollAwareCursorNavigation;
diff --git a/Headers/program.h b/Headers/program.h
index e72be9160..c36b9c68b 100644
--- a/Headers/program.h
+++ b/Headers/program.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -49,9 +49,8 @@ extern void onProgramExit (const char *name, ProgramExitHandler *handler, void *
extern void registerProgramMemory (const char *name, void *pointer);
extern const char *getProgramDirectory (void);
-extern int fixInstallPath (char **path);
+extern int toAbsoluteInstallPath (char **path);
extern char *makeProgramPath (const char *name);
-extern char *makeCommandPath (const char *name);
extern int createPidFile (const char *path, ProcessIdentifier pid);
extern int cancelProgram (const char *pidFile);
diff --git a/Headers/prologue.h b/Headers/prologue.h
index 5290f4ca6..423af00ca 100644
--- a/Headers/prologue.h
+++ b/Headers/prologue.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/pty_object.h b/Headers/pty_object.h
index 57cc018c7..15663eff2 100644
--- a/Headers/pty_object.h
+++ b/Headers/pty_object.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/pty_screen.h b/Headers/pty_screen.h
index 03807d9e4..a113f856d 100644
--- a/Headers/pty_screen.h
+++ b/Headers/pty_screen.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -28,6 +28,7 @@ extern "C" {
extern int ptyBeginScreen (PtyObject *pty, int driverDirectives);
extern void ptyEndScreen (void);
+extern void ptyResizeScreen (unsigned int lines, unsigned int columns);
extern void ptyRefreshScreen (void);
extern void ptySetCursorPosition (unsigned int row, unsigned int column);
diff --git a/Headers/pty_terminal.h b/Headers/pty_terminal.h
index 7f6d4708a..bcd05aefe 100644
--- a/Headers/pty_terminal.h
+++ b/Headers/pty_terminal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -29,6 +29,7 @@ extern const char *ptyGetTerminalType (void);
extern int ptyBeginTerminal (PtyObject *pty, int driverDirectives);
extern void ptyEndTerminal (void);
+extern void ptyResizeTerminal (unsigned int lines, unsigned int columns);
extern int ptyProcessTerminalInput (PtyObject *pty);
extern int ptyProcessTerminalOutput (const unsigned char *bytes, size_t count);
diff --git a/Headers/queue.h b/Headers/queue.h
index eabdc49f3..02d02f539 100644
--- a/Headers/queue.h
+++ b/Headers/queue.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/revision.h b/Headers/revision.h
index 036c8dd34..ff99b7c72 100644
--- a/Headers/revision.h
+++ b/Headers/revision.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/rgx.h b/Headers/rgx.h
index 63d3edd73..18950a575 100644
--- a/Headers/rgx.h
+++ b/Headers/rgx.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/scr_base.h b/Headers/scr_base.h
index 624a29ab4..0f4b21d3e 100644
--- a/Headers/scr_base.h
+++ b/Headers/scr_base.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -42,6 +42,7 @@ typedef struct {
int (*readCharacters) (const ScreenBox *box, ScreenCharacter *buffer);
int (*insertKey) (ScreenKey key);
+ ScreenPasteMode (*getPasteMode) (void);
int (*routeCursor) (int column, int row, int screen);
int (*highlightRegion) (int left, int right, int top, int bottom);
@@ -62,7 +63,7 @@ typedef struct {
} BaseScreen;
extern void initializeBaseScreen (BaseScreen *);
-extern void describeBaseScreen (BaseScreen *, ScreenDescription *);
+extern void describeScreenObject (ScreenDescription *description, BaseScreen *screen);
extern int validateScreenBox (const ScreenBox *box, int columns, int rows);
extern void setScreenMessage (const ScreenBox *box, ScreenCharacter *buffer, const char *message);
diff --git a/Headers/scr_driver.h b/Headers/scr_driver.h
index 62ff5b75e..bf433e7f0 100644
--- a/Headers/scr_driver.h
+++ b/Headers/scr_driver.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/scr_emulator.h b/Headers/scr_emulator.h
index 2f5ac3f03..8f877dddb 100644
--- a/Headers/scr_emulator.h
+++ b/Headers/scr_emulator.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/scr_gpm.h b/Headers/scr_gpm.h
index 5a3a3d5cf..f142c6d8f 100644
--- a/Headers/scr_gpm.h
+++ b/Headers/scr_gpm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/scr_main.h b/Headers/scr_main.h
index 54a48db51..027adbde9 100644
--- a/Headers/scr_main.h
+++ b/Headers/scr_main.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/scr_real.h b/Headers/scr_real.h
index 3ca9d32d5..4d62a3b38 100644
--- a/Headers/scr_real.h
+++ b/Headers/scr_real.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/scr_terminal.h b/Headers/scr_terminal.h
index 9c638c794..52293ed3c 100644
--- a/Headers/scr_terminal.h
+++ b/Headers/scr_terminal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/scr_types.h b/Headers/scr_types.h
index a34541263..0665bf262 100644
--- a/Headers/scr_types.h
+++ b/Headers/scr_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -158,6 +158,12 @@ isSpecialKey (ScreenKey key) {
/* must be less than 0 */
#define SCR_NO_VT -1
+typedef enum {
+ SPM_UNKNOWN,
+ SPM_PLAIN,
+ SPM_BRACKETED,
+} ScreenPasteMode;
+
typedef struct ScreenDriverStruct ScreenDriver;
#ifdef __cplusplus
diff --git a/Headers/scr_utils.h b/Headers/scr_utils.h
index c5a5b547f..814f585ee 100644
--- a/Headers/scr_utils.h
+++ b/Headers/scr_utils.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/serial_types.h b/Headers/serial_types.h
index 3c1f8c901..92468de93 100644
--- a/Headers/serial_types.h
+++ b/Headers/serial_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/service.h b/Headers/service.h
index 03c899472..df76c7fb5 100644
--- a/Headers/service.h
+++ b/Headers/service.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/spk.h b/Headers/spk.h
index 4a2938e63..e3dad7667 100644
--- a/Headers/spk.h
+++ b/Headers/spk.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -68,6 +68,7 @@ extern int toNormalizedSpeechPitch (unsigned char pitch);
extern int canSetSpeechPunctuation (SpeechSynthesizer *spk);
extern int setSpeechPunctuation (SpeechSynthesizer *spk, SpeechPunctuation setting, int say);
+extern const char *getSpeechPunctuation (unsigned char level);
extern int haveSpeechDriver (const char *code);
extern const char *getDefaultSpeechDriver (void);
diff --git a/Headers/spk_base.h b/Headers/spk_base.h
index 2d302683b..688cca740 100644
--- a/Headers/spk_base.h
+++ b/Headers/spk_base.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/spk_driver.h b/Headers/spk_driver.h
index c8d499253..1357d4dfb 100644
--- a/Headers/spk_driver.h
+++ b/Headers/spk_driver.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/spk_types.h b/Headers/spk_types.h
index 791b76c50..60614306b 100644
--- a/Headers/spk_types.h
+++ b/Headers/spk_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -43,6 +43,7 @@ typedef enum {
typedef enum {
SPK_PUNCTUATION_NONE,
SPK_PUNCTUATION_SOME,
+ SPK_PUNCTUATION_MOST,
SPK_PUNCTUATION_ALL
} SpeechPunctuation;
diff --git a/Headers/status_types.h b/Headers/status_types.h
index ca2421980..9d88c2280 100644
--- a/Headers/status_types.h
+++ b/Headers/status_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/stdiox.h b/Headers/stdiox.h
index 4fcf21780..a21cdbd15 100644
--- a/Headers/stdiox.h
+++ b/Headers/stdiox.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/strfmt.h b/Headers/strfmt.h
index 61fc06c93..e3d3df88f 100644
--- a/Headers/strfmt.h
+++ b/Headers/strfmt.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/strfmth.h b/Headers/strfmth.h
index 24c4e6965..740858669 100644
--- a/Headers/strfmth.h
+++ b/Headers/strfmth.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/system.h b/Headers/system.h
index 577d48996..6ed62fee8 100644
--- a/Headers/system.h
+++ b/Headers/system.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/system_darwin.h b/Headers/system_darwin.h
index 7dcbf74a0..5557958c0 100644
--- a/Headers/system_darwin.h
+++ b/Headers/system_darwin.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/system_java.h b/Headers/system_java.h
index 5f7013555..a9ed12bcf 100644
--- a/Headers/system_java.h
+++ b/Headers/system_java.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/system_linux.h b/Headers/system_linux.h
index 3520e9fb1..305d2f2c9 100644
--- a/Headers/system_linux.h
+++ b/Headers/system_linux.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -23,6 +23,8 @@
extern "C" {
#endif /* __cplusplus */
+extern int getKernelRelease (int *major, int *minor, int *patch);
+
typedef struct {
const char *path;
void *data;
diff --git a/Headers/system_msdos.h b/Headers/system_msdos.h
index 2de87d004..a3be4106f 100644
--- a/Headers/system_msdos.h
+++ b/Headers/system_msdos.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/system_windows.h b/Headers/system_windows.h
index 385c60f50..2af101fcd 100644
--- a/Headers/system_windows.h
+++ b/Headers/system_windows.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/thread.h b/Headers/thread.h
index 818b34594..a4ec8ce85 100644
--- a/Headers/thread.h
+++ b/Headers/thread.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/timing.h b/Headers/timing.h
index d7fddfe21..bd054a60c 100644
--- a/Headers/timing.h
+++ b/Headers/timing.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/timing_types.h b/Headers/timing_types.h
index 43a5d623b..53374e532 100644
--- a/Headers/timing_types.h
+++ b/Headers/timing_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/ttb.h b/Headers/ttb.h
index baed02b80..73eaf7d45 100644
--- a/Headers/ttb.h
+++ b/Headers/ttb.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/tune.h b/Headers/tune.h
index 7eb910b68..610de814e 100644
--- a/Headers/tune.h
+++ b/Headers/tune.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/tune_builder.h b/Headers/tune_builder.h
index 44807f637..3cccd67e8 100644
--- a/Headers/tune_builder.h
+++ b/Headers/tune_builder.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/tune_types.h b/Headers/tune_types.h
index 35d02c970..d5309ce1d 100644
--- a/Headers/tune_types.h
+++ b/Headers/tune_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/tune_utils.h b/Headers/tune_utils.h
index b49bad368..9ba973148 100644
--- a/Headers/tune_utils.h
+++ b/Headers/tune_utils.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/unicode.h b/Headers/unicode.h
index 2162ba6b2..fb037f481 100644
--- a/Headers/unicode.h
+++ b/Headers/unicode.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/usb_hid.h b/Headers/usb_hid.h
index 01ac02250..d24df2019 100644
--- a/Headers/usb_hid.h
+++ b/Headers/usb_hid.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/usb_types.h b/Headers/usb_types.h
index 62f93cbaa..af078b723 100644
--- a/Headers/usb_types.h
+++ b/Headers/usb_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/utf8.h b/Headers/utf8.h
index bd2236e94..80a179579 100644
--- a/Headers/utf8.h
+++ b/Headers/utf8.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/variables.h b/Headers/variables.h
index 442f561ca..d68018afc 100644
--- a/Headers/variables.h
+++ b/Headers/variables.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/win_errno.h b/Headers/win_errno.h
index c06969383..654517d07 100644
--- a/Headers/win_errno.h
+++ b/Headers/win_errno.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Headers/win_pthread.h b/Headers/win_pthread.h
index fe0ab538f..53d04ec8c 100644
--- a/Headers/win_pthread.h
+++ b/Headers/win_pthread.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Makefile.in b/Makefile.in
index 2bfadff63..02b83230e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Messages/Makefile.in b/Messages/Makefile.in
index 488362e8b..57e2e2009 100644
--- a/Messages/Makefile.in
+++ b/Messages/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Messages/ar.po b/Messages/ar.po
index d97bd46cc..fe04704bd 100644
--- a/Messages/ar.po
+++ b/Messages/ar.po
@@ -1,7 +1,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Messages/brltty.pot b/Messages/brltty.pot
index 350e04bbf..e206a5f8d 100644
--- a/Messages/brltty.pot
+++ b/Messages/brltty.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: brltty 6.5\n"
+"Project-Id-Version: brltty 6.7\n"
"Report-Msgid-Bugs-To: BRLTTY@brltty.app\n"
-"POT-Creation-Date: 2024-10-11 19:57+0200\n"
+"POT-Creation-Date: 2025-04-07 08:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,83 +48,83 @@ msgid_plural "%u seconds"
msgstr[0] ""
msgstr[1] ""
-#: Programs/menu_prefs.c:543
#: Programs/menu_prefs.c:544
-#: Programs/menu_prefs.c:546
+#: Programs/menu_prefs.c:545
#: Programs/menu_prefs.c:547
-#: Programs/menu_prefs.c:550
+#: Programs/menu_prefs.c:548
#: Programs/menu_prefs.c:551
#: Programs/menu_prefs.c:552
-#: Programs/menu_prefs.c:554
+#: Programs/menu_prefs.c:553
#: Programs/menu_prefs.c:555
-#: Programs/menu_prefs.c:561
+#: Programs/menu_prefs.c:556
+#: Programs/menu_prefs.c:562
msgid "1 cell"
msgstr ""
-#: Programs/menu_prefs.c:902
+#: Programs/menu_prefs.c:903
msgid "1 second"
msgstr ""
-#: Programs/menu_prefs.c:964
+#: Programs/menu_prefs.c:965
msgid "10 seconds"
msgstr ""
-#: Programs/menu_prefs.c:1297
+#: Programs/menu_prefs.c:1298
msgid "12 Hour"
msgstr ""
-#: Programs/menu_prefs.c:542
-#: Programs/menu_prefs.c:545
-#: Programs/menu_prefs.c:548
+#: Programs/menu_prefs.c:543
+#: Programs/menu_prefs.c:546
#: Programs/menu_prefs.c:549
-#: Programs/menu_prefs.c:553
+#: Programs/menu_prefs.c:550
+#: Programs/menu_prefs.c:554
msgid "2 cells"
msgstr ""
-#: Programs/menu_prefs.c:903
+#: Programs/menu_prefs.c:904
msgid "2 seconds"
msgstr ""
-#: Programs/menu_prefs.c:965
+#: Programs/menu_prefs.c:966
msgid "20 seconds"
msgstr ""
-#: Programs/menu_prefs.c:1296
+#: Programs/menu_prefs.c:1297
msgid "24 Hour"
msgstr ""
-#: Programs/menu_prefs.c:900
+#: Programs/menu_prefs.c:901
msgid "250 milliseconds"
msgstr ""
-#: Programs/menu_prefs.c:557
#: Programs/menu_prefs.c:558
#: Programs/menu_prefs.c:559
#: Programs/menu_prefs.c:560
+#: Programs/menu_prefs.c:561
msgid "3 cells"
msgstr ""
-#: Programs/menu_prefs.c:966
+#: Programs/menu_prefs.c:967
msgid "40 seconds"
msgstr ""
-#: Programs/menu_prefs.c:963
+#: Programs/menu_prefs.c:964
msgid "5 seconds"
msgstr ""
-#: Programs/menu_prefs.c:901
+#: Programs/menu_prefs.c:902
msgid "500 milliseconds"
msgstr ""
-#: Programs/menu_prefs.c:734
+#: Programs/menu_prefs.c:735
msgid "6-dot"
msgstr ""
-#: Programs/brltty-ttb.c:169
+#: Programs/brltty-ttb.c:170
msgid "8-bit character set to use."
msgstr ""
-#: Programs/menu_prefs.c:733
+#: Programs/menu_prefs.c:734
msgid "8-dot"
msgstr ""
@@ -132,8 +132,12 @@ msgstr ""
msgid "<off>"
msgstr ""
+#: Programs/menu_prefs.c:1748
+msgid "API Parameters"
+msgstr ""
+
#. xgettext: This is the description of the PASSAT command.
-#: Programs/cmds.auto.h:1487
+#: Programs/cmds.auto.h:1502
msgid "AT (set 2) keyboard scan code"
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "Acoustic Guitar (steel)"
msgstr ""
-#: Programs/menu_prefs.c:1323
+#: Programs/menu_prefs.c:1324
msgid "After Time"
msgstr ""
@@ -174,32 +178,32 @@ msgstr ""
msgid "Agogo"
msgstr ""
-#: Programs/menu_prefs.c:1511
+#: Programs/menu_prefs.c:1760
msgid "Alert"
msgstr ""
-#: Programs/menu_prefs.c:1106
+#: Programs/menu_prefs.c:1107
msgid "Alert Dots"
msgstr ""
-#: Programs/menu_prefs.c:1111
+#: Programs/menu_prefs.c:1112
msgid "Alert Messages"
msgstr ""
-#: Programs/menu_prefs.c:1051
+#: Programs/menu_prefs.c:1052
msgid "Alert Tunes"
msgstr ""
-#: Programs/menu_prefs.c:866
-#: Programs/menu_prefs.c:1214
+#: Programs/menu_prefs.c:867
+#: Programs/spk.c:282
msgid "All"
msgstr ""
-#: Programs/menu_prefs.c:555
+#: Programs/menu_prefs.c:556
msgid "Alphabetic Cursor Coordinates"
msgstr ""
-#: Programs/menu_prefs.c:554
+#: Programs/menu_prefs.c:555
msgid "Alphabetic Window Coordinates"
msgstr ""
@@ -217,15 +221,16 @@ msgstr ""
msgid "Async Events"
msgstr ""
-#: Programs/menu_prefs.c:808
+#: Programs/menu_prefs.c:809
msgid "Attributes Blink Period"
msgstr ""
-#: Programs/menu_prefs.c:816
+#: Programs/menu_prefs.c:817
msgid "Attributes Percent Visible"
msgstr ""
-#: Programs/menu_prefs.c:1426
+#: Programs/menu_prefs.c:1427
+#: Programs/menu_prefs.c:1606
msgid "Attributes Table"
msgstr ""
@@ -237,31 +242,31 @@ msgstr ""
msgid "Autorelease"
msgstr ""
-#: Programs/menu_prefs.c:969
+#: Programs/menu_prefs.c:970
msgid "Autorelease Time"
msgstr ""
-#: Programs/menu_prefs.c:986
+#: Programs/menu_prefs.c:987
msgid "Autorepeat Enabled"
msgstr ""
-#: Programs/menu_prefs.c:992
+#: Programs/menu_prefs.c:993
msgid "Autorepeat Interval"
msgstr ""
-#: Programs/menu_prefs.c:999
+#: Programs/menu_prefs.c:1000
msgid "Autorepeat Panning"
msgstr ""
-#: Programs/menu_prefs.c:1133
+#: Programs/menu_prefs.c:1134
msgid "Autospeak"
msgstr ""
-#: Programs/menu_prefs.c:1130
+#: Programs/menu_prefs.c:1131
msgid "Autospeak Options"
msgstr ""
-#: Programs/config.c:2138
+#: Programs/config.c:2146
msgid "BRLTTY stopped"
msgstr ""
@@ -290,11 +295,11 @@ msgstr ""
msgid "Bassoon"
msgstr ""
-#: Programs/menu_prefs.c:1058
+#: Programs/menu_prefs.c:1059
msgid "Beeper"
msgstr ""
-#: Programs/menu_prefs.c:1322
+#: Programs/menu_prefs.c:1323
msgid "Before Time"
msgstr ""
@@ -303,24 +308,24 @@ msgstr ""
msgid "Bird Tweet"
msgstr ""
-#: Programs/menu_prefs.c:802
+#: Programs/menu_prefs.c:803
msgid "Blinking Attributes"
msgstr ""
-#: Programs/menu_prefs.c:824
+#: Programs/menu_prefs.c:825
msgid "Blinking Capitals"
msgstr ""
-#: Programs/menu_prefs.c:775
+#: Programs/menu_prefs.c:776
msgid "Blinking Screen Cursor"
msgstr ""
-#: Programs/menu_prefs.c:1268
+#: Programs/menu_prefs.c:1269
msgid "Blinking Speech Cursor"
msgstr ""
-#: Programs/menu_prefs.c:665
-#: Programs/menu_prefs.c:1382
+#: Programs/menu_prefs.c:666
+#: Programs/menu_prefs.c:1383
msgid "Block"
msgstr ""
@@ -333,15 +338,24 @@ msgstr ""
msgid "Bluetooth I/O"
msgstr ""
-#: Programs/config.c:1907
+#: Programs/menu_prefs.c:1551
+msgid "Boot Parameters"
+msgstr ""
+
+#: Programs/config.c:1915
+#: Programs/menu_prefs.c:1641
msgid "Braille Device"
msgstr ""
+#: Programs/menu_prefs.c:1631
+msgid "Braille Driver"
+msgstr ""
+
#: Programs/log.c:155
msgid "Braille Driver Events"
msgstr ""
-#: Programs/menu_prefs.c:753
+#: Programs/menu_prefs.c:754
msgid "Braille Firmness"
msgstr ""
@@ -349,32 +363,36 @@ msgstr ""
msgid "Braille Key Events"
msgstr ""
-#: Programs/menu_prefs.c:699
+#: Programs/menu_prefs.c:1636
+msgid "Braille Parameters"
+msgstr ""
+
+#: Programs/menu_prefs.c:700
msgid "Braille Presentation"
msgstr ""
-#: Programs/menu_prefs.c:1409
+#: Programs/menu_prefs.c:1410
msgid "Braille Tables"
msgstr ""
-#: Programs/menu_prefs.c:934
+#: Programs/menu_prefs.c:935
msgid "Braille Typing"
msgstr ""
-#: Programs/menu_prefs.c:707
+#: Programs/menu_prefs.c:708
msgid "Braille Variant"
msgstr ""
-#: Programs/menu_prefs.c:887
+#: Programs/menu_prefs.c:888
msgid "Braille Window Overlap"
msgstr ""
-#: Programs/config.c:410
+#: Programs/config.c:409
#, c-format
msgid "Braille driver code (%s, %s, or one of {%s})."
msgstr ""
-#: Programs/brltty-ktb.c:47
+#: Programs/brltty-ktb.c:48
msgid "Braille driver code."
msgstr ""
@@ -406,23 +424,23 @@ msgstr ""
msgid "BrlAPI host and/or port to connect to"
msgstr ""
-#: Programs/menu_prefs.c:1444
+#: Programs/menu_prefs.c:1467
msgid "Build Information"
msgstr ""
-#: Programs/menu_prefs.c:726
+#: Programs/menu_prefs.c:727
msgid "Capitalization Mode"
msgstr ""
-#: Programs/menu_prefs.c:829
+#: Programs/menu_prefs.c:830
msgid "Capitals Blink Period"
msgstr ""
-#: Programs/menu_prefs.c:837
+#: Programs/menu_prefs.c:838
msgid "Capitals Percent Visible"
msgstr ""
-#: Programs/menu_prefs.c:1534
+#: Programs/menu_prefs.c:1780
msgid "Category Log Level"
msgstr ""
@@ -437,15 +455,15 @@ msgstr ""
msgid "Cello"
msgstr ""
-#: Programs/brltty-atb.c:49
+#: Programs/brltty-atb.c:50
msgid "Check an attributes table."
msgstr ""
-#: Programs/brltty-ttb.c:2513
+#: Programs/brltty-ttb.c:2514
msgid "Check/edit a text (computer braille) table, or convert it from one format to another."
msgstr ""
-#: Programs/brltty-ctb.c:449
+#: Programs/brltty-ctb.c:450
msgid "Check/validate a contraction (literary braille) table, or translate text into contracted braille."
msgstr ""
@@ -474,31 +492,32 @@ msgstr ""
msgid "Clavinet"
msgstr ""
-#: Programs/menu.c:891
+#: Programs/menu.c:943
msgid "Close"
msgstr ""
-#: Programs/menu_prefs.c:1306
+#: Programs/menu_prefs.c:1307
msgid "Colon"
msgstr ""
-#: Programs/brltty-tune.c:158
+#: Programs/brltty-tune.c:159
msgid "Compose a tune with the tune builder and play it with the tone generator."
msgstr ""
-#: Programs/menu_prefs.c:703
+#: Programs/menu_prefs.c:704
msgid "Computer Braille"
msgstr ""
-#: Programs/menu_prefs.c:737
+#: Programs/menu_prefs.c:738
msgid "Computer Braille Cell Type"
msgstr ""
-#: Programs/menu_prefs.c:1468
+#: Programs/menu_prefs.c:1501
msgid "Configuration Directory"
msgstr ""
-#: Programs/menu_prefs.c:1473
+#: Programs/menu_prefs.c:1491
+#: Programs/menu_prefs.c:1541
msgid "Configuration File"
msgstr ""
@@ -506,7 +525,7 @@ msgstr ""
msgid "Console Bell"
msgstr ""
-#: Programs/menu_prefs.c:1037
+#: Programs/menu_prefs.c:1038
msgid "Console Bell Alert"
msgstr ""
@@ -515,19 +534,20 @@ msgstr ""
msgid "Contrabass"
msgstr ""
-#: Programs/menu_prefs.c:704
+#: Programs/menu_prefs.c:705
msgid "Contracted Braille"
msgstr ""
-#: Programs/menu_prefs.c:1419
+#: Programs/menu_prefs.c:1420
+#: Programs/menu_prefs.c:1601
msgid "Contraction Table"
msgstr ""
-#: Programs/brltty-ctb.c:73
+#: Programs/brltty-ctb.c:74
msgid "Contraction table."
msgstr ""
-#: Programs/brltty-ctb.c:87
+#: Programs/brltty-ctb.c:88
msgid "Contraction verification table."
msgstr ""
@@ -535,16 +555,16 @@ msgstr ""
msgid "Could not get XKB major opcode\n"
msgstr ""
-#: Programs/menu_prefs.c:1512
+#: Programs/menu_prefs.c:1761
msgid "Critical"
msgstr ""
-#: Programs/menu_prefs.c:546
+#: Programs/menu_prefs.c:547
msgid "Cursor Column"
msgstr ""
-#: Programs/menu_prefs.c:545
-#: Programs/menu_prefs.c:557
+#: Programs/menu_prefs.c:546
+#: Programs/menu_prefs.c:558
msgid "Cursor Coordinates"
msgstr ""
@@ -552,7 +572,7 @@ msgstr ""
msgid "Cursor Routing"
msgstr ""
-#: Programs/menu_prefs.c:547
+#: Programs/menu_prefs.c:548
msgid "Cursor Row"
msgstr ""
@@ -560,49 +580,49 @@ msgstr ""
msgid "Cursor Tracking"
msgstr ""
-#: Programs/menu_prefs.c:906
+#: Programs/menu_prefs.c:907
msgid "Cursor Tracking Delay"
msgstr ""
-#: Programs/menu_prefs.c:548
-#: Programs/menu_prefs.c:559
+#: Programs/menu_prefs.c:549
+#: Programs/menu_prefs.c:560
msgid "Cursor and Window Column"
msgstr ""
-#: Programs/menu_prefs.c:549
-#: Programs/menu_prefs.c:560
+#: Programs/menu_prefs.c:550
+#: Programs/menu_prefs.c:561
msgid "Cursor and Window Row"
msgstr ""
-#: Programs/menu_prefs.c:1344
+#: Programs/menu_prefs.c:1345
msgid "Dash"
msgstr ""
-#: Programs/menu_prefs.c:1337
+#: Programs/menu_prefs.c:1338
msgid "Date Format"
msgstr ""
-#: Programs/menu_prefs.c:1326
+#: Programs/menu_prefs.c:1327
msgid "Date Position"
msgstr ""
-#: Programs/menu_prefs.c:1349
+#: Programs/menu_prefs.c:1350
msgid "Date Separator"
msgstr ""
-#: Programs/menu_prefs.c:1334
+#: Programs/menu_prefs.c:1335
msgid "Day Month Year"
msgstr ""
-#: Programs/menu_prefs.c:1517
+#: Programs/menu_prefs.c:1766
msgid "Debug"
msgstr ""
-#: Programs/config.c:431
+#: Programs/config.c:430
msgid "Device for accessing braille display."
msgstr ""
-#: Programs/config.c:592
+#: Programs/config.c:591
msgid "Disable the application programming interface."
msgstr ""
@@ -611,7 +631,7 @@ msgstr ""
msgid "Distortion Guitar"
msgstr ""
-#: Programs/config.c:506
+#: Programs/config.c:497
msgid "Do not autospeak when braille is not being used."
msgstr ""
@@ -619,11 +639,11 @@ msgstr ""
msgid "Do not write any text to the braille device"
msgstr ""
-#: Programs/brltty-trtxt.c:70
+#: Programs/brltty-trtxt.c:71
msgid "Don't fall back to the Unicode base character."
msgstr ""
-#: Programs/config.c:645
+#: Programs/config.c:644
msgid "Don't switch to an unprivileged user or relinquish any privileges (group memberships, capabilities, etc)."
msgstr ""
@@ -631,12 +651,12 @@ msgstr ""
msgid "Done"
msgstr ""
-#: Programs/menu_prefs.c:1307
-#: Programs/menu_prefs.c:1346
+#: Programs/menu_prefs.c:1308
+#: Programs/menu_prefs.c:1347
msgid "Dot"
msgstr ""
-#: Programs/menu_prefs.c:944
+#: Programs/menu_prefs.c:945
msgid "Dots via Unicode Braille"
msgstr ""
@@ -646,7 +666,8 @@ msgstr ""
msgid "Drawbar Organ"
msgstr ""
-#: Programs/menu_prefs.c:1493
+#: Programs/menu_prefs.c:1511
+#: Programs/menu_prefs.c:1571
msgid "Drivers Directory"
msgstr ""
@@ -655,7 +676,7 @@ msgstr ""
msgid "Dulcimer"
msgstr ""
-#: Programs/menu_prefs.c:881
+#: Programs/menu_prefs.c:882
msgid "Eager Sliding Braille Window"
msgstr ""
@@ -663,7 +684,7 @@ msgstr ""
msgid "Echo (in hexadecimal) input received from the device."
msgstr ""
-#: Programs/brltty-ttb.c:148
+#: Programs/brltty-ttb.c:149
msgid "Edit table."
msgstr ""
@@ -707,15 +728,15 @@ msgstr ""
msgid "Electric Piano 2"
msgstr ""
-#: Programs/menu_prefs.c:1510
+#: Programs/menu_prefs.c:1759
msgid "Emergency"
msgstr ""
-#: Programs/menu_prefs.c:541
+#: Programs/menu_prefs.c:542
msgid "End"
msgstr ""
-#: Programs/menu_prefs.c:867
+#: Programs/menu_prefs.c:868
msgid "End of Line"
msgstr ""
@@ -724,7 +745,7 @@ msgstr ""
msgid "English Horn"
msgstr ""
-#: Programs/menu_prefs.c:1249
+#: Programs/menu_prefs.c:1250
msgid "Enqueue"
msgstr ""
@@ -733,7 +754,11 @@ msgstr ""
msgid "Ensemble"
msgstr ""
-#: Programs/menu_prefs.c:1513
+#: Programs/menu_prefs.c:1546
+msgid "Environment Variables"
+msgstr ""
+
+#: Programs/menu_prefs.c:1762
msgid "Error"
msgstr ""
@@ -742,23 +767,23 @@ msgstr ""
msgid "Ethnic Instruments"
msgstr ""
-#: Programs/menu_prefs.c:1034
+#: Programs/menu_prefs.c:1035
msgid "Event Alerts"
msgstr ""
-#: Programs/menu_prefs.c:714
+#: Programs/menu_prefs.c:715
msgid "Expand Current Word"
msgstr ""
-#: Programs/config.c:584
+#: Programs/config.c:583
msgid "Explicit preference settings."
msgstr ""
-#: Programs/menu_prefs.c:1061
+#: Programs/menu_prefs.c:1062
msgid "FM"
msgstr ""
-#: Programs/menu_prefs.c:1099
+#: Programs/menu_prefs.c:1100
msgid "FM Volume"
msgstr ""
@@ -826,15 +851,15 @@ msgstr ""
msgid "Flute"
msgstr ""
-#: Programs/brltty-ctb.c:65
+#: Programs/brltty-ctb.c:66
msgid "Force immediate output."
msgstr ""
-#: Programs/brltty-ttb.c:155
+#: Programs/brltty-ttb.c:156
msgid "Format of input file."
msgstr ""
-#: Programs/brltty-ttb.c:162
+#: Programs/brltty-ttb.c:163
msgid "Format of output file."
msgstr ""
@@ -852,7 +877,15 @@ msgstr ""
msgid "Frozen"
msgstr ""
-#: Programs/menu_prefs.c:556
+#: Programs/menu_prefs.c:1621
+msgid "GUI Keyboard Enabled"
+msgstr ""
+
+#: Programs/menu_prefs.c:1626
+msgid "GUI Keyboard Table"
+msgstr ""
+
+#: Programs/menu_prefs.c:557
msgid "Generic"
msgstr ""
@@ -882,7 +915,7 @@ msgstr ""
msgid "Gunshot"
msgstr ""
-#: Programs/config.c:558
+#: Programs/config.c:557
msgid "Handle keyboard key events when using a Linux tty in graphics mode."
msgstr ""
@@ -905,16 +938,21 @@ msgstr ""
msgid "Help Screen"
msgstr ""
-#: Programs/menu_prefs.c:668
+#: Programs/menu_prefs.c:1516
+#: Programs/menu_prefs.c:1576
+msgid "Helpers Directory"
+msgstr ""
+
+#: Programs/menu_prefs.c:669
msgid "Hide"
msgstr ""
-#: Programs/menu_prefs.c:749
-#: Programs/menu_prefs.c:1015
+#: Programs/menu_prefs.c:750
+#: Programs/menu_prefs.c:1016
msgid "High"
msgstr ""
-#: Programs/menu_prefs.c:923
+#: Programs/menu_prefs.c:924
msgid "Highlight Braille Window Location"
msgstr ""
@@ -927,7 +965,7 @@ msgstr ""
msgid "Human Interface I/O"
msgstr ""
-#: Programs/menu_prefs.c:1248
+#: Programs/menu_prefs.c:1249
msgid "Immediate"
msgstr ""
@@ -939,11 +977,11 @@ msgstr ""
msgid "Incompatible XKB server support\n"
msgstr ""
-#: Programs/menu_prefs.c:1516
+#: Programs/menu_prefs.c:1765
msgid "Information"
msgstr ""
-#: Programs/menu_prefs.c:958
+#: Programs/menu_prefs.c:959
msgid "Input Options"
msgstr ""
@@ -951,15 +989,11 @@ msgstr ""
msgid "Input Packets"
msgstr ""
-#: Programs/config.c:774
+#: Programs/config.c:783
#, c-format
msgid "Install the %s service, and then exit."
msgstr ""
-#: Programs/menu_prefs.c:1520
-msgid "Internal Parameters"
-msgstr ""
-
#: Drivers/Screen/Android/screen.c:197
msgid "Java class not found"
msgstr ""
@@ -977,20 +1011,20 @@ msgstr ""
msgid "Kalimba"
msgstr ""
-#: Programs/config.c:1833
+#: Programs/config.c:1841
msgid "Key Bindings"
msgstr ""
-#: Programs/config.c:1275
+#: Programs/config.c:1283
msgid "Key Help"
msgstr ""
-#: Programs/config.c:1838
+#: Programs/config.c:1846
#: Programs/ktb_list.c:737
msgid "Key Table"
msgstr ""
-#: Programs/menu_prefs.c:937
+#: Programs/menu_prefs.c:938
msgid "Keyboard Enabled"
msgstr ""
@@ -998,11 +1032,16 @@ msgstr ""
msgid "Keyboard Key Events"
msgstr ""
-#: Programs/menu_prefs.c:1044
+#: Programs/menu_prefs.c:1045
msgid "Keyboard LED Alerts"
msgstr ""
-#: Programs/menu_prefs.c:1026
+#: Programs/menu_prefs.c:1616
+msgid "Keyboard Properties"
+msgstr ""
+
+#: Programs/menu_prefs.c:1027
+#: Programs/menu_prefs.c:1611
msgid "Keyboard Table"
msgstr ""
@@ -1011,7 +1050,7 @@ msgstr ""
msgid "Koto"
msgstr ""
-#: Programs/config.c:3223
+#: Programs/config.c:3232
msgid "Language"
msgstr ""
@@ -1060,7 +1099,7 @@ msgstr ""
msgid "Learn Mode"
msgstr ""
-#: Programs/menu_prefs.c:1361
+#: Programs/menu_prefs.c:1362
msgid "Left"
msgstr ""
@@ -1068,15 +1107,15 @@ msgstr ""
msgid "List each report's identifier and sizes."
msgstr ""
-#: Programs/brltty-ktb.c:59
+#: Programs/brltty-ktb.c:60
msgid "List key names."
msgstr ""
-#: Programs/brltty-ktb.c:65
+#: Programs/brltty-ktb.c:66
msgid "List key table in help screen format."
msgstr ""
-#: Programs/brltty-ktb.c:71
+#: Programs/brltty-ktb.c:72
msgid "List key table in reStructuredText format."
msgstr ""
@@ -1092,65 +1131,82 @@ msgstr ""
msgid "List the paths to a data file and those which it recursively includes."
msgstr ""
-#: Programs/menu_prefs.c:1503
+#: Programs/menu_prefs.c:1531
+#: Programs/menu_prefs.c:1591
msgid "Locale Directory"
msgstr ""
-#: Programs/menu_prefs.c:1539
+#: Programs/menu_prefs.c:1785
msgid "Log Categories"
msgstr ""
-#: Programs/menu_prefs.c:1600
+#: Programs/menu_prefs.c:1697
+msgid "Log File"
+msgstr ""
+
+#: Programs/menu_prefs.c:1824
msgid "Log Messages"
msgstr ""
-#: Programs/config.c:384
+#: Programs/menu_prefs.c:1755
+msgid "Log Settings"
+msgstr ""
+
+#: Programs/config.c:383
msgid "Log the versions of the core, API, and built-in drivers, and then exit."
msgstr ""
-#: Programs/config.c:632
+#: Programs/menu_prefs.c:1702
+msgid "Log to Standard Error"
+msgstr ""
+
+#: Programs/config.c:631
msgid "Log to standard error rather than to the system log."
msgstr ""
-#: Programs/config.c:617
+#: Programs/config.c:616
#, c-format
msgid "Logging level (%s or one of {%s}) and/or log categories to enable (any combination of {%s}, each optionally prefixed by %s to disable)."
msgstr ""
-#: Programs/menu_prefs.c:980
+#: Programs/menu_prefs.c:981
msgid "Long Press Time"
msgstr ""
-#: Programs/menu_prefs.c:747
-#: Programs/menu_prefs.c:1013
+#: Programs/menu_prefs.c:748
+#: Programs/menu_prefs.c:1014
msgid "Low"
msgstr ""
-#: Programs/menu_prefs.c:666
+#: Programs/menu_prefs.c:667
msgid "Lower Left Dot"
msgstr ""
-#: Programs/menu_prefs.c:667
+#: Programs/menu_prefs.c:668
msgid "Lower Right Dot"
msgstr ""
-#: Programs/menu_prefs.c:1060
+#: Programs/menu_prefs.c:1061
msgid "MIDI"
msgstr ""
-#: Programs/config.c:702
+#: Programs/config.c:701
msgid "MIDI (Musical Instrument Digital Interface) device specifier."
msgstr ""
-#: Programs/menu_prefs.c:1090
+#: Programs/menu_prefs.c:1691
+msgid "MIDI Device"
+msgstr ""
+
+#: Programs/menu_prefs.c:1091
msgid "MIDI Instrument"
msgstr ""
-#: Programs/menu_prefs.c:1080
+#: Programs/menu_prefs.c:1081
msgid "MIDI Volume"
msgstr ""
-#: Programs/menu_prefs.c:1463
+#: Programs/menu_prefs.c:1486
msgid "Mailing List"
msgstr ""
@@ -1191,17 +1247,17 @@ msgstr ""
msgid "Match the vendor identifier (four hexadecimal digits)."
msgstr ""
-#: Programs/menu_prefs.c:750
-#: Programs/menu_prefs.c:1016
+#: Programs/menu_prefs.c:751
+#: Programs/menu_prefs.c:1017
msgid "Maximum"
msgstr ""
-#: Programs/brltty-ctb.c:53
+#: Programs/brltty-ctb.c:54
msgid "Maximum length of an output line."
msgstr ""
-#: Programs/menu_prefs.c:748
-#: Programs/menu_prefs.c:1014
+#: Programs/menu_prefs.c:749
+#: Programs/menu_prefs.c:1015
msgid "Medium"
msgstr ""
@@ -1210,34 +1266,38 @@ msgstr ""
msgid "Melodic Tom"
msgstr ""
-#: Programs/menu_prefs.c:680
+#: Programs/menu_prefs.c:681
msgid "Menu Options"
msgstr ""
-#: Programs/config.c:662
+#: Programs/config.c:661
msgid "Message hold timeout (in 10ms units)."
msgstr ""
-#: Programs/menu_prefs.c:746
-#: Programs/menu_prefs.c:1012
+#: Programs/menu_prefs.c:747
+#: Programs/menu_prefs.c:1013
msgid "Minimum"
msgstr ""
-#: Programs/config.c:513
+#: Programs/config.c:512
#, c-format
msgid "Minimum screen content quality to autospeak (one of {%s})."
msgstr ""
-#: Programs/menu_prefs.c:1333
+#: Programs/menu_prefs.c:1334
msgid "Month Day Year"
msgstr ""
+#: Programs/spk.c:281
+msgid "Most"
+msgstr ""
+
#. xgettext: This is the name of MIDI musical instrument #11 (in the Chromatic Percussion group).
#: Programs/midi.c:111
msgid "Music Box"
msgstr ""
-#: Programs/menu_prefs.c:1060
+#: Programs/menu_prefs.c:1061
msgid "Musical Instrument Digital Interface"
msgstr ""
@@ -1246,58 +1306,66 @@ msgstr ""
msgid "Muted Trumpet"
msgstr ""
-#: Programs/config.c:567
+#: Programs/config.c:566
msgid "Name of or path to GUI keyboard table."
msgstr ""
-#: Programs/config.c:471
+#: Programs/config.c:470
msgid "Name of or path to attributes table."
msgstr ""
-#: Programs/config.c:463
+#: Programs/config.c:462
msgid "Name of or path to contraction table."
msgstr ""
-#: Programs/config.c:576
+#: Programs/config.c:575
msgid "Name of or path to default preferences file."
msgstr ""
-#: Programs/config.c:543
+#: Programs/config.c:542
msgid "Name of or path to keyboard table."
msgstr ""
-#: Programs/config.c:499
+#: Programs/config.c:505
msgid "Name of or path to speech input object."
msgstr ""
-#: Programs/config.c:453
+#: Programs/config.c:452
#, c-format
msgid "Name of or path to text table (or %s)."
msgstr ""
-#: Programs/menu_prefs.c:846
+#: Programs/menu_prefs.c:847
msgid "Navigation Options"
msgstr ""
-#: Programs/menu.c:523
+#: Programs/menu.c:504
msgid "No"
msgstr ""
-#: Programs/menu_prefs.c:721
+#: Programs/menu_prefs.c:1743
+msgid "No API"
+msgstr ""
+
+#: Programs/menu_prefs.c:722
msgid "No Capitalization"
msgstr ""
-#: Programs/menu_prefs.c:899
-#: Programs/menu_prefs.c:1212
-#: Programs/menu_prefs.c:1225
-#: Programs/menu_prefs.c:1238
-#: Programs/menu_prefs.c:1321
-#: Programs/menu_prefs.c:1360
-#: Programs/menu_prefs.c:1380
+#: Programs/menu_prefs.c:1712
+msgid "No Daemon"
+msgstr ""
+
+#: Programs/menu_prefs.c:900
+#: Programs/menu_prefs.c:1226
+#: Programs/menu_prefs.c:1239
+#: Programs/menu_prefs.c:1322
+#: Programs/menu_prefs.c:1361
+#: Programs/menu_prefs.c:1381
+#: Programs/spk.c:279
msgid "None"
msgstr ""
-#: Programs/menu_prefs.c:1515
+#: Programs/menu_prefs.c:1764
msgid "Notice"
msgstr ""
@@ -1311,15 +1379,15 @@ msgstr ""
msgid "Ocarina"
msgstr ""
-#: Programs/menu_prefs.c:962
+#: Programs/menu_prefs.c:963
msgid "Off"
msgstr ""
-#: Programs/config.c:1926
+#: Programs/config.c:1934
msgid "Old Preferences File"
msgstr ""
-#: Programs/menu_prefs.c:975
+#: Programs/menu_prefs.c:976
msgid "On First Release"
msgstr ""
@@ -1351,32 +1419,44 @@ msgstr ""
msgid "Overdriven Guitar"
msgstr ""
+#: Programs/menu_prefs.c:1561
+msgid "Override Preferences"
+msgstr ""
+
#: Drivers/Braille/Iris/braille.c:1548
msgid "PC mode"
msgstr ""
-#: Programs/menu_prefs.c:1059
+#: Programs/menu_prefs.c:1060
msgid "PCM"
msgstr ""
-#: Programs/config.c:692
+#: Programs/config.c:691
msgid "PCM (soundcard digital audio) device specifier."
msgstr ""
-#: Programs/menu_prefs.c:1072
+#: Programs/menu_prefs.c:1684
+msgid "PCM Device"
+msgstr ""
+
+#: Programs/menu_prefs.c:1073
msgid "PCM Volume"
msgstr ""
+#: Programs/menu_prefs.c:1707
+msgid "PID File"
+msgstr ""
+
#. xgettext: This is the description of the PASSPS2 command.
-#: Programs/cmds.auto.h:1503
+#: Programs/cmds.auto.h:1518
msgid "PS/2 (set 3) keyboard scan code"
msgstr ""
-#: Programs/menu_prefs.c:1453
+#: Programs/menu_prefs.c:1476
msgid "Package Revision"
msgstr ""
-#: Programs/menu_prefs.c:1448
+#: Programs/menu_prefs.c:1471
msgid "Package Version"
msgstr ""
@@ -1426,84 +1506,88 @@ msgstr ""
msgid "Pan Flute"
msgstr ""
-#: Programs/config.c:601
+#: Programs/config.c:600
msgid "Parameters for the application programming interface."
msgstr ""
-#: Programs/config.c:421
+#: Programs/config.c:420
msgid "Parameters for the braille driver."
msgstr ""
-#: Programs/config.c:654
+#: Programs/config.c:653
msgid "Parameters for the privilege establishment stage."
msgstr ""
-#: Programs/config.c:534
+#: Programs/config.c:533
msgid "Parameters for the screen driver."
msgstr ""
-#: Programs/config.c:491
+#: Programs/config.c:490
msgid "Parameters for the speech driver."
msgstr ""
-#: Programs/config.c:400
+#: Programs/config.c:399
msgid "Path to default settings file."
msgstr ""
-#: Programs/config.c:723
+#: Programs/config.c:722
msgid "Path to directory containing drivers."
msgstr ""
+#: Programs/config.c:732
+msgid "Path to directory containing helper commands."
+msgstr ""
+
#: Programs/brltest.c:65
-#: Programs/brltty-atb.c:35
-#: Programs/brltty-ctb.c:96
-#: Programs/brltty-ktb.c:80
-#: Programs/config.c:713
+#: Programs/brltty-atb.c:36
+#: Programs/brltty-ctb.c:97
+#: Programs/brltty-ktb.c:81
+#: Programs/config.c:712
msgid "Path to directory containing tables."
msgstr ""
-#: Programs/brltty-ttb.c:186
+#: Programs/brltty-ttb.c:187
msgid "Path to directory containing text tables."
msgstr ""
-#: Programs/brltty-ktb.c:89
+#: Programs/brltty-ktb.c:90
msgid "Path to directory for loading drivers."
msgstr ""
-#: Programs/brltty-trtxt.c:79
+#: Programs/brltty-trtxt.c:80
msgid "Path to directory for text tables."
msgstr ""
#: Programs/brltest.c:83
-#: Programs/config.c:743
+#: Programs/config.c:752
msgid "Path to directory which can be written to."
msgstr ""
-#: Programs/config.c:733
+#: Programs/config.c:742
msgid "Path to directory which contains files that can be updated."
msgstr ""
-#: Programs/config.c:752
+#: Programs/config.c:761
msgid "Path to directory which contains message localizations."
msgstr ""
-#: Programs/brltty-trtxt.c:50
+#: Programs/brltty-trtxt.c:51
msgid "Path to input text table."
msgstr ""
-#: Programs/config.c:626
+#: Programs/config.c:625
msgid "Path to log file."
msgstr ""
-#: Programs/brltty-trtxt.c:58
+#: Programs/brltty-trtxt.c:59
msgid "Path to output text table."
msgstr ""
-#: Programs/config.c:761
+#: Programs/config.c:770
msgid "Path to process identifier file."
msgstr ""
-#: Programs/config.c:683
+#: Programs/config.c:682
msgid "Patterns that match command prompts."
msgstr ""
@@ -1533,6 +1617,10 @@ msgstr ""
msgid "Pipe"
msgstr ""
+#: Programs/spk.c:263
+msgid "Pitch"
+msgstr ""
+
#. xgettext: This is the name of MIDI musical instrument #46 (in the Strings group).
#: Programs/midi.c:220
msgid "Pizzicato Strings"
@@ -1542,7 +1630,8 @@ msgstr ""
msgid "Powerdown"
msgstr ""
-#: Programs/menu_prefs.c:1483
+#: Programs/menu_prefs.c:1496
+#: Programs/menu_prefs.c:1556
msgid "Preferences File"
msgstr ""
@@ -1550,22 +1639,46 @@ msgstr ""
msgid "Preferences Menu"
msgstr ""
-#: Programs/menu_prefs.c:1434
+#: Programs/menu_prefs.c:1717
+msgid "Privilege Parameters"
+msgstr ""
+
+#: Programs/menu_prefs.c:1435
msgid "Profiles"
msgstr ""
-#: Programs/config.c:551
+#: Programs/menu_prefs.c:1537
+msgid "Program Options"
+msgstr ""
+
+#: Programs/menu_prefs.c:1737
+msgid "Prompt Patterns"
+msgstr ""
+
+#: Programs/config.c:550
msgid "Properties of eligible keyboards."
msgstr ""
-#: Programs/menu_prefs.c:952
+#: Programs/spk.c:299
+msgid "Punctuation"
+msgstr ""
+
+#: Programs/menu_prefs.c:953
msgid "Quick Space"
msgstr ""
-#: Programs/menu_prefs.c:1229
+#: Programs/menu_prefs.c:1662
+msgid "Quiet If No Braille"
+msgstr ""
+
+#: Programs/menu_prefs.c:1230
msgid "Raise Pitch"
msgstr ""
+#: Programs/spk.c:237
+msgid "Rate"
+msgstr ""
+
#: Programs/brltty-hid.c:181
msgid "Read (get) a feature report (two hexadecimal digits)."
msgstr ""
@@ -1574,7 +1687,7 @@ msgstr ""
msgid "Read (get) an input report (two hexadecimal digits)."
msgstr ""
-#: Programs/config.c:390
+#: Programs/config.c:389
msgid "Recognize environment variables."
msgstr ""
@@ -1593,11 +1706,15 @@ msgstr ""
msgid "Reed Organ"
msgstr ""
-#: Programs/brltty-ctb.c:59
+#: Programs/brltty-ctb.c:60
msgid "Reformat input."
msgstr ""
-#: Programs/config.c:443
+#: Programs/menu_prefs.c:1646
+msgid "Release Device"
+msgstr ""
+
+#: Programs/config.c:442
msgid "Release braille device when screen or window is unreadable."
msgstr ""
@@ -1605,40 +1722,40 @@ msgstr ""
msgid "Remain a foreground process"
msgstr ""
-#: Programs/config.c:638
+#: Programs/config.c:637
msgid "Remain a foreground process."
msgstr ""
-#: Programs/brltty-trtxt.c:64
+#: Programs/brltty-trtxt.c:65
msgid "Remove dots seven and eight."
msgstr ""
-#: Programs/config.c:781
+#: Programs/config.c:790
#, c-format
msgid "Remove the %s service, and then exit."
msgstr ""
-#: Programs/brltty-ktb.c:53
+#: Programs/brltty-ktb.c:54
msgid "Report problems with the key table."
msgstr ""
-#: Programs/brltty-ttb.c:176
+#: Programs/brltty-ttb.c:177
msgid "Report the characters within the current screen font that aren't defined within the text table."
msgstr ""
-#: Programs/menu_prefs.c:868
+#: Programs/menu_prefs.c:869
msgid "Rest of Line"
msgstr ""
-#: Programs/menu_prefs.c:1582
+#: Programs/menu_prefs.c:1449
msgid "Restart Braille Driver"
msgstr ""
-#: Programs/menu_prefs.c:1594
+#: Programs/menu_prefs.c:1461
msgid "Restart Screen Driver"
msgstr ""
-#: Programs/menu_prefs.c:1588
+#: Programs/menu_prefs.c:1455
msgid "Restart Speech Driver"
msgstr ""
@@ -1647,7 +1764,7 @@ msgstr ""
msgid "Reverse Cymbal"
msgstr ""
-#: Programs/menu_prefs.c:1362
+#: Programs/menu_prefs.c:1363
msgid "Right"
msgstr ""
@@ -1656,58 +1773,66 @@ msgstr ""
msgid "Rock Organ"
msgstr ""
-#: Programs/brltty-pty.c:389
+#: Programs/brltty-pty.c:418
msgid "Run a shell or terminal manager within a pty (virtual terminal) and export its screen via a shared memory segment so that brltty can read it via its Terminal Emulator screen driver."
msgstr ""
-#: Programs/menu_prefs.c:675
+#: Programs/menu_prefs.c:676
msgid "Save on Exit"
msgstr ""
#. "cap" here, used during speech output, is short for "capital".
#. It is spoken just before an uppercase letter, e.g. "cap A".
-#: Programs/menu_prefs.c:1228
+#: Programs/menu_prefs.c:1229
msgid "Say Cap"
msgstr ""
-#: Programs/menu_prefs.c:1252
+#: Programs/menu_prefs.c:1253
msgid "Say Line Mode"
msgstr ""
-#: Programs/menu_prefs.c:1239
+#: Programs/menu_prefs.c:1240
msgid "Say Space"
msgstr ""
-#: Programs/menu_prefs.c:781
+#: Programs/menu_prefs.c:782
msgid "Screen Cursor Blink Period"
msgstr ""
-#: Programs/menu_prefs.c:789
+#: Programs/menu_prefs.c:790
msgid "Screen Cursor Percent Visible"
msgstr ""
-#: Programs/menu_prefs.c:769
+#: Programs/menu_prefs.c:770
msgid "Screen Cursor Style"
msgstr ""
+#: Programs/menu_prefs.c:1673
+msgid "Screen Driver"
+msgstr ""
+
#: Programs/log.c:167
msgid "Screen Driver Events"
msgstr ""
-#: Programs/menu_prefs.c:550
+#: Programs/menu_prefs.c:551
msgid "Screen Number"
msgstr ""
-#: Programs/config.c:524
+#: Programs/menu_prefs.c:1678
+msgid "Screen Parameters"
+msgstr ""
+
+#: Programs/config.c:523
#, c-format
msgid "Screen driver code (%s, %s, or one of {%s})."
msgstr ""
-#: Programs/config.c:877
+#: Programs/config.c:886
msgid "Screen reader for those who use a braille device."
msgstr ""
-#: Programs/menu_prefs.c:893
+#: Programs/menu_prefs.c:894
msgid "Scroll-aware Cursor Navigation"
msgstr ""
@@ -1739,31 +1864,31 @@ msgstr ""
msgid "Shanai"
msgstr ""
-#: Programs/menu_prefs.c:688
+#: Programs/menu_prefs.c:689
msgid "Show Advanced Submenus"
msgstr ""
-#: Programs/menu_prefs.c:693
+#: Programs/menu_prefs.c:694
msgid "Show All Items"
msgstr ""
-#: Programs/menu_prefs.c:797
+#: Programs/menu_prefs.c:798
msgid "Show Attributes"
msgstr ""
-#: Programs/menu_prefs.c:764
+#: Programs/menu_prefs.c:765
msgid "Show Screen Cursor"
msgstr ""
-#: Programs/menu_prefs.c:1315
+#: Programs/menu_prefs.c:1316
msgid "Show Seconds"
msgstr ""
-#: Programs/menu_prefs.c:1257
+#: Programs/menu_prefs.c:1258
msgid "Show Speech Cursor"
msgstr ""
-#: Programs/menu_prefs.c:683
+#: Programs/menu_prefs.c:684
msgid "Show Submenu Sizes"
msgstr ""
@@ -1797,15 +1922,15 @@ msgstr ""
msgid "Sitar"
msgstr ""
-#: Programs/menu_prefs.c:860
+#: Programs/menu_prefs.c:861
msgid "Skip Blank Braille Windows"
msgstr ""
-#: Programs/menu_prefs.c:854
+#: Programs/menu_prefs.c:855
msgid "Skip Identical Lines"
msgstr ""
-#: Programs/menu_prefs.c:871
+#: Programs/menu_prefs.c:872
msgid "Skip Which Blank Braille Windows"
msgstr ""
@@ -1819,15 +1944,15 @@ msgstr ""
msgid "Slap Bass 2"
msgstr ""
-#: Programs/menu_prefs.c:1345
+#: Programs/menu_prefs.c:1346
msgid "Slash"
msgstr ""
-#: Programs/menu_prefs.c:876
+#: Programs/menu_prefs.c:877
msgid "Sliding Braille Window"
msgstr ""
-#: Programs/menu_prefs.c:1213
+#: Programs/spk.c:280
msgid "Some"
msgstr ""
@@ -1842,63 +1967,67 @@ msgstr ""
msgid "Sound Effects"
msgstr ""
-#: Programs/menu_prefs.c:561
-#: Programs/menu_prefs.c:1381
+#: Programs/menu_prefs.c:562
+#: Programs/menu_prefs.c:1382
msgid "Space"
msgstr ""
-#: Programs/menu_prefs.c:1174
+#: Programs/menu_prefs.c:1175
msgid "Speak Completed Words"
msgstr ""
-#: Programs/menu_prefs.c:1162
+#: Programs/menu_prefs.c:1163
msgid "Speak Deleted Characters"
msgstr ""
-#: Programs/menu_prefs.c:1144
+#: Programs/menu_prefs.c:1145
msgid "Speak Empty Line"
msgstr ""
-#: Programs/menu_prefs.c:1156
+#: Programs/menu_prefs.c:1157
msgid "Speak Inserted Characters"
msgstr ""
-#: Programs/menu_prefs.c:1117
+#: Programs/menu_prefs.c:1118
msgid "Speak Key Context"
msgstr ""
-#: Programs/menu_prefs.c:1180
+#: Programs/menu_prefs.c:1181
msgid "Speak Line Indent"
msgstr ""
-#: Programs/menu_prefs.c:1122
+#: Programs/menu_prefs.c:1123
msgid "Speak Modifier Key"
msgstr ""
-#: Programs/menu_prefs.c:1168
+#: Programs/menu_prefs.c:1169
msgid "Speak Replaced Characters"
msgstr ""
-#: Programs/menu_prefs.c:1150
+#: Programs/menu_prefs.c:1151
msgid "Speak Selected Character"
msgstr ""
-#: Programs/menu_prefs.c:1138
+#: Programs/menu_prefs.c:1139
msgid "Speak Selected Line"
msgstr ""
-#: Programs/menu_prefs.c:1274
+#: Programs/menu_prefs.c:1275
msgid "Speech Cursor Blink Period"
msgstr ""
-#: Programs/menu_prefs.c:1282
+#: Programs/menu_prefs.c:1283
msgid "Speech Cursor Percent Visible"
msgstr ""
-#: Programs/menu_prefs.c:1262
+#: Programs/menu_prefs.c:1263
msgid "Speech Cursor Style"
msgstr ""
+#: Programs/menu_prefs.c:1652
+msgid "Speech Driver"
+msgstr ""
+
#: Programs/log.c:161
msgid "Speech Driver Events"
msgstr ""
@@ -1907,85 +2036,105 @@ msgstr ""
msgid "Speech Events"
msgstr ""
-#: Programs/menu_prefs.c:1187
+#: Programs/menu_prefs.c:1667
+msgid "Speech Input"
+msgstr ""
+
+#: Programs/menu_prefs.c:1188
msgid "Speech Options"
msgstr ""
-#: Programs/menu_prefs.c:1204
+#: Programs/menu_prefs.c:1657
+msgid "Speech Parameters"
+msgstr ""
+
+#: Programs/menu_prefs.c:1205
msgid "Speech Pitch"
msgstr ""
-#: Programs/menu_prefs.c:1217
+#: Programs/menu_prefs.c:1218
msgid "Speech Punctuation"
msgstr ""
-#: Programs/menu_prefs.c:1197
+#: Programs/menu_prefs.c:1198
msgid "Speech Rate"
msgstr ""
-#: Programs/menu_prefs.c:1232
+#: Programs/menu_prefs.c:1233
msgid "Speech Uppercase Indicator"
msgstr ""
-#: Programs/menu_prefs.c:1190
+#: Programs/menu_prefs.c:1191
msgid "Speech Volume"
msgstr ""
-#: Programs/menu_prefs.c:1242
+#: Programs/menu_prefs.c:1243
msgid "Speech Whitespace Indicator"
msgstr ""
-#: Programs/config.c:481
+#: Programs/config.c:480
#, c-format
msgid "Speech driver code (%s, %s, or one of {%s})."
msgstr ""
-#: Programs/menu_prefs.c:1529
+#: Programs/menu_prefs.c:1775
msgid "Standard Error Log Level"
msgstr ""
-#: Programs/menu_prefs.c:928
+#: Programs/menu_prefs.c:1727
+msgid "Start Message"
+msgstr ""
+
+#: Programs/menu_prefs.c:929
msgid "Start Selection with Routing Key"
msgstr ""
-#: Programs/menu_prefs.c:551
+#: Programs/menu_prefs.c:552
msgid "State Dots"
msgstr ""
-#: Programs/menu_prefs.c:552
+#: Programs/menu_prefs.c:553
msgid "State Letter"
msgstr ""
-#: Programs/menu_prefs.c:1356
+#: Programs/menu_prefs.c:1357
msgid "Status Cells"
msgstr ""
-#: Programs/menu_prefs.c:1372
+#: Programs/menu_prefs.c:1373
msgid "Status Count"
msgstr ""
-#: Programs/menu_prefs.c:565
+#: Programs/menu_prefs.c:566
msgid "Status Field"
msgstr ""
-#: Programs/menu_prefs.c:1365
+#: Programs/menu_prefs.c:1366
msgid "Status Position"
msgstr ""
-#: Programs/menu_prefs.c:1387
+#: Programs/menu_prefs.c:1388
msgid "Status Separator"
msgstr ""
-#: Programs/menu_prefs.c:1383
+#: Programs/menu_prefs.c:1384
msgid "Status Side"
msgstr ""
+#: Programs/menu_prefs.c:1722
+msgid "Stay Privileged"
+msgstr ""
+
#. xgettext: This is the name of MIDI musical instrument #115 (in the Percussive group).
#: Programs/midi.c:437
msgid "Steel Drums"
msgstr ""
-#: Programs/config.c:767
+#: Programs/menu_prefs.c:1732
+msgid "Stop Message"
+msgstr ""
+
+#: Programs/config.c:776
#, c-format
msgid "Stop an existing instance of %s, and then exit."
msgstr ""
@@ -2006,11 +2155,11 @@ msgstr ""
msgid "Strings"
msgstr ""
-#: Programs/menu_prefs.c:723
+#: Programs/menu_prefs.c:724
msgid "Superimpose Dot 7"
msgstr ""
-#: Programs/config.c:609
+#: Programs/config.c:608
msgid "Suppress start-up messages."
msgstr ""
@@ -2077,11 +2226,12 @@ msgstr ""
msgid "SynthStrings 2"
msgstr ""
-#: Programs/menu_prefs.c:1524
+#: Programs/menu_prefs.c:1770
msgid "System Log Level"
msgstr ""
-#: Programs/menu_prefs.c:1498
+#: Programs/menu_prefs.c:1506
+#: Programs/menu_prefs.c:1566
msgid "Tables Directory"
msgstr ""
@@ -2113,11 +2263,11 @@ msgstr ""
msgid "Test a braille driver."
msgstr ""
-#: Programs/scrtest.c:137
+#: Programs/scrtest.c:138
msgid "Test a screen driver."
msgstr ""
-#: Programs/spktest.c:115
+#: Programs/spktest.c:116
msgid "Test a speech driver."
msgstr ""
@@ -2129,19 +2279,20 @@ msgstr ""
msgid "Test supported CRC (Cyclic Redundancy Check) checksum algorithms."
msgstr ""
-#: Programs/menu_prefs.c:761
+#: Programs/menu_prefs.c:762
msgid "Text Indicators"
msgstr ""
-#: Programs/menu_prefs.c:1384
+#: Programs/menu_prefs.c:1385
msgid "Text Side"
msgstr ""
-#: Programs/menu_prefs.c:1412
+#: Programs/menu_prefs.c:1413
+#: Programs/menu_prefs.c:1596
msgid "Text Table"
msgstr ""
-#: Programs/brltty-ctb.c:80
+#: Programs/brltty-ctb.c:81
msgid "Text table."
msgstr ""
@@ -2153,27 +2304,27 @@ msgstr ""
msgid "The input timeout (in seconds)."
msgstr ""
-#: Programs/config.c:669
+#: Programs/config.c:668
msgid "The text to be shown when the braille driver starts and to be spoken when the speech driver starts."
msgstr ""
-#: Programs/config.c:676
+#: Programs/config.c:675
msgid "The text to be shown when the braille driver stops."
msgstr ""
-#: Programs/menu_prefs.c:553
+#: Programs/menu_prefs.c:554
msgid "Time"
msgstr ""
-#: Programs/menu_prefs.c:1300
+#: Programs/menu_prefs.c:1301
msgid "Time Format"
msgstr ""
-#: Programs/menu_prefs.c:1292
+#: Programs/menu_prefs.c:1293
msgid "Time Presentation"
msgstr ""
-#: Programs/menu_prefs.c:1310
+#: Programs/menu_prefs.c:1311
msgid "Time Separator"
msgstr ""
@@ -2188,35 +2339,35 @@ msgstr ""
msgid "Tinkle Bell"
msgstr ""
-#: Programs/menu_prefs.c:1578
+#: Programs/menu_prefs.c:1445
msgid "Tools"
msgstr ""
-#: Programs/menu_prefs.c:1005
+#: Programs/menu_prefs.c:1006
msgid "Touch Navigation"
msgstr ""
-#: Programs/menu_prefs.c:1019
+#: Programs/menu_prefs.c:1020
msgid "Touch Sensitivity"
msgstr ""
-#: Programs/menu_prefs.c:917
+#: Programs/menu_prefs.c:918
msgid "Track Screen Pointer"
msgstr ""
-#: Programs/menu_prefs.c:911
+#: Programs/menu_prefs.c:912
msgid "Track Screen Scroll"
msgstr ""
-#: Programs/brltty-trtxt.c:239
+#: Programs/brltty-trtxt.c:240
msgid "Translate one binary braille representation to another."
msgstr ""
-#: Programs/brltty-morse.c:136
+#: Programs/brltty-morse.c:137
msgid "Translate text into Morse Code tones."
msgstr ""
-#: Programs/menu_prefs.c:943
+#: Programs/menu_prefs.c:944
msgid "Translated via Text Table"
msgstr ""
@@ -2246,11 +2397,11 @@ msgstr ""
msgid "Tubular Bells"
msgstr ""
-#: Programs/menu_prefs.c:1064
+#: Programs/menu_prefs.c:1065
msgid "Tune Device"
msgstr ""
-#: Programs/menu_prefs.c:947
+#: Programs/menu_prefs.c:948
msgid "Typing Mode"
msgstr ""
@@ -2258,7 +2409,7 @@ msgstr ""
msgid "USB I/O"
msgstr ""
-#: Programs/menu_prefs.c:664
+#: Programs/menu_prefs.c:665
msgid "Underline"
msgstr ""
@@ -2266,7 +2417,8 @@ msgstr ""
msgid "Unfrozen"
msgstr ""
-#: Programs/menu_prefs.c:1478
+#: Programs/menu_prefs.c:1521
+#: Programs/menu_prefs.c:1581
msgid "Updatable Directory"
msgstr ""
@@ -2274,7 +2426,7 @@ msgstr ""
msgid "Update Events"
msgstr ""
-#: Programs/menu_prefs.c:722
+#: Programs/menu_prefs.c:723
msgid "Use Capital Sign"
msgstr ""
@@ -2299,11 +2451,15 @@ msgstr ""
msgid "Voice Oohs"
msgstr ""
-#: Programs/menu_prefs.c:1514
+#: Programs/spk.c:211
+msgid "Volume"
+msgstr ""
+
+#: Programs/menu_prefs.c:1763
msgid "Warning"
msgstr ""
-#: Programs/menu_prefs.c:1458
+#: Programs/menu_prefs.c:1481
msgid "Web Site"
msgstr ""
@@ -2312,16 +2468,16 @@ msgstr ""
msgid "Whistle"
msgstr ""
-#: Programs/menu_prefs.c:543
+#: Programs/menu_prefs.c:544
msgid "Window Column"
msgstr ""
-#: Programs/menu_prefs.c:542
-#: Programs/menu_prefs.c:558
+#: Programs/menu_prefs.c:543
+#: Programs/menu_prefs.c:559
msgid "Window Coordinates"
msgstr ""
-#: Programs/menu_prefs.c:544
+#: Programs/menu_prefs.c:545
msgid "Window Row"
msgstr ""
@@ -2330,11 +2486,12 @@ msgstr ""
msgid "Woodblock"
msgstr ""
-#: Programs/menu_prefs.c:849
+#: Programs/menu_prefs.c:850
msgid "Word Wrap"
msgstr ""
-#: Programs/menu_prefs.c:1488
+#: Programs/menu_prefs.c:1526
+#: Programs/menu_prefs.c:1586
msgid "Writable Directory"
msgstr ""
@@ -2358,7 +2515,7 @@ msgstr ""
msgid "Write the hexadecimal array representation of a compiled table."
msgstr ""
-#: Programs/config.c:788
+#: Programs/config.c:797
msgid "Write the start-up logs, and then exit."
msgstr ""
@@ -2366,15 +2523,15 @@ msgstr ""
msgid "X display to connect to"
msgstr ""
-#: Programs/pgmprivs_linux.c:1951
+#: Programs/pgmprivs_linux.c:1953
msgid "XDG runtime directory access problem"
msgstr ""
-#: Programs/pgmprivs_linux.c:1933
+#: Programs/pgmprivs_linux.c:1935
msgid "XDG runtime directory created"
msgstr ""
-#: Programs/pgmprivs_linux.c:1928
+#: Programs/pgmprivs_linux.c:1930
msgid "XDG runtime directory exists"
msgstr ""
@@ -2387,7 +2544,7 @@ msgid "XFree(wm_name) for change"
msgstr ""
#. xgettext: This is the description of the PASSXT command.
-#: Programs/cmds.auto.h:1495
+#: Programs/cmds.auto.h:1510
msgid "XT (set 1) keyboard scan code"
msgstr ""
@@ -2396,11 +2553,11 @@ msgstr ""
msgid "Xylophone"
msgstr ""
-#: Programs/menu_prefs.c:1332
+#: Programs/menu_prefs.c:1333
msgid "Year Month Day"
msgstr ""
-#: Programs/menu.c:524
+#: Programs/menu.c:505
msgid "Yes"
msgstr ""
@@ -2408,7 +2565,7 @@ msgstr ""
msgid "[host][:port]"
msgstr ""
-#: Programs/menu_prefs.c:665
+#: Programs/menu_prefs.c:666
msgid "all dots"
msgstr ""
@@ -2417,12 +2574,12 @@ msgid "and"
msgstr ""
#. xgettext: This is the description of the CLIP_APPEND command.
-#: Programs/cmds.auto.h:1353
+#: Programs/cmds.auto.h:1368
msgid "append characters to clipboard"
msgstr ""
#. xgettext: This is the description of the CLIP_ADD command.
-#: Programs/cmds.auto.h:1230
+#: Programs/cmds.auto.h:1245
msgid "append to clipboard from character"
msgstr ""
@@ -2431,7 +2588,7 @@ msgid "at cursor"
msgstr ""
#. xgettext: This is the description of the KEY_BACKSPACE command.
-#: Programs/cmds.auto.h:1559
+#: Programs/cmds.auto.h:1574
msgid "backspace key"
msgstr ""
@@ -2441,7 +2598,7 @@ msgid "battery low"
msgstr ""
#. xgettext: This is the description of the SELECTVT command.
-#: Programs/cmds.auto.h:1453
+#: Programs/cmds.auto.h:1468
msgid "bind to specific virtual terminal"
msgstr ""
@@ -2460,11 +2617,11 @@ msgstr ""
msgid "black"
msgstr ""
-#: Programs/update.c:1021
+#: Programs/update.c:1022
msgid "blank"
msgstr ""
-#: Programs/core.c:1157
+#: Programs/core.c:1158
msgid "blank line"
msgstr ""
@@ -2477,7 +2634,7 @@ msgstr ""
msgid "blue"
msgstr ""
-#: Programs/config.c:3104
+#: Programs/config.c:3113
#, c-format
msgid "braille device not specified"
msgstr ""
@@ -2487,11 +2644,11 @@ msgstr ""
msgid "braille display temporarily unavailable"
msgstr ""
-#: Programs/config.c:1942
+#: Programs/config.c:1950
msgid "braille driver not loadable"
msgstr ""
-#: Programs/config.c:2203
+#: Programs/config.c:2211
msgid "braille driver restarting"
msgstr ""
@@ -2504,7 +2661,7 @@ msgid "braille released"
msgstr ""
#. xgettext: This is the description of the ROUTE command.
-#: Programs/cmds.auto.h:1214
+#: Programs/cmds.auto.h:1229
msgid "bring screen cursor to character"
msgstr ""
@@ -2514,7 +2671,7 @@ msgid "bring screen cursor to current line"
msgstr ""
#. xgettext: This is the description of the ROUTE_LINE command.
-#: Programs/cmds.auto.h:1411
+#: Programs/cmds.auto.h:1426
msgid "bring screen cursor to line"
msgstr ""
@@ -2524,7 +2681,7 @@ msgid "bring screen cursor to speech cursor"
msgstr ""
#. xgettext: This is the description of the ROUTE_SPEECH command.
-#: Programs/cmds.auto.h:1445
+#: Programs/cmds.auto.h:1460
msgid "bring speech cursor to character"
msgstr ""
@@ -2566,7 +2723,7 @@ msgstr ""
msgid "cannot compile contraction table"
msgstr ""
-#: Programs/config.c:1844
+#: Programs/config.c:1852
msgid "cannot compile key table"
msgstr ""
@@ -2589,7 +2746,7 @@ msgstr ""
msgid "cannot connect to display %s\n"
msgstr ""
-#: Programs/file.c:437
+#: Programs/file.c:468
msgid "cannot create directory"
msgstr ""
@@ -2598,8 +2755,8 @@ msgstr ""
msgid "cannot determine program directory"
msgstr ""
-#: Programs/config.c:3062
-#: Programs/menu.c:618
+#: Programs/config.c:3070
+#: Programs/menu.c:601
msgid "cannot determine working directory"
msgstr ""
@@ -2607,10 +2764,6 @@ msgstr ""
msgid "cannot find procedure"
msgstr ""
-#: Programs/program.c:165
-msgid "cannot fix install path"
-msgstr ""
-
#: Programs/xbrlapi.c:285
msgid "cannot get tty\n"
msgstr ""
@@ -2620,7 +2773,7 @@ msgstr ""
msgid "cannot get tty %d\n"
msgstr ""
-#: Programs/file.c:576
+#: Programs/file.c:592
msgid "cannot get working directory"
msgstr ""
@@ -2649,19 +2802,19 @@ msgstr ""
msgid "cannot load text table"
msgstr ""
-#: Programs/file.c:426
+#: Programs/file.c:457
msgid "cannot make world writable"
msgstr ""
-#: Programs/config.c:1277
+#: Programs/config.c:1285
msgid "cannot open key help"
msgstr ""
-#: Programs/program.c:289
+#: Programs/program.c:256
msgid "cannot open process identifier file"
msgstr ""
-#: Programs/menu.c:616
+#: Programs/menu.c:599
msgid "cannot open working directory"
msgstr ""
@@ -2674,8 +2827,8 @@ msgstr ""
msgid "cannot set focus to %#010x\n"
msgstr ""
-#: Programs/file.c:590
-#: Programs/menu.c:605
+#: Programs/file.c:606
+#: Programs/menu.c:588
msgid "cannot set working directory"
msgstr ""
@@ -2685,12 +2838,12 @@ msgstr ""
#. "cap" here, used during speech output, is short for "capital".
#. It is spoken just before an uppercase letter, e.g. "cap A".
-#: Programs/core.c:1086
+#: Programs/core.c:1087
msgid "cap"
msgstr ""
-#: Programs/menu_prefs.c:888
-#: Programs/menu_prefs.c:1373
+#: Programs/menu_prefs.c:889
+#: Programs/menu_prefs.c:1374
msgid "cells"
msgstr ""
@@ -2698,7 +2851,7 @@ msgstr ""
msgid "changes discarded"
msgstr ""
-#: Programs/brltty-ktb.c:290
+#: Programs/brltty-ktb.c:291
msgid "check a key table, list the key naems it can use, or write the key bindings it defines in useful formats."
msgstr ""
@@ -2712,11 +2865,11 @@ msgstr ""
msgid "clear the text selection"
msgstr ""
-#: Programs/cmd_speech.c:501
+#: Programs/cmd_speech.c:515
msgid "column"
msgstr ""
-#: Programs/brltty-pty.c:240
+#: Programs/brltty-pty.c:260
msgid "command not found"
msgstr ""
@@ -2733,12 +2886,12 @@ msgstr ""
msgid "console not in use"
msgstr ""
-#: Programs/menu_prefs.c:1058
+#: Programs/menu_prefs.c:1059
msgid "console tone generator"
msgstr ""
#. xgettext: This is the description of the CLIP_COPY command.
-#: Programs/cmds.auto.h:1345
+#: Programs/cmds.auto.h:1360
msgid "copy characters to clipboard"
msgstr ""
@@ -2747,32 +2900,32 @@ msgstr ""
msgid "copy selected text to host clipboard"
msgstr ""
-#: Programs/config.c:660
+#: Programs/config.c:659
msgid "csecs"
msgstr ""
#. xgettext: This is the description of the TOUCH_AT command.
-#: Programs/cmds.auto.h:1519
+#: Programs/cmds.auto.h:1534
msgid "current reading location"
msgstr ""
#. xgettext: This is the description of the KEY_CURSOR_DOWN command.
-#: Programs/cmds.auto.h:1599
+#: Programs/cmds.auto.h:1614
msgid "cursor-down key"
msgstr ""
#. xgettext: This is the description of the KEY_CURSOR_LEFT command.
-#: Programs/cmds.auto.h:1575
+#: Programs/cmds.auto.h:1590
msgid "cursor-left key"
msgstr ""
#. xgettext: This is the description of the KEY_CURSOR_RIGHT command.
-#: Programs/cmds.auto.h:1583
+#: Programs/cmds.auto.h:1598
msgid "cursor-right key"
msgstr ""
#. xgettext: This is the description of the KEY_CURSOR_UP command.
-#: Programs/cmds.auto.h:1591
+#: Programs/cmds.auto.h:1606
msgid "cursor-up key"
msgstr ""
@@ -2786,6 +2939,11 @@ msgstr ""
msgid "cyan"
msgstr ""
+#. xgettext: This is the description of the SPK_PUNCT_LEVEL command.
+#: Programs/cmds.auto.h:1220
+msgid "cycle speech punctuation level"
+msgstr ""
+
#. xgettext: This is the description of the ALTGR command.
#: Programs/cmds.auto.h:894
msgid "cycle the AltGr (Right Alt) sticky input modifier (next, on, off)"
@@ -2837,12 +2995,12 @@ msgid "decrease speaking volume"
msgstr ""
#. xgettext: This is the description of the KEY_DELETE command.
-#: Programs/cmds.auto.h:1647
+#: Programs/cmds.auto.h:1662
msgid "delete key"
msgstr ""
#. xgettext: This is the description of the DESCCHAR command.
-#: Programs/cmds.auto.h:1282
+#: Programs/cmds.auto.h:1297
msgid "describe character"
msgstr ""
@@ -2851,23 +3009,24 @@ msgstr ""
msgid "describe current character"
msgstr ""
-#: Programs/config.c:690
-#: Programs/config.c:700
+#: Programs/config.c:689
+#: Programs/config.c:699
msgid "device"
msgstr ""
#: Programs/brltest.c:61
#: Programs/brltest.c:79
-#: Programs/brltty-atb.c:31
-#: Programs/brltty-ctb.c:92
-#: Programs/brltty-ktb.c:76
-#: Programs/brltty-ktb.c:85
-#: Programs/brltty-trtxt.c:75
-#: Programs/config.c:709
-#: Programs/config.c:719
-#: Programs/config.c:729
-#: Programs/config.c:739
+#: Programs/brltty-atb.c:32
+#: Programs/brltty-ctb.c:93
+#: Programs/brltty-ktb.c:77
+#: Programs/brltty-ktb.c:86
+#: Programs/brltty-trtxt.c:76
+#: Programs/config.c:708
+#: Programs/config.c:718
+#: Programs/config.c:728
+#: Programs/config.c:738
#: Programs/config.c:748
+#: Programs/config.c:757
msgid "directory"
msgstr ""
@@ -2884,19 +3043,19 @@ msgstr ""
msgid "done"
msgstr ""
-#: Programs/menu_prefs.c:666
+#: Programs/menu_prefs.c:667
msgid "dot 7"
msgstr ""
-#: Programs/menu_prefs.c:667
+#: Programs/menu_prefs.c:668
msgid "dot 8"
msgstr ""
-#: Programs/menu_prefs.c:664
+#: Programs/menu_prefs.c:665
msgid "dots 7 and 8"
msgstr ""
-#: Programs/brltty-ktb.c:45
+#: Programs/brltty-ktb.c:46
msgid "driver"
msgstr ""
@@ -2904,19 +3063,19 @@ msgstr ""
msgid "driver request"
msgstr ""
-#: Programs/config.c:407
-#: Programs/config.c:478
-#: Programs/config.c:521
+#: Programs/config.c:406
+#: Programs/config.c:477
+#: Programs/config.c:520
msgid "driver,..."
msgstr ""
#. xgettext: This is the description of the KEY_END command.
-#: Programs/cmds.auto.h:1631
+#: Programs/cmds.auto.h:1646
msgid "end key"
msgstr ""
#. xgettext: This is the description of the KEY_ENTER command.
-#: Programs/cmds.auto.h:1543
+#: Programs/cmds.auto.h:1558
msgid "enter key"
msgstr ""
@@ -2941,7 +3100,7 @@ msgid "enter/leave status display"
msgstr ""
#. xgettext: This is the description of the KEY_ESCAPE command.
-#: Programs/cmds.auto.h:1567
+#: Programs/cmds.auto.h:1582
msgid "escape key"
msgstr ""
@@ -2954,12 +3113,12 @@ msgstr ""
msgid "exactly"
msgstr ""
-#: Programs/config.c:894
+#: Programs/config.c:903
msgid "excess argument"
msgstr ""
#. xgettext: This is the description of the MACRO command.
-#: Programs/cmds.auto.h:1527
+#: Programs/cmds.auto.h:1542
msgid "execute command macro"
msgstr ""
@@ -2969,7 +3128,7 @@ msgstr ""
msgid "executing \"%s\" (from \"%s\")\n"
msgstr ""
-#: Programs/pgmprivs_linux.c:2047
+#: Programs/pgmprivs_linux.c:2049
msgid "executing as the invoking user"
msgstr ""
@@ -2983,18 +3142,18 @@ msgstr ""
msgid "failed to get first focus\n"
msgstr ""
-#: Programs/brltty-trtxt.c:47
-#: Programs/brltty-trtxt.c:55
-#: Programs/config.c:396
-#: Programs/config.c:450
-#: Programs/config.c:460
-#: Programs/config.c:469
-#: Programs/config.c:497
-#: Programs/config.c:540
-#: Programs/config.c:564
-#: Programs/config.c:573
-#: Programs/config.c:624
-#: Programs/config.c:758
+#: Programs/brltty-trtxt.c:48
+#: Programs/brltty-trtxt.c:56
+#: Programs/config.c:395
+#: Programs/config.c:449
+#: Programs/config.c:459
+#: Programs/config.c:468
+#: Programs/config.c:503
+#: Programs/config.c:539
+#: Programs/config.c:563
+#: Programs/config.c:572
+#: Programs/config.c:623
+#: Programs/config.c:767
#: Programs/xbrlapi.c:135
#: Programs/xbrlapi.c:142
msgid "file"
@@ -3024,7 +3183,7 @@ msgid "fork of \"%s\" failed: %s\n"
msgstr ""
#. xgettext: This is the description of the KEY_FUNCTION command.
-#: Programs/cmds.auto.h:1656
+#: Programs/cmds.auto.h:1671
msgid "function key"
msgstr ""
@@ -3078,7 +3237,7 @@ msgid "go down to last item"
msgstr ""
#. xgettext: This is the description of the NXDIFCHAR command.
-#: Programs/cmds.auto.h:1337
+#: Programs/cmds.auto.h:1352
msgid "go down to nearest line with different character"
msgstr ""
@@ -3093,7 +3252,7 @@ msgid "go down to nearest line with different highlighting"
msgstr ""
#. xgettext: This is the description of the NXINDENT command.
-#: Programs/cmds.auto.h:1274
+#: Programs/cmds.auto.h:1289
msgid "go down to nearest line with less indent than character"
msgstr ""
@@ -3228,7 +3387,7 @@ msgid "go to previous menu level"
msgstr ""
#. xgettext: This is the description of the GOTOMARK command.
-#: Programs/cmds.auto.h:1307
+#: Programs/cmds.auto.h:1322
msgid "go to remembered braille window position"
msgstr ""
@@ -3243,7 +3402,7 @@ msgid "go to screen cursor or go back after cursor tracking"
msgstr ""
#. xgettext: This is the description of the GOTOLINE command.
-#: Programs/cmds.auto.h:1317
+#: Programs/cmds.auto.h:1332
msgid "go to selected line"
msgstr ""
@@ -3278,7 +3437,7 @@ msgid "go up to first line of paragraph"
msgstr ""
#. xgettext: This is the description of the PRDIFCHAR command.
-#: Programs/cmds.auto.h:1327
+#: Programs/cmds.auto.h:1342
msgid "go up to nearest line with different character"
msgstr ""
@@ -3293,7 +3452,7 @@ msgid "go up to nearest line with different highlighting"
msgstr ""
#. xgettext: This is the description of the PRINDENT command.
-#: Programs/cmds.auto.h:1264
+#: Programs/cmds.auto.h:1279
msgid "go up to nearest line with less indent than character"
msgstr ""
@@ -3312,7 +3471,7 @@ msgstr ""
msgid "green"
msgstr ""
-#: Programs/pgmprivs_linux.c:2169
+#: Programs/pgmprivs_linux.c:2171
msgid "group permissions added"
msgstr ""
@@ -3325,7 +3484,7 @@ msgid "help screen not readable"
msgstr ""
#. xgettext: This is the description of the KEY_HOME command.
-#: Programs/cmds.auto.h:1623
+#: Programs/cmds.auto.h:1638
msgid "home key"
msgstr ""
@@ -3336,7 +3495,7 @@ msgstr ""
msgid "identifier"
msgstr ""
-#: Programs/config.c:428
+#: Programs/config.c:427
msgid "identifier,..."
msgstr ""
@@ -3359,12 +3518,12 @@ msgstr ""
msgid "increase speaking volume"
msgstr ""
-#: Programs/core.c:1160
+#: Programs/core.c:1161
msgid "indent"
msgstr ""
#. xgettext: This is the description of the PASTE_HISTORY command.
-#: Programs/cmds.auto.h:1361
+#: Programs/cmds.auto.h:1376
msgid "insert clipboard history entry after screen cursor"
msgstr ""
@@ -3379,14 +3538,10 @@ msgid "insert host clipboard text after screen cursor"
msgstr ""
#. xgettext: This is the description of the KEY_INSERT command.
-#: Programs/cmds.auto.h:1639
+#: Programs/cmds.auto.h:1654
msgid "insert key"
msgstr ""
-#: Programs/program.c:173
-msgid "install path not absolute"
-msgstr ""
-
#: Programs/brltty-hid.c:206
msgid "integer"
msgstr ""
@@ -3403,7 +3558,7 @@ msgstr ""
msgid "invalid flag setting"
msgstr ""
-#: Programs/config.c:2980
+#: Programs/config.c:2988
msgid "invalid message hold timeout"
msgstr ""
@@ -3450,32 +3605,32 @@ msgstr ""
msgid "light red"
msgstr ""
-#: Programs/cmd_speech.c:500
+#: Programs/cmd_speech.c:514
msgid "line"
msgstr ""
#. xgettext: This is the description of the COPY_LINE command.
-#: Programs/cmds.auto.h:1246
+#: Programs/cmds.auto.h:1261
msgid "linear copy to character"
msgstr ""
-#: Programs/brltty-pty.c:112
+#: Programs/brltty-pty.c:113
msgid "log escape sequences and special characters received from the pty slave"
msgstr ""
-#: Programs/brltty-pty.c:100
+#: Programs/brltty-pty.c:101
msgid "log input written to the pty slave"
msgstr ""
-#: Programs/brltty-pty.c:106
+#: Programs/brltty-pty.c:107
msgid "log output received from the pty slave that isn't an escape sequence or a special character"
msgstr ""
-#: Programs/brltty-pty.c:118
+#: Programs/brltty-pty.c:119
msgid "log unexpected input/output"
msgstr ""
-#: Programs/config.c:615
+#: Programs/config.c:614
msgid "lvl|cat,..."
msgstr ""
@@ -3524,13 +3679,13 @@ msgstr ""
msgid "name"
msgstr ""
-#: Programs/config.c:418
-#: Programs/config.c:488
-#: Programs/config.c:531
-#: Programs/config.c:549
-#: Programs/config.c:582
-#: Programs/config.c:598
-#: Programs/config.c:651
+#: Programs/config.c:417
+#: Programs/config.c:487
+#: Programs/config.c:530
+#: Programs/config.c:548
+#: Programs/config.c:581
+#: Programs/config.c:597
+#: Programs/config.c:650
msgid "name=value,..."
msgstr ""
@@ -3538,11 +3693,11 @@ msgstr ""
msgid "native"
msgstr ""
-#: Programs/menu_prefs.c:668
+#: Programs/menu_prefs.c:669
msgid "no dots"
msgstr ""
-#: Programs/config.c:1286
+#: Programs/config.c:1294
msgid "no key bindings"
msgstr ""
@@ -3562,7 +3717,11 @@ msgstr ""
msgid "not saved"
msgstr ""
-#: Programs/pgmprivs_linux.c:2020
+#: Programs/menu.c:816
+msgid "not set"
+msgstr ""
+
+#: Programs/pgmprivs_linux.c:2022
msgid "not switching to an unprivileged user"
msgstr ""
@@ -3604,17 +3763,17 @@ msgstr ""
msgid "option"
msgstr ""
-#: Programs/pgmprivs_linux.c:2154
+#: Programs/pgmprivs_linux.c:2156
msgid "ownership claimed"
msgstr ""
#. xgettext: This is the description of the KEY_PAGE_DOWN command.
-#: Programs/cmds.auto.h:1615
+#: Programs/cmds.auto.h:1630
msgid "page-down key"
msgstr ""
#. xgettext: This is the description of the KEY_PAGE_UP command.
-#: Programs/cmds.auto.h:1607
+#: Programs/cmds.auto.h:1622
msgid "page-up key"
msgstr ""
@@ -3622,20 +3781,16 @@ msgstr ""
msgid "path"
msgstr ""
-#: Programs/config.c:2953
+#: Programs/config.c:2961
msgid "pid file not specified"
msgstr ""
-#: Programs/program.c:335
+#: Programs/program.c:302
msgid "pid file open error"
msgstr ""
-#: Programs/spk.c:263
-msgid "pitch"
-msgstr ""
-
#. xgettext: This is the description of the SETLEFT command.
-#: Programs/cmds.auto.h:1290
+#: Programs/cmds.auto.h:1305
msgid "place left end of braille window at character"
msgstr ""
@@ -3643,16 +3798,12 @@ msgstr ""
msgid "power switch"
msgstr ""
-#: Programs/config.c:511
+#: Programs/config.c:510
msgid "quality"
msgstr ""
-#: Programs/spk.c:237
-msgid "rate"
-msgstr ""
-
#. xgettext: This is the description of the COPY_RECT command.
-#: Programs/cmds.auto.h:1238
+#: Programs/cmds.auto.h:1253
msgid "rectangular copy to character"
msgstr ""
@@ -3667,36 +3818,36 @@ msgid "refresh braille display"
msgstr ""
#. xgettext: This is the description of the REFRESH_LINE command.
-#: Programs/cmds.auto.h:1420
+#: Programs/cmds.auto.h:1435
msgid "refresh braille line"
msgstr ""
-#: Programs/config.c:681
+#: Programs/config.c:680
msgid "regexp,..."
msgstr ""
-#: Programs/config.c:2207
+#: Programs/config.c:2215
#, c-format
msgid "reinitializing braille driver"
msgstr ""
-#: Programs/config.c:2725
+#: Programs/config.c:2733
#, c-format
msgid "reinitializing screen driver"
msgstr ""
-#: Programs/config.c:2522
+#: Programs/config.c:2530
#, c-format
msgid "reinitializing speech driver"
msgstr ""
#. xgettext: This is the description of the SETMARK command.
-#: Programs/cmds.auto.h:1298
+#: Programs/cmds.auto.h:1313
msgid "remember current braille window position"
msgstr ""
#. xgettext: This is the description of the ALERT command.
-#: Programs/cmds.auto.h:1461
+#: Programs/cmds.auto.h:1476
msgid "render an alert"
msgstr ""
@@ -3738,7 +3889,7 @@ msgid "return to the active screen area"
msgstr ""
#. xgettext: This is the description of the HOSTCMD command.
-#: Programs/cmds.auto.h:1535
+#: Programs/cmds.auto.h:1550
msgid "run host command"
msgstr ""
@@ -3756,11 +3907,11 @@ msgstr ""
msgid "scheme+..."
msgstr ""
-#: Programs/config.c:2601
+#: Programs/config.c:2609
msgid "screen driver not loadable"
msgstr ""
-#: Programs/config.c:2722
+#: Programs/config.c:2730
msgid "screen driver restarting"
msgstr ""
@@ -3798,7 +3949,7 @@ msgstr ""
msgid "search forward for clipboard text"
msgstr ""
-#: Programs/menu.c:469
+#: Programs/menu.c:452
msgid "seconds"
msgstr ""
@@ -3833,7 +3984,7 @@ msgid "set attribute underlining on/off"
msgstr ""
#. xgettext: This is the description of the SET_ATTRIBUTES_TABLE command.
-#: Programs/cmds.auto.h:1377
+#: Programs/cmds.auto.h:1392
msgid "set attributes table"
msgstr ""
@@ -3852,6 +4003,11 @@ msgstr ""
msgid "set autospeak deleted characters on/off"
msgstr ""
+#. xgettext: This is the description of the ASPK_EMP_LINE command.
+#: Programs/cmds.auto.h:1213
+msgid "set autospeak empty line on/off"
+msgstr ""
+
#. xgettext: This is the description of the ASPK_INDENT command.
#: Programs/cmds.auto.h:998
msgid "set autospeak indent of current line on/off"
@@ -3903,7 +4059,7 @@ msgid "set contracted/computer braille"
msgstr ""
#. xgettext: This is the description of the SET_CONTRACTION_TABLE command.
-#: Programs/cmds.auto.h:1385
+#: Programs/cmds.auto.h:1400
msgid "set contraction table"
msgstr ""
@@ -3918,12 +4074,12 @@ msgid "set hidden screen cursor on/off"
msgstr ""
#. xgettext: This is the description of the SET_KEYBOARD_TABLE command.
-#: Programs/cmds.auto.h:1393
+#: Programs/cmds.auto.h:1408
msgid "set keyboard table"
msgstr ""
#. xgettext: This is the description of the SET_LANGUAGE_PROFILE command.
-#: Programs/cmds.auto.h:1401
+#: Programs/cmds.auto.h:1416
msgid "set language profile"
msgstr ""
@@ -3973,7 +4129,7 @@ msgid "set speech cursor visibility on/off"
msgstr ""
#. xgettext: This is the description of the TXTSEL_SET command.
-#: Programs/cmds.auto.h:1436
+#: Programs/cmds.auto.h:1451
msgid "set text selection"
msgstr ""
@@ -3983,7 +4139,7 @@ msgid "set text style 6-dot/8-dot"
msgstr ""
#. xgettext: This is the description of the SET_TEXT_TABLE command.
-#: Programs/cmds.auto.h:1369
+#: Programs/cmds.auto.h:1384
msgid "set text table"
msgstr ""
@@ -4002,7 +4158,7 @@ msgstr ""
msgid "show current date and time"
msgstr ""
-#: Programs/brltty-pty.c:66
+#: Programs/brltty-pty.c:67
msgid "show the absolute path to the pty slave"
msgstr ""
@@ -4016,16 +4172,16 @@ msgstr ""
msgid "show various device status indicators"
msgstr ""
-#: Programs/menu_prefs.c:1059
+#: Programs/menu_prefs.c:1060
msgid "soundcard digital audio"
msgstr ""
-#: Programs/menu_prefs.c:1061
+#: Programs/menu_prefs.c:1062
msgid "soundcard synthesizer"
msgstr ""
#: Programs/cmd.c:278
-#: Programs/core.c:1066
+#: Programs/core.c:1067
msgid "space"
msgstr ""
@@ -4075,11 +4231,11 @@ msgstr ""
msgid "specifier"
msgstr ""
-#: Programs/config.c:2370
+#: Programs/config.c:2378
msgid "speech driver not loadable"
msgstr ""
-#: Programs/config.c:2519
+#: Programs/config.c:2527
msgid "speech driver restarting"
msgstr ""
@@ -4092,21 +4248,21 @@ msgstr ""
msgid "spell current word"
msgstr ""
-#: Programs/brltty-pty.c:403
+#: Programs/brltty-pty.c:432
msgid "standard input isn't a terminal"
msgstr ""
-#: Programs/brltty-pty.c:408
+#: Programs/brltty-pty.c:437
msgid "standard output isn't a terminal"
msgstr ""
#. xgettext: This is the description of the CLIP_NEW command.
-#: Programs/cmds.auto.h:1222
+#: Programs/cmds.auto.h:1237
msgid "start new clipboard at character"
msgstr ""
#. xgettext: This is the description of the TXTSEL_START command.
-#: Programs/cmds.auto.h:1428
+#: Programs/cmds.auto.h:1443
msgid "start text selection"
msgstr ""
@@ -4158,12 +4314,12 @@ msgid "string"
msgstr ""
#. xgettext: This is the description of the CONTEXT command.
-#: Programs/cmds.auto.h:1511
+#: Programs/cmds.auto.h:1526
msgid "switch to command context"
msgstr ""
#. xgettext: This is the description of the SWITCHVT command.
-#: Programs/cmds.auto.h:1254
+#: Programs/cmds.auto.h:1269
msgid "switch to specific virtual terminal"
msgstr ""
@@ -4187,25 +4343,25 @@ msgstr ""
msgid "switch to the previous virtual terminal"
msgstr ""
-#: Programs/pgmprivs_linux.c:1996
+#: Programs/pgmprivs_linux.c:1998
msgid "switched to unprivileged user"
msgstr ""
#. xgettext: This is the description of the KEY_TAB command.
-#: Programs/cmds.auto.h:1551
+#: Programs/cmds.auto.h:1566
msgid "tab key"
msgstr ""
-#: Programs/config.c:667
-#: Programs/config.c:674
+#: Programs/config.c:666
+#: Programs/config.c:673
msgid "text"
msgstr ""
-#: Programs/brltty-pty.c:87
+#: Programs/brltty-pty.c:88
msgid "the directory to change to"
msgstr ""
-#: Programs/brltty-pty.c:94
+#: Programs/brltty-pty.c:95
msgid "the home directory to use"
msgstr ""
@@ -4221,21 +4377,21 @@ msgstr ""
msgid "the name of the domain containing the translations"
msgstr ""
-#: Programs/brltty-pty.c:80
+#: Programs/brltty-pty.c:81
msgid "the name or number of the group to run as"
msgstr ""
-#: Programs/brltty-pty.c:73
+#: Programs/brltty-pty.c:74
msgid "the name or number of the user to run as"
msgstr ""
#. xgettext: This is the description of the PASSDOTS command.
-#: Programs/cmds.auto.h:1479
+#: Programs/cmds.auto.h:1494
msgid "type braille dots"
msgstr ""
#. xgettext: This is the description of the PASSCHAR command.
-#: Programs/cmds.auto.h:1470
+#: Programs/cmds.auto.h:1485
msgid "type unicode character"
msgstr ""
@@ -4259,7 +4415,7 @@ msgstr ""
msgid "unknown configuration directive"
msgstr ""
-#: Programs/config.c:806
+#: Programs/config.c:815
msgid "unknown log level or category"
msgstr ""
@@ -4267,7 +4423,7 @@ msgstr ""
msgid "unknown option"
msgstr ""
-#: Programs/config.c:332
+#: Programs/config.c:331
msgid "unknown screen content quality"
msgstr ""
@@ -4275,20 +4431,16 @@ msgstr ""
msgid "unsupported parameter"
msgstr ""
-#: Programs/spk.c:211
-msgid "volume"
-msgstr ""
-
#. LRGB
#: Programs/cmd_utils.c:175
msgid "white"
msgstr ""
-#: Programs/pgmprivs_linux.c:1856
+#: Programs/pgmprivs_linux.c:1858
msgid "working directory changed"
msgstr ""
-#: Programs/brltty-pty.c:60
+#: Programs/brltty-pty.c:61
msgid "write driver directives to standard error"
msgstr ""
diff --git a/Messages/de.po b/Messages/de.po
index 181ab2c55..387ad310b 100644
--- a/Messages/de.po
+++ b/Messages/de.po
@@ -1,7 +1,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: brltty 4.5\n"
"Report-Msgid-Bugs-To: BRLTTY@brltty.app\n"
-"POT-Creation-Date: 2021-09-07 15:29+0200\n"
-"PO-Revision-Date: 2021-09-13 12:42+0200\n"
+"POT-Creation-Date: 2025-01-14 17:27+0100\n"
+"PO-Revision-Date: 2025-01-15 01:53+0000\n"
"Last-Translator: Angela Engel <angela.engel@gmx.at>\n"
"Language-Team: Friends of BRLTTY <BRLTTY@brlttY.app>\n"
"Language: de\n"
@@ -28,7 +28,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: Programs/brltty.c:167
+#: Programs/brltty.c:209
#, c-format
msgid "\"%s\" started as \"%s\"\n"
msgstr "\"%s\" gestartet als \"%s\"\n"
@@ -36,7 +36,7 @@ msgstr "\"%s\" gestartet als \"%s\"\n"
#. xgettext: This phrase describes the colour of a character on the screen.
#. xgettext: %1$s is the (already translated) foreground colour.
#. xgettext: %2$s is the (already translated) background colour.
-#: Programs/cmd_utils.c:169
+#: Programs/cmd_utils.c:185
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s auf %2$s"
@@ -66,15 +66,15 @@ msgstr[1] "%u Sekunden"
msgid "1 cell"
msgstr "1 Zelle"
-#: Programs/menu_prefs.c:900
+#: Programs/menu_prefs.c:902
msgid "1 second"
msgstr "1 Sekunde"
-#: Programs/menu_prefs.c:962
+#: Programs/menu_prefs.c:964
msgid "10 seconds"
msgstr "10 Sekunden"
-#: Programs/menu_prefs.c:1277
+#: Programs/menu_prefs.c:1297
msgid "12 Hour"
msgstr "12 Stunden"
@@ -84,19 +84,19 @@ msgstr "12 Stunden"
msgid "2 cells"
msgstr "2 Zellen"
-#: Programs/menu_prefs.c:901
+#: Programs/menu_prefs.c:903
msgid "2 seconds"
msgstr "2 Sekunden"
-#: Programs/menu_prefs.c:963
+#: Programs/menu_prefs.c:965
msgid "20 seconds"
msgstr "20 Sekunden"
-#: Programs/menu_prefs.c:1276
+#: Programs/menu_prefs.c:1296
msgid "24 Hour"
msgstr "24 Stunden"
-#: Programs/menu_prefs.c:898
+#: Programs/menu_prefs.c:900
msgid "250 milliseconds"
msgstr "250 Millisekunden"
@@ -105,27 +105,27 @@ msgstr "250 Millisekunden"
msgid "3 cells"
msgstr "3 Zellen"
-#: Programs/menu_prefs.c:964
+#: Programs/menu_prefs.c:966
msgid "40 seconds"
msgstr "40 Sekunden"
-#: Programs/menu_prefs.c:961
+#: Programs/menu_prefs.c:963
msgid "5 seconds"
msgstr "5 Sekunden"
-#: Programs/menu_prefs.c:899
+#: Programs/menu_prefs.c:901
msgid "500 milliseconds"
msgstr "500 Millisekunden"
-#: Programs/menu_prefs.c:733
+#: Programs/menu_prefs.c:734
msgid "6-dot"
msgstr "6-Punkt-Braille"
-#: Programs/brltty-ttb.c:179
+#: Programs/brltty-ttb.c:169
msgid "8-bit character set to use."
msgstr "8-bit Zeichensatz der verwendet werden soll."
-#: Programs/menu_prefs.c:732
+#: Programs/menu_prefs.c:733
msgid "8-dot"
msgstr "8-Punkt-Braille"
@@ -133,12 +133,8 @@ msgstr "8-Punkt-Braille"
msgid "<off>"
msgstr "<aus>"
-#: Programs/config.c:1566
-msgid "API Parameter"
-msgstr "API Parameter"
-
#. xgettext: This is the description of the PASSAT command.
-#: Programs/cmds.auto.h:1471
+#: Programs/cmds.auto.h:1487
msgid "AT (set 2) keyboard scan code"
msgstr "AT (set 2) Tastatur-Scancode"
@@ -170,7 +166,7 @@ msgstr "Akustische Gitarre (Nylonsaiten)"
msgid "Acoustic Guitar (steel)"
msgstr "Akustische Gitarre (Stahlsaiten)"
-#: Programs/menu_prefs.c:1303
+#: Programs/menu_prefs.c:1323
msgid "After Time"
msgstr "Nach Uhrzeit"
@@ -179,23 +175,23 @@ msgstr "Nach Uhrzeit"
msgid "Agogo"
msgstr "Agogo"
-#: Programs/menu_prefs.c:1491
+#: Programs/menu_prefs.c:1511
msgid "Alert"
msgstr "Alarm"
-#: Programs/menu_prefs.c:1104
+#: Programs/menu_prefs.c:1106
msgid "Alert Dots"
msgstr "Warnpunkte"
-#: Programs/menu_prefs.c:1109
+#: Programs/menu_prefs.c:1111
msgid "Alert Messages"
msgstr "Warnmeldungen"
-#: Programs/menu_prefs.c:1049
+#: Programs/menu_prefs.c:1051
msgid "Alert Tunes"
msgstr "Warntöne"
-#: Programs/menu_prefs.c:864 Programs/menu_prefs.c:1194
+#: Programs/menu_prefs.c:866 Programs/spk.c:282
msgid "All"
msgstr "Alle"
@@ -217,55 +213,55 @@ msgstr "Alt Saxofon"
msgid "Applause"
msgstr "Applaus"
-#: Programs/log.c:118
+#: Programs/log.c:113
msgid "Async Events"
msgstr "Asynchrone Ereignisse"
-#: Programs/menu_prefs.c:807
+#: Programs/menu_prefs.c:808
msgid "Attributes Blink Period"
msgstr "Blinkdauer für Atribute"
-#: Programs/menu_prefs.c:815
+#: Programs/menu_prefs.c:816
msgid "Attributes Percent Visible"
msgstr "Anzeigedauer von Attributen in Prozent"
-#: Programs/config.c:1059 Programs/menu_prefs.c:1406
+#: Programs/menu_prefs.c:1426
msgid "Attributes Table"
msgstr "Attributtabelle"
-#: Programs/alert.c:168
+#: Programs/xbrlapi.c:1194
+msgid "Augment an X session by supporting input typed on the braille device, showing the title of the focused window on the braille display, and switching braille focus to it."
+msgstr ""
+
+#: Programs/alert.c:174
msgid "Autorelease"
msgstr "Automatische Einrastbeendung"
-#: Programs/menu_prefs.c:967
+#: Programs/menu_prefs.c:969
msgid "Autorelease Time"
msgstr "Zeit bis zur automatischen Einrastbeendung"
-#: Programs/menu_prefs.c:984
+#: Programs/menu_prefs.c:986
msgid "Autorepeat Enabled"
msgstr "Automatische Wiedderholung aktiviert"
-#: Programs/menu_prefs.c:990
+#: Programs/menu_prefs.c:992
msgid "Autorepeat Interval"
msgstr "Wiederholungsintervall"
-#: Programs/menu_prefs.c:997
+#: Programs/menu_prefs.c:999
msgid "Autorepeat Panning"
msgstr "Automatische Wiederholung für Seitwertsbewegungen"
-#: Programs/menu_prefs.c:1119
+#: Programs/menu_prefs.c:1133
msgid "Autospeak"
msgstr "Automatisches Sprechen"
-#: Programs/menu_prefs.c:1116
+#: Programs/menu_prefs.c:1130
msgid "Autospeak Options"
msgstr "Optionen für automatisches Sprechen"
-#: Programs/config.c:335
-msgid "Autospeak Threshold"
-msgstr ""
-
-#: Programs/config.c:2012
+#: Programs/config.c:2138
msgid "BRLTTY stopped"
msgstr "BRLTTY gestoppt"
@@ -282,7 +278,7 @@ msgstr "Banjo"
#. xgettext: This is the name of MIDI musical instrument #68 (in the Reed group).
#: Programs/midi.c:289
msgid "Baritone Saxophone"
-msgstr ""
+msgstr "Baritonsaxophon"
#. xgettext: This is the name of MIDI musical instrument group #5.
#: Programs/midi.c:37
@@ -294,11 +290,11 @@ msgstr "Bass"
msgid "Bassoon"
msgstr "Fagott"
-#: Programs/menu_prefs.c:1056
+#: Programs/menu_prefs.c:1058
msgid "Beeper"
msgstr "PC-Piepser"
-#: Programs/menu_prefs.c:1302
+#: Programs/menu_prefs.c:1322
msgid "Before Time"
msgstr "Vor Uhrzeit"
@@ -307,23 +303,23 @@ msgstr "Vor Uhrzeit"
msgid "Bird Tweet"
msgstr "Vogelzwitschern"
-#: Programs/menu_prefs.c:801
+#: Programs/menu_prefs.c:802
msgid "Blinking Attributes"
msgstr "Blinkende Attribute"
-#: Programs/menu_prefs.c:823
+#: Programs/menu_prefs.c:824
msgid "Blinking Capitals"
msgstr "Blinkende Großbuchstaben"
-#: Programs/menu_prefs.c:774
+#: Programs/menu_prefs.c:775
msgid "Blinking Screen Cursor"
msgstr "Blinkender Bildschirmcursor"
-#: Programs/menu_prefs.c:1248
+#: Programs/menu_prefs.c:1268
msgid "Blinking Speech Cursor"
msgstr "Blinkender Sprachcursor"
-#: Programs/menu_prefs.c:665 Programs/menu_prefs.c:1362
+#: Programs/menu_prefs.c:665 Programs/menu_prefs.c:1382
msgid "Block"
msgstr "Block"
@@ -332,59 +328,55 @@ msgstr "Block"
msgid "Blown Bottle"
msgstr "Geblasene Flasche"
-#: Programs/log.c:142
+#: Programs/log.c:143
msgid "Bluetooth I/O"
msgstr "Bluetooth E/A"
-#: Programs/config.c:1787
+#: Programs/config.c:1907
msgid "Braille Device"
msgstr "Braillegerät"
-#: Programs/config.c:1783
-msgid "Braille Driver"
-msgstr "Brailletreiber"
-
-#: Programs/log.c:148
+#: Programs/log.c:155
msgid "Braille Driver Events"
msgstr "Brailletreiberereignisse"
-#: Programs/menu_prefs.c:752
+#: Programs/menu_prefs.c:753
msgid "Braille Firmness"
msgstr "Punktstärke"
-#: Programs/log.c:82
+#: Programs/log.c:77
msgid "Braille Key Events"
msgstr "Tastenereignisse der Braillezeile"
-#: Programs/config.c:1786
-msgid "Braille Parameter"
-msgstr "Braille-Parameter"
-
-#: Programs/menu_prefs.c:698
+#: Programs/menu_prefs.c:699
msgid "Braille Presentation"
msgstr "Brailledarstellung"
-#: Programs/menu_prefs.c:1389
+#: Programs/menu_prefs.c:1409
msgid "Braille Tables"
msgstr "Brailletabellen"
-#: Programs/menu_prefs.c:932
+#: Programs/menu_prefs.c:934
msgid "Braille Typing"
msgstr "Braille-Eingabe"
-#: Programs/menu_prefs.c:706
+#: Programs/menu_prefs.c:707
msgid "Braille Variant"
msgstr "Braillevariante"
-#: Programs/menu_prefs.c:885
+#: Programs/menu_prefs.c:887
msgid "Braille Window Overlap"
msgstr "Braillezeilenüberlappung"
-#: Programs/config.c:552
+#: Programs/config.c:410
#, c-format
msgid "Braille driver code (%s, %s, or one of {%s})."
msgstr "Brailletreiber-Code: (%s, %s, oder einer von {%s})."
+#: Programs/brltty-ktb.c:47
+msgid "Braille driver code."
+msgstr "Braille-Treibercode."
+
#. xgettext: This is the name of MIDI musical instrument group #8.
#: Programs/midi.c:46
msgid "Brass"
@@ -405,31 +397,31 @@ msgstr "Atemgeräusch"
msgid "Bright Acoustic Piano"
msgstr "Akustisches helles Klavier"
-#: Programs/xbrlapi.c:93
+#: Programs/xbrlapi.c:105
msgid "BrlAPI authorization/authentication schemes"
msgstr "BrlAPI Authorisierungs-/Berechtigungs-Schemen"
-#: Programs/xbrlapi.c:86
+#: Programs/xbrlapi.c:98
msgid "BrlAPI host and/or port to connect to"
msgstr "BrlAPI Host und/oder Port mit dem verbunden werden soll"
-#: Programs/menu_prefs.c:1424
+#: Programs/menu_prefs.c:1444
msgid "Build Information"
msgstr "Build Informationen"
-#: Programs/menu_prefs.c:725
+#: Programs/menu_prefs.c:726
msgid "Capitalization Mode"
msgstr "Großbuchstabenmodus"
-#: Programs/menu_prefs.c:828
+#: Programs/menu_prefs.c:829
msgid "Capitals Blink Period"
msgstr "Blinkdauer bei Großbuchstaben"
-#: Programs/menu_prefs.c:836
+#: Programs/menu_prefs.c:837
msgid "Capitals Percent Visible"
msgstr "Anzeigedauer von Großbuchstaben in Prozent"
-#: Programs/menu_prefs.c:1514
+#: Programs/menu_prefs.c:1534
msgid "Category Log Level"
msgstr "Protokollierungsausführlichkeit für Kategorien"
@@ -444,6 +436,18 @@ msgstr "Celesta"
msgid "Cello"
msgstr "Cello"
+#: Programs/brltty-atb.c:49
+msgid "Check an attributes table."
+msgstr ""
+
+#: Programs/brltty-ttb.c:2513
+msgid "Check/edit a text (computer braille) table, or convert it from one format to another."
+msgstr ""
+
+#: Programs/brltty-ctb.c:449
+msgid "Check/validate a contraction (literary braille) table, or translate text into contracted braille."
+msgstr ""
+
#. xgettext: This is the name of MIDI musical instrument #53 (in the Ensemble group).
#: Programs/midi.c:242
msgid "Choir Aahs"
@@ -467,37 +471,41 @@ msgstr "Klarinette"
#. xgettext: This is the name of MIDI musical instrument #8 (in the Piano group).
#: Programs/midi.c:101
msgid "Clavinet"
-msgstr ""
+msgstr "Klavinet"
-#: Programs/menu.c:894
+#: Programs/menu.c:891
msgid "Close"
msgstr "Schließen"
-#: Programs/menu_prefs.c:1286
+#: Programs/menu_prefs.c:1306
msgid "Colon"
msgstr "Doppelpunkt"
-#: Programs/menu_prefs.c:702
+#: Programs/brltty-tune.c:158
+msgid "Compose a tune with the tune builder and play it with the tone generator."
+msgstr ""
+
+#: Programs/menu_prefs.c:703
msgid "Computer Braille"
msgstr "Computerbraille"
-#: Programs/menu_prefs.c:736
+#: Programs/menu_prefs.c:737
msgid "Computer Braille Cell Type"
-msgstr ""
+msgstr "Computer-Braille-Zellentyp"
-#: Programs/menu_prefs.c:1448
+#: Programs/menu_prefs.c:1468
msgid "Configuration Directory"
msgstr "Konfigurationsverzeichnis"
-#: Programs/config.c:2955 Programs/menu_prefs.c:1453
+#: Programs/menu_prefs.c:1473
msgid "Configuration File"
msgstr "Konfigurationsdatei"
-#: Programs/alert.c:163
+#: Programs/alert.c:169
msgid "Console Bell"
msgstr "Konsolenglöckchen"
-#: Programs/menu_prefs.c:1035
+#: Programs/menu_prefs.c:1037
msgid "Console Bell Alert"
msgstr "Konsolen-Tongenerator Hinweis"
@@ -506,23 +514,27 @@ msgstr "Konsolen-Tongenerator Hinweis"
msgid "Contrabass"
msgstr "Kontrabass"
-#: Programs/menu_prefs.c:703
+#: Programs/menu_prefs.c:704
msgid "Contracted Braille"
msgstr "Braille-Kurzschrift"
-#: Programs/config.c:1027 Programs/menu_prefs.c:1399
+#: Programs/menu_prefs.c:1419
msgid "Contraction Table"
msgstr "Kurzschrifttabelle"
-#: Programs/brltty-ctb.c:62
+#: Programs/brltty-ctb.c:73
msgid "Contraction table."
msgstr "Kurzschrifttabelle."
-#: Programs/brltty-ctb.c:76
+#: Programs/brltty-ctb.c:87
msgid "Contraction verification table."
msgstr "Kurzschriftverifikationstabelle"
-#: Programs/menu_prefs.c:1492
+#: Programs/xbrlapi.c:817
+msgid "Could not get XKB major opcode\n"
+msgstr ""
+
+#: Programs/menu_prefs.c:1512
msgid "Critical"
msgstr "Kritisch"
@@ -534,7 +546,7 @@ msgstr "Cursorspalte"
msgid "Cursor Coordinates"
msgstr "Cursorkoordinaten"
-#: Programs/log.c:100
+#: Programs/log.c:95
msgid "Cursor Routing"
msgstr "Cursorrouting"
@@ -542,11 +554,11 @@ msgstr "Cursorrouting"
msgid "Cursor Row"
msgstr "Cursorzeile"
-#: Programs/log.c:94
+#: Programs/log.c:89
msgid "Cursor Tracking"
msgstr "Cursorverfolgung"
-#: Programs/menu_prefs.c:904
+#: Programs/menu_prefs.c:906
msgid "Cursor Tracking Delay"
msgstr "Zeitverzögerung für Cursorverfolgung"
@@ -558,35 +570,35 @@ msgstr "Cursor- und Braillezeilenspalte"
msgid "Cursor and Window Row"
msgstr "Cursor- und Braillezeilenzeile"
-#: Programs/menu_prefs.c:1324
+#: Programs/menu_prefs.c:1344
msgid "Dash"
msgstr "Bindestrich"
-#: Programs/menu_prefs.c:1317
+#: Programs/menu_prefs.c:1337
msgid "Date Format"
msgstr "Datumsformat"
-#: Programs/menu_prefs.c:1306
+#: Programs/menu_prefs.c:1326
msgid "Date Position"
msgstr "Datumsposition"
-#: Programs/menu_prefs.c:1329
+#: Programs/menu_prefs.c:1349
msgid "Date Separator"
msgstr "Datum Trennzeichen"
-#: Programs/menu_prefs.c:1314
+#: Programs/menu_prefs.c:1334
msgid "Day Month Year"
msgstr "Tag Monat Jahr"
-#: Programs/menu_prefs.c:1497
+#: Programs/menu_prefs.c:1517
msgid "Debug"
msgstr "Debug"
-#: Programs/config.c:573
+#: Programs/config.c:431
msgid "Device for accessing braille display."
msgstr "Pfad zur Schnittstelle für den Zugriff auf die Braillezeile."
-#: Programs/config.c:532
+#: Programs/config.c:592
msgid "Disable the application programming interface."
msgstr "Deaktiviere die Programmierschnittstelle."
@@ -595,31 +607,31 @@ msgstr "Deaktiviere die Programmierschnittstelle."
msgid "Distortion Guitar"
msgstr "Verzerrte Gitarre"
-#: Programs/config.c:675
+#: Programs/config.c:506
msgid "Do not autospeak when braille is not being used."
msgstr "Nicht automatisch sprechen wenn keine Braillezeile in Verwendung ist."
-#: Programs/xbrlapi.c:112
+#: Programs/xbrlapi.c:118
msgid "Do not write any text to the braille device"
msgstr "Schreibe keinen Text auf die Braillezeile"
-#: Programs/brltty-trtxt.c:79
+#: Programs/brltty-trtxt.c:70
msgid "Don't fall back to the Unicode base character."
msgstr "Nicht auf das Unicode Basiszeichen zurückfallen."
-#: Programs/config.c:443
+#: Programs/config.c:645
msgid "Don't switch to an unprivileged user or relinquish any privileges (group memberships, capabilities, etc)."
msgstr ""
-#: Programs/alert.c:52
+#: Programs/alert.c:58
msgid "Done"
msgstr "Fertig"
-#: Programs/menu_prefs.c:1287 Programs/menu_prefs.c:1326
+#: Programs/menu_prefs.c:1307 Programs/menu_prefs.c:1346
msgid "Dot"
msgstr "Punkt"
-#: Programs/menu_prefs.c:942
+#: Programs/menu_prefs.c:944
msgid "Dots via Unicode Braille"
msgstr "Punkte via Unicode Braille"
@@ -629,7 +641,7 @@ msgstr "Punkte via Unicode Braille"
msgid "Drawbar Organ"
msgstr "Orgel mit Zugstange"
-#: Programs/config.c:2976 Programs/menu_prefs.c:1473
+#: Programs/menu_prefs.c:1493
msgid "Drivers Directory"
msgstr "Treiber-Verzeichnis"
@@ -638,12 +650,16 @@ msgstr "Treiber-Verzeichnis"
msgid "Dulcimer"
msgstr "Dulcimer"
-#: Programs/menu_prefs.c:879
+#: Programs/menu_prefs.c:881
#, fuzzy
msgid "Eager Sliding Braille Window"
msgstr "Erweiterte Braillezeilenausschnittsüberlappung"
-#: Programs/brltty-ttb.c:158
+#: Programs/brltty-hid.c:201
+msgid "Echo (in hexadecimal) input received from the device."
+msgstr ""
+
+#: Programs/brltty-ttb.c:148
msgid "Edit table."
msgstr "Tabelle editieren."
@@ -652,7 +668,6 @@ msgstr "Tabelle editieren."
msgid "Electric Bass (finger)"
msgstr "Elektrischer Bass (Finger)"
-# Elektronischer Bass (Pick)
#. xgettext: This is the name of MIDI musical instrument #35 (in the Bass group).
#: Programs/midi.c:186
msgid "Electric Bass (pick)"
@@ -688,7 +703,7 @@ msgstr "Elektrisches Klavier 1"
msgid "Electric Piano 2"
msgstr "Elektrisches Klavier 2"
-#: Programs/menu_prefs.c:1490
+#: Programs/menu_prefs.c:1510
msgid "Emergency"
msgstr "Notfall"
@@ -696,7 +711,7 @@ msgstr "Notfall"
msgid "End"
msgstr "Ende"
-#: Programs/menu_prefs.c:865
+#: Programs/menu_prefs.c:867
msgid "End of Line"
msgstr "Zeilenende"
@@ -705,7 +720,7 @@ msgstr "Zeilenende"
msgid "English Horn"
msgstr "Englisches Horn"
-#: Programs/menu_prefs.c:1229
+#: Programs/menu_prefs.c:1249
msgid "Enqueue"
msgstr "Anhängen"
@@ -714,7 +729,7 @@ msgstr "Anhängen"
msgid "Ensemble"
msgstr "Ensemble"
-#: Programs/menu_prefs.c:1493
+#: Programs/menu_prefs.c:1513
msgid "Error"
msgstr "Fehler"
@@ -723,23 +738,23 @@ msgstr "Fehler"
msgid "Ethnic Instruments"
msgstr "Ethnische Instrumente"
-#: Programs/menu_prefs.c:1032
+#: Programs/menu_prefs.c:1034
msgid "Event Alerts"
msgstr "Warnungen bei Ereignissen"
-#: Programs/menu_prefs.c:713
+#: Programs/menu_prefs.c:714
msgid "Expand Current Word"
msgstr "Aktuelles Wort ausschreiben"
-#: Programs/config.c:487
+#: Programs/config.c:584
msgid "Explicit preference settings."
msgstr "Explizite Einstellungen."
-#: Programs/menu_prefs.c:1059
+#: Programs/menu_prefs.c:1061
msgid "FM"
msgstr "FM"
-#: Programs/menu_prefs.c:1097
+#: Programs/menu_prefs.c:1099
msgid "FM Volume"
msgstr "FM Lautstärke"
@@ -790,24 +805,32 @@ msgstr "FX 8 (Sci-Fi)"
msgid "Fiddle"
msgstr "Fiedel"
+#: Programs/brltty-hid.c:76
+msgid "Filter for a Bluetooth device."
+msgstr ""
+
+#: Programs/brltty-hid.c:70
+msgid "Filter for a USB device (the default if not ambiguous)."
+msgstr ""
+
+#: Programs/brltty-hid.c:1065
+msgid "Find HID devices, list report descriptors, read/write reports/features, or monitor input from a HID device."
+msgstr ""
+
#. xgettext: This is the name of MIDI musical instrument #74 (in the Pipe group).
#: Programs/midi.c:308
msgid "Flute"
msgstr "Flöte"
-#: Programs/brltty-ctb.c:96
+#: Programs/brltty-ctb.c:65
msgid "Force immediate output."
msgstr "Sofortige Ausgabe erzwingen."
-#: Programs/brltty-cldr.c:42
-msgid "Format of each output line."
-msgstr "Format einer Ausgabezeile."
-
-#: Programs/brltty-ttb.c:165
+#: Programs/brltty-ttb.c:155
msgid "Format of input file."
msgstr "Format der Eingabedatei."
-#: Programs/brltty-ttb.c:172
+#: Programs/brltty-ttb.c:162
msgid "Format of output file."
msgstr "Format der Ausgabedatei."
@@ -821,7 +844,7 @@ msgstr "Waldhorn"
msgid "Fretless Bass"
msgstr "bundloser Bass"
-#: Programs/alert.c:97
+#: Programs/alert.c:103
msgid "Frozen"
msgstr "Eingefroren"
@@ -829,10 +852,6 @@ msgstr "Eingefroren"
msgid "Generic"
msgstr "Allgemein"
-#: Programs/log.c:64
-msgid "Generic Input"
-msgstr "allgemeine Eingaben"
-
#. xgettext: This is the name of MIDI musical instrument #10 (in the Chromatic Percussion group).
#: Programs/midi.c:108
msgid "Glockenspiel"
@@ -859,6 +878,10 @@ msgstr "Gitarre, Obertöne"
msgid "Gunshot"
msgstr "Gewehrschuss"
+#: Programs/config.c:558
+msgid "Handle keyboard key events when using a Linux tty in graphics mode."
+msgstr ""
+
#. xgettext: This is the name of MIDI musical instrument #23 (in the Organ group).
#: Programs/midi.c:148
msgid "Harmonica"
@@ -878,11 +901,15 @@ msgstr "Helikopter"
msgid "Help Screen"
msgstr "Hilfe-Schirm"
-#: Programs/menu_prefs.c:748 Programs/menu_prefs.c:1013
+#: Programs/menu_prefs.c:668
+msgid "Hide"
+msgstr "Verstecken"
+
+#: Programs/menu_prefs.c:749 Programs/menu_prefs.c:1015
msgid "High"
msgstr "Hoch"
-#: Programs/menu_prefs.c:921
+#: Programs/menu_prefs.c:923
msgid "Highlight Braille Window Location"
msgstr "Braillezeilenposition hervorheben"
@@ -891,36 +918,40 @@ msgstr "Braillezeilenposition hervorheben"
msgid "Honkytonk Piano"
msgstr "Honky-tonk Klavier"
-#: Programs/menu_prefs.c:1228
+#: Programs/log.c:149
+msgid "Human Interface I/O"
+msgstr ""
+
+#: Programs/menu_prefs.c:1248
msgid "Immediate"
msgstr "Sofort"
-#: Programs/xbrlapi.c:665
+#: Programs/xbrlapi.c:813
msgid "Incompatible XKB library\n"
msgstr "Inkompatible XKB Bibliothek\n"
-#: Programs/xbrlapi.c:667
+#: Programs/xbrlapi.c:815
msgid "Incompatible XKB server support\n"
msgstr "Inkompatible XKB Serverunterstützung\n"
-#: Programs/menu_prefs.c:1496
+#: Programs/menu_prefs.c:1516
msgid "Information"
msgstr "Information"
-#: Programs/menu_prefs.c:956
+#: Programs/menu_prefs.c:958
msgid "Input Options"
msgstr "Eingabeoptionen"
-#: Programs/log.c:70
+#: Programs/log.c:65
msgid "Input Packets"
msgstr "eingehende Datenpakete"
-#: Programs/config.c:418
+#: Programs/config.c:774
#, c-format
msgid "Install the %s service, and then exit."
msgstr "Installiere das Service %s und beende dann."
-#: Programs/menu_prefs.c:1500
+#: Programs/menu_prefs.c:1520
msgid "Internal Parameters"
msgstr "Interne Parameter"
@@ -930,7 +961,7 @@ msgstr "Java-Klasse nicht gefunden"
#: Drivers/Screen/Android/screen.c:181
msgid "Java exception occurred"
-msgstr ""
+msgstr "Ein Java-Ausnahmefehler ist aufgetreten"
#: Drivers/Screen/Android/screen.c:194
msgid "Java method not found"
@@ -941,31 +972,31 @@ msgstr "Java-Methode nicht gefunden"
msgid "Kalimba"
msgstr "Kalimba"
-#: Programs/config.c:1709
+#: Programs/config.c:1833
msgid "Key Bindings"
msgstr "Tastenbelegungen"
-#: Programs/config.c:1237
+#: Programs/config.c:1275
msgid "Key Help"
msgstr "Tastenhilfe"
-#: Programs/config.c:1714 Programs/ktb_list.c:737
+#: Programs/config.c:1838 Programs/ktb_list.c:737
msgid "Key Table"
msgstr "Tastentabelle"
-#: Programs/menu_prefs.c:935
+#: Programs/menu_prefs.c:937
msgid "Keyboard Enabled"
msgstr "Tastatur aktiviert"
-#: Programs/log.c:88
+#: Programs/log.c:83
msgid "Keyboard Key Events"
msgstr "Tastaturereignisse"
-#: Programs/menu_prefs.c:1042
+#: Programs/menu_prefs.c:1044
msgid "Keyboard LED Alerts"
msgstr "Tastaturer-LED Warnungen"
-#: Programs/config.c:1322 Programs/menu_prefs.c:1024
+#: Programs/menu_prefs.c:1026
msgid "Keyboard Table"
msgstr "Tastaturtabelle"
@@ -974,7 +1005,7 @@ msgstr "Tastaturtabelle"
msgid "Koto"
msgstr "Koto"
-#: Programs/config.c:3112
+#: Programs/config.c:3223
msgid "Language"
msgstr "Sprache"
@@ -1023,56 +1054,68 @@ msgstr "Hauptstimme 8 (Bass und Führung)"
msgid "Learn Mode"
msgstr "Lernmodus"
-#: Programs/menu_prefs.c:1341
+#: Programs/menu_prefs.c:1361
msgid "Left"
msgstr "Links"
-#: Programs/brltty-ktb.c:51
+#: Programs/brltty-hid.c:167
+msgid "List each report's identifier and sizes."
+msgstr ""
+
+#: Programs/brltty-ktb.c:59
msgid "List key names."
msgstr "Tastennamen auflisten."
-#: Programs/brltty-ktb.c:57
+#: Programs/brltty-ktb.c:65
msgid "List key table in help screen format."
msgstr "Tastentabelle im Hilfe-Schirm Format auflisten."
-#: Programs/brltty-ktb.c:63
+#: Programs/brltty-ktb.c:71
msgid "List key table in reStructuredText format."
msgstr "Tastentabelle im reStructuredText-Format auflisten."
-#: Programs/menu_prefs.c:1483
+#: Programs/brltty-hid.c:161
+msgid "List the HID report descriptor's items."
+msgstr ""
+
+#: Programs/brltty-cldr.c:237
+msgid "List the characters defined within a CLDR (Common Locale Data Repository Project) annotations file."
+msgstr ""
+
+#: Programs/brltty-lsinc.c:95
+msgid "List the paths to a data file and those which it recursively includes."
+msgstr ""
+
+#: Programs/menu_prefs.c:1503
msgid "Locale Directory"
msgstr "Lokalisierungsverzeichnis"
-#: Programs/menu_prefs.c:1519
+#: Programs/menu_prefs.c:1539
msgid "Log Categories"
msgstr "Protokollierungskategorien"
-#: Programs/config.c:890
-msgid "Log Level"
-msgstr "Protokollierungsausführlichkeit"
-
-#: Programs/menu_prefs.c:1580
+#: Programs/menu_prefs.c:1600
msgid "Log Messages"
msgstr "Protokollierungsmeldungen"
-#: Programs/config.c:773
+#: Programs/config.c:384
msgid "Log the versions of the core, API, and built-in drivers, and then exit."
msgstr "Protokolliere die Version des Kerns, der API, der integrierten Treiber und beende dann."
-#: Programs/config.c:738
+#: Programs/config.c:632
msgid "Log to standard error rather than to the system log."
msgstr "Protokolliere via Standardfehlerausgabe anstatt System Log."
-#: Programs/config.c:752
+#: Programs/config.c:617
#, c-format
msgid "Logging level (%s or one of {%s}) and/or log categories to enable (any combination of {%s}, each optionally prefixed by %s to disable)."
msgstr ""
-#: Programs/menu_prefs.c:978
+#: Programs/menu_prefs.c:980
msgid "Long Press Time"
msgstr "Zeitverzögerung"
-#: Programs/menu_prefs.c:746 Programs/menu_prefs.c:1011
+#: Programs/menu_prefs.c:747 Programs/menu_prefs.c:1013
msgid "Low"
msgstr "Niedrig"
@@ -1084,40 +1127,72 @@ msgstr "Unterer linker Punkt"
msgid "Lower Right Dot"
msgstr "Unterer rechter Punkt"
-#: Programs/menu_prefs.c:1058
+#: Programs/menu_prefs.c:1060
msgid "MIDI"
msgstr "MIDI"
-#: Programs/config.c:722
+#: Programs/config.c:702
msgid "MIDI (Musical Instrument Digital Interface) device specifier."
msgstr "MIDI (Musical Instrument Digital Interface) Geräts-Angabe."
-#: Programs/menu_prefs.c:1088
+#: Programs/menu_prefs.c:1090
msgid "MIDI Instrument"
msgstr "MIDI Instrument"
-#: Programs/menu_prefs.c:1078
+#: Programs/menu_prefs.c:1080
msgid "MIDI Volume"
msgstr "MIDI Lautstärke"
-#: Programs/menu_prefs.c:1443
+#: Programs/menu_prefs.c:1463
msgid "Mailing List"
msgstr "Mailing-Liste"
+#: Programs/brltty-clip.c:154
+msgid "Manage brltty's clipboard from the command line."
+msgstr ""
+
#. xgettext: This is the name of MIDI musical instrument #13 (in the Chromatic Percussion group).
#: Programs/midi.c:117
msgid "Marimba"
msgstr "Marimba"
-#: Programs/menu_prefs.c:749 Programs/menu_prefs.c:1014
+#: Programs/brltty-hid.c:118
+msgid "Match the full device address (Bluetooth only - all six two-digit, hexadecimal octets separated by a colon [:])."
+msgstr ""
+
+#: Programs/brltty-hid.c:90
+msgid "Match the product identifier (four hexadecimal digits)."
+msgstr ""
+
+#: Programs/brltty-hid.c:125
+msgid "Match the start of the device name (Bluetooth only)."
+msgstr ""
+
+#: Programs/brltty-hid.c:97
+msgid "Match the start of the manufacturer name (USB only)."
+msgstr ""
+
+#: Programs/brltty-hid.c:104
+msgid "Match the start of the product description (USB only)."
+msgstr ""
+
+#: Programs/brltty-hid.c:111
+msgid "Match the start of the serial number (USB only)."
+msgstr ""
+
+#: Programs/brltty-hid.c:83
+msgid "Match the vendor identifier (four hexadecimal digits)."
+msgstr ""
+
+#: Programs/menu_prefs.c:750 Programs/menu_prefs.c:1016
msgid "Maximum"
msgstr "Maximal"
-#: Programs/brltty-ctb.c:90
+#: Programs/brltty-ctb.c:53
msgid "Maximum length of an output line."
msgstr "Maximale Länge einer Ausgabezeile."
-#: Programs/menu_prefs.c:747 Programs/menu_prefs.c:1012
+#: Programs/menu_prefs.c:748 Programs/menu_prefs.c:1014
msgid "Medium"
msgstr "Mittel"
@@ -1126,46 +1201,37 @@ msgstr "Mittel"
msgid "Melodic Tom"
msgstr "Melodische Trommel"
-#: Programs/menu_prefs.c:679
+#: Programs/menu_prefs.c:680
msgid "Menu Options"
msgstr "Menüoptionen"
-#: Programs/config.c:731
+#: Programs/config.c:662
msgid "Message hold timeout (in 10ms units)."
msgstr "Meldungsanzeigedauer (in 10ms Einheiten)."
-#: Programs/config.c:893
-#, fuzzy
-msgid "Messages Directory"
-msgstr "Tabellenverzeichnis"
-
-#: Programs/config.c:892
-msgid "Messages Domain"
-msgstr ""
-
-#: Programs/config.c:891
-msgid "Messages Locale"
-msgstr ""
-
-#: Programs/menu_prefs.c:745 Programs/menu_prefs.c:1010
+#: Programs/menu_prefs.c:746 Programs/menu_prefs.c:1012
msgid "Minimum"
msgstr "Minimal"
-#: Programs/config.c:682
+#: Programs/config.c:513
#, c-format
msgid "Minimum screen content quality to autospeak (one of {%s})."
-msgstr ""
+msgstr "Minimale Bildschirminhalt-Qualität für automatisches Sprechen (einer von {%s})."
-#: Programs/menu_prefs.c:1313
+#: Programs/menu_prefs.c:1333
msgid "Month Day Year"
msgstr "Monat Tag Jahr"
+#: Programs/spk.c:281
+msgid "Most"
+msgstr "Die meisten"
+
#. xgettext: This is the name of MIDI musical instrument #11 (in the Chromatic Percussion group).
#: Programs/midi.c:111
msgid "Music Box"
msgstr "Musikbox"
-#: Programs/menu_prefs.c:1058
+#: Programs/menu_prefs.c:1060
msgid "Musical Instrument Digital Interface"
msgstr "Musical Instrument Digital Interface"
@@ -1174,32 +1240,36 @@ msgstr "Musical Instrument Digital Interface"
msgid "Muted Trumpet"
msgstr "Gedämpfte Trompete"
-#: Programs/config.c:623
+#: Programs/config.c:567
+msgid "Name of or path to GUI keyboard table."
+msgstr "Name oder Pfad zur GUI-Tastaturtabelle."
+
+#: Programs/config.c:471
msgid "Name of or path to attributes table."
msgstr "Name der oder Pfad zur Attributtabelle."
-#: Programs/config.c:615
+#: Programs/config.c:463
msgid "Name of or path to contraction table."
msgstr "Name der oder Pfad zur Kurzschrifttabelle."
-#: Programs/config.c:479
+#: Programs/config.c:576
msgid "Name of or path to default preferences file."
msgstr "Name der oder Pfad zur Standardeinstellungsdatei."
-#: Programs/config.c:632
+#: Programs/config.c:543
msgid "Name of or path to keyboard table."
msgstr "Name der oder Pfad zur Tastentabelle."
-#: Programs/config.c:668
+#: Programs/config.c:499
msgid "Name of or path to speech input object."
msgstr "Name des oder Pfad zum Spracheingabeobjekts."
-#: Programs/config.c:605
+#: Programs/config.c:453
#, c-format
msgid "Name of or path to text table (or %s)."
msgstr "Name der oder Pfad zur Texttabelle (oder %s)."
-#: Programs/menu_prefs.c:845
+#: Programs/menu_prefs.c:846
msgid "Navigation Options"
msgstr "Navigationsoptionen"
@@ -1207,18 +1277,17 @@ msgstr "Navigationsoptionen"
msgid "No"
msgstr "Nein"
-#: Programs/menu_prefs.c:720
+#: Programs/menu_prefs.c:721
msgid "No Capitalization"
msgstr "Keine Großschreibung"
-#: Programs/menu_prefs.c:897 Programs/menu_prefs.c:1192
-#: Programs/menu_prefs.c:1205 Programs/menu_prefs.c:1218
-#: Programs/menu_prefs.c:1301 Programs/menu_prefs.c:1340
-#: Programs/menu_prefs.c:1360
+#: Programs/menu_prefs.c:899 Programs/menu_prefs.c:1225
+#: Programs/menu_prefs.c:1238 Programs/menu_prefs.c:1321
+#: Programs/menu_prefs.c:1360 Programs/menu_prefs.c:1380 Programs/spk.c:279
msgid "None"
msgstr "Keine"
-#: Programs/menu_prefs.c:1495
+#: Programs/menu_prefs.c:1515
msgid "Notice"
msgstr "Hinweis"
@@ -1232,18 +1301,22 @@ msgstr "Oboe"
msgid "Ocarina"
msgstr "Okarina"
-#: Programs/menu_prefs.c:960
+#: Programs/menu_prefs.c:962
msgid "Off"
msgstr "Aus"
-#: Programs/config.c:1800
+#: Programs/config.c:1926
msgid "Old Preferences File"
msgstr "Alte Einstellungsdatei"
-#: Programs/menu_prefs.c:973
+#: Programs/menu_prefs.c:975
msgid "On First Release"
msgstr "Beim ersten Loslassen"
+#: Programs/cmdline.c:281
+msgid "Options"
+msgstr "Optionen"
+
#. xgettext: This is the name of MIDI musical instrument #56 (in the Ensemble group).
#: Programs/midi.c:251
msgid "Orchestra Hit"
@@ -1259,7 +1332,7 @@ msgstr "Orchesterharfe"
msgid "Organ"
msgstr "Orgel"
-#: Programs/log.c:76
+#: Programs/log.c:71
msgid "Output Packets"
msgstr "ausgehende Datenpakete"
@@ -1268,32 +1341,32 @@ msgstr "ausgehende Datenpakete"
msgid "Overdriven Guitar"
msgstr "Übersteuerte Gitarre"
-#: Drivers/Braille/Iris/braille.c:1545
+#: Drivers/Braille/Iris/braille.c:1548
msgid "PC mode"
msgstr "PC-Modus"
-#: Programs/menu_prefs.c:1057
+#: Programs/menu_prefs.c:1059
msgid "PCM"
msgstr "PCM"
-#: Programs/config.c:712
+#: Programs/config.c:692
msgid "PCM (soundcard digital audio) device specifier."
-msgstr ""
+msgstr "PCM (Soundkarte Digital Audio) Gerätespezifikator."
-#: Programs/menu_prefs.c:1070
+#: Programs/menu_prefs.c:1072
msgid "PCM Volume"
msgstr "PCM Lautstärke"
#. xgettext: This is the description of the PASSPS2 command.
-#: Programs/cmds.auto.h:1487
+#: Programs/cmds.auto.h:1503
msgid "PS/2 (set 3) keyboard scan code"
msgstr "PS/2 (set 3) Tastatur-Scancode"
-#: Programs/menu_prefs.c:1433
+#: Programs/menu_prefs.c:1453
msgid "Package Revision"
msgstr "Paketrevision"
-#: Programs/menu_prefs.c:1428
+#: Programs/menu_prefs.c:1448
msgid "Package Version"
msgstr "Paket Version"
@@ -1343,81 +1416,81 @@ msgstr "Basisstimme 8 (Sweep)"
msgid "Pan Flute"
msgstr "Panflöte"
-#: Programs/config.c:541
+#: Programs/config.c:601
msgid "Parameters for the application programming interface."
msgstr "Parameter für die Programmierschnittstelle."
-#: Programs/config.c:563
+#: Programs/config.c:421
msgid "Parameters for the braille driver."
msgstr "Parameter für den Brailletreiber."
-#: Programs/config.c:436
+#: Programs/config.c:654
#, fuzzy
msgid "Parameters for the privilege establishment stage."
msgstr "Parameter für den Brailletreiber."
-#: Programs/config.c:703
+#: Programs/config.c:534
msgid "Parameters for the screen driver."
msgstr "Parameter für den Bildschirmtreiber."
-#: Programs/config.c:660
+#: Programs/config.c:491
msgid "Parameters for the speech driver."
msgstr "Parameter für den Sprachausgabentreiber."
-#: Programs/config.c:470
+#: Programs/config.c:400
msgid "Path to default settings file."
msgstr "Pfad zur Standardkonfigurationsdatei."
-#: Programs/config.c:524
+#: Programs/config.c:723
msgid "Path to directory containing drivers."
msgstr "Pfad zum Verzeichnis das Treiber enthält."
-#: Programs/brltest.c:68 Programs/brltty-atb.c:36 Programs/brltty-ctb.c:54
-#: Programs/brltty-ktb.c:73 Programs/config.c:595
+#: Programs/brltest.c:65 Programs/brltty-atb.c:35 Programs/brltty-ctb.c:96
+#: Programs/brltty-ktb.c:80 Programs/config.c:713
msgid "Path to directory containing tables."
msgstr "Pfad zum Tabellen-Verzeichnis."
-#: Programs/brltty-ttb.c:152
+#: Programs/brltty-ttb.c:186
msgid "Path to directory containing text tables."
msgstr "Pfad zum einem Verzeichnis das Texttabellen enthält."
-#: Programs/brltty-ktb.c:83
+#: Programs/brltty-ktb.c:89
msgid "Path to directory for loading drivers."
msgstr "Pfad zum Verzeichnis aus dem Treiber geladen werden."
-#: Programs/brltty-trtxt.c:51
+#: Programs/brltty-trtxt.c:79
msgid "Path to directory for text tables."
msgstr "Pfad zum Verzeichnis für Texttabellen."
-#: Programs/brltest.c:78 Programs/config.c:514
+#: Programs/brltest.c:83 Programs/config.c:743
msgid "Path to directory which can be written to."
msgstr "Pfad zum Verzeichnis in dem Dateien erstellt werden können."
-#: Programs/config.c:504
+#: Programs/config.c:733
msgid "Path to directory which contains files that can be updated."
msgstr "Pfad zum Verzeichnis in dem Dateien modifiziert werden können."
-#: Programs/config.c:404
+#: Programs/config.c:752
msgid "Path to directory which contains message localizations."
-msgstr ""
+msgstr "Pfad zum Verzeichnis, das Nachrichten-Lokalisierungen enthält."
-#: Programs/brltty-trtxt.c:59
+#: Programs/brltty-trtxt.c:50
msgid "Path to input text table."
msgstr "Pfad der Brailletabelle für den Eingabetext."
-#: Programs/config.c:761
+#: Programs/config.c:626
msgid "Path to log file."
msgstr "Pfad zur Protokolldatei."
-#: Programs/brltty-trtxt.c:67
+#: Programs/brltty-trtxt.c:58
msgid "Path to output text table."
msgstr "Pfad der Brailletabelle für den Ausgabetext."
-#: Programs/config.c:460
+#: Programs/config.c:761
msgid "Path to process identifier file."
msgstr "Pfad zur Prozessidentifikationsdatei."
-#: Programs/config.c:494
+#: Programs/config.c:683
msgid "Patterns that match command prompts."
msgstr "Muster die den Kommandoprompt beschreiben."
@@ -1447,16 +1520,20 @@ msgstr "Piccoloflöte"
msgid "Pipe"
msgstr "Pfeife"
+#: Programs/spk.c:263
+msgid "Pitch"
+msgstr ""
+
#. xgettext: This is the name of MIDI musical instrument #46 (in the Strings group).
#: Programs/midi.c:220
msgid "Pizzicato Strings"
msgstr "Pizzikato-Saiten"
-#: Drivers/Braille/Baum/braille.c:1158
+#: Drivers/Braille/Baum/braille.c:1159
msgid "Powerdown"
msgstr "Abschaltung"
-#: Programs/config.c:2956 Programs/menu_prefs.c:1463
+#: Programs/menu_prefs.c:1483
msgid "Preferences File"
msgstr "Einstellungsdatei"
@@ -1464,36 +1541,39 @@ msgstr "Einstellungsdatei"
msgid "Preferences Menu"
msgstr "Einstellungsmenü"
-#: Headers/options.h:75
-msgid "Print a usage summary (all options), and then exit."
-msgstr "Zeige eine Benutzungszusammenfassung (alle Optionen) und beende dann."
-
-#: Headers/options.h:70
-msgid "Print a usage summary (commonly used options only), and then exit."
-msgstr "Zeige eine Benutzungszusammenfassung (nur häufig verwendete Optionen) und beende dann."
-
-#: Programs/config.c:844
-#, fuzzy
-msgid "Privilege Parameter"
-msgstr "Braille-Parameter"
-
-#: Programs/menu_prefs.c:1414
+#: Programs/menu_prefs.c:1434
msgid "Profiles"
msgstr "Profile"
-#: Programs/config.c:640
+#: Programs/config.c:551
msgid "Properties of eligible keyboards."
msgstr "Eigenschaften von geeigneten Tastaturen."
-#: Programs/menu_prefs.c:950
+#: Programs/spk.c:299
+msgid "Punctuation"
+msgstr "Interpunktion"
+
+#: Programs/menu_prefs.c:952
msgid "Quick Space"
msgstr "Doppelhub"
-#: Programs/menu_prefs.c:1209
+#: Programs/menu_prefs.c:1229
msgid "Raise Pitch"
msgstr "Erhöhe Tonhöhe"
-#: Programs/config.c:395
+#: Programs/spk.c:237
+msgid "Rate"
+msgstr ""
+
+#: Programs/brltty-hid.c:181
+msgid "Read (get) a feature report (two hexadecimal digits)."
+msgstr ""
+
+#: Programs/brltty-hid.c:174
+msgid "Read (get) an input report (two hexadecimal digits)."
+msgstr ""
+
+#: Programs/config.c:390
msgid "Recognize environment variables."
msgstr "Verwende Umgebungsvariablen."
@@ -1512,52 +1592,52 @@ msgstr "Rohrblatt"
msgid "Reed Organ"
msgstr "Harmonium"
-#: Programs/brltty-ctb.c:82
+#: Programs/brltty-ctb.c:59
msgid "Reformat input."
msgstr "Eingabe neu formatieren."
-#: Programs/config.c:585
+#: Programs/config.c:443
msgid "Release braille device when screen or window is unreadable."
msgstr "Gib die Braillezeile frei wenn der Bildschirm oder das Fenster nicht lesbar ist."
-#: Programs/xbrlapi.c:106
+#: Programs/xbrlapi.c:130
msgid "Remain a foreground process"
msgstr "Verbleibe als Fordergrundprozess"
-#: Programs/config.c:411
+#: Programs/config.c:638
msgid "Remain a foreground process."
msgstr "Verbleibe als Fordergrundprozess."
-#: Programs/brltty-trtxt.c:73
+#: Programs/brltty-trtxt.c:64
msgid "Remove dots seven and eight."
msgstr "Entferne Punkt sieben und acht."
-#: Programs/config.c:426
+#: Programs/config.c:781
#, c-format
msgid "Remove the %s service, and then exit."
msgstr "Entferne das Service %s und beende dann."
-#: Programs/brltty-ktb.c:45
+#: Programs/brltty-ktb.c:53
msgid "Report problems with the key table."
msgstr "Probleme mit der Tastatur-Befehlstabelle melden."
-#: Programs/brltty-ttb.c:186
+#: Programs/brltty-ttb.c:176
msgid "Report the characters within the current screen font that aren't defined within the text table."
msgstr "Jene Zeichen der aktuellen Bildschirmschriftart melden, welche nicht im aktuellen Braillezeichensatz definiert sind."
-#: Programs/menu_prefs.c:866
+#: Programs/menu_prefs.c:868
msgid "Rest of Line"
msgstr "Rest der Zeile"
-#: Programs/menu_prefs.c:1562
+#: Programs/menu_prefs.c:1582
msgid "Restart Braille Driver"
msgstr "Brailletreiber neu starten"
-#: Programs/menu_prefs.c:1574
+#: Programs/menu_prefs.c:1594
msgid "Restart Screen Driver"
msgstr "Bildschirmtreiber neu starten"
-#: Programs/menu_prefs.c:1568
+#: Programs/menu_prefs.c:1588
msgid "Restart Speech Driver"
msgstr "Sprachausgabentreiber neu starten"
@@ -1566,7 +1646,7 @@ msgstr "Sprachausgabentreiber neu starten"
msgid "Reverse Cymbal"
msgstr "Becken Rückseite"
-#: Programs/menu_prefs.c:1342
+#: Programs/menu_prefs.c:1362
msgid "Right"
msgstr "Rechts"
@@ -1575,41 +1655,41 @@ msgstr "Rechts"
msgid "Rock Organ"
msgstr "Rock-Orgel"
-#: Programs/menu_prefs.c:674
+#: Programs/brltty-pty.c:389
+msgid "Run a shell or terminal manager within a pty (virtual terminal) and export its screen via a shared memory segment so that brltty can read it via its Terminal Emulator screen driver."
+msgstr ""
+
+#: Programs/menu_prefs.c:675
msgid "Save on Exit"
msgstr "Beim Verlassen speichern"
#. "cap" here, used during speech output, is short for "capital".
#. It is spoken just before an uppercase letter, e.g. "cap A".
-#: Programs/menu_prefs.c:1208
+#: Programs/menu_prefs.c:1228
msgid "Say Cap"
msgstr "Sprich Groß"
-#: Programs/menu_prefs.c:1232
+#: Programs/menu_prefs.c:1252
msgid "Say Line Mode"
msgstr "Zeilen-Vorlesemodus"
-#: Programs/menu_prefs.c:1219
+#: Programs/menu_prefs.c:1239
msgid "Say Space"
msgstr "Sprich Leerzeichen"
-#: Programs/menu_prefs.c:780
+#: Programs/menu_prefs.c:781
msgid "Screen Cursor Blink Period"
msgstr "Blinkdauer des Bildschirmcursors"
-#: Programs/menu_prefs.c:788
+#: Programs/menu_prefs.c:789
msgid "Screen Cursor Percent Visible"
msgstr "Anzeigedauer des Bildschirmcursors in Prozent"
-#: Programs/menu_prefs.c:768
+#: Programs/menu_prefs.c:769
msgid "Screen Cursor Style"
msgstr "Bildschirmcursordarstellung"
-#: Programs/config.c:2453
-msgid "Screen Driver"
-msgstr "Bildschirmtreiber"
-
-#: Programs/log.c:160
+#: Programs/log.c:167
msgid "Screen Driver Events"
msgstr "Bildschirmtreiberereignisse"
@@ -1617,16 +1697,16 @@ msgstr "Bildschirmtreiberereignisse"
msgid "Screen Number"
msgstr "Bildschirmnummer"
-#: Programs/config.c:2459
-msgid "Screen Parameter"
-msgstr "Bildschirm-Parameter"
-
-#: Programs/config.c:693
+#: Programs/config.c:524
#, c-format
msgid "Screen driver code (%s, %s, or one of {%s})."
msgstr "Bildschirmtreiber Kurzbezeichnung (%s, %s, oder eine von {%s})."
-#: Programs/menu_prefs.c:891
+#: Programs/config.c:877
+msgid "Screen reader for those who use a braille device."
+msgstr ""
+
+#: Programs/menu_prefs.c:893
msgid "Scroll-aware Cursor Navigation"
msgstr "Scrollsensitive Cursornavigation"
@@ -1635,11 +1715,11 @@ msgstr "Scrollsensitive Cursornavigation"
msgid "Seashore"
msgstr "Brandung"
-#: Programs/log.c:130
+#: Programs/log.c:131
msgid "Serial I/O"
msgstr "Serielle E/A"
-#: Programs/log.c:124
+#: Programs/log.c:119
msgid "Server Events"
msgstr "Server Ereignisse"
@@ -1658,49 +1738,73 @@ msgstr "Shamisen"
msgid "Shanai"
msgstr "Shanai"
-#: Programs/menu_prefs.c:687
+#: Programs/menu_prefs.c:688
msgid "Show Advanced Submenus"
msgstr "Zeige erweiterte Untermenüs"
-#: Programs/menu_prefs.c:692
+#: Programs/menu_prefs.c:693
msgid "Show All Items"
msgstr "Zeige alle Elemente"
-#: Programs/menu_prefs.c:796
+#: Programs/menu_prefs.c:797
msgid "Show Attributes"
msgstr "Zeige Attribute"
-#: Programs/menu_prefs.c:763
+#: Programs/menu_prefs.c:764
msgid "Show Screen Cursor"
msgstr "Zeige Bildschirmcursor"
-#: Programs/menu_prefs.c:1295
+#: Programs/menu_prefs.c:1315
msgid "Show Seconds"
msgstr "Sekunden anzeigen"
-#: Programs/menu_prefs.c:1237
+#: Programs/menu_prefs.c:1257
msgid "Show Speech Cursor"
msgstr "Zeige Sprachcursor"
-#: Programs/menu_prefs.c:682
+#: Programs/menu_prefs.c:683
msgid "Show Submenu Sizes"
msgstr "Zeige Größen von Untermenüs"
+#: Programs/brltty-hid.c:137
+msgid "Show the device address (USB serial number, Bluetooth device address, etc)."
+msgstr ""
+
+#: Programs/brltty-hid.c:143
+msgid "Show the device name (USB manufacturer and/or product strings, Bluetooth device name, etc)."
+msgstr ""
+
+#: Programs/brltty-hid.c:155
+msgid "Show the host device (usually its absolute path)."
+msgstr ""
+
+#: Programs/brltty-hid.c:149
+msgid "Show the host path (USB topology, Bluetooth host controller address, etc)."
+msgstr ""
+
+#: Programs/brltty-hid.c:131
+msgid "Show the vendor and product identifiers."
+msgstr ""
+
+#: Headers/cmdline_types.h:72
+msgid "Show this usage summary, and then exit."
+msgstr ""
+
#. Ethnic Instruments
#. xgettext: This is the name of MIDI musical instrument #105 (in the Ethnic group).
#: Programs/midi.c:406
msgid "Sitar"
msgstr "Sitar"
-#: Programs/menu_prefs.c:858
+#: Programs/menu_prefs.c:860
msgid "Skip Blank Braille Windows"
msgstr "Leere Braillezeileninhalte überspringen"
-#: Programs/menu_prefs.c:852
+#: Programs/menu_prefs.c:854
msgid "Skip Identical Lines"
msgstr "Identische Zeilen überspringen"
-#: Programs/menu_prefs.c:869
+#: Programs/menu_prefs.c:871
#, fuzzy
msgid "Skip Which Blank Braille Windows"
msgstr "Zu überspringende leere Braille-Inhalte"
@@ -1715,15 +1819,15 @@ msgstr "Geschlagener Bass 1"
msgid "Slap Bass 2"
msgstr "Geschlagener Bass 2"
-#: Programs/menu_prefs.c:1325
+#: Programs/menu_prefs.c:1345
msgid "Slash"
msgstr "Schrägstrich"
-#: Programs/menu_prefs.c:874
+#: Programs/menu_prefs.c:876
msgid "Sliding Braille Window"
msgstr "überlappende Braillezeilenausschnitte"
-#: Programs/menu_prefs.c:1193
+#: Programs/spk.c:280
msgid "Some"
msgstr "Einige"
@@ -1731,116 +1835,115 @@ msgstr "Einige"
#. xgettext: This is the name of MIDI musical instrument #65 (in the Reed group).
#: Programs/midi.c:280
msgid "Soprano Saxophone"
-msgstr ""
+msgstr "Sopran-Saxophon"
#. xgettext: This is the name of MIDI musical instrument group #16.
#: Programs/midi.c:74
msgid "Sound Effects"
msgstr "Soundeffekte"
-#: Programs/menu_prefs.c:561 Programs/menu_prefs.c:1361
+#: Programs/menu_prefs.c:561 Programs/menu_prefs.c:1381
msgid "Space"
msgstr "Leer"
-#: Programs/menu_prefs.c:1154
+#: Programs/menu_prefs.c:1174
msgid "Speak Completed Words"
msgstr "Sprich vervollständigte Wörter"
-#: Programs/menu_prefs.c:1142
+#: Programs/menu_prefs.c:1162
msgid "Speak Deleted Characters"
msgstr "Sprich gelöschte Zeichen"
-#: Programs/menu_prefs.c:1136
+#: Programs/menu_prefs.c:1144
+msgid "Speak Empty Line"
+msgstr ""
+
+#: Programs/menu_prefs.c:1156
msgid "Speak Inserted Characters"
msgstr "Sprich eingefügte Zeichen"
-#: Programs/menu_prefs.c:1160
+#: Programs/menu_prefs.c:1117
+msgid "Speak Key Context"
+msgstr ""
+
+#: Programs/menu_prefs.c:1180
msgid "Speak Line Indent"
msgstr "Zeilen-Einrückung sprechen"
-#: Programs/menu_prefs.c:1148
+#: Programs/menu_prefs.c:1122
+msgid "Speak Modifier Key"
+msgstr ""
+
+#: Programs/menu_prefs.c:1168
msgid "Speak Replaced Characters"
msgstr "Sprich ersetzte Zeichen"
-#: Programs/menu_prefs.c:1130
+#: Programs/menu_prefs.c:1150
msgid "Speak Selected Character"
msgstr "Sprich hervorgehobenes Zeichen"
-#: Programs/menu_prefs.c:1124
+#: Programs/menu_prefs.c:1138
msgid "Speak Selected Line"
msgstr "Sprich hervorgehobene Zeile"
-#: Programs/menu_prefs.c:1254
+#: Programs/menu_prefs.c:1274
msgid "Speech Cursor Blink Period"
msgstr "Blinkdauer des Sprachcursors"
-#: Programs/menu_prefs.c:1262
+#: Programs/menu_prefs.c:1282
msgid "Speech Cursor Percent Visible"
msgstr "Anzeigedauer des Sprachcursors in Prozent"
-#: Programs/menu_prefs.c:1242
+#: Programs/menu_prefs.c:1262
msgid "Speech Cursor Style"
msgstr "Sprachcursordarstellung"
-#: Programs/config.c:2228
-msgid "Speech Driver"
-msgstr "Sprachausgabentreiber"
-
-#: Programs/log.c:154
+#: Programs/log.c:161
msgid "Speech Driver Events"
msgstr "Ereignisse des Sprachausgabentreibers"
-#: Programs/log.c:112
+#: Programs/log.c:107
msgid "Speech Events"
msgstr "Sprachausgabenereignisse"
-#. Create the file system object for speech input.
-#: Programs/config.c:3023
-msgid "Speech Input"
-msgstr "Spracheingabe"
-
-#: Programs/menu_prefs.c:1167
+#: Programs/menu_prefs.c:1187
msgid "Speech Options"
msgstr "Sprachausgabenoptionen"
-#: Programs/config.c:2231
-msgid "Speech Parameter"
-msgstr "Sprachausgaben-Parameter"
-
-#: Programs/menu_prefs.c:1184
+#: Programs/menu_prefs.c:1204
msgid "Speech Pitch"
msgstr "Tonhöhe"
-#: Programs/menu_prefs.c:1197
+#: Programs/menu_prefs.c:1217
msgid "Speech Punctuation"
msgstr "Satzzeichenansage"
-#: Programs/menu_prefs.c:1177
+#: Programs/menu_prefs.c:1197
msgid "Speech Rate"
msgstr "Sprechgeschwindigkeit"
-#: Programs/menu_prefs.c:1212
+#: Programs/menu_prefs.c:1232
msgid "Speech Uppercase Indicator"
msgstr "Großbuchstabenansage"
-#: Programs/menu_prefs.c:1170
+#: Programs/menu_prefs.c:1190
msgid "Speech Volume"
msgstr "Sprachlautstärke"
-#: Programs/menu_prefs.c:1222
+#: Programs/menu_prefs.c:1242
msgid "Speech Whitespace Indicator"
msgstr "Leerraumansage"
-#: Programs/config.c:650
+#: Programs/config.c:481
#, c-format
msgid "Speech driver code (%s, %s, or one of {%s})."
msgstr "Sprachausgabentreiber Kurzbezeichnung (%s, %s, oder eine von {%s})."
-#: Programs/menu_prefs.c:1509
+#: Programs/menu_prefs.c:1529
msgid "Standard Error Log Level"
msgstr "Protokollierungsausführlichkeit für die Standard-Fehlerausgabe"
-#: Programs/menu_prefs.c:926
+#: Programs/menu_prefs.c:928
msgid "Start Selection with Routing Key"
msgstr "Auswahl durch Cursorrouting-Taste starten"
@@ -1852,11 +1955,11 @@ msgstr "Statuspunkte"
msgid "State Letter"
msgstr "Statusbuchstabe"
-#: Programs/menu_prefs.c:1336
+#: Programs/menu_prefs.c:1356
msgid "Status Cells"
msgstr "Statuszellen"
-#: Programs/menu_prefs.c:1352
+#: Programs/menu_prefs.c:1372
msgid "Status Count"
msgstr "Gesamtanzahl der Statuszellen"
@@ -1864,15 +1967,15 @@ msgstr "Gesamtanzahl der Statuszellen"
msgid "Status Field"
msgstr "Statusfeld"
-#: Programs/menu_prefs.c:1345
+#: Programs/menu_prefs.c:1365
msgid "Status Position"
msgstr "Position der Statuszellen"
-#: Programs/menu_prefs.c:1367
+#: Programs/menu_prefs.c:1387
msgid "Status Separator"
msgstr "Status-Trennzeichen"
-#: Programs/menu_prefs.c:1363
+#: Programs/menu_prefs.c:1383
msgid "Status Side"
msgstr "Statusseitig"
@@ -1881,7 +1984,7 @@ msgstr "Statusseitig"
msgid "Steel Drums"
msgstr "Steel Drums"
-#: Programs/config.c:450
+#: Programs/config.c:767
#, c-format
msgid "Stop an existing instance of %s, and then exit."
msgstr "Stoppe eine laufende Instanz von %s und beende dann."
@@ -1902,14 +2005,18 @@ msgstr "Saiten Ensemble 2"
msgid "Strings"
msgstr "Saiteninstrumente"
-#: Programs/menu_prefs.c:722
+#: Programs/menu_prefs.c:723
msgid "Superimpose Dot 7"
msgstr "Punkt 7 hinzufügen"
-#: Programs/config.c:744
+#: Programs/config.c:609
msgid "Suppress start-up messages."
msgstr "Unterdrücke Meldungen zum Startvorgang."
+#: Programs/cmdline.c:243
+msgid "Syntax"
+msgstr "Syntax"
+
#. xgettext: This is the name of MIDI musical instrument #39 (in the Bass group).
#: Programs/midi.c:198
msgid "Synth Bass 1"
@@ -1969,11 +2076,11 @@ msgstr "Synth Saiteninstrumente 1"
msgid "SynthStrings 2"
msgstr "Synth Saiteninstrumente 2"
-#: Programs/menu_prefs.c:1504
+#: Programs/menu_prefs.c:1524
msgid "System Log Level"
msgstr "System-Protokollierungsausführlichkeit"
-#: Programs/config.c:2977 Programs/menu_prefs.c:1478
+#: Programs/menu_prefs.c:1498
msgid "Tables Directory"
msgstr "Tabellenverzeichnis"
@@ -1997,27 +2104,59 @@ msgstr "Telefonklingeln"
msgid "Tenor Saxophone"
msgstr ""
-#: Programs/menu_prefs.c:760
+#: Programs/apitest.c:482
+msgid "Test BrlAPI functions."
+msgstr ""
+
+#: Programs/brltest.c:100
+msgid "Test a braille driver."
+msgstr ""
+
+#: Programs/scrtest.c:137
+msgid "Test a screen driver."
+msgstr ""
+
+#: Programs/spktest.c:115
+msgid "Test a speech driver."
+msgstr ""
+
+#: Programs/msgtest.c:251
+msgid "Test message localization using the message catalog reader."
+msgstr ""
+
+#: Programs/crctest.c:121
+msgid "Test supported CRC (Cyclic Redundancy Check) checksum algorithms."
+msgstr ""
+
+#: Programs/menu_prefs.c:761
msgid "Text Indicators"
msgstr "Darstellungsform"
-#: Programs/menu_prefs.c:1364
+#: Programs/menu_prefs.c:1384
msgid "Text Side"
msgstr "Textseitig"
-#: Programs/config.c:1003 Programs/menu_prefs.c:1392
+#: Programs/menu_prefs.c:1412
msgid "Text Table"
msgstr "Texttabelle"
-#: Programs/brltty-ctb.c:69
+#: Programs/brltty-ctb.c:80
msgid "Text table."
msgstr "Texttabelle."
-#: Programs/config.c:381
+#: Programs/brltty-cldr.c:42
+msgid "The format of each output line."
+msgstr ""
+
+#: Programs/brltty-hid.c:208
+msgid "The input timeout (in seconds)."
+msgstr ""
+
+#: Programs/config.c:669
msgid "The text to be shown when the braille driver starts and to be spoken when the speech driver starts."
msgstr "Text der angezeigt und/oder gesprochen werden soll, wenn der Braille- und/oder Sprachausgabentreiber gestartet wird."
-#: Programs/config.c:388
+#: Programs/config.c:676
msgid "The text to be shown when the braille driver stops."
msgstr "Text der gezeigt werden soll wenn der Brailletreiber angehalten wird."
@@ -2025,15 +2164,15 @@ msgstr "Text der gezeigt werden soll wenn der Brailletreiber angehalten wird."
msgid "Time"
msgstr "Uhrzeit"
-#: Programs/menu_prefs.c:1280
+#: Programs/menu_prefs.c:1300
msgid "Time Format"
msgstr "Zeitformat"
-#: Programs/menu_prefs.c:1272
+#: Programs/menu_prefs.c:1292
msgid "Time Presentation"
msgstr "Zeitanzeige"
-#: Programs/menu_prefs.c:1290
+#: Programs/menu_prefs.c:1310
msgid "Time Separator"
msgstr "Uhrzeit-Trennzeichen"
@@ -2048,27 +2187,35 @@ msgstr "Pauken"
msgid "Tinkle Bell"
msgstr "Glöckchen"
-#: Programs/menu_prefs.c:1558
+#: Programs/menu_prefs.c:1578
msgid "Tools"
msgstr "Werkzeuge"
-#: Programs/menu_prefs.c:1003
+#: Programs/menu_prefs.c:1005
msgid "Touch Navigation"
msgstr "Berührungsbasierte Navigation"
-#: Programs/menu_prefs.c:1017
+#: Programs/menu_prefs.c:1019
msgid "Touch Sensitivity"
msgstr "Berührungsempfindlichkeit"
-#: Programs/menu_prefs.c:915
+#: Programs/menu_prefs.c:917
msgid "Track Screen Pointer"
msgstr "Mauszeigerverfolgung"
-#: Programs/menu_prefs.c:909
+#: Programs/menu_prefs.c:911
msgid "Track Screen Scroll"
msgstr "Bildschirmscrollverfolgung"
-#: Programs/menu_prefs.c:941
+#: Programs/brltty-trtxt.c:239
+msgid "Translate one binary braille representation to another."
+msgstr ""
+
+#: Programs/brltty-morse.c:136
+msgid "Translate text into Morse Code tones."
+msgstr ""
+
+#: Programs/menu_prefs.c:943
msgid "Translated via Text Table"
msgstr "Durch Texttabelle übersetzt"
@@ -2098,15 +2245,15 @@ msgstr "Tuba"
msgid "Tubular Bells"
msgstr "Röhrenglocken"
-#: Programs/menu_prefs.c:1062
+#: Programs/menu_prefs.c:1064
msgid "Tune Device"
msgstr "Tongeber"
-#: Programs/menu_prefs.c:945
+#: Programs/menu_prefs.c:947
msgid "Typing Mode"
msgstr "Eingabe-Modus"
-#: Programs/log.c:136
+#: Programs/log.c:137
msgid "USB I/O"
msgstr "USB E/A"
@@ -2114,23 +2261,19 @@ msgstr "USB E/A"
msgid "Underline"
msgstr "Unterlegung"
-#: Programs/alert.c:102
+#: Programs/alert.c:108
msgid "Unfrozen"
msgstr "Aufgetaut"
-#: Programs/config.c:2974 Programs/menu_prefs.c:1458
+#: Programs/menu_prefs.c:1478
msgid "Updatable Directory"
msgstr "Modifizierbares Verzeichnis"
-#: Programs/log.c:106
+#: Programs/log.c:101
msgid "Update Events"
msgstr "Update Ereignisse"
-#: Programs/options.c:197
-msgid "Usage"
-msgstr "Benutzung"
-
-#: Programs/menu_prefs.c:721
+#: Programs/menu_prefs.c:722
msgid "Use Capital Sign"
msgstr "Verwende Großschreibungszeichen"
@@ -2155,11 +2298,15 @@ msgstr "Violine"
msgid "Voice Oohs"
msgstr "Stimme (Ooh)"
-#: Programs/menu_prefs.c:1494
+#: Programs/spk.c:211
+msgid "Volume"
+msgstr ""
+
+#: Programs/menu_prefs.c:1514
msgid "Warning"
msgstr "Warnung"
-#: Programs/menu_prefs.c:1438
+#: Programs/menu_prefs.c:1458
msgid "Web Site"
msgstr "Webseite"
@@ -2185,27 +2332,39 @@ msgstr "Braillezielenzeile"
msgid "Woodblock"
msgstr "Holzblock"
-#: Programs/menu_prefs.c:848
+#: Programs/menu_prefs.c:849
msgid "Word Wrap"
msgstr "Wortumbruch"
-#: Programs/config.c:2948
-msgid "Working Directory"
-msgstr "Arbeitsverzeichnis"
-
-#: Programs/config.c:2975 Programs/menu_prefs.c:1468
+#: Programs/menu_prefs.c:1488
msgid "Writable Directory"
msgstr "Verzeichnis mit Schreibzugriff"
-#: Programs/xbrlapi.c:118
+#: Programs/brltty-hid.c:195
+msgid "Write (set) a feature report (see below)."
+msgstr ""
+
+#: Programs/brltty-hid.c:188
+msgid "Write (set) an output report (see below)."
+msgstr ""
+
+#: Programs/brltty-lscmds.c:254
+msgid "Write a brltty command reference in reStructuredText."
+msgstr ""
+
+#: Programs/xbrlapi.c:124
msgid "Write debugging output to stdout"
msgstr ""
-#: Programs/config.c:767
+#: Programs/tbl2hex.c:215
+msgid "Write the hexadecimal array representation of a compiled table."
+msgstr ""
+
+#: Programs/config.c:788
msgid "Write the start-up logs, and then exit."
msgstr "Schreibe das Startprotokoll und beende dann."
-#: Programs/xbrlapi.c:100
+#: Programs/xbrlapi.c:112
msgid "X display to connect to"
msgstr "X Display mit dem Verbindung aufgenommen werden soll"
@@ -2221,12 +2380,16 @@ msgstr "XDG-Laufzeitverzeichnis erstellt"
msgid "XDG runtime directory exists"
msgstr "XDG-Laufzeitverzeichnis existiert"
-#: Programs/xbrlapi.c:786
+#: Programs/xbrlapi.c:960
+msgid "XFree(wm_command) for change"
+msgstr ""
+
+#: Programs/xbrlapi.c:941
msgid "XFree(wm_name) for change"
msgstr ""
#. xgettext: This is the description of the PASSXT command.
-#: Programs/cmds.auto.h:1479
+#: Programs/cmds.auto.h:1495
msgid "XT (set 1) keyboard scan code"
msgstr "XT (set 1) Tastatur-Scancode"
@@ -2235,7 +2398,7 @@ msgstr "XT (set 1) Tastatur-Scancode"
msgid "Xylophone"
msgstr "Xylophon"
-#: Programs/menu_prefs.c:1312
+#: Programs/menu_prefs.c:1332
msgid "Year Month Day"
msgstr "Jahr Monat Tag"
@@ -2243,7 +2406,7 @@ msgstr "Jahr Monat Tag"
msgid "Yes"
msgstr "Ja"
-#: Programs/xbrlapi.c:84
+#: Programs/xbrlapi.c:96
msgid "[host][:port]"
msgstr "[Host][:Port]"
@@ -2256,30 +2419,30 @@ msgid "and"
msgstr "und"
#. xgettext: This is the description of the CLIP_APPEND command.
-#: Programs/cmds.auto.h:1346
+#: Programs/cmds.auto.h:1353
msgid "append characters to clipboard"
msgstr "hänge Zeichenkette an die Zwischenablage an"
#. xgettext: This is the description of the CLIP_ADD command.
-#: Programs/cmds.auto.h:1223
+#: Programs/cmds.auto.h:1230
msgid "append to clipboard from character"
msgstr "hänge ab Zeichen an die Zwischenablage an"
-#: Programs/cmd.c:290
+#: Programs/cmd.c:291
msgid "at cursor"
msgstr "beim Cursor"
#. xgettext: This is the description of the KEY_BACKSPACE command.
-#: Programs/cmds.auto.h:1527
+#: Programs/cmds.auto.h:1559
msgid "backspace key"
msgstr "Rücktaste"
-#: Drivers/Braille/Baum/braille.c:1149 Drivers/Braille/TSI/braille.c:869
+#: Drivers/Braille/Baum/braille.c:1150 Drivers/Braille/TSI/braille.c:869
msgid "battery low"
msgstr "Akku schwach"
#. xgettext: This is the description of the SELECTVT command.
-#: Programs/cmds.auto.h:1437
+#: Programs/cmds.auto.h:1453
msgid "bind to specific virtual terminal"
msgstr "an ein bestimmtes virtuellen Terminal anbinden"
@@ -2294,24 +2457,28 @@ msgid "bind to the previous virtual terminal"
msgstr "an das vorhergehende virtuelle Terminal anbinden"
#.
-#: Programs/cmd_utils.c:144
+#: Programs/cmd_utils.c:160
msgid "black"
msgstr "Schwarz"
-#: Programs/core.c:1125
+#: Programs/update.c:1021
+msgid "blank"
+msgstr "leer"
+
+#: Programs/core.c:1157
msgid "blank line"
msgstr "leere Zeile"
-#: Programs/cmd_utils.c:173
+#: Programs/cmd_utils.c:189
msgid "blinking"
msgstr ""
#. B
-#: Programs/cmd_utils.c:145
+#: Programs/cmd_utils.c:161
msgid "blue"
msgstr "Blau"
-#: Programs/config.c:2993
+#: Programs/config.c:3104
#, c-format
msgid "braille device not specified"
msgstr "Braillegerät nicht spezifiziert"
@@ -2321,15 +2488,11 @@ msgstr "Braillegerät nicht spezifiziert"
msgid "braille display temporarily unavailable"
msgstr "Braillezeile vorübergehend nicht verfügbar"
-#: Programs/config.c:1737
-msgid "braille driver initialization failed"
-msgstr "Initialisierung des Brailletreibers fehlgeschlagen"
-
-#: Programs/config.c:1816
+#: Programs/config.c:1942
msgid "braille driver not loadable"
msgstr "Brailletreiber kann nicht geladen werden"
-#: Programs/config.c:2077
+#: Programs/config.c:2203
msgid "braille driver restarting"
msgstr "Braille Treiber wird neu gestartet"
@@ -2342,7 +2505,7 @@ msgid "braille released"
msgstr "Braille freigegeben"
#. xgettext: This is the description of the ROUTE command.
-#: Programs/cmds.auto.h:1207
+#: Programs/cmds.auto.h:1214
msgid "bring screen cursor to character"
msgstr "Bewege Bildschirmcursor zu Zeichen"
@@ -2352,7 +2515,7 @@ msgid "bring screen cursor to current line"
msgstr "Bewege Bildschirmcursor zur aktuellen Braillezeilenposition"
#. xgettext: This is the description of the ROUTE_LINE command.
-#: Programs/cmds.auto.h:1404
+#: Programs/cmds.auto.h:1411
msgid "bring screen cursor to line"
msgstr "Bewege Bildschirmcursor zu Zeile"
@@ -2361,29 +2524,38 @@ msgstr "Bewege Bildschirmcursor zu Zeile"
msgid "bring screen cursor to speech cursor"
msgstr "Bewege Bildschirmcursor zur Sprachcursorposition"
+#. xgettext: This is the description of the ROUTE_SPEECH command.
+#: Programs/cmds.auto.h:1445
+msgid "bring speech cursor to character"
+msgstr ""
+
#. RG
-#: Programs/cmd_utils.c:150
+#: Programs/cmd_utils.c:166
msgid "brown"
msgstr "Braun"
-#: Drivers/Screen/Linux/screen.c:1432
+#: Programs/brltty-hid.c:186 Programs/brltty-hid.c:193
+msgid "bytes"
+msgstr "Bytes"
+
+#: Drivers/Screen/Linux/screen.c:1486
msgid "can't get console state"
-msgstr ""
+msgstr "Kann den Konsolenzustand nicht abrufen"
-#: Drivers/Screen/Linux/screen.c:1510
+#: Drivers/Screen/Linux/screen.c:1564
msgid "can't open console"
msgstr "kann console nicht öffnen"
-#: Drivers/Screen/Linux/screen.c:1556
+#: Drivers/Screen/Linux/screen.c:1610
msgid "can't read screen content"
msgstr "kann Bildschirminhalt nicht lesen"
-#: Drivers/Screen/Linux/screen.c:1601
+#: Drivers/Screen/Linux/screen.c:1655
#, fuzzy
msgid "can't read screen header"
msgstr "Bildschirmtreiber starten"
-#: Programs/ctb_translate.c:393
+#: Programs/ctb_translate.c:406
msgid "cannot access internal contraction table"
msgstr ""
@@ -2391,18 +2563,14 @@ msgstr ""
msgid "cannot compile attributes table"
msgstr "kann Attributtabelle nicht kompilieren"
-#: Programs/ctb_translate.c:387
+#: Programs/ctb_translate.c:400
msgid "cannot compile contraction table"
msgstr "kann Kurzschrifttabelle nicht kompilieren"
-#: Programs/config.c:1720
+#: Programs/config.c:1844
msgid "cannot compile key table"
msgstr "kann Tastentabelle nicht kompilieren"
-#: Programs/config.c:1284
-msgid "cannot compile keyboard table"
-msgstr "kann Tastentabelle nicht kompilieren"
-
#: Programs/ttb_translate.c:275
msgid "cannot compile text table"
msgstr "kann Texttabelle nicht kompilieren"
@@ -2412,26 +2580,26 @@ msgstr "kann Texttabelle nicht kompilieren"
#. * running xbrlapi by hand, but not fill logs, eat battery, spam
#. * 127.0.0.1 with reconnection attempts.
#.
-#: Programs/xbrlapi.c:204
+#: Programs/xbrlapi.c:230
#, c-format
msgid "cannot connect to braille devices daemon brltty at %s\n"
msgstr "Kann nicht mit Braillegerätedienst brltty via %s verbinden\n"
-#: Programs/xbrlapi.c:654
+#: Programs/xbrlapi.c:802
#, c-format
msgid "cannot connect to display %s\n"
msgstr "kann mit Braillezeile %s nicht verbinden\n"
-#: Programs/file.c:381
+#: Programs/file.c:437
msgid "cannot create directory"
msgstr "kann Verzeichnis nicht erstellen"
-#: Programs/program.c:150
+#: Programs/program.c:151
#, c-format
msgid "cannot determine program directory"
msgstr "kann Programmverzeichnis nicht bestimmen"
-#: Programs/config.c:2951 Programs/menu.c:618
+#: Programs/config.c:3062 Programs/menu.c:618
msgid "cannot determine working directory"
msgstr "kann Arbeitsverzeichnis nicht bestimmen"
@@ -2439,29 +2607,29 @@ msgstr "kann Arbeitsverzeichnis nicht bestimmen"
msgid "cannot find procedure"
msgstr "kann Prozedur nicht finden"
-#: Programs/program.c:158
+#: Programs/program.c:165
msgid "cannot fix install path"
msgstr "kann Installationspfad nicht beheben"
-#: Programs/xbrlapi.c:259
+#: Programs/xbrlapi.c:285
msgid "cannot get tty\n"
msgstr ""
-#: Programs/xbrlapi.c:265
+#: Programs/xbrlapi.c:291
#, c-format
msgid "cannot get tty %d\n"
msgstr ""
-#: Programs/file.c:518
+#: Programs/file.c:576
msgid "cannot get working directory"
msgstr "kann Arbeitsverzeichnis nicht erfragen"
-#: Programs/xbrlapi.c:702
+#: Programs/xbrlapi.c:853
#, c-format
msgid "cannot grab windows on screen %d\n"
msgstr ""
-#: Programs/xbrlapi.c:272
+#: Programs/xbrlapi.c:298
msgid "cannot ignore keys\n"
msgstr "kann tasten nicht ignorieren\n"
@@ -2469,7 +2637,7 @@ msgstr "kann tasten nicht ignorieren\n"
msgid "cannot load attributes table"
msgstr "kann Attributtabelle nicht laden"
-#: Programs/ctb_translate.c:407
+#: Programs/ctb_translate.c:420
msgid "cannot load contraction table"
msgstr ""
@@ -2481,16 +2649,16 @@ msgstr "kann Programmbibliothek nicht laden"
msgid "cannot load text table"
msgstr "kann Texttabelle nicht laden"
-#: Programs/file.c:370
+#: Programs/file.c:426
#, fuzzy
msgid "cannot make world writable"
msgstr "kann Tastentabelle nicht kompilieren"
-#: Programs/config.c:1239
+#: Programs/config.c:1277
msgid "cannot open key help"
msgstr "kann Tastenhilfe nicht öffnen"
-#: Programs/program.c:262
+#: Programs/program.c:289
msgid "cannot open process identifier file"
msgstr "kann Prozessidentifikationsdatei nicht öffnen"
@@ -2502,12 +2670,12 @@ msgstr "kann Arbeitsverzeichnis nicht öffnen"
msgid "cannot read preferences file"
msgstr "kann Einstellungsdatei nicht lesen"
-#: Programs/xbrlapi.c:337
+#: Programs/xbrlapi.c:363
#, c-format
msgid "cannot set focus to %#010x\n"
msgstr "kann Fokus nicht auf %#010x setzen\n"
-#: Programs/file.c:532 Programs/menu.c:605
+#: Programs/file.c:590 Programs/menu.c:605
msgid "cannot set working directory"
msgstr "kann Arbeitsverzeichnis nicht wechseln"
@@ -2517,18 +2685,22 @@ msgstr "kann Einstellungsdatei nicht schreiben"
#. "cap" here, used during speech output, is short for "capital".
#. It is spoken just before an uppercase letter, e.g. "cap A".
-#: Programs/core.c:1070
+#: Programs/core.c:1086
msgid "cap"
msgstr "Groß"
-#: Programs/menu_prefs.c:886 Programs/menu_prefs.c:1353
+#: Programs/menu_prefs.c:888 Programs/menu_prefs.c:1373
msgid "cells"
msgstr "Zellen"
-#: Programs/cmd_preferences.c:87
+#: Programs/cmd_preferences.c:95
msgid "changes discarded"
msgstr "Änderungen verworfen"
+#: Programs/brltty-ktb.c:290
+msgid "check a key table, list the key naems it can use, or write the key bindings it defines in useful formats."
+msgstr ""
+
#. xgettext: This is the description of the UNSTICK command.
#: Programs/cmds.auto.h:887
msgid "clear all sticky input modifiers"
@@ -2539,29 +2711,33 @@ msgstr "alle eingerasteten Steuertasten löschen"
msgid "clear the text selection"
msgstr ""
-#: Programs/cmd_speech.c:501
+#: Programs/cmd_speech.c:515
msgid "column"
msgstr "Spalte"
+#: Programs/brltty-pty.c:240
+msgid "command not found"
+msgstr "Befehl nicht gefunden"
+
#. configuration menu
#: Drivers/Braille/BrailleLite/braille.c:607
msgid "config"
-msgstr ""
+msgstr "Konfiguration"
-#: Programs/options.c:812
+#: Programs/cmdline.c:944
msgid "configuration directive specified more than once"
msgstr "Konfigurationsdirektive mehrfach angegeben"
-#: Drivers/Screen/Linux/screen.c:1508
+#: Drivers/Screen/Linux/screen.c:1562
msgid "console not in use"
msgstr "Konsole nicht in Verwendung"
-#: Programs/menu_prefs.c:1056
+#: Programs/menu_prefs.c:1058
msgid "console tone generator"
msgstr "Konsolen-Tongenerator"
#. xgettext: This is the description of the CLIP_COPY command.
-#: Programs/cmds.auto.h:1338
+#: Programs/cmds.auto.h:1345
msgid "copy characters to clipboard"
msgstr "kopiere Zeichenkette in die Zwischenablage"
@@ -2571,42 +2747,42 @@ msgstr "kopiere Zeichenkette in die Zwischenablage"
msgid "copy selected text to host clipboard"
msgstr "kopiere Zeichenkette in die Zwischenablage"
-#: Programs/config.c:729
+#: Programs/config.c:660
msgid "csecs"
msgstr ""
#. xgettext: This is the description of the TOUCH_AT command.
-#: Programs/cmds.auto.h:1503
+#: Programs/cmds.auto.h:1519
msgid "current reading location"
msgstr "aktuelle Leseposition"
#. xgettext: This is the description of the KEY_CURSOR_DOWN command.
-#: Programs/cmds.auto.h:1567
+#: Programs/cmds.auto.h:1599
msgid "cursor-down key"
msgstr "Pfeil-Runter-Taste"
#. xgettext: This is the description of the KEY_CURSOR_LEFT command.
-#: Programs/cmds.auto.h:1543
+#: Programs/cmds.auto.h:1575
msgid "cursor-left key"
msgstr "Pfeil-Links-Taste"
#. xgettext: This is the description of the KEY_CURSOR_RIGHT command.
-#: Programs/cmds.auto.h:1551
+#: Programs/cmds.auto.h:1583
msgid "cursor-right key"
msgstr "Pfeil-Rechts-Taste"
#. xgettext: This is the description of the KEY_CURSOR_UP command.
-#: Programs/cmds.auto.h:1559
+#: Programs/cmds.auto.h:1591
msgid "cursor-up key"
msgstr "Pfeil-Rauf-Taste"
#. xgettext: This is the description of the HOST_CUT command.
#: Programs/cmds.auto.h:1040
msgid "cut selected text to host clipboard"
-msgstr ""
+msgstr "ausgewählten Text in die Zwischenablage des Hosts kopieren"
#. GB
-#: Programs/cmd_utils.c:147
+#: Programs/cmd_utils.c:163
msgid "cyan"
msgstr "Zyan"
@@ -2641,7 +2817,7 @@ msgid "cycle the Upper sticky input modifier (next, on, off)"
msgstr "Einrastfunktion der Feststelltaste umschalten (ändern, ein, aus)"
#. L
-#: Programs/cmd_utils.c:152
+#: Programs/cmd_utils.c:168
msgid "dark grey"
msgstr "Dunkelgrau"
@@ -2661,12 +2837,12 @@ msgid "decrease speaking volume"
msgstr "leiser sprechen"
#. xgettext: This is the description of the KEY_DELETE command.
-#: Programs/cmds.auto.h:1615
+#: Programs/cmds.auto.h:1647
msgid "delete key"
msgstr "Entfernen-Taste"
#. xgettext: This is the description of the DESCCHAR command.
-#: Programs/cmds.auto.h:1275
+#: Programs/cmds.auto.h:1282
msgid "describe character"
msgstr "beschreibe Zeichen"
@@ -2675,18 +2851,18 @@ msgstr "beschreibe Zeichen"
msgid "describe current character"
msgstr "beschreibe aktuelles Zeichen"
-#: Programs/config.c:710 Programs/config.c:720
+#: Programs/config.c:690 Programs/config.c:700
msgid "device"
msgstr "Gerät"
-#: Programs/brltest.c:64 Programs/brltest.c:74 Programs/brltty-atb.c:32
-#: Programs/brltty-ctb.c:50 Programs/brltty-ktb.c:69 Programs/brltty-ktb.c:79
-#: Programs/brltty-trtxt.c:47 Programs/config.c:400 Programs/config.c:500
-#: Programs/config.c:510 Programs/config.c:520 Programs/config.c:591
+#: Programs/brltest.c:61 Programs/brltest.c:79 Programs/brltty-atb.c:31
+#: Programs/brltty-ctb.c:92 Programs/brltty-ktb.c:76 Programs/brltty-ktb.c:85
+#: Programs/brltty-trtxt.c:75 Programs/config.c:709 Programs/config.c:719
+#: Programs/config.c:729 Programs/config.c:739 Programs/config.c:748
msgid "directory"
msgstr "Verzeichnis"
-#: Programs/xbrlapi.c:98
+#: Programs/xbrlapi.c:110
msgid "display"
msgstr "display"
@@ -2711,21 +2887,25 @@ msgstr "Punkt 8"
msgid "dots 7 and 8"
msgstr "Punkte 7 und 8"
-#: Drivers/Braille/Baum/braille.c:1146
+#: Programs/brltty-ktb.c:45
+msgid "driver"
+msgstr ""
+
+#: Drivers/Braille/Baum/braille.c:1147
msgid "driver request"
msgstr "Treiberanfrage"
-#: Programs/config.c:549 Programs/config.c:647 Programs/config.c:690
+#: Programs/config.c:407 Programs/config.c:478 Programs/config.c:521
msgid "driver,..."
msgstr "Treiber,..."
#. xgettext: This is the description of the KEY_END command.
-#: Programs/cmds.auto.h:1599
+#: Programs/cmds.auto.h:1631
msgid "end key"
msgstr "Ende-Taste"
#. xgettext: This is the description of the KEY_ENTER command.
-#: Programs/cmds.auto.h:1511
+#: Programs/cmds.auto.h:1543
msgid "enter key"
msgstr "Eingabetaste"
@@ -2750,11 +2930,11 @@ msgid "enter/leave status display"
msgstr "Aufrufen/Verlassen der Statusanzeige"
#. xgettext: This is the description of the KEY_ESCAPE command.
-#: Programs/cmds.auto.h:1535
+#: Programs/cmds.auto.h:1567
msgid "escape key"
msgstr "Escape-Taste"
-#: Drivers/Braille/Iris/braille.c:1494
+#: Drivers/Braille/Iris/braille.c:1497
msgid "eurobraille"
msgstr "Eurobraille"
@@ -2763,53 +2943,75 @@ msgstr "Eurobraille"
msgid "exactly"
msgstr "genau"
-#: Programs/config.c:873
+#: Programs/config.c:894
msgid "excess argument"
msgstr "überschüssiges Argument"
+#. xgettext: This is the description of the MACRO command.
+#: Programs/cmds.auto.h:1527
+msgid "execute command macro"
+msgstr ""
+
#. parent
-#: Programs/brltty.c:177
+#: Programs/brltty.c:219
#, c-format
msgid "executing \"%s\" (from \"%s\")\n"
msgstr "führe \"%s\" (von \"%s\") aus\n"
-#: Programs/pgmprivs_linux.c:2045
+#: Programs/pgmprivs_linux.c:2047
msgid "executing as the invoking user"
msgstr ""
#. execv() shouldn't return
-#: Programs/brltty.c:184
+#: Programs/brltty.c:226
#, c-format
msgid "execution of \"%s\" failed: %s\n"
msgstr "Ausführen von \"%s\" fehlgeschlagen: %s\n"
-#: Programs/xbrlapi.c:709
+#: Programs/xbrlapi.c:860
msgid "failed to get first focus\n"
msgstr ""
-#: Programs/brltty-trtxt.c:56 Programs/brltty-trtxt.c:64 Programs/config.c:457
-#: Programs/config.c:466 Programs/config.c:476 Programs/config.c:602
-#: Programs/config.c:612 Programs/config.c:621 Programs/config.c:629
-#: Programs/config.c:666 Programs/config.c:759
+#: Programs/brltty-trtxt.c:47 Programs/brltty-trtxt.c:55 Programs/config.c:396
+#: Programs/config.c:450 Programs/config.c:460 Programs/config.c:469
+#: Programs/config.c:497 Programs/config.c:540 Programs/config.c:564
+#: Programs/config.c:573 Programs/config.c:624 Programs/config.c:758
+#: Programs/xbrlapi.c:135 Programs/xbrlapi.c:142
msgid "file"
msgstr "Datei"
-#: Programs/options.c:998
+#: Programs/cmdline.c:1130
#, c-format
msgid "file '%s' processing error."
msgstr "Verarbeitungsfehler in Datei '%s'."
+#: Drivers/Screen/FileViewer/screen.c:177
+msgid "file not specified"
+msgstr ""
+
+#: Programs/xbrlapi.c:137
+msgid "file to write the name of the focused command to"
+msgstr ""
+
+#: Programs/xbrlapi.c:144
+msgid "file to write the name of the focused window to"
+msgstr ""
+
#. failed
-#: Programs/brltty.c:172
+#: Programs/brltty.c:214
#, c-format
msgid "fork of \"%s\" failed: %s\n"
msgstr ""
#. xgettext: This is the description of the KEY_FUNCTION command.
-#: Programs/cmds.auto.h:1624
+#: Programs/cmds.auto.h:1656
msgid "function key"
msgstr "Funktionstaste"
+#: Programs/log.c:125
+msgid "generic I/O"
+msgstr ""
+
#. xgettext: This is the description of the BACK command.
#: Programs/cmds.auto.h:271
msgid "go back after cursor tracking"
@@ -2857,7 +3059,7 @@ msgid "go down to last item"
msgstr "Gehe nach unten zum letzten Element"
#. xgettext: This is the description of the NXDIFCHAR command.
-#: Programs/cmds.auto.h:1330
+#: Programs/cmds.auto.h:1337
msgid "go down to nearest line with different character"
msgstr "Gehe zu nächster Zeile mit anderem Zeichen"
@@ -2872,7 +3074,7 @@ msgid "go down to nearest line with different highlighting"
msgstr "Gehe zu nächster Zeile mit anderer Hervorhebung"
#. xgettext: This is the description of the NXINDENT command.
-#: Programs/cmds.auto.h:1267
+#: Programs/cmds.auto.h:1274
msgid "go down to nearest line with less indent than character"
msgstr "Gehe zu nächster Zeile mit weniger Einrückung als Zeichen"
@@ -3007,7 +3209,7 @@ msgid "go to previous menu level"
msgstr "Gehe zur vorherigen Menüebene"
#. xgettext: This is the description of the GOTOMARK command.
-#: Programs/cmds.auto.h:1300
+#: Programs/cmds.auto.h:1307
msgid "go to remembered braille window position"
msgstr "Gehe zu gespeicherter Braillezeilenposition"
@@ -3022,7 +3224,7 @@ msgid "go to screen cursor or go back after cursor tracking"
msgstr "Gehe zum Bildschirmcursor oder gehe zurück nach Cursorverfolgung"
#. xgettext: This is the description of the GOTOLINE command.
-#: Programs/cmds.auto.h:1310
+#: Programs/cmds.auto.h:1317
msgid "go to selected line"
msgstr "Gehe zu hervorgehobener Zeile"
@@ -3058,7 +3260,7 @@ msgid "go up to first line of paragraph"
msgstr "Gehe zur ersten Zeile des Absatzes"
#. xgettext: This is the description of the PRDIFCHAR command.
-#: Programs/cmds.auto.h:1320
+#: Programs/cmds.auto.h:1327
msgid "go up to nearest line with different character"
msgstr "Gehe zu vorheriger Zeile mit anderem Zeichen"
@@ -3073,7 +3275,7 @@ msgid "go up to nearest line with different highlighting"
msgstr "Gehe zu vorheriger Zeile mit anderer Hervorhebung"
#. xgettext: This is the description of the PRINDENT command.
-#: Programs/cmds.auto.h:1257
+#: Programs/cmds.auto.h:1264
msgid "go up to nearest line with less indent than character"
msgstr "Gehe zu vorheriger Zeile mit weniger Einrückung als Zeichen"
@@ -3088,11 +3290,11 @@ msgid "go up to previous item"
msgstr "Gehe nach oben zum vorherigen Element"
#. G
-#: Programs/cmd_utils.c:146
+#: Programs/cmd_utils.c:162
msgid "green"
msgstr "Grün"
-#: Programs/pgmprivs_linux.c:2167
+#: Programs/pgmprivs_linux.c:2169
msgid "group permissions added"
msgstr "Gruppenberechtigungen hinzugefügt"
@@ -3105,15 +3307,20 @@ msgid "help screen not readable"
msgstr "Hilfe nicht lesbar"
#. xgettext: This is the description of the KEY_HOME command.
-#: Programs/cmds.auto.h:1591
+#: Programs/cmds.auto.h:1623
msgid "home key"
msgstr "Pos1-Taste"
-#: Programs/config.c:570
+#: Programs/brltty-hid.c:81 Programs/brltty-hid.c:88 Programs/brltty-hid.c:172
+#: Programs/brltty-hid.c:179
+msgid "identifier"
+msgstr ""
+
+#: Programs/config.c:428
msgid "identifier,..."
msgstr "Bezeichnung,..."
-#: Drivers/Braille/Baum/braille.c:1148
+#: Drivers/Braille/Baum/braille.c:1149
msgid "idle timeout"
msgstr "Inaktivitätszeitüberschreitung"
@@ -3132,12 +3339,12 @@ msgstr "Schneller sprechen"
msgid "increase speaking volume"
msgstr "Lauter sprechen"
-#: Programs/core.c:1128
+#: Programs/core.c:1160
msgid "indent"
msgstr "Einrückung"
#. xgettext: This is the description of the PASTE_HISTORY command.
-#: Programs/cmds.auto.h:1354
+#: Programs/cmds.auto.h:1361
msgid "insert clipboard history entry after screen cursor"
msgstr "Text der Zwischenablagenhistorie nach Bildschirmcursor einfügen"
@@ -3153,15 +3360,19 @@ msgid "insert host clipboard text after screen cursor"
msgstr "Text der Zwischenablage an Bildschirmcursorposition einfügen"
#. xgettext: This is the description of the KEY_INSERT command.
-#: Programs/cmds.auto.h:1607
+#: Programs/cmds.auto.h:1639
msgid "insert key"
msgstr "Einfüge-Taste"
-#: Programs/program.c:166
+#: Programs/program.c:173
msgid "install path not absolute"
msgstr "Installationspfad ist nicht absolut"
-#: Programs/options.c:104
+#: Programs/brltty-hid.c:206
+msgid "integer"
+msgstr "Ganzzahl"
+
+#: Programs/cmdline.c:104
msgid "invalid counter setting"
msgstr "ungültige Zähler-Einstellung"
@@ -3169,24 +3380,19 @@ msgstr "ungültige Zähler-Einstellung"
msgid "invalid escape sequence"
msgstr "ungültige Escape-Sequenz"
-#: Programs/options.c:113
+#: Programs/cmdline.c:113
msgid "invalid flag setting"
msgstr "ungültige Schalter-Einstellung"
-#: Programs/config.c:2863
+#: Programs/config.c:2980
msgid "invalid message hold timeout"
msgstr "ungültige Meldungsanzeigedauer"
-#. the operand for an option is invalid
-#: Programs/options.c:594
+#: Programs/cmdline.c:667
#, fuzzy
msgid "invalid operand"
msgstr "fehlender Operand"
-#: Programs/brlapi_server.c:4516
-msgid "invalid thread stack size"
-msgstr "ungültige Threadstapelgröße"
-
#: Drivers/Braille/BrailleLite/braille.c:590
#: Drivers/Braille/BrailleLite/braille.c:668
msgid "keyboard emu off"
@@ -3197,67 +3403,82 @@ msgid "keyboard emu on"
msgstr "Tastaturemulation ein"
#. L B
-#: Programs/cmd_utils.c:153
+#: Programs/cmd_utils.c:169
msgid "light blue"
msgstr "Hellblau"
#. L GB
-#: Programs/cmd_utils.c:155
+#: Programs/cmd_utils.c:171
msgid "light cyan"
msgstr "Hellzyan"
#. L G
-#: Programs/cmd_utils.c:154
+#: Programs/cmd_utils.c:170
msgid "light green"
msgstr "Hellgrün"
#. RGB
-#: Programs/cmd_utils.c:151
+#: Programs/cmd_utils.c:167
msgid "light grey"
msgstr "Hellgrau"
#. LR B
-#: Programs/cmd_utils.c:157
+#: Programs/cmd_utils.c:173
msgid "light magenta"
msgstr "Hellmagenta"
#. LR
-#: Programs/cmd_utils.c:156
+#: Programs/cmd_utils.c:172
msgid "light red"
msgstr "Hellrot"
-#: Programs/cmd_speech.c:500
+#: Programs/cmd_speech.c:514
msgid "line"
msgstr "Zeile"
#. xgettext: This is the description of the COPY_LINE command.
-#: Programs/cmds.auto.h:1239
+#: Programs/cmds.auto.h:1246
msgid "linear copy to character"
msgstr "kopiere ohne Zeilenumbrüche bis Zeichen"
-#: Programs/config.c:750
+#: Programs/brltty-pty.c:112
+msgid "log escape sequences and special characters received from the pty slave"
+msgstr ""
+
+#: Programs/brltty-pty.c:100
+msgid "log input written to the pty slave"
+msgstr ""
+
+#: Programs/brltty-pty.c:106
+msgid "log output received from the pty slave that isn't an escape sequence or a special character"
+msgstr ""
+
+#: Programs/brltty-pty.c:118
+msgid "log unexpected input/output"
+msgstr ""
+
+#: Programs/config.c:615
msgid "lvl|cat,..."
msgstr "lvl|kat,..."
#. R B
-#: Programs/cmd_utils.c:149
+#: Programs/cmd_utils.c:165
msgid "magenta"
msgstr "Magenta"
-#. the operand for a string option hasn't been specified
-#: Programs/options.c:588
+#: Programs/cmdline.c:662
msgid "missing operand"
msgstr "fehlender Operand"
-#: Programs/parse.c:472
+#: Programs/parse.c:533
msgid "missing parameter name"
msgstr "fehlender Parametername"
-#: Programs/parse.c:458
+#: Programs/parse.c:519
msgid "missing parameter qualifier"
msgstr "fehlende Parameterkennzeichnung"
-#: Programs/parse.c:434
+#: Programs/parse.c:495
msgid "missing parameter value"
msgstr "fehlender Parameterwert"
@@ -3285,17 +3506,21 @@ msgstr "gehe zum vorherigen Element des Bildschirmbereiches"
msgid "name"
msgstr "Name"
-#: Programs/config.c:433 Programs/config.c:485 Programs/config.c:538
-#: Programs/config.c:560 Programs/config.c:638 Programs/config.c:657
-#: Programs/config.c:700
+#: Programs/config.c:418 Programs/config.c:488 Programs/config.c:531
+#: Programs/config.c:549 Programs/config.c:582 Programs/config.c:598
+#: Programs/config.c:651
msgid "name=value,..."
msgstr "Name=Wert,..."
-#: Drivers/Braille/Iris/braille.c:1510
+#: Drivers/Braille/Iris/braille.c:1513
msgid "native"
msgstr "eigenes"
-#: Programs/config.c:1248
+#: Programs/menu_prefs.c:668
+msgid "no dots"
+msgstr "keine Punkte"
+
+#: Programs/config.c:1286
msgid "no key bindings"
msgstr "Keine Tastenbelegungen"
@@ -3303,18 +3528,26 @@ msgstr "Keine Tastenbelegungen"
msgid "no screen"
msgstr "Kein Bildschirm"
-#: Programs/config.c:116
-msgid "none"
-msgstr "keine"
+#: Drivers/Screen/TerminalEmulator/em_screen.c:137
+msgid "no screen cache"
+msgstr ""
+
+#: Drivers/Screen/TerminalEmulator/em_screen.c:398
+msgid "no screen emulator"
+msgstr ""
-#: Programs/config.c:1537
+#: Programs/cmd_preferences.c:47
msgid "not saved"
msgstr "nicht gespeichert"
-#: Programs/pgmprivs_linux.c:2018
+#: Programs/pgmprivs_linux.c:2020
msgid "not switching to an unprivileged user"
msgstr ""
+#: Programs/brltty-hid.c:116
+msgid "octets"
+msgstr ""
+
#. xgettext: This is the description of the GUI_APP_ALERTS command.
#: Programs/cmds.auto.h:1112
msgid "open the application alerts window"
@@ -3346,64 +3579,56 @@ msgstr ""
msgid "open the device settings window"
msgstr ""
-#: Programs/options.c:202
+#: Programs/cmdline.c:246
msgid "option"
msgstr "Option"
-#: Programs/pgmprivs_linux.c:2152
+#: Programs/pgmprivs_linux.c:2154
msgid "ownership claimed"
-msgstr ""
+msgstr "Besitz beansprucht"
#. xgettext: This is the description of the KEY_PAGE_DOWN command.
-#: Programs/cmds.auto.h:1583
+#: Programs/cmds.auto.h:1615
msgid "page-down key"
msgstr "Seite-Runter Taste"
#. xgettext: This is the description of the KEY_PAGE_UP command.
-#: Programs/cmds.auto.h:1575
+#: Programs/cmds.auto.h:1607
msgid "page-up key"
msgstr "Seite-Rauf Taste"
#: Programs/msgtest.c:42
msgid "path"
-msgstr ""
+msgstr "Pfad"
-#: Programs/config.c:2836
+#: Programs/config.c:2953
msgid "pid file not specified"
msgstr "PID-Datei nicht spezifiziert"
-#: Programs/program.c:308
+#: Programs/program.c:335
msgid "pid file open error"
msgstr "Fehler beim öffnen der PID-Datei"
-#: Programs/spk.c:232
-msgid "pitch"
-msgstr "Tonhöhe"
-
#. xgettext: This is the description of the SETLEFT command.
-#: Programs/cmds.auto.h:1283
+#: Programs/cmds.auto.h:1290
msgid "place left end of braille window at character"
msgstr "Positioniere linken Rand der Braillezeile bei Zeichen"
-#: Drivers/Braille/Baum/braille.c:1147
+#: Drivers/Braille/Baum/braille.c:1148
msgid "power switch"
msgstr "Ein-/Aus-Schalter"
-#: Programs/config.c:680
+#: Programs/config.c:511
msgid "quality"
-msgstr ""
-
-#: Programs/spk.c:206
-msgid "rate"
-msgstr "Geschwindigkeit"
+msgstr "Qualität"
#. xgettext: This is the description of the COPY_RECT command.
-#: Programs/cmds.auto.h:1231
+#: Programs/cmds.auto.h:1238
msgid "rectangular copy to character"
msgstr "kopiere mit Zeilenumbrüchen bis Zeichen"
#. R
-#: Programs/cmd_utils.c:148
+#: Programs/cmd_utils.c:164
msgid "red"
msgstr "Rot"
@@ -3414,39 +3639,39 @@ msgid "refresh braille display"
msgstr "Pfad zur Schnittstelle für den Zugriff auf die Braillezeile."
#. xgettext: This is the description of the REFRESH_LINE command.
-#: Programs/cmds.auto.h:1413
+#: Programs/cmds.auto.h:1420
#, fuzzy
msgid "refresh braille line"
msgstr "Brailletreiber neu starten"
-#: Programs/config.c:492
+#: Programs/config.c:681
msgid "regexp,..."
msgstr "regexp,..."
-#: Programs/config.c:2081
+#: Programs/config.c:2207
#, c-format
msgid "reinitializing braille driver"
msgstr "reinitialisiere Brailletreiber"
-#: Programs/config.c:2594
+#: Programs/config.c:2725
#, c-format
msgid "reinitializing screen driver"
msgstr "reinitialisiere Bildschirmtreiber"
-#: Programs/config.c:2394
+#: Programs/config.c:2522
#, c-format
msgid "reinitializing speech driver"
msgstr "reinitialisiere Sprachausgabentreiber"
#. xgettext: This is the description of the SETMARK command.
-#: Programs/cmds.auto.h:1291
+#: Programs/cmds.auto.h:1298
msgid "remember current braille window position"
msgstr "Speichere aktuelle Braillezeilenposition"
#. xgettext: This is the description of the ALERT command.
-#: Programs/cmds.auto.h:1445
+#: Programs/cmds.auto.h:1461
msgid "render an alert"
-msgstr ""
+msgstr "Gib eine Warnung aus"
#: Drivers/Braille/BrailleLite/braille.c:601
#: Drivers/Braille/BrailleLite/braille.c:780
@@ -3455,6 +3680,11 @@ msgstr ""
msgid "repeat count"
msgstr "Wiederholungsanzahl"
+#. xgettext: This is the description of the PREFRESET command.
+#: Programs/cmds.auto.h:1205
+msgid "reset preferences to defaults"
+msgstr "Einstellungen auf Standard zurücksetzen"
+
#. xgettext: This is the description of the RESTARTBRL command.
#: Programs/cmds.auto.h:607
msgid "restart braille driver"
@@ -3481,6 +3711,11 @@ msgstr "gespeicherte Einstellungen wiederherstellen"
msgid "return to the active screen area"
msgstr "Bildschirmtreiber starten"
+#. xgettext: This is the description of the HOSTCMD command.
+#: Programs/cmds.auto.h:1535
+msgid "run host command"
+msgstr ""
+
#. xgettext: This is the description of the CLIP_SAVE command.
#: Programs/cmds.auto.h:857
msgid "save clipboard to disk"
@@ -3491,15 +3726,15 @@ msgstr "Speichert den Inhalt der Zwischenablage auf die Festplatte"
msgid "save preferences to disk"
msgstr "Einstellungen speichern"
-#: Programs/xbrlapi.c:91
+#: Programs/xbrlapi.c:103
msgid "scheme+..."
-msgstr ""
+msgstr "Schema+..."
-#: Programs/config.c:2470
+#: Programs/config.c:2601
msgid "screen driver not loadable"
msgstr "Bildschirmtreiber kann nicht geladen werden"
-#: Programs/config.c:2591
+#: Programs/config.c:2722
msgid "screen driver restarting"
msgstr "Bildschirmtreiber wird neu gestartet"
@@ -3511,7 +3746,19 @@ msgstr "Bildschirmtreiber gestoppt"
msgid "screen locked"
msgstr "Bildschirm gesperrt"
-#: Drivers/Screen/Linux/screen.c:1531
+#: Drivers/Screen/TerminalEmulator/em_screen.c:141
+msgid "screen not accessible"
+msgstr "Bildschirm nicht erreichbar"
+
+#: Drivers/Screen/TerminalEmulator/em_screen.c:395
+msgid "screen not attached"
+msgstr "Bildschirm nicht angeschlossen"
+
+#: Drivers/Screen/TerminalEmulator/em_screen.c:384
+msgid "screen not available"
+msgstr "Bildschirm nicht verfügbar"
+
+#: Drivers/Screen/Linux/screen.c:1585
msgid "screen not in text mode"
msgstr "Bildschirm nicht im Textmodus"
@@ -3560,7 +3807,7 @@ msgid "set attribute underlining on/off"
msgstr "schalte unterstrichene Attribute ein/aus"
#. xgettext: This is the description of the SET_ATTRIBUTES_TABLE command.
-#: Programs/cmds.auto.h:1370
+#: Programs/cmds.auto.h:1377
msgid "set attributes table"
msgstr "Setze Attributtabelle"
@@ -3630,7 +3877,7 @@ msgid "set contracted/computer braille"
msgstr ""
#. xgettext: This is the description of the SET_CONTRACTION_TABLE command.
-#: Programs/cmds.auto.h:1378
+#: Programs/cmds.auto.h:1385
msgid "set contraction table"
msgstr "Setze Kurzschrifttabelle"
@@ -3645,12 +3892,12 @@ msgid "set hidden screen cursor on/off"
msgstr "Schalte versteckten Bildschirmcursor ein/aus"
#. xgettext: This is the description of the SET_KEYBOARD_TABLE command.
-#: Programs/cmds.auto.h:1386
+#: Programs/cmds.auto.h:1393
msgid "set keyboard table"
msgstr "Setze Tastaturtabelle"
#. xgettext: This is the description of the SET_LANGUAGE_PROFILE command.
-#: Programs/cmds.auto.h:1394
+#: Programs/cmds.auto.h:1401
msgid "set language profile"
msgstr "Setze Sprachprofil"
@@ -3677,7 +3924,7 @@ msgstr "Standbild ein-/ausschalten"
#. xgettext: This is the description of the COMPBRL6 command.
#: Programs/cmds.auto.h:1198
msgid "set six/eight dot computer braille"
-msgstr ""
+msgstr "Sechs/Acht Punkte Computer Braille"
#. xgettext: This is the description of the SKPBLNKWINS command.
#: Programs/cmds.auto.h:327
@@ -3700,7 +3947,7 @@ msgid "set speech cursor visibility on/off"
msgstr "Schalte die Sichtbarkeit des Sprachcursors ein/aus"
#. xgettext: This is the description of the TXTSEL_SET command.
-#: Programs/cmds.auto.h:1429
+#: Programs/cmds.auto.h:1436
#, fuzzy
msgid "set text selection"
msgstr "Setze Texttabelle"
@@ -3711,7 +3958,7 @@ msgid "set text style 6-dot/8-dot"
msgstr "wechsle zwischen 6-Punkt und 8-Punkt Braille"
#. xgettext: This is the description of the SET_TEXT_TABLE command.
-#: Programs/cmds.auto.h:1362
+#: Programs/cmds.auto.h:1369
msgid "set text table"
msgstr "Setze Texttabelle"
@@ -3730,6 +3977,10 @@ msgstr "Schalte die Verfolgung des Bildschirmcursors ein/aus"
msgid "show current date and time"
msgstr "Aktuelles Datum und Uhrzeit anzeigen"
+#: Programs/brltty-pty.c:66
+msgid "show the absolute path to the pty slave"
+msgstr ""
+
#. xgettext: This is the description of the GUI_TITLE command.
#: Programs/cmds.auto.h:1054
msgid "show the window title"
@@ -3740,15 +3991,15 @@ msgstr "zeige den Fenstertitel"
msgid "show various device status indicators"
msgstr ""
-#: Programs/menu_prefs.c:1057
+#: Programs/menu_prefs.c:1059
msgid "soundcard digital audio"
msgstr "Digital Audio Soundkarte"
-#: Programs/menu_prefs.c:1059
+#: Programs/menu_prefs.c:1061
msgid "soundcard synthesizer"
msgstr "Synthesizer der Soundkarte"
-#: Programs/cmd.c:277 Programs/core.c:1051
+#: Programs/cmd.c:278 Programs/core.c:1066
msgid "space"
msgstr "leer"
@@ -3797,11 +4048,11 @@ msgstr "Sprich Sprachcursorposition"
msgid "specifier"
msgstr ""
-#: Programs/config.c:2242
+#: Programs/config.c:2370
msgid "speech driver not loadable"
msgstr "Sprachausgabentreiber kann nicht geladen werden"
-#: Programs/config.c:2391
+#: Programs/config.c:2519
msgid "speech driver restarting"
msgstr "Bildschirmtreiber wird neu gestartet"
@@ -3814,13 +4065,21 @@ msgstr "Bildschirmtreiber gestoppt"
msgid "spell current word"
msgstr "buchstabiere aktuelles Wort"
+#: Programs/brltty-pty.c:403
+msgid "standard input isn't a terminal"
+msgstr "Standard-Eingabe ist kein Terminal"
+
+#: Programs/brltty-pty.c:408
+msgid "standard output isn't a terminal"
+msgstr "Standardausgabe ist kein Terminal"
+
#. xgettext: This is the description of the CLIP_NEW command.
-#: Programs/cmds.auto.h:1215
+#: Programs/cmds.auto.h:1222
msgid "start new clipboard at character"
msgstr "beginne neue Auswahl bei Zeichen"
#. xgettext: This is the description of the TXTSEL_START command.
-#: Programs/cmds.auto.h:1421
+#: Programs/cmds.auto.h:1428
#, fuzzy
msgid "start text selection"
msgstr "Sprachausgabentreiber starten"
@@ -3860,21 +4119,22 @@ msgstr "Bildschirmtreiber stoppen"
msgid "stop the speech driver"
msgstr "Sprachausgabentreiber stoppen"
-#: Programs/xbrlapi.c:656
+#: Programs/xbrlapi.c:804
msgid "strange old error handler\n"
msgstr "befremdlicher alter Fehlerbehandler\n"
-#: Programs/brltty-cldr.c:39
+#: Programs/brltty-cldr.c:39 Programs/brltty-hid.c:95 Programs/brltty-hid.c:102
+#: Programs/brltty-hid.c:109 Programs/brltty-hid.c:123
msgid "string"
msgstr "Zeichenkette"
#. xgettext: This is the description of the CONTEXT command.
-#: Programs/cmds.auto.h:1495
+#: Programs/cmds.auto.h:1511
msgid "switch to command context"
msgstr "wechsle in den Kommandokontext"
#. xgettext: This is the description of the SWITCHVT command.
-#: Programs/cmds.auto.h:1247
+#: Programs/cmds.auto.h:1254
msgid "switch to specific virtual terminal"
msgstr "Wechsle zu einem spezifischen virtuellen Terminal"
@@ -3900,19 +4160,27 @@ msgstr "Wechsle zum vorherigen virtuellen Terminal"
msgid "switch to the previous virtual terminal"
msgstr "Wechsle zum vorherigen virtuellen Terminal"
-#: Programs/pgmprivs_linux.c:1994
+#: Programs/pgmprivs_linux.c:1996
msgid "switched to unprivileged user"
-msgstr ""
+msgstr "gewechselt zum nicht privilegierten Benutzer"
#. xgettext: This is the description of the KEY_TAB command.
-#: Programs/cmds.auto.h:1519
+#: Programs/cmds.auto.h:1551
msgid "tab key"
msgstr "Tabulator-Taste"
-#: Programs/config.c:379 Programs/config.c:386
+#: Programs/config.c:667 Programs/config.c:674
msgid "text"
msgstr "Text"
+#: Programs/brltty-pty.c:87
+msgid "the directory to change to"
+msgstr ""
+
+#: Programs/brltty-pty.c:94
+msgid "the home directory to use"
+msgstr ""
+
#: Programs/msgtest.c:45
msgid "the locale directory containing the translations"
msgstr ""
@@ -3925,59 +4193,62 @@ msgstr ""
msgid "the name of the domain containing the translations"
msgstr ""
+#: Programs/brltty-pty.c:80
+msgid "the name or number of the group to run as"
+msgstr ""
+
+#: Programs/brltty-pty.c:73
+msgid "the name or number of the user to run as"
+msgstr ""
+
#. xgettext: This is the description of the PASSDOTS command.
-#: Programs/cmds.auto.h:1463
+#: Programs/cmds.auto.h:1479
msgid "type braille dots"
msgstr "Braillezeichen eingeben"
#. xgettext: This is the description of the PASSCHAR command.
-#: Programs/cmds.auto.h:1454
+#: Programs/cmds.auto.h:1470
msgid "type unicode character"
msgstr "Unicode-Zeichen eingeben"
-#: Programs/xbrlapi.c:974
+#: Programs/xbrlapi.c:1153
msgid "unexpected block type"
msgstr "unerwarteter Blocktyp"
-#: Programs/xbrlapi.c:864
+#: Programs/xbrlapi.c:1043
msgid "unexpected cmd"
msgstr "unerwartetes Kommando"
-#: Programs/cmd_queue.c:157
+#: Programs/cmd_queue.c:158
msgid "unhandled command"
msgstr "nicht erkanntes Kommando"
-#: Programs/cmd.c:198
+#: Programs/cmd.c:199
msgid "unknown command"
msgstr "unbekanntes Kommando"
-#: Programs/options.c:828
+#: Programs/cmdline.c:960
msgid "unknown configuration directive"
msgstr "unbekannte Konfigurationsdirektive"
-#: Programs/config.c:791
+#: Programs/config.c:806
msgid "unknown log level or category"
msgstr "unbekannte Protokollierungsausführlichkeit oder Kategorie"
-#. an unknown option has been specified
-#: Programs/options.c:575
+#: Programs/cmdline.c:657
msgid "unknown option"
msgstr "unbekannte Option"
-#: Programs/config.c:327
+#: Programs/config.c:332
msgid "unknown screen content quality"
msgstr ""
-#: Programs/parse.c:501
+#: Programs/parse.c:562
msgid "unsupported parameter"
msgstr "nicht unterstützter Parameter"
-#: Programs/spk.c:180
-msgid "volume"
-msgstr "Lautstärke"
-
#. LRGB
-#: Programs/cmd_utils.c:159
+#: Programs/cmd_utils.c:175
msgid "white"
msgstr "Weiß"
@@ -3986,98 +4257,113 @@ msgstr "Weiß"
msgid "working directory changed"
msgstr "Arbeitsverzeichnis"
+#: Programs/brltty-pty.c:60
+msgid "write driver directives to standard error"
+msgstr ""
+
#: Programs/msgtest.c:65
msgid "write the translations using UTF-8"
msgstr ""
-#: Programs/xbrlapi.c:911
+#: Programs/xbrlapi.c:1090
#, c-format
msgid "xbrlapi: Couldn't find a keycode to remap for simulating unbound keysym %08X\n"
msgstr ""
-#: Programs/xbrlapi.c:898
+#: Programs/xbrlapi.c:1077
#, c-format
msgid "xbrlapi: Couldn't find modifiers to apply to %d for getting keysym %08X\n"
msgstr ""
-#: Programs/xbrlapi.c:874
+#: Programs/xbrlapi.c:1053
#, c-format
msgid "xbrlapi: Couldn't translate keysym %08X to keycode.\n"
msgstr ""
-#: Programs/xbrlapi.c:415
+#: Programs/xbrlapi.c:604
#, c-format
msgid "xbrlapi: X Error %d, %s on display %s\n"
msgstr ""
-#: Programs/xbrlapi.c:457
+#: Programs/xbrlapi.c:646
#, c-format
msgid "xbrlapi: bad format for VT number\n"
msgstr "xbrlapi: ungültiges Format für VT Nummer\n"
-#: Programs/xbrlapi.c:460
+#: Programs/xbrlapi.c:649
#, c-format
msgid "xbrlapi: bad type for VT number\n"
msgstr "xbrlapi: ungültiger Typ für VT Nummer\n"
-#: Programs/xbrlapi.c:439
+#: Programs/xbrlapi.c:628
#, c-format
msgid "xbrlapi: cannot get root window XFree86_VT property\n"
msgstr ""
-#: Programs/xbrlapi.c:316
+#: Programs/xbrlapi.c:342
#, c-format
msgid "xbrlapi: cannot write window name %s\n"
msgstr ""
-#: Programs/xbrlapi.c:764
+#: Programs/xbrlapi.c:916
#, c-format
msgid "xbrlapi: didn't grab parent of %#010lx\n"
msgstr ""
-#: Programs/xbrlapi.c:782
+#: Programs/xbrlapi.c:937 Programs/xbrlapi.c:956
#, c-format
msgid "xbrlapi: didn't grab window %#010lx\n"
msgstr ""
-#: Programs/xbrlapi.c:582
+#: Programs/xbrlapi.c:720
#, c-format
msgid "xbrlapi: didn't grab window %#010lx but got focus\n"
msgstr ""
-#: Programs/xbrlapi.c:448
+#: Programs/xbrlapi.c:637
#, c-format
msgid "xbrlapi: more than one item for VT number\n"
msgstr "xbrlapi: mehr als ein Element für VT Nummer\n"
-#: Programs/xbrlapi.c:433
+#: Programs/xbrlapi.c:622
#, c-format
msgid "xbrlapi: no XFree86_VT atom\n"
msgstr ""
-#: Programs/xbrlapi.c:444
+#: Programs/xbrlapi.c:633
#, c-format
msgid "xbrlapi: no items for VT number\n"
msgstr "xbrlapi: keine Elemente für VT Nummer\n"
-#: Programs/xbrlapi.c:416
+#: Programs/xbrlapi.c:605
#, c-format
msgid "xbrlapi: resource %#010lx, req %u:%u\n"
msgstr ""
+#. Server refused our Xkb remapping request, probably the buggy version 21, ignore error
+#: Programs/xbrlapi.c:598
+#, c-format
+msgid "xbrlapi: server refused our mapping request, could not synthesize key\n"
+msgstr ""
+
#. "shouldn't happen" events
-#: Programs/xbrlapi.c:811
+#: Programs/xbrlapi.c:990
#, c-format
msgid "xbrlapi: unhandled event type: %d\n"
msgstr "xbrlapi: unbehandelter Ereignistyp: %d\n"
-#: Programs/xbrlapi.c:790
+#: Programs/xbrlapi.c:965
+#, c-format
+msgid "xbrlapi: window %#010lx changed to NULL command\n"
+msgstr ""
+
+#: Programs/xbrlapi.c:949
#, c-format
msgid "xbrlapi: window %#010lx changed to NULL name\n"
msgstr ""
#. LRG
-#: Programs/cmd_utils.c:158
+#: Programs/cmd_utils.c:174
msgid "yellow"
msgstr "Gelb"
diff --git a/Messages/fr.po b/Messages/fr.po
index 897f81980..5fefc6695 100644
--- a/Messages/fr.po
+++ b/Messages/fr.po
@@ -1,7 +1,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Messages/it.po b/Messages/it.po
index aa0d9861f..51f5ac962 100644
--- a/Messages/it.po
+++ b/Messages/it.po
@@ -1,7 +1,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Messages/ru.po b/Messages/ru.po
index 0dc7ab3f9..db003e644 100644
--- a/Messages/ru.po
+++ b/Messages/ru.po
@@ -1,7 +1,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Messages/zh.po b/Messages/zh.po
index 86ebac08a..40b28f1db 100644
--- a/Messages/zh.po
+++ b/Messages/zh.po
@@ -1,7 +1,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Programs/Makefile.in b/Programs/Makefile.in
index cf7e569b7..6454e3585 100644
--- a/Programs/Makefile.in
+++ b/Programs/Makefile.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -1166,8 +1166,8 @@ install-commands: all-commands install-program-directories $(INSTALL_BRLTTY_PTY)
$(INSTALL_PROGRAM) brltty-lscmds$X $(INSTALL_PROGRAM_DIRECTORY)
$(INSTALL_PROGRAM) brltty-hid$X $(INSTALL_PROGRAM_DIRECTORY)
-install-brltty-pty: install-commands-directory
- $(INSTALL_PROGRAM) brltty-pty$X $(INSTALL_COMMANDS_DIRECTORY)
+install-brltty-pty: install-helpers-directory
+ $(INSTALL_PROGRAM) brltty-pty$X $(INSTALL_HELPERS_DIRECTORY)
install-tools: all-tools install-program-directories
$(INSTALL_PROGRAM) brltty-cldr$X $(INSTALL_PROGRAM_DIRECTORY)
@@ -1183,7 +1183,7 @@ install-tools: all-tools install-program-directories
XBRLAPI_X11_AUTOSTART_FILE = 90xbrlapi
XBRLAPI_GDM_AUTOSTART_FILE = xbrlapi.desktop
-install-xbrlapi: xbrlapi$X install-program-directory install-x11-autostart-directory install-gdm-autostart-directory
+install-xbrlapi: xbrlapi$X install-program-directory install-man1-directory install-x11-autostart-directory install-gdm-autostart-directory
$(INSTALL_PROGRAM) xbrlapi$X $(INSTALL_PROGRAM_DIRECTORY)
$(INSTALL_DATA) $(BLD_TOP)$(DOC_DIR)/xbrlapi.1 $(INSTALL_MAN1_DIRECTORY)
$(INSTALL_DATA) $(BLD_TOP)Autostart/X11/$(XBRLAPI_X11_AUTOSTART_FILE) $(INSTALL_X11_AUTOSTART_DIRECTORY)
@@ -1280,7 +1280,7 @@ install-api-key:
if test ! -f $$file -a -w $(sysconfdir) -a -z "$(INSTALL_ROOT)"; \
then $(SRC_TOP)brltty-genkey -f $$file; fi
-install-api-commands: all-brltty-clip
+install-api-commands: all-brltty-clip install-program-directory
$(INSTALL_PROGRAM) brltty-clip$X $(INSTALL_PROGRAM_DIRECTORY)
###############################################################################
@@ -1290,7 +1290,7 @@ uninstall:: uninstall-programs uninstall-tables uninstall-drivers uninstall-mess
uninstall-programs:
-rm -f $(INSTALL_PROGRAM_DIRECTORY)/brltty$X
-rm -f $(INSTALL_PROGRAM_DIRECTORY)/brltty-*
- -rm -f $(INSTALL_COMMANDS_DIRECTORY)/brltty-*
+ -rm -f $(INSTALL_HELPERS_DIRECTORY)/brltty-*
-rm -f $(INSTALL_PROGRAM_DIRECTORY)/xbrlapi$X
-rm -f $(INSTALL_X11_AUTOSTART_DIRECTORY)/$(XBRLAPI_X11_AUTOSTART_FILE)
-rm -f $(INSTALL_GDM_AUTOSTART_DIRECTORY)/$(XBRLAPI_GDM_AUTOSTART_FILE)
diff --git a/Programs/activity.c b/Programs/activity.c
index 6ef0ac967..4bb9b0b3b 100644
--- a/Programs/activity.c
+++ b/Programs/activity.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/activity.h b/Programs/activity.h
index 13dd8bf1e..748f1b1dd 100644
--- a/Programs/activity.h
+++ b/Programs/activity.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/addresses.c b/Programs/addresses.c
index ff58932d7..ede17807d 100644
--- a/Programs/addresses.c
+++ b/Programs/addresses.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/alert.c b/Programs/alert.c
index a47c2dc13..8825afda8 100644
--- a/Programs/alert.c
+++ b/Programs/alert.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/api.h b/Programs/api.h
index 7b3a7d152..86b3f7764 100644
--- a/Programs/api.h
+++ b/Programs/api.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/api_control.c b/Programs/api_control.c
index b35c2e388..2572325c3 100644
--- a/Programs/api_control.c
+++ b/Programs/api_control.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/api_control.h b/Programs/api_control.h
index 4509e61cd..66c116703 100644
--- a/Programs/api_control.h
+++ b/Programs/api_control.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/api_server.h b/Programs/api_server.h
index 45df4351d..811266ed3 100644
--- a/Programs/api_server.h
+++ b/Programs/api_server.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/apitest.c b/Programs/apitest.c
index 1f64d9134..d58236315 100644
--- a/Programs/apitest.c
+++ b/Programs/apitest.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/async_alarm.c b/Programs/async_alarm.c
index 5bbd2825f..f6bd1e765 100644
--- a/Programs/async_alarm.c
+++ b/Programs/async_alarm.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/async_data.c b/Programs/async_data.c
index 35148490a..22c0ef6b3 100644
--- a/Programs/async_data.c
+++ b/Programs/async_data.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/async_event.c b/Programs/async_event.c
index ce7ed3d0d..2ae08bd15 100644
--- a/Programs/async_event.c
+++ b/Programs/async_event.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/async_handle.c b/Programs/async_handle.c
index ee4d7f51a..4e20627df 100644
--- a/Programs/async_handle.c
+++ b/Programs/async_handle.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/async_internal.h b/Programs/async_internal.h
index 20b287790..2f6a8eca8 100644
--- a/Programs/async_internal.h
+++ b/Programs/async_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/async_io.c b/Programs/async_io.c
index cb0d712d7..974fb45e6 100644
--- a/Programs/async_io.c
+++ b/Programs/async_io.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/async_signal.c b/Programs/async_signal.c
index 02a34d0d5..cc8239417 100644
--- a/Programs/async_signal.c
+++ b/Programs/async_signal.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/async_task.c b/Programs/async_task.c
index 710680a00..c18e955b5 100644
--- a/Programs/async_task.c
+++ b/Programs/async_task.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/async_wait.c b/Programs/async_wait.c
index f90d9cb4d..f4a266c0a 100644
--- a/Programs/async_wait.c
+++ b/Programs/async_wait.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/atb_compile.c b/Programs/atb_compile.c
index 12a242e9d..5a0c8117f 100644
--- a/Programs/atb_compile.c
+++ b/Programs/atb_compile.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/atb_internal.h b/Programs/atb_internal.h
index a2b4680c4..39e0470ad 100644
--- a/Programs/atb_internal.h
+++ b/Programs/atb_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/atb_translate.c b/Programs/atb_translate.c
index 0444d3108..78143cb92 100644
--- a/Programs/atb_translate.c
+++ b/Programs/atb_translate.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/auth.c b/Programs/auth.c
index 2982bff36..8a00dd465 100644
--- a/Programs/auth.c
+++ b/Programs/auth.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/beep.c b/Programs/beep.c
index bdaf6704e..1a814600a 100644
--- a/Programs/beep.c
+++ b/Programs/beep.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/beep_linux.c b/Programs/beep_linux.c
index 510c7e8d4..075459ef4 100644
--- a/Programs/beep_linux.c
+++ b/Programs/beep_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/beep_msdos.c b/Programs/beep_msdos.c
index 5d06404d5..b882bf0f0 100644
--- a/Programs/beep_msdos.c
+++ b/Programs/beep_msdos.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/beep_none.c b/Programs/beep_none.c
index 80b777fd2..5ecb869d9 100644
--- a/Programs/beep_none.c
+++ b/Programs/beep_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/beep_solaris.c b/Programs/beep_solaris.c
index 7c77b9531..eeff2c242 100644
--- a/Programs/beep_solaris.c
+++ b/Programs/beep_solaris.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/beep_spkr.c b/Programs/beep_spkr.c
index cb31f1c9e..0ed11004e 100644
--- a/Programs/beep_spkr.c
+++ b/Programs/beep_spkr.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/beep_windows.c b/Programs/beep_windows.c
index 417b5421b..cc6de0a1c 100644
--- a/Programs/beep_windows.c
+++ b/Programs/beep_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/beep_wskbd.c b/Programs/beep_wskbd.c
index 1e275a9e6..b34886ab2 100644
--- a/Programs/beep_wskbd.c
+++ b/Programs/beep_wskbd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bell.c b/Programs/bell.c
index 7f6fbcffd..38f5d8f8a 100644
--- a/Programs/bell.c
+++ b/Programs/bell.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bell_linux.c b/Programs/bell_linux.c
index 00bb637f3..0aed4d192 100644
--- a/Programs/bell_linux.c
+++ b/Programs/bell_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bell_none.c b/Programs/bell_none.c
index 211486ce3..e4473dbe7 100644
--- a/Programs/bell_none.c
+++ b/Programs/bell_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/blink.c b/Programs/blink.c
index c96f37f98..0d46c5008 100644
--- a/Programs/blink.c
+++ b/Programs/blink.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/blink.h b/Programs/blink.h
index d0a1c03e2..91d781ea4 100644
--- a/Programs/blink.h
+++ b/Programs/blink.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bluetooth.c b/Programs/bluetooth.c
index 314615ee3..959a8dbc3 100644
--- a/Programs/bluetooth.c
+++ b/Programs/bluetooth.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bluetooth_android.c b/Programs/bluetooth_android.c
index e106f8ab3..d77c8c31f 100644
--- a/Programs/bluetooth_android.c
+++ b/Programs/bluetooth_android.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bluetooth_darwin.c b/Programs/bluetooth_darwin.c
index e12ff4853..350b32d22 100644
--- a/Programs/bluetooth_darwin.c
+++ b/Programs/bluetooth_darwin.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bluetooth_internal.h b/Programs/bluetooth_internal.h
index 02d486864..31ac3dda8 100644
--- a/Programs/bluetooth_internal.h
+++ b/Programs/bluetooth_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bluetooth_linux.c b/Programs/bluetooth_linux.c
index a30fad61e..c40a8f60f 100644
--- a/Programs/bluetooth_linux.c
+++ b/Programs/bluetooth_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bluetooth_names.c b/Programs/bluetooth_names.c
index 26f922727..f2fbea865 100644
--- a/Programs/bluetooth_names.c
+++ b/Programs/bluetooth_names.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bluetooth_none.c b/Programs/bluetooth_none.c
index 0853da993..d0644ada8 100644
--- a/Programs/bluetooth_none.c
+++ b/Programs/bluetooth_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/bluetooth_windows.c b/Programs/bluetooth_windows.c
index d6490d196..99447aaa4 100644
--- a/Programs/bluetooth_windows.c
+++ b/Programs/bluetooth_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brl.c b/Programs/brl.c
index a7693c5e8..3134a1afd 100644
--- a/Programs/brl.c
+++ b/Programs/brl.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brl.h b/Programs/brl.h
index f4c709239..f68be4798 100644
--- a/Programs/brl.h
+++ b/Programs/brl.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brl_base.c b/Programs/brl_base.c
index 832c8921e..c4bf989bb 100644
--- a/Programs/brl_base.c
+++ b/Programs/brl_base.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brl_cmds.awk b/Programs/brl_cmds.awk
index 283ecca3f..2c87f6d63 100644
--- a/Programs/brl_cmds.awk
+++ b/Programs/brl_cmds.awk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Programs/brl_driver.c b/Programs/brl_driver.c
index dc26f3446..618c2af56 100644
--- a/Programs/brl_driver.c
+++ b/Programs/brl_driver.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brl_input.c b/Programs/brl_input.c
index b12fc2fb9..2e3d46af9 100644
--- a/Programs/brl_input.c
+++ b/Programs/brl_input.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brl_input.h b/Programs/brl_input.h
index 60421a320..c2b7df364 100644
--- a/Programs/brl_input.h
+++ b/Programs/brl_input.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brl_utils.c b/Programs/brl_utils.c
index fb7abd7c2..f25484bbb 100644
--- a/Programs/brl_utils.c
+++ b/Programs/brl_utils.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brlapi.awk b/Programs/brlapi.awk
index 9798595ff..45d83f142 100644
--- a/Programs/brlapi.awk
+++ b/Programs/brlapi.awk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Programs/brlapi.h.in b/Programs/brlapi.h.in
index c3736f629..32fd6a690 100644
--- a/Programs/brlapi.h.in
+++ b/Programs/brlapi.h.in
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2002-2024 by
+ * Copyright (C) 2002-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
@@ -17,6 +17,13 @@
* This software is maintained by Dave Mielke <dave@mielke.cc>.
*/
+/** \mainpage BrlAPI API reference manual
+ * This documentation provides all the API details of BrlAPI.
+ *
+ * A general introduction guide is available online on
+ * https://brltty.app/doc/Manual-BrlAPI/English/BrlAPI.html
+ */
+
/** \file
* \brief Types, defines and functions prototypes for \e BrlAPI's library
*/
@@ -438,6 +445,11 @@ int BRLAPI_STDCALL brlapi__getDisplaySize(brlapi_handle_t *handle, unsigned int
* Once brlapi_enterTtyMode() is called, brlapi_leaveTtyMode() has to be called
* before calling brlapi_enterTtyMode() again.
*
+ * If the application does not want to take control of a particular tty, but
+ * keep control on all ttys, brlapi_enterTtyModeWithPath should be called
+ * instead with nttys equal to 0. This is usually what a screen reader wants to
+ * use.
+ *
* TODO: document which functions work in TTY mode only.
*
* \sa brlapi_leaveTtyMode() brlapi_readKey()
@@ -1154,7 +1166,12 @@ int BRLAPI_STDCALL brlapi__setParameter(brlapi_handle_t *handle, brlapi_param_t
* \param len is the size of the data.
*
* This callback only gets called when the application calls some brlapi_
- * function (i.e. BrlAPI gets direct control of the execution).
+ * function (i.e. BrlAPI gets direct control of the execution), BrlAPI itself
+ * does not start a separate thread or such.
+ *
+ * If an application wants to see such event trigger a callback getting called
+ * e.g. in another thread, it can use brlapi_pause() to give BrlAPI an
+ * opportunity to receive messages and call the callbacks.
*/
typedef void (*brlapi_paramCallback_t)(brlapi_param_t parameter, brlapi_param_subparam_t subparam, brlapi_param_flags_t flags, void *priv, const void *data, size_t len);
diff --git a/Programs/brlapi_brldefs.awk b/Programs/brlapi_brldefs.awk
index 7f8bc6112..1e98d15c4 100644
--- a/Programs/brlapi_brldefs.awk
+++ b/Programs/brlapi_brldefs.awk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
index 12a7dc62a..4d823cd4c 100644
--- a/Programs/brlapi_client.c
+++ b/Programs/brlapi_client.c
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2002-2024 by
+ * Copyright (C) 2002-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Programs/brlapi_common.h b/Programs/brlapi_common.h
index 29e0643a5..a12c8c4f6 100644
--- a/Programs/brlapi_common.h
+++ b/Programs/brlapi_common.h
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2002-2024 by
+ * Copyright (C) 2002-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Programs/brlapi_constants.awk b/Programs/brlapi_constants.awk
index 84177b55e..3bc639865 100644
--- a/Programs/brlapi_constants.awk
+++ b/Programs/brlapi_constants.awk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Programs/brlapi_keycodes.h b/Programs/brlapi_keycodes.h
index a1daa2eaa..6afa2140f 100644
--- a/Programs/brlapi_keycodes.h
+++ b/Programs/brlapi_keycodes.h
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2002-2024 by
+ * Copyright (C) 2002-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Programs/brlapi_keyranges.c b/Programs/brlapi_keyranges.c
index 9e3383ce9..d3c5de894 100644
--- a/Programs/brlapi_keyranges.c
+++ b/Programs/brlapi_keyranges.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brlapi_keyranges.h b/Programs/brlapi_keyranges.h
index b91c8bbac..a565b85c6 100644
--- a/Programs/brlapi_keyranges.h
+++ b/Programs/brlapi_keyranges.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brlapi_keytab.awk b/Programs/brlapi_keytab.awk
index 0a25974bc..727dc6828 100644
--- a/Programs/brlapi_keytab.awk
+++ b/Programs/brlapi_keytab.awk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Programs/brlapi_param.h b/Programs/brlapi_param.h
index 1b0ae92ab..cbdb528d7 100644
--- a/Programs/brlapi_param.h
+++ b/Programs/brlapi_param.h
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2002-2024 by
+ * Copyright (C) 2002-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Programs/brlapi_protocol.h b/Programs/brlapi_protocol.h
index 876f3f98a..b2c4283da 100644
--- a/Programs/brlapi_protocol.h
+++ b/Programs/brlapi_protocol.h
@@ -1,7 +1,7 @@
/*
* libbrlapi - A library providing access to braille terminals for applications.
*
- * Copyright (C) 2002-2024 by
+ * Copyright (C) 2002-2025 by
* Samuel Thibault <Samuel.Thibault@ens-lyon.org>
* Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
*
diff --git a/Programs/brlapi_server.c b/Programs/brlapi_server.c
index 717daa7df..f8d57010b 100644
--- a/Programs/brlapi_server.c
+++ b/Programs/brlapi_server.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -24,7 +24,7 @@
#define UNAUTH_TIMEOUT 30
#define RELEASE "BrlAPI Server: release " BRLAPI_RELEASE
-#define COPYRIGHT " Copyright (C) 2002-2024 by Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>, \
+#define COPYRIGHT " Copyright (C) 2002-2025 by Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>, \
Samuel Thibault <samuel.thibault@ens-lyon.org>"
#include "prologue.h"
@@ -78,7 +78,6 @@ Samuel Thibault <samuel.thibault@ens-lyon.org>"
#include "embed.h"
#include "clipboard.h"
#include "ttb.h"
-#include "core.h"
#include "api_server.h"
#include "report.h"
#include "log.h"
@@ -95,6 +94,8 @@ Samuel Thibault <samuel.thibault@ens-lyon.org>"
#include "async_signal.h"
#include "thread.h"
#include "blink.h"
+#include "options.h"
+#include "core.h"
#ifdef __MINGW32__
#define LogSocketError(msg) logWindowsSocketError(msg)
@@ -182,6 +183,7 @@ extern char *opt_brailleParameters;
extern char *cfg_brailleParameters;
typedef struct {
+ unsigned int size;
unsigned int cursor;
wchar_t *text;
unsigned char *andAttr;
@@ -425,7 +427,7 @@ static int resumeBrailleDriver(BrailleDisplay *brl) {
}
typedef struct {
- unsigned resumed:1;
+ unsigned char resumed:1;
} CoreTaskData_resumeBrailleDriver;
CORE_TASK_CALLBACK(apiCoreTask_resumeBrailleDriver) {
@@ -486,7 +488,7 @@ static int flushBrailleOutput(BrailleDisplay *brl) {
}
typedef struct {
- unsigned flushed:1;
+ unsigned char flushed:1;
} CoreTaskData_flushBrailleOutput;
CORE_TASK_CALLBACK(apiCoreTask_flushBrailleOutput) {
@@ -579,13 +581,15 @@ typedef struct { /* packet handlers */
/* Returns to report success, -1 on errors */
static int allocBrailleWindow(BrailleWindow *brailleWindow)
{
- if (!(brailleWindow->text = malloc(displaySize*sizeof(wchar_t)))) goto out;
- if (!(brailleWindow->andAttr = malloc(displaySize))) goto outText;
- if (!(brailleWindow->orAttr = malloc(displaySize))) goto outAnd;
-
- wmemset(brailleWindow->text, WC_C(' '), displaySize);
- memset(brailleWindow->andAttr, 0xFF, displaySize);
- memset(brailleWindow->orAttr, 0x00, displaySize);
+ unsigned int size = displaySize;
+ brailleWindow->size = size;
+ if (!(brailleWindow->text = malloc(size*sizeof(wchar_t)))) goto out;
+ if (!(brailleWindow->andAttr = malloc(size))) goto outText;
+ if (!(brailleWindow->orAttr = malloc(size))) goto outAnd;
+
+ wmemset(brailleWindow->text, WC_C(' '), size);
+ memset(brailleWindow->andAttr, 0xFF, size);
+ memset(brailleWindow->orAttr, 0x00, size);
brailleWindow->cursor = 0;
return 0;
@@ -599,6 +603,43 @@ out:
return -1;
}
+/* Function : reAllocBrailleWindow */
+/* Resizes the members of a BrailleWindow structure according to a new size */
+/* Returns to report success, -1 on errors */
+static int reallocBrailleWindow(BrailleWindow *brailleWindow, unsigned size)
+{
+ wchar_t *newText;
+ unsigned char *newAndAttr;
+ unsigned char *newOrAttr;
+ unsigned int oldsize = brailleWindow->size;
+
+ if (!(newText = realloc(brailleWindow->text, size*sizeof(wchar_t)))) goto out;
+ if (!(newAndAttr = realloc(brailleWindow->andAttr, size))) goto outText;
+ if (!(newOrAttr = realloc(brailleWindow->orAttr, size))) goto outAnd;
+
+ brailleWindow->size = size;
+ brailleWindow->text = newText;
+ brailleWindow->andAttr = newAndAttr;
+ brailleWindow->orAttr = newOrAttr;
+
+ if (size > oldsize) {
+ wmemset(newText + oldsize, WC_C(' '), size - oldsize);
+ memset(newAndAttr + oldsize, 0xFF, size - oldsize);
+ memset(newOrAttr + oldsize, 0x00, size - oldsize);
+ }
+
+ return 0;
+
+outAnd:
+ free(newAndAttr);
+
+outText:
+ free(newText);
+
+out:
+ return -1;
+}
+
/* Function: freeBrailleWindow */
/* Frees the fields of a BrailleWindow structure */
static void freeBrailleWindow(BrailleWindow *brailleWindow)
@@ -629,16 +670,35 @@ static void getDots(const BrailleWindow *brailleWindow, unsigned char *buf)
{
int i;
unsigned char c;
- for (i=0; i<displaySize; i++) {
+ unsigned int size = MIN(brailleWindow->size, displaySize);
+ for (i=0; i<size; i++) {
c = convertCharacterToDots(textTable, brailleWindow->text[i]);
buf[i] = (c & brailleWindow->andAttr[i]) | brailleWindow->orAttr[i];
}
+ for (i=size; i<displaySize; i++) {
+ buf[i] = 0;
+ }
- if (brailleWindow->cursor) {
+ if (brailleWindow->cursor && brailleWindow->cursor < displaySize) {
buf[brailleWindow->cursor-1] |= cursorOverlay;
}
}
+/* Function: getText */
+/* Returns the braille text corresponding to a BrailleWindow structure */
+/* No allocation of buf is performed */
+static void getText(const BrailleWindow *brailleWindow, wchar_t *buf)
+{
+ int i;
+ unsigned int size = MIN(brailleWindow->size, displaySize);
+ for (i=0; i<size; i++) {
+ buf[i] = brailleWindow->text[i];
+ }
+ for (i=size; i<displaySize; i++) {
+ buf[i] = WC_C(' ');
+ }
+}
+
/****************************************************************************/
/** CONNECTIONS MANAGING **/
/****************************************************************************/
@@ -1083,6 +1143,7 @@ static int handleWrite(Connection *c, brlapi_packetType_t type, brlapi_packet_t
int remaining = size;
char *charset = NULL;
unsigned int charsetLen = 0;
+ unsigned int connSize;
CHECKEXC(remaining>=sizeof(wa->flags), BRLAPI_ERROR_INVALID_PACKET, "packet too small for flags");
CHECKEXC(!c->raw,BRLAPI_ERROR_ILLEGAL_INSTRUCTION,"not allowed in raw mode");
CHECKEXC(c->tty,BRLAPI_ERROR_ILLEGAL_INSTRUCTION,"not allowed out of tty mode");
@@ -1093,6 +1154,13 @@ static int handleWrite(Connection *c, brlapi_packetType_t type, brlapi_packet_t
}
remaining -= sizeof(wa->flags); /* flags */
CHECKEXC((wa->flags & BRLAPI_WF_DISPLAYNUMBER)==0, BRLAPI_ERROR_OPNOTSUPP, "display number not yet supported");
+ connSize = c->brailleWindow.size;
+ if (connSize < displaySize) { /* Display got bigger, allocate room for this */
+ connSize = displaySize;
+ lockMutex(&c->brailleWindowMutex);
+ reallocBrailleWindow(&c->brailleWindow, connSize);
+ unlockMutex(&c->brailleWindowMutex);
+ }
if (wa->flags & BRLAPI_WF_REGION) {
int regionSize;
CHECKEXC(remaining>2*sizeof(uint32_t), BRLAPI_ERROR_INVALID_PACKET, "packet too small for region");
@@ -1110,23 +1178,23 @@ static int handleWrite(Connection *c, brlapi_packetType_t type, brlapi_packet_t
}
CHECKEXC(
- (rbeg >= 1) && (rbeg <= displaySize),
+ (rbeg >= 1) && (rbeg <= connSize),
BRLAPI_ERROR_INVALID_PARAMETER, "invalid region start"
);
CHECKEXC(
- (rsiz >= 1) && (rsiz <= displaySize),
+ (rsiz >= 1) && (rsiz <= connSize),
BRLAPI_ERROR_INVALID_PARAMETER, "invalid region size"
);
CHECKEXC(
- (rbeg + rsiz - 1 <= displaySize),
+ (rbeg + rsiz - 1 <= connSize),
BRLAPI_ERROR_INVALID_PARAMETER, "invalid region"
);
} else {
logMessage(LOG_CATEGORY(SERVER_EVENTS), "warning: fd %"PRIfd" uses deprecated regionBegin=0 and regionSize = 0",c->fd);
rbeg = 1;
- rsiz = displaySize;
+ rsiz = connSize;
fill = true;
}
if (wa->flags & BRLAPI_WF_TEXT) {
@@ -1153,7 +1221,7 @@ static int handleWrite(Connection *c, brlapi_packetType_t type, brlapi_packet_t
memcpy(&u32, p, sizeof(uint32_t));
cursor = ntohl(u32);
p += sizeof(uint32_t); remaining -= sizeof(uint32_t); /* cursor */
- CHECKEXC(cursor<=displaySize, BRLAPI_ERROR_INVALID_PACKET, "wrong cursor");
+ CHECKEXC(cursor<=connSize, BRLAPI_ERROR_INVALID_PACKET, "wrong cursor");
}
if (wa->flags & BRLAPI_WF_CHARSET) {
CHECKEXC(wa->flags & BRLAPI_WF_TEXT, BRLAPI_ERROR_INVALID_PACKET, "charset requires text");
@@ -1166,7 +1234,7 @@ static int handleWrite(Connection *c, brlapi_packetType_t type, brlapi_packet_t
CHECKEXC(remaining==0, BRLAPI_ERROR_INVALID_PACKET, "packet too big");
/* Here the whole packet has been checked */
- unsigned int rsiz_filled = fill ? displaySize - rbeg + 1 : rsiz;
+ unsigned int rsiz_filled = fill ? connSize - rbeg + 1 : rsiz;
if (text) {
int isUTF8 = 0;
@@ -1264,8 +1332,8 @@ static int handleWrite(Connection *c, brlapi_packetType_t type, brlapi_packet_t
}
logConversionResult(c, rsiz, textLen);
len -= sout / sizeof(wchar_t);
- if (len > displaySize - rbeg + 1)
- len = displaySize - rbeg + 1;
+ if (len > connSize - rbeg + 1)
+ len = connSize - rbeg + 1;
lockMutex(&c->brailleWindowMutex);
wmemcpy(c->brailleWindow.text+rbeg-1, textBuf, len);
@@ -1290,7 +1358,7 @@ static int handleWrite(Connection *c, brlapi_packetType_t type, brlapi_packet_t
end = rbeg-1 + len;
}
if (fill)
- wmemset(c->brailleWindow.text+end, L' ', displaySize - end);
+ wmemset(c->brailleWindow.text+end, L' ', connSize - end);
// Forget the charset in case it's pointing to a local buffer.
// This occurs when getCharset() is saved and alloca() isn't available.
@@ -2062,6 +2130,17 @@ PARAM_READER(driverPropertyValue)
return NULL;
}
+typedef struct {
+ const uint64_t property;
+ const uint64_t value;
+ unsigned char set:1;
+} CoreTaskData_setDriverProperty;
+
+CORE_TASK_CALLBACK(apiCoreTask_setDriverProperty) {
+ CoreTaskData_setDriverProperty *sdp = data;
+ sdp->set = brl.setDriverProperty(&brl, sdp->property, sdp->value);
+}
+
PARAM_WRITER(driverPropertyValue)
{
if (!brl.setDriverProperty) return "no settable driver properties";
@@ -2074,7 +2153,14 @@ PARAM_WRITER(driverPropertyValue)
c->fd, subparam, *propertyValue
);
- if (!brl.setDriverProperty(&brl, subparam, *propertyValue)) return "cannot set driver property";
+ CoreTaskData_setDriverProperty sdp = {
+ .property = subparam,
+ .value = *propertyValue,
+ .set = 0
+ };
+
+ runCoreTask(apiCoreTask_setDriverProperty, &sdp, 1);
+ if (!sdp.set) return "cannot set driver property";
return NULL;
}
@@ -4437,11 +4523,13 @@ int api_flushOutput(BrailleDisplay *brl) {
}
if (c != displayed_last || c->brlbufstate==TODISPLAY || update) {
- unsigned char *oldbuf = disp->buffer, buf[displaySize];
- disp->buffer = buf;
- getDots(&c->brailleWindow, buf);
+ unsigned char *oldbuf = disp->buffer, dots[displaySize];
+ wchar_t text[displaySize];
+ disp->buffer = dots;
+ getDots(&c->brailleWindow, dots);
+ getText(&c->brailleWindow, text);
brl->cursor = c->brailleWindow.cursor-1;
- if (!trueBraille->writeWindow(brl, c->brailleWindow.text)) ok = 0;
+ if (!trueBraille->writeWindow(brl, text)) ok = 0;
/* FIXME: the client should have gotten the notification when the write
* was received, rather than only when it eventually gets displayed
* (possibly only because of focus change) */
diff --git a/Programs/brldefs.h b/Programs/brldefs.h
index 849056005..e98cf11e9 100644
--- a/Programs/brldefs.h
+++ b/Programs/brldefs.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brltest.c b/Programs/brltest.c
index 349936e22..85ae2c157 100644
--- a/Programs/brltest.c
+++ b/Programs/brltest.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -25,6 +25,7 @@
#include "program.h"
#include "cmdline.h"
+#include "options.h"
#include "parameters.h"
#include "log.h"
#include "parse.h"
@@ -42,10 +43,9 @@
BrailleDisplay brl;
-static char *opt_brailleDevice;
+char *opt_brailleDevice;
char *opt_driversDirectory;
-static char *opt_tablesDirectory;
-static char *opt_writableDirectory;
+char *opt_tablesDirectory;
BEGIN_OPTION_TABLE(programOptions)
{ .word = "device",
@@ -61,7 +61,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_tablesDirectory,
.internal.setting = TABLES_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory containing tables.")
},
@@ -70,7 +70,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = "directory",
.setting.string = &opt_driversDirectory,
.internal.setting = DRIVERS_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = "Path to directory for loading drivers."
},
@@ -79,7 +79,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_writableDirectory,
.internal.setting = WRITABLE_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory which can be written to.")
},
END_OPTION_TABLE(programOptions)
@@ -105,8 +105,6 @@ main (int argc, char *argv[]) {
PROCESS_OPTIONS(descriptor, argc, argv);
}
- setWritableDirectory(opt_writableDirectory);
-
if (argc) {
driver = *argv++, --argc;
}
@@ -289,6 +287,11 @@ message (const char *mode, const char *text, MessageOptions options) {
return 1;
}
+int
+sayMessage (const char *text) {
+ return 1;
+}
+
#include "scr.h"
KeyTableCommandContext
diff --git a/Programs/brltty-atb.c b/Programs/brltty-atb.c
index 6f86d91f1..99694bf7d 100644
--- a/Programs/brltty-atb.c
+++ b/Programs/brltty-atb.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -20,10 +20,11 @@
#include "program.h"
#include "cmdline.h"
+#include "options.h"
#include "log.h"
#include "atb.h"
-static char *opt_tablesDirectory;
+char *opt_tablesDirectory;
BEGIN_OPTION_TABLE(programOptions)
{ .word = "tables-directory",
@@ -31,7 +32,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_tablesDirectory,
.internal.setting = TABLES_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory containing tables.")
},
END_OPTION_TABLE(programOptions)
diff --git a/Programs/brltty-cldr.c b/Programs/brltty-cldr.c
index 45354784c..b14ba1a3f 100644
--- a/Programs/brltty-cldr.c
+++ b/Programs/brltty-cldr.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brltty-clip.c b/Programs/brltty-clip.c
index 4044f1747..a5d458e0a 100644
--- a/Programs/brltty-clip.c
+++ b/Programs/brltty-clip.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brltty-ctb.c b/Programs/brltty-ctb.c
index 9b99e0ced..595b883a7 100644
--- a/Programs/brltty-ctb.c
+++ b/Programs/brltty-ctb.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -24,6 +24,7 @@
#include "program.h"
#include "cmdline.h"
+#include "options.h"
#include "prefs.h"
#include "log.h"
#include "file.h"
@@ -35,9 +36,9 @@
#include "ttb.h"
#include "ctb.h"
-static char *opt_tablesDirectory;
-static char *opt_contractionTable;
-static char *opt_textTable;
+char *opt_tablesDirectory;
+char *opt_contractionTable;
+char *opt_textTable;
static char *opt_verificationTable;
static char *opt_outputWidth;
@@ -92,7 +93,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_tablesDirectory,
.internal.setting = TABLES_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory containing tables.")
},
END_OPTION_TABLE(programOptions)
diff --git a/Programs/brltty-hid.c b/Programs/brltty-hid.c
index fdda01e2d..523731e1d 100644
--- a/Programs/brltty-hid.c
+++ b/Programs/brltty-hid.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brltty-ktb.c b/Programs/brltty-ktb.c
index 33ac9064e..f01e10d0b 100644
--- a/Programs/brltty-ktb.c
+++ b/Programs/brltty-ktb.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -23,6 +23,7 @@
#include "program.h"
#include "cmdline.h"
+#include "options.h"
#include "log.h"
#include "file.h"
#include "parse.h"
@@ -31,12 +32,12 @@
#include "ktb_keyboard.h"
#include "brl.h"
-static char *opt_brailleDriver;
+char *opt_brailleDriver;
static int opt_audit;
static int opt_listKeyNames;
static int opt_listHelpScreen;
static int opt_listRestructuredText;
-static char *opt_tablesDirectory;
+char *opt_tablesDirectory;
char *opt_driversDirectory;
BEGIN_OPTION_TABLE(programOptions)
@@ -76,7 +77,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_tablesDirectory,
.internal.setting = TABLES_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory containing tables.")
},
@@ -85,7 +86,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_driversDirectory,
.internal.setting = DRIVERS_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory for loading drivers.")
},
END_OPTION_TABLE(programOptions)
diff --git a/Programs/brltty-lscmds.c b/Programs/brltty-lscmds.c
index 859256ed7..11660763c 100644
--- a/Programs/brltty-lscmds.c
+++ b/Programs/brltty-lscmds.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brltty-lsinc.c b/Programs/brltty-lsinc.c
index 909fb6122..c4507e2d6 100644
--- a/Programs/brltty-lsinc.c
+++ b/Programs/brltty-lsinc.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brltty-morse.c b/Programs/brltty-morse.c
index 5faa2abe6..9e818f254 100644
--- a/Programs/brltty-morse.c
+++ b/Programs/brltty-morse.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -22,6 +22,7 @@
#include "log.h"
#include "cmdline.h"
+#include "options.h"
#include "prefs.h"
#include "parse.h"
#include "tune_utils.h"
diff --git a/Programs/brltty-pty.c b/Programs/brltty-pty.c
index cfe2e18f6..a29e0b587 100644
--- a/Programs/brltty-pty.c
+++ b/Programs/brltty-pty.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -29,6 +29,7 @@
#include <errno.h>
#include <limits.h>
#include <sys/wait.h>
+#include <sys/ioctl.h>
#include "log.h"
#include "cmdline.h"
@@ -138,6 +139,18 @@ writeDriverDirective (const char *format, ...) {
}
}
+static int
+setWindowSize (int tty, size_t columns, size_t lines) {
+ struct winsize size = {
+ .ws_col = columns,
+ .ws_row = lines,
+ };
+
+ if (ioctl(tty, TIOCSWINSZ, &size) != -1) return 1;
+ logSystemError("ioctl[TIOCSWINSZ]");
+ return 0;
+}
+
static int
setEnvironmentString (const char *variable, const char *string) {
int result = setenv(variable, string, 1);
@@ -155,7 +168,7 @@ setEnvironmentInteger (const char *variable, int integer) {
}
static int
-setEnvironmentVariables (void) {
+setEnvironmentVariables (size_t *columns, size_t *lines) {
if (!setEnvironmentString("TERM_PROGRAM", programName)) return 0;
if (!setEnvironmentString("TERM_PROGRAM_VERSION", PACKAGE_VERSION)) return 0;
@@ -177,49 +190,55 @@ setEnvironmentVariables (void) {
}
}
- {
- size_t width, height;
-
- if (getConsoleSize(&width, &height)) {
- if (!setEnvironmentInteger("COLUMNS", width)) return 0;
- if (!setEnvironmentInteger("LINES", height)) return 0;
- }
+ if (getConsoleSize(columns, lines)) {
+ if (!setEnvironmentInteger("COLUMNS", *columns)) return 0;
+ if (!setEnvironmentInteger("LINES", *lines)) return 0;
+ } else {
+ *columns = 0;
+ *lines = 0;
}
return setEnvironmentString("TERM", ptyGetTerminalType());
}
+static PtyObject *ptyObject = NULL;
+
static int
-prepareChild (PtyObject *pty) {
+prepareChild (void) {
setsid();
- ptyCloseMaster(pty);
+ ptyCloseMaster(ptyObject);
- if (setEnvironmentVariables()) {
+ size_t columns, lines;
+ if (setEnvironmentVariables(&columns, &lines)) {
int tty;
- if (!ptyOpenSlave(pty, &tty)) return 0;
- int keep = 0;
-
- for (int fd=0; fd<=2; fd+=1) {
- if (fd == tty) {
- keep = 1;
- } else {
- int result = dup2(tty, fd);
-
- if (result == -1) {
- logSystemError("dup2");
- return 0;
+ if (!ptyOpenSlave(ptyObject, &tty)) return 0;
+ setWindowSize(tty, columns, lines);
+
+ {
+ int keep = 0;
+
+ for (int fd=0; fd<=2; fd+=1) {
+ if (fd == tty) {
+ keep = 1;
+ } else {
+ int result = dup2(tty, fd);
+
+ if (result == -1) {
+ logSystemError("dup2");
+ return 0;
+ }
}
}
- }
- if (!keep) close(tty);
+ if (!keep) close(tty);
+ }
}
return 1;
}
static int
-runChild (PtyObject *pty, char **command) {
+runChild (char **command) {
char *defaultCommand[2];
if (!(command && *command)) {
@@ -228,10 +247,11 @@ runChild (PtyObject *pty, char **command) {
defaultCommand[0] = shell;
defaultCommand[1] = NULL;
+
command = defaultCommand;
}
- if (prepareChild(pty)) {
+ if (prepareChild()) {
int result = execvp(*command, command);
if (result == -1) {
@@ -267,6 +287,16 @@ parentQuitMonitor (int signalNumber) {
parentIsQuitting = 1;
}
+static void
+windowSizeMonitor (int signalNumber) {
+ size_t columns, lines;
+
+ if (getConsoleSize(&columns, &lines)) {
+ setWindowSize(ptyGetMaster(ptyObject), columns, lines);
+ ptyResizeTerminal(lines, columns);
+ }
+}
+
static void
childTerminationMonitor (int signalNumber) {
childHasTerminated = 1;
@@ -277,13 +307,13 @@ installSignalHandlers (void) {
if (!asyncHandleSignal(SIGTERM, parentQuitMonitor, NULL)) return 0;
if (!asyncHandleSignal(SIGINT, parentQuitMonitor, NULL)) return 0;
if (!asyncHandleSignal(SIGQUIT, parentQuitMonitor, NULL)) return 0;
+ if (!asyncHandleSignal(SIGWINCH, windowSizeMonitor, NULL)) return 0;
return asyncHandleSignal(SIGCHLD, childTerminationMonitor, NULL);
}
static
ASYNC_MONITOR_CALLBACK(standardInputMonitor) {
- PtyObject *pty = parameters->data;
- if (ptyProcessTerminalInput(pty)) return 1;
+ if (ptyProcessTerminalInput(ptyObject)) return 1;
parentIsQuitting = 1;
return 0;
@@ -337,7 +367,7 @@ reapExitStatus (pid_t pid) {
}
static int
-runParent (PtyObject *pty, pid_t child) {
+runParent (pid_t child) {
int exitStatus = PROG_EXIT_FATAL;
AsyncHandle ptyInputHandle;
@@ -345,19 +375,19 @@ runParent (PtyObject *pty, pid_t child) {
childHasTerminated = 0;
slaveHasBeenClosed = 0;
- if (asyncReadFile(&ptyInputHandle, ptyGetMaster(pty), 1, ptyInputHandler, NULL)) {
+ if (asyncReadFile(&ptyInputHandle, ptyGetMaster(ptyObject), 1, ptyInputHandler, NULL)) {
AsyncHandle standardInputHandle;
- if (asyncMonitorFileInput(&standardInputHandle, STDIN_FILENO, standardInputMonitor, pty)) {
+ if (asyncMonitorFileInput(&standardInputHandle, STDIN_FILENO, standardInputMonitor, NULL)) {
if (installSignalHandlers()) {
if (!isatty(2)) {
unsigned char level = LOG_NOTICE;
ptySetTerminalLogLevel(level);
- ptySetLogLevel(pty, level);
+ ptySetLogLevel(ptyObject, level);
}
- if (ptyBeginTerminal(pty, opt_driverDirectives)) {
- writeDriverDirective("path %s", ptyGetPath(pty));
+ if (ptyBeginTerminal(ptyObject, opt_driverDirectives)) {
+ writeDriverDirective("path %s", ptyGetPath(ptyObject));
asyncAwaitCondition(INT_MAX, parentTerminationTester, NULL);
if (!parentIsQuitting) exitStatus = reapExitStatus(child);
@@ -378,7 +408,6 @@ runParent (PtyObject *pty, pid_t child) {
int
main (int argc, char *argv[]) {
int exitStatus = PROG_EXIT_FATAL;
- PtyObject *pty;
{
const CommandLineDescriptor descriptor = {
@@ -455,9 +484,9 @@ main (int argc, char *argv[]) {
}
}
- if ((pty = ptyNewObject())) {
- ptySetLogInput(pty, opt_logInput);
- const char *ttyPath = ptyGetPath(pty);
+ if ((ptyObject = ptyNewObject())) {
+ ptySetLogInput(ptyObject, opt_logInput);
+ const char *ttyPath = ptyGetPath(ptyObject);
if (opt_showPath) {
FILE *stream = stderr;
@@ -472,14 +501,15 @@ main (int argc, char *argv[]) {
break;
case 0:
- _exit(runChild(pty, argv));
+ _exit(runChild(argv));
default:
- exitStatus = runParent(pty, child);
+ exitStatus = runParent(child);
break;
}
- ptyDestroyObject(pty);
+ ptyDestroyObject(ptyObject);
+ ptyObject = NULL;
}
return exitStatus;
diff --git a/Programs/brltty-trtxt.c b/Programs/brltty-trtxt.c
index 08368cb0e..0e847b5da 100644
--- a/Programs/brltty-trtxt.c
+++ b/Programs/brltty-trtxt.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -24,6 +24,7 @@
#include "program.h"
#include "cmdline.h"
+#include "options.h"
#include "log.h"
#include "file.h"
#include "unicode.h"
@@ -31,7 +32,7 @@
#include "brl_dots.h"
#include "ttb.h"
-static char *opt_tablesDirectory;
+char *opt_tablesDirectory;
static char *opt_inputTable;
static char *opt_outputTable;
@@ -75,7 +76,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_tablesDirectory,
.internal.setting = TABLES_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory for text tables.")
},
END_OPTION_TABLE(programOptions)
diff --git a/Programs/brltty-ttb.c b/Programs/brltty-ttb.c
index ff53e1cc5..6b618a19e 100644
--- a/Programs/brltty-ttb.c
+++ b/Programs/brltty-ttb.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -27,6 +27,7 @@
#include "strfmt.h"
#include "program.h"
#include "cmdline.h"
+#include "options.h"
#include "file.h"
#include "get_select.h"
#include "brl_dots.h"
@@ -134,7 +135,7 @@ showUndefinedCharacters (TextTableData *ttd) {
static char *opt_charset;
static char *opt_inputFormat;
static char *opt_outputFormat;
-static char *opt_tablesDirectory;
+char *opt_tablesDirectory;
static int opt_edit;
#ifdef HAVE_UNDEFINED_CHARACTERS_SUPPORT
@@ -182,7 +183,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = "directory",
.setting.string = &opt_tablesDirectory,
.internal.setting = TABLES_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory containing text tables.")
},
END_OPTION_TABLE(programOptions)
diff --git a/Programs/brltty-tune.c b/Programs/brltty-tune.c
index 6b5049d0a..d80e3cf24 100644
--- a/Programs/brltty-tune.c
+++ b/Programs/brltty-tune.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -23,6 +23,7 @@
#include "log.h"
#include "cmdline.h"
+#include "options.h"
#include "prefs.h"
#include "tune_utils.h"
#include "tune_builder.h"
diff --git a/Programs/brltty.c b/Programs/brltty.c
index bbe9b2053..48bc6f43a 100644
--- a/Programs/brltty.c
+++ b/Programs/brltty.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brltty.java b/Programs/brltty.java
index 42c265fb9..e4d90e424 100644
--- a/Programs/brltty.java
+++ b/Programs/brltty.java
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/brltty_jni.c b/Programs/brltty_jni.c
index bc9942941..8c1a69619 100644
--- a/Programs/brltty_jni.c
+++ b/Programs/brltty_jni.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/charset.c b/Programs/charset.c
index a7ed6a4c4..1d58f038b 100644
--- a/Programs/charset.c
+++ b/Programs/charset.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/charset_grub.c b/Programs/charset_grub.c
index be74e473c..5326c4b4b 100644
--- a/Programs/charset_grub.c
+++ b/Programs/charset_grub.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/charset_iconv.c b/Programs/charset_iconv.c
index 96c9da8f9..3429d3ea0 100644
--- a/Programs/charset_iconv.c
+++ b/Programs/charset_iconv.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/charset_internal.h b/Programs/charset_internal.h
index 371ccaa77..3625e1bd3 100644
--- a/Programs/charset_internal.h
+++ b/Programs/charset_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/charset_msdos.c b/Programs/charset_msdos.c
index bbbc2c920..b1bc10c66 100644
--- a/Programs/charset_msdos.c
+++ b/Programs/charset_msdos.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/charset_none.c b/Programs/charset_none.c
index a9f0f3677..efaf9fdc1 100644
--- a/Programs/charset_none.c
+++ b/Programs/charset_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/charset_windows.c b/Programs/charset_windows.c
index ce35ea69f..543c60310 100644
--- a/Programs/charset_windows.c
+++ b/Programs/charset_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cldr.c b/Programs/cldr.c
index d8fc21b9a..80a8f05e4 100644
--- a/Programs/cldr.c
+++ b/Programs/cldr.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/clipboard.c b/Programs/clipboard.c
index 3367d4926..5ea8b6481 100644
--- a/Programs/clipboard.c
+++ b/Programs/clipboard.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -23,6 +23,7 @@
#include "log.h"
#include "clipboard.h"
+#include "unicode.h"
#include "utf8.h"
#include "queue.h"
#include "lock.h"
@@ -119,7 +120,7 @@ getClipboardContentLength (ClipboardObject *cpb) {
int
truncateClipboardContent (ClipboardObject *cpb, size_t length) {
- if (length >= cpb->buffer.length) return 0;
+ if (length > cpb->buffer.length) return 0;
cpb->buffer.length = length;
return 1;
}
@@ -130,8 +131,7 @@ clearClipboardContent (ClipboardObject *cpb) {
const wchar_t *characters = getClipboardContent(cpb, &length);
if (!addClipboardHistory(cpb, characters, length)) return 0;
- truncateClipboardContent(cpb, 0);
- return 1;
+ return truncateClipboardContent(cpb, 0);
}
int
@@ -153,16 +153,72 @@ appendClipboardContent (ClipboardObject *cpb, const wchar_t *characters, size_t
cpb->buffer.size = newSize;
}
- wmemcpy(&cpb->buffer.characters[cpb->buffer.length], characters, length);
- cpb->buffer.length += length;
+ {
+ const wchar_t *from = characters;
+ const wchar_t *fromEnd = from + length;
+ wchar_t *to = &cpb->buffer.characters[cpb->buffer.length];
+
+ while (from < fromEnd) {
+ wchar_t character = *from++;
+ if (character == UNICODE_ZERO_WIDTH_SPACE) continue;
+ *to++ = character;
+ }
+
+ cpb->buffer.length = to - cpb->buffer.characters;
+ }
+
return 1;
}
int
setClipboardContent (ClipboardObject *cpb, const wchar_t *characters, size_t length) {
- int truncated = truncateClipboardContent(cpb, 0);
- int appended = appendClipboardContent(cpb, characters, length);
- return truncated || appended;
+ if (!clearClipboardContent(cpb)) return 0;
+ return appendClipboardContent(cpb, characters, length);
+}
+
+int
+copyClipboardContent (
+ ClipboardObject *cpb, const wchar_t *characters, size_t length,
+ size_t offset, int insertCR
+) {
+ if (offset > 0) {
+ if (!truncateClipboardContent(cpb, offset)) return 0;
+
+ if (insertCR) {
+ size_t length;
+ const wchar_t *content = getClipboardContent(cpb, &length);
+
+ if (content) {
+ int truncate = 0;
+
+ while (length > 0) {
+ size_t last = length - 1;
+ wchar_t character = content[last];
+
+ if (character == WC_C('\r')) insertCR = 0;
+ if (character != WC_C(' ')) break;
+
+ truncate = 1;
+ length = last;
+ }
+
+ if (truncate) {
+ if (!truncateClipboardContent(cpb, length)) {
+ return 0;
+ }
+ }
+
+ if (insertCR && (length > 0)) {
+ static const wchar_t cr = WC_C('\r');
+ if (!appendClipboardContent(cpb, &cr, 1)) return 0;
+ }
+ }
+ }
+ } else if (!clearClipboardContent(cpb)) {
+ return 0;
+ }
+
+ return appendClipboardContent(cpb, characters, length);
}
int
@@ -175,9 +231,8 @@ appendClipboardContentUTF8 (ClipboardObject *cpb, const char *text) {
int
setClipboardContentUTF8 (ClipboardObject *cpb, const char *text) {
- int truncated = truncateClipboardContent(cpb, 0);
- int appended = appendClipboardContentUTF8(cpb, text);
- return truncated || appended;
+ if (!clearClipboardContent(cpb)) return 0;
+ return appendClipboardContentUTF8(cpb, text);
}
static void
diff --git a/Programs/cmd.c b/Programs/cmd.c
index 664295fd0..232bd184a 100644
--- a/Programs/cmd.c
+++ b/Programs/cmd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_brlapi.c b/Programs/cmd_brlapi.c
index c0675595e..8e5808207 100644
--- a/Programs/cmd_brlapi.c
+++ b/Programs/cmd_brlapi.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_brlapi.h b/Programs/cmd_brlapi.h
index db513b85f..9e9247f0b 100644
--- a/Programs/cmd_brlapi.h
+++ b/Programs/cmd_brlapi.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_clipboard.c b/Programs/cmd_clipboard.c
index c56d56713..bb4138803 100644
--- a/Programs/cmd_clipboard.c
+++ b/Programs/cmd_clipboard.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -24,6 +24,7 @@
#include "log.h"
#include "alert.h"
+#include "message.h"
#include "cmd_queue.h"
#include "cmd_utils.h"
#include "cmd_clipboard.h"
@@ -34,6 +35,7 @@
#include "file.h"
#include "datafile.h"
#include "utf8.h"
+#include "ascii.h"
#include "core.h"
typedef struct {
@@ -42,7 +44,7 @@ typedef struct {
struct {
int column;
int row;
- int offset;
+ size_t offset;
} begin;
} ClipboardCommandData;
@@ -52,20 +54,16 @@ cpbReadScreen (ClipboardCommandData *ccd, size_t *length, int fromColumn, int fr
int columns = toColumn - fromColumn + 1;
int rows = toRow - fromRow + 1;
- if ((columns >= 1) && (rows >= 1) && (ccd->begin.offset >= 0)) {
+ if ((columns >= 1) && (rows >= 1)) {
wchar_t fromBuffer[rows * columns];
if (readScreenText(fromColumn, fromRow, columns, rows, fromBuffer)) {
wchar_t toBuffer[rows * (columns + 1)];
wchar_t *toAddress = toBuffer;
-
const wchar_t *fromAddress = fromBuffer;
- int row;
-
- for (row=fromRow; row<=toRow; row+=1) {
- int column;
- for (column=fromColumn; column<=toColumn; column+=1) {
+ for (int row=fromRow; row<=toRow; row+=1) {
+ for (int column=fromColumn; column<=toColumn; column+=1) {
wchar_t character = *fromAddress++;
if (iswcntrl(character) || iswspace(character)) character = WC_C(' ');
*toAddress++ = character;
@@ -88,49 +86,31 @@ cpbReadScreen (ClipboardCommandData *ccd, size_t *length, int fromColumn, int fr
return newBuffer;
}
-static int
-cpbEndOperation (ClipboardCommandData *ccd, const wchar_t *characters, size_t length,
- int insertCR) {
- lockMainClipboard();
- if (insertCR && ccd->begin.offset >= 1) {
- size_t length;
- const wchar_t *characters = getClipboardContent(ccd->clipboard, &length);
- if (length > ccd->begin.offset) length = ccd->begin.offset;
- while (length > 0) {
- size_t last = length - 1;
- if (characters[last] == WC_C('\r')) insertCR = 0;
- if (characters[last] != WC_C(' ')) break;
- length = last;
- }
- ccd->begin.offset = length;
- }
- if (ccd->begin.offset <= 0) insertCR = 0;
-
- int truncated = truncateClipboardContent(ccd->clipboard, ccd->begin.offset);
- if (insertCR) appendClipboardContent(ccd->clipboard, &(wchar_t){WC_C('\r')}, 1);
- int appended = appendClipboardContent(ccd->clipboard, characters, length);
- unlockMainClipboard();
-
- if (truncated || appended) onMainClipboardUpdated();
- if (!appended) return 0;
- alert(ALERT_CLIPBOARD_END);
- return 1;
-}
-
static void
-cpbBeginOperation (ClipboardCommandData *ccd, int column, int row) {
+cpbBeginOperation (ClipboardCommandData *ccd, int column, int row, int append) {
ccd->begin.column = column;
ccd->begin.row = row;
+ ccd->begin.offset = append? getClipboardContentLength(ccd->clipboard): 0;
+ alert(ALERT_CLIPBOARD_BEGIN);
+}
+static int
+cpbEndOperation (ClipboardCommandData *ccd, const wchar_t *characters, size_t length, int insertCR) {
lockMainClipboard();
- ccd->begin.offset = getClipboardContentLength(ccd->clipboard);
+ int copied = copyClipboardContent(ccd->clipboard, characters, length, ccd->begin.offset, insertCR);
unlockMainClipboard();
- alert(ALERT_CLIPBOARD_BEGIN);
+ if (!copied) return 0;
+ alert(ALERT_CLIPBOARD_END);
+ onMainClipboardUpdated();
+ return 1;
}
static int
cpbRectangularCopy (ClipboardCommandData *ccd, int column, int row) {
+ if (row < ccd->begin.row) return 0;
+ if (column < ccd->begin.column) return 0;
+
int copied = 0;
size_t length;
wchar_t *buffer = cpbReadScreen(ccd, &length, ccd->begin.column, ccd->begin.row, column, row);
@@ -178,6 +158,9 @@ cpbRectangularCopy (ClipboardCommandData *ccd, int column, int row) {
static int
cpbLinearCopy (ClipboardCommandData *ccd, int column, int row) {
+ if (row < ccd->begin.row) return 0;
+ if ((row == ccd->begin.row) && (column < ccd->begin.column)) return 0;
+
int copied = 0;
ScreenDescription screen;
describeScreen(&screen);
@@ -261,46 +244,95 @@ cpbLinearCopy (ClipboardCommandData *ccd, int column, int row) {
static int
pasteCharacters (const wchar_t *characters, size_t count) {
- if (!characters) return 0;
- if (!count) return 0;
+ const wchar_t *character = characters;
+ const wchar_t *end = character + count;
- if (!isMainScreen()) return 0;
- if (isRouting()) return 0;
-
- {
- unsigned int i;
-
- for (i=0; i<count; i+=1) {
- if (!insertScreenKey(characters[i])) return 0;
- }
+ while (character < end) {
+ if (!insertScreenKey(*character++)) return 0;
}
return 1;
}
static int
-cpbPaste (ClipboardCommandData *ccd, unsigned int index) {
- int pasted;
+cpbPaste (ClipboardCommandData *ccd, unsigned int index, int useAlternateMode) {
+ if (!isMainScreen()) return 0;
+ if (isRouting()) return 0;
- lockMainClipboard();
- const wchar_t *characters;
- size_t length;
+ if (!prefs.alternatePasteModeEnabled) useAlternateMode = 0;
+ int bracketed;
- if (index) {
- characters = getClipboardHistory(ccd->clipboard, index-1, &length);
- } else {
- characters = getClipboardContent(ccd->clipboard, &length);
+ {
+ ScreenPasteMode mode = getScreenPasteMode();
+
+ switch (mode) {
+ case SPM_UNKNOWN:
+ bracketed = useAlternateMode;
+ break;
+
+ case SPM_BRACKETED:
+ bracketed = !useAlternateMode;
+ break;
+
+ default:
+ logMessage(LOG_WARNING, "unexpected screen paste mode: %d", mode);
+ /* fall through */
+ case SPM_PLAIN:
+ bracketed = 0;
+ break;
}
+ }
+
+ int pasted = 0;
+ lockMainClipboard();
+
+ const wchar_t *characters;
+ size_t length;
+ if (index) {
+ characters = getClipboardHistory(ccd->clipboard, index-1, &length);
+ } else {
+ characters = getClipboardContent(ccd->clipboard, &length);
+ }
+
+ if (characters) {
while (length > 0) {
size_t last = length - 1;
- if (characters[last] != WC_C(' ')) break;
+ if (!iswspace(characters[last])) break;
length = last;
}
- pasted = pasteCharacters(characters, length);
- unlockMainClipboard();
+ if (length > 0) {
+ if (bracketed) {
+ static const wchar_t sequence[] = {
+ ASCII_ESC, WC_C('['), WC_C('2'), WC_C('0'), WC_C('0'), WC_C('~')
+ };
+
+ if (!pasteCharacters(sequence, ARRAY_COUNT(sequence))) {
+ goto PASTE_FAILED;
+ }
+ }
+
+ if (!pasteCharacters(characters, length)) {
+ goto PASTE_FAILED;
+ }
+
+ if (bracketed) {
+ static const wchar_t sequence[] = {
+ ASCII_ESC, WC_C('['), WC_C('2'), WC_C('0'), WC_C('1'), WC_C('~')
+ };
+
+ if (!pasteCharacters(sequence, ARRAY_COUNT(sequence))) {
+ goto PASTE_FAILED;
+ }
+ }
+ }
+
+ pasted = 1;
+ }
+PASTE_FAILED:
+ unlockMainClipboard();
return pasted;
}
@@ -456,9 +488,21 @@ handleClipboardCommands (int command, void *data) {
ClipboardCommandData *ccd = data;
switch (command & BRL_MSK_CMD) {
+ {
+ int useAlternateMode;
+
case BRL_CMD_PASTE:
- if (!cpbPaste(ccd, 0)) alert(ALERT_COMMAND_REJECTED);
+ useAlternateMode = 0;
+ goto doPaste;
+
+ case BRL_CMD_PASTE_ALTMODE:
+ useAlternateMode = 1;
+ goto doPaste;
+
+ doPaste:
+ if (!cpbPaste(ccd, 0, useAlternateMode)) alert(ALERT_COMMAND_REJECTED);
break;
+ }
case BRL_CMD_CLIP_SAVE:
alert(cpbSave(ccd)? ALERT_COMMAND_DONE: ALERT_COMMAND_REJECTED);
@@ -546,39 +590,40 @@ handleClipboardCommands (int command, void *data) {
}
default: {
- int arg = command & BRL_MSK_ARG;
- int ext = BRL_CODE_GET(EXT, command);
+ int arg1 = BRL_CODE_GET(ARG, command);
+ int arg2 = BRL_CODE_GET(EXT, command);
switch (command & BRL_MSK_BLK) {
{
- int clear;
+ int append;
int column, row;
case BRL_CMD_BLK(CLIP_NEW):
- clear = 1;
+ append = 0;
goto doClipBegin;
case BRL_CMD_BLK(CLIP_ADD):
- clear = 0;
+ append = 1;
goto doClipBegin;
doClipBegin:
- if (getCharacterCoordinates(arg, &row, &column, NULL, 0)) {
- if (clear) clearClipboardContent(ccd->clipboard);
- cpbBeginOperation(ccd, column, row);
- } else {
- alert(ALERT_COMMAND_REJECTED);
+ if (getCharacterCoordinates(arg1, &row, &column, NULL, 0)) {
+ cpbBeginOperation(ccd, column, row, append);
+ break;
}
+ alert(ALERT_COMMAND_REJECTED);
break;
}
case BRL_CMD_BLK(COPY_RECT): {
int column, row;
- if (getCharacterCoordinates(arg, &row, NULL, &column, 1))
- if (cpbRectangularCopy(ccd, column, row))
+ if (getCharacterCoordinates(arg1, &row, NULL, &column, 1)) {
+ if (cpbRectangularCopy(ccd, column, row)) {
break;
+ }
+ }
alert(ALERT_COMMAND_REJECTED);
break;
@@ -587,35 +632,36 @@ handleClipboardCommands (int command, void *data) {
case BRL_CMD_BLK(COPY_LINE): {
int column, row;
- if (getCharacterCoordinates(arg, &row, NULL, &column, 1))
- if (cpbLinearCopy(ccd, column, row))
+ if (getCharacterCoordinates(arg1, &row, NULL, &column, 1)) {
+ if (cpbLinearCopy(ccd, column, row)) {
break;
+ }
+ }
alert(ALERT_COMMAND_REJECTED);
break;
}
{
- int clear;
+ int append;
case BRL_CMD_BLK(CLIP_COPY):
- clear = 1;
- goto doCopy;
+ append = 0;
+ goto doClipCopy;
case BRL_CMD_BLK(CLIP_APPEND):
- clear = 0;
- goto doCopy;
+ append = 1;
+ goto doClipCopy;
- doCopy:
- if (ext > arg) {
+ doClipCopy:
+ if (arg2 > arg1) {
int column1, row1;
- if (getCharacterCoordinates(arg, &row1, &column1, NULL, 0)) {
+ if (getCharacterCoordinates(arg1, &row1, &column1, NULL, 0)) {
int column2, row2;
- if (getCharacterCoordinates(ext, &row2, NULL, &column2, 1)) {
- if (clear) clearClipboardContent(ccd->clipboard);
- cpbBeginOperation(ccd, column1, row1);
+ if (getCharacterCoordinates(arg2, &row2, NULL, &column2, 1)) {
+ cpbBeginOperation(ccd, column1, row1, append);
if (cpbLinearCopy(ccd, column2, row2)) break;
}
}
@@ -625,9 +671,21 @@ handleClipboardCommands (int command, void *data) {
break;
}
+ {
+ int useAlternateMode;
+
case BRL_CMD_BLK(PASTE_HISTORY):
- if (!cpbPaste(ccd, arg)) alert(ALERT_COMMAND_REJECTED);
+ useAlternateMode = 0;
+ goto doPasteHistory;
+
+ case BRL_CMD_BLK(PASTE_HISTORY_ALTMODE):
+ useAlternateMode = 1;
+ goto doPasteHistory;
+
+ doPasteHistory:
+ if (!cpbPaste(ccd, arg1, useAlternateMode)) alert(ALERT_COMMAND_REJECTED);
break;
+ }
default:
return 0;
@@ -656,7 +714,7 @@ addClipboardCommands (void) {
ccd->begin.column = 0;
ccd->begin.row = 0;
- ccd->begin.offset = -1;
+ ccd->begin.offset = 0;
if (pushCommandHandler("clipboard", KTB_CTX_DEFAULT,
handleClipboardCommands, destroyClipboardCommandData, ccd)) {
diff --git a/Programs/cmd_clipboard.h b/Programs/cmd_clipboard.h
index 22577c4cb..ae1077588 100644
--- a/Programs/cmd_clipboard.h
+++ b/Programs/cmd_clipboard.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_custom.c b/Programs/cmd_custom.c
index 5364cfc90..5c23ae69d 100644
--- a/Programs/cmd_custom.c
+++ b/Programs/cmd_custom.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_custom.h b/Programs/cmd_custom.h
index 779f5fa15..0fb0259b4 100644
--- a/Programs/cmd_custom.h
+++ b/Programs/cmd_custom.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_input.c b/Programs/cmd_input.c
index 52da7b9f2..db07dcb37 100644
--- a/Programs/cmd_input.c
+++ b/Programs/cmd_input.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_input.h b/Programs/cmd_input.h
index 4b98a4a6b..b6db56c50 100644
--- a/Programs/cmd_input.h
+++ b/Programs/cmd_input.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_keycodes.c b/Programs/cmd_keycodes.c
index b98d9e17a..62fa93d45 100644
--- a/Programs/cmd_keycodes.c
+++ b/Programs/cmd_keycodes.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_keycodes.h b/Programs/cmd_keycodes.h
index beee20ff7..7d6f42be1 100644
--- a/Programs/cmd_keycodes.h
+++ b/Programs/cmd_keycodes.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_learn.c b/Programs/cmd_learn.c
index b45b19653..66bb3d112 100644
--- a/Programs/cmd_learn.c
+++ b/Programs/cmd_learn.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_learn.h b/Programs/cmd_learn.h
index e6841b746..bf9e332c2 100644
--- a/Programs/cmd_learn.h
+++ b/Programs/cmd_learn.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_miscellaneous.c b/Programs/cmd_miscellaneous.c
index dcc4bce63..44457d116 100644
--- a/Programs/cmd_miscellaneous.c
+++ b/Programs/cmd_miscellaneous.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_miscellaneous.h b/Programs/cmd_miscellaneous.h
index 4c2c2c1f7..0126d9732 100644
--- a/Programs/cmd_miscellaneous.h
+++ b/Programs/cmd_miscellaneous.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_navigation.c b/Programs/cmd_navigation.c
index 09f155de2..f0ebb0140 100644
--- a/Programs/cmd_navigation.c
+++ b/Programs/cmd_navigation.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -169,7 +169,7 @@ testIndent (int column, int row, void *data UNUSED) {
while (column >= 0) {
wchar_t text = characters[column].text;
- if (text != WC_C(' ')) return 1;
+ if (!iswspace(text)) return 1;
column -= 1;
}
@@ -264,8 +264,7 @@ toPreviousNonblankWindow (void) {
for (charIndex=charCount-1; charIndex>=0; charIndex-=1) {
wchar_t text = characters[charIndex].text;
-
- if (text != WC_C(' ')) break;
+ if (!iswspace(text)) break;
}
if (showScreenCursor() &&
@@ -310,8 +309,7 @@ toNextNonblankWindow (void) {
for (charIndex=0; charIndex<charCount; charIndex+=1) {
wchar_t text = characters[charIndex].text;
-
- if (text != WC_C(' ')) break;
+ if (!iswspace(text)) break;
}
if (showScreenCursor() &&
@@ -484,7 +482,7 @@ handleNavigationCommands (int command, void *data) {
int column = 0;
while (column < length) {
- if (characters[column].text == WC_C(' ')) break;
+ if (iswspace(characters[column].text)) break;
column += 1;
}
@@ -577,8 +575,7 @@ handleNavigationCommands (int command, void *data) {
for (charIndex=0; charIndex<charCount; charIndex+=1) {
wchar_t text = characters[charIndex].text;
-
- if (text != WC_C(' ')) break;
+ if (!iswspace(text)) break;
}
if (charIndex == charCount) goto wrapUp;
@@ -651,8 +648,7 @@ handleNavigationCommands (int command, void *data) {
for (charIndex=0; charIndex<charCount; charIndex+=1) {
wchar_t text = characters[charIndex].text;
-
- if (text != WC_C(' ')) break;
+ if (!iswspace(text)) break;
}
if (charIndex == charCount) goto wrapDown;
diff --git a/Programs/cmd_navigation.h b/Programs/cmd_navigation.h
index 475639d10..b76af5ebf 100644
--- a/Programs/cmd_navigation.h
+++ b/Programs/cmd_navigation.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_override.c b/Programs/cmd_override.c
index 095f0b8a3..a72a92cb4 100644
--- a/Programs/cmd_override.c
+++ b/Programs/cmd_override.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_override.h b/Programs/cmd_override.h
index 81b1394da..4b8f91823 100644
--- a/Programs/cmd_override.h
+++ b/Programs/cmd_override.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_preferences.c b/Programs/cmd_preferences.c
index 048bfdec3..a63b0f773 100644
--- a/Programs/cmd_preferences.c
+++ b/Programs/cmd_preferences.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_preferences.h b/Programs/cmd_preferences.h
index 49578a4e3..37d8e671e 100644
--- a/Programs/cmd_preferences.h
+++ b/Programs/cmd_preferences.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_queue.c b/Programs/cmd_queue.c
index 24212e690..1d9e26132 100644
--- a/Programs/cmd_queue.c
+++ b/Programs/cmd_queue.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_queue.h b/Programs/cmd_queue.h
index 06fef0a26..69b703fe4 100644
--- a/Programs/cmd_queue.h
+++ b/Programs/cmd_queue.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_speech.c b/Programs/cmd_speech.c
index a0d05b933..f0306cd82 100644
--- a/Programs/cmd_speech.c
+++ b/Programs/cmd_speech.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -199,6 +199,20 @@ handleSpeechCommands (int command, void *data) {
}
break;
+ case BRL_CMD_SPK_PUNCT_LEVEL:
+ if (canSetSpeechPunctuation(&spk)) {
+ unsigned char newLevel = prefs.speechPunctuation + 1;
+ if (newLevel > SPK_PUNCTUATION_ALL) newLevel = 0;
+
+ if (setSpeechPunctuation(&spk, newLevel, 1)) {
+ prefs.speechPunctuation = newLevel;
+ break;
+ }
+ }
+
+ alert(ALERT_COMMAND_REJECTED);
+ break;
+
case BRL_CMD_SPEAK_CURR_CHAR:
speakCurrentCharacter();
break;
diff --git a/Programs/cmd_speech.h b/Programs/cmd_speech.h
index 4c05b0fc2..abc08a8b1 100644
--- a/Programs/cmd_speech.h
+++ b/Programs/cmd_speech.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_toggle.c b/Programs/cmd_toggle.c
index d791f9edd..aa05f7732 100644
--- a/Programs/cmd_toggle.c
+++ b/Programs/cmd_toggle.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_toggle.h b/Programs/cmd_toggle.h
index e7209e20a..e95431c49 100644
--- a/Programs/cmd_toggle.h
+++ b/Programs/cmd_toggle.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_touch.c b/Programs/cmd_touch.c
index ab46d1864..829e8a042 100644
--- a/Programs/cmd_touch.c
+++ b/Programs/cmd_touch.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_touch.h b/Programs/cmd_touch.h
index b991aade4..cb7cac6e2 100644
--- a/Programs/cmd_touch.h
+++ b/Programs/cmd_touch.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_utils.c b/Programs/cmd_utils.c
index b76f67e78..d144d9efa 100644
--- a/Programs/cmd_utils.c
+++ b/Programs/cmd_utils.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmd_utils.h b/Programs/cmd_utils.h
index 852a9a692..4658455e3 100644
--- a/Programs/cmd_utils.h
+++ b/Programs/cmd_utils.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/cmdline.c b/Programs/cmdline.c
index 23c7660e9..9e72dd3ed 100644
--- a/Programs/cmdline.c
+++ b/Programs/cmdline.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -1141,6 +1141,25 @@ processConfigurationFile (
}
}
+static void
+toAbsolutePaths (OptionProcessingInformation *info) {
+ char *parent = getWorkingDirectory();
+
+ if (parent) {
+ for (unsigned int optionIndex=0; optionIndex<info->options->count; optionIndex+=1) {
+ const CommandLineOption *option = &info->options->table[optionIndex];
+
+ if (option->internal.adjust == toAbsoluteInstallPath) {
+ if (**option->setting.string) {
+ anchorRelativePath(option->setting.string, parent);
+ }
+ }
+ }
+
+ free(parent);
+ }
+}
+
void
resetOptions (const CommandLineOptions *options) {
for (unsigned int index=0; index<options->count; index+=1) {
@@ -1200,6 +1219,8 @@ processOptions (const CommandLineDescriptor *descriptor, int *argumentCount, cha
if (info.exitImmediately) return PROG_EXIT_FORCE;
if (info.syntaxError) return PROG_EXIT_SYNTAX;
+
+ toAbsolutePaths(&info);
return PROG_EXIT_SUCCESS;
}
diff --git a/Programs/cmds.awk b/Programs/cmds.awk
index e86430279..1af873530 100644
--- a/Programs/cmds.awk
+++ b/Programs/cmds.awk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Programs/config.c b/Programs/config.c
index 5e664dd58..36c988106 100644
--- a/Programs/config.c
+++ b/Programs/config.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -48,8 +48,8 @@
#include "variables.h"
#include "datafile.h"
#include "ttb.h"
-#include "atb.h"
#include "ctb.h"
+#include "atb.h"
#include "ktb.h"
#include "ktb_keyboard.h"
#include "kbd.h"
@@ -69,6 +69,7 @@
#include "revision.h"
#include "service.h"
#include "cmdline.h"
+#include "options.h"
#include "profile_types.h"
#include "brl_input.h"
#include "cmd_queue.h"
@@ -109,12 +110,29 @@ logProgramBanner (void) {
}
}
+static const char optionValue_off[] = "off";
+
+static void
+onSettingChange (char **setting, const char *newValue, const char *label) {
+ const char *oldValue = *setting;
+
+ if (!*oldValue) oldValue = optionValue_off;
+ if (!*newValue) newValue = optionValue_off;
+
+ logMessage(LOG_DEBUG,
+ "%s changed: %s -> %s",
+ label, oldValue, newValue
+ );
+
+ changeStringSetting(setting, newValue);
+}
+
static void
logProperty (const char *value, const char *variable, const char *label) {
if (value && *value) {
if (variable) setGlobalVariable(variable, value);
} else {
- value = "none";
+ value = optionValue_off;
}
logMessage(LOG_INFO, "%s: %s", label, value);
@@ -122,7 +140,7 @@ logProperty (const char *value, const char *variable, const char *label) {
static const char optionOperand_none[] = "no";
static const char optionOperand_autodetect[] = "auto";
-static const char optionOperand_off[] = "off";
+static const char optionOperand_off[] = "";
static const char *const *const fallbackBrailleDrivers =
NULL_TERMINATED_STRING_ARRAY(
@@ -225,19 +243,19 @@ static const char *const optionStrings_RemoveService[] = {
NULL
};
-static char *opt_startMessage;
-static char *opt_stopMessage;
-static char *opt_localeDirectory;
+char *opt_startMessage;
+char *opt_stopMessage;
+char *opt_localeDirectory;
static int opt_version;
static int opt_verify;
static int opt_quiet;
-static int opt_noDaemon;
-static int opt_standardError;
+int opt_noDaemon;
+int opt_logToStandardError;
static char *opt_logLevel;
-static char *opt_logFile;
-static int opt_bootParameters = 1;
-static int opt_environmentVariables;
+char *opt_logFile;
+int opt_environmentVariables;
+int opt_bootParameters = 1;
static char *opt_messageTime;
static int opt_cancelExecution;
@@ -246,16 +264,14 @@ static const char *const optionStrings_CancelExecution[] = {
NULL
};
-static char *opt_promptPatterns;
+char *opt_promptPatterns;
-static int opt_stayPrivileged;
-static char *opt_privilegeParameters;
+int opt_stayPrivileged;
+char *opt_privilegeParameters;
-static char *opt_pidFile;
-static char *opt_configurationFile;
+char *opt_pidFile;
+char *opt_configurationFile;
-static char *opt_updatableDirectory;
-static char *opt_writableDirectory;
char *opt_driversDirectory;
char *opt_brailleDevice;
@@ -263,18 +279,18 @@ static char **brailleDevices = NULL;
static const char *brailleDevice = NULL;
int opt_releaseDevice;
-static char *opt_brailleDriver;
+char *opt_brailleDriver;
static char **brailleDrivers = NULL;
static const BrailleDriver *brailleDriver = NULL;
static void *brailleObject = NULL;
static int brailleDriverConstructed;
-static char *opt_brailleParameters;
+char *opt_brailleParameters;
static char *brailleParameters = NULL;
static char **brailleDriverParameters = NULL;
-static char *opt_preferencesFile;
-static char *opt_overridePreferences;
+char *opt_preferencesFile;
+char *opt_overridePreferences;
static char *oldPreferencesFile = NULL;
static int oldPreferencesEnabled = 1;
@@ -288,30 +304,30 @@ char *opt_keyboardTable;
KeyTable *keyboardTable = NULL;
static KeyboardMonitorObject *keyboardMonitor = NULL;
-static char *opt_keyboardProperties;
+char *opt_keyboardProperties;
static KeyboardProperties keyboardProperties;
-static int opt_guiKeyboardEnabled;
-static char *opt_guiKeyboardTable;
+int opt_guiKeyboardEnabled;
+char *opt_guiKeyboardTable;
static KeyTable *guiKeyboardTable = NULL;
#ifdef ENABLE_API
-static int opt_noApi;
-static char *opt_apiParameters = NULL;
+int opt_noApi;
+char *opt_apiParameters;
static char **apiParameters = NULL;
#endif /* ENABLE_API */
#ifdef ENABLE_SPEECH_SUPPORT
-static char *opt_speechDriver;
+char *opt_speechDriver;
static char **speechDrivers = NULL;
static const SpeechDriver *speechDriver = NULL;
static void *speechObject = NULL;
-static char *opt_speechParameters;
+char *opt_speechParameters;
static char *speechParameters = NULL;
static char **speechDriverParameters = NULL;
-static char *opt_speechInput;
+char *opt_speechInput;
static SpeechInputObject *speechInputObject;
int opt_quietIfNoBraille;
@@ -341,11 +357,11 @@ setAutospeakThreshold (void) {
}
#endif /* ENABLE_SPEECH_SUPPORT */
-static char *opt_screenDriver;
+char *opt_screenDriver;
static char **screenDrivers = NULL;
static const ScreenDriver *screenDriver = NULL;
static void *screenObject = NULL;
-static char *opt_screenParameters;
+char *opt_screenParameters;
static char *screenParameters = NULL;
static char **screenDriverParameters = NULL;
@@ -396,7 +412,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("file"),
.setting.string = &opt_configurationFile,
.internal.setting = CONFIGURATION_DIRECTORY "/" CONFIGURATION_FILE,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to default settings file.")
},
@@ -491,6 +507,13 @@ BEGIN_OPTION_TABLE(programOptions)
.description = strtext("Parameters for the speech driver.")
},
+ { .word = "quiet-if-no-braille",
+ .letter = 'Q',
+ .flags = OPT_Config | OPT_EnvVar,
+ .setting.flag = &opt_quietIfNoBraille,
+ .description = strtext("Do not autospeak when braille is not being used.")
+ },
+
{ .word = "speech-input",
.letter = 'i',
.flags = OPT_Config | OPT_EnvVar,
@@ -499,13 +522,6 @@ BEGIN_OPTION_TABLE(programOptions)
.description = strtext("Name of or path to speech input object.")
},
- { .word = "quiet-if-no-braille",
- .letter = 'Q',
- .flags = OPT_Config | OPT_EnvVar,
- .setting.flag = &opt_quietIfNoBraille,
- .description = strtext("Do not autospeak when braille is not being used.")
- },
-
{ .word = "autospeak-threshold",
.flags = OPT_Config | OPT_EnvVar | OPT_Format,
.argument = strtext("quality"),
@@ -628,7 +644,7 @@ BEGIN_OPTION_TABLE(programOptions)
{ .word = "standard-error",
.letter = 'e',
- .setting.flag = &opt_standardError,
+ .setting.flag = &opt_logToStandardError,
.description = strtext("Log to standard error rather than to the system log.")
},
@@ -709,7 +725,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_tablesDirectory,
.internal.setting = TABLES_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory containing tables.")
},
@@ -719,17 +735,27 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_driversDirectory,
.internal.setting = DRIVERS_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory containing drivers.")
},
+ { .word = "helpers-directory",
+ .letter = 'H',
+ .flags = OPT_Config | OPT_EnvVar,
+ .argument = strtext("directory"),
+ .setting.string = &opt_helpersDirectory,
+ .internal.setting = HELPERS_DIRECTORY,
+ .internal.adjust = toAbsoluteInstallPath,
+ .description = strtext("Path to directory containing helper commands.")
+ },
+
{ .word = "updatable-directory",
.letter = 'U',
.flags = OPT_Config | OPT_EnvVar,
.argument = strtext("directory"),
.setting.string = &opt_updatableDirectory,
.internal.setting = UPDATABLE_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory which contains files that can be updated.")
},
@@ -739,7 +765,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_writableDirectory,
.internal.setting = WRITABLE_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory which can be written to.")
},
@@ -748,7 +774,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = strtext("directory"),
.setting.string = &opt_localeDirectory,
.internal.setting = LOCALE_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to directory which contains message localizations.")
},
@@ -757,7 +783,7 @@ BEGIN_OPTION_TABLE(programOptions)
.flags = OPT_Config | OPT_EnvVar,
.argument = strtext("file"),
.setting.string = &opt_pidFile,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("Path to process identifier file.")
},
@@ -837,7 +863,7 @@ setLogLevels (void) {
{
unsigned char level;
- if (opt_standardError) {
+ if (opt_logToStandardError) {
level = systemLogLevel;
} else {
level = LOG_NOTICE;
@@ -895,8 +921,7 @@ brlttyPrepare (int argc, char *argv[]) {
}
setMessagesDirectory(opt_localeDirectory);
- setUpdatableDirectory(opt_updatableDirectory);
- setWritableDirectory(opt_writableDirectory);
+ anchorRelativePath(&opt_preferencesFile, getUpdatableDirectory());
setLogLevels();
onProgramExit("log", exitLog, NULL);
@@ -1309,9 +1334,6 @@ int
changeKeyboardTable (const char *name) {
KeyTable *table = NULL;
- if (!*name) name = "";
- if (strcmp(name, optionOperand_off) == 0) name = "";
-
if (*name) {
char *path = makeKeyboardTablePath(opt_tablesDirectory, name);
@@ -1345,10 +1367,7 @@ changeKeyboardTable (const char *name) {
makeKeyboardHelpPage();
}
- if (!*name) name = optionOperand_off;
- logMessage(LOG_DEBUG, "keyboard table changed: %s -> %s", opt_keyboardTable, name);
-
- changeStringSetting(&opt_keyboardTable, name);
+ onSettingChange(&opt_keyboardTable, name, "keyboard table");
return 1;
}
@@ -1372,9 +1391,6 @@ int
changeGuiKeyboardTable (const char *name) {
KeyTable *table = NULL;
- if (!*name) name = "";
- if (strcmp(name, optionOperand_off) == 0) name = "";
-
if (*name) {
char *path = makeKeyboardTablePath(opt_tablesDirectory, name);
@@ -1402,9 +1418,7 @@ changeGuiKeyboardTable (const char *name) {
guiKeyboardTable = table;
}
- if (!*name) name = optionOperand_off;
- logMessage(LOG_DEBUG, "GUI keyboard table changed: %s -> %s", opt_guiKeyboardTable, name);
- changeStringSetting(&opt_guiKeyboardTable, name);
+ onSettingChange(&opt_guiKeyboardTable, name, "GUI keyboard table");
return 1;
}
@@ -1651,9 +1665,22 @@ savePreferences (void) {
char *path = makePreferencesFilePath(opt_preferencesFile);
if (path) {
- if (savePreferencesFile(path)) {
- ok = 1;
- oldPreferencesEnabled = 0;
+ static const char suffix[] = ".new";
+ char newPath[strlen(path) + strlen(suffix) + 1];
+ snprintf(newPath, sizeof(newPath), "%s%s", path, suffix);
+
+ if (savePreferencesFile(newPath)) {
+ logMessage(LOG_DEBUG,
+ "renaming new preferences file: %s -> %s",
+ newPath, path
+ );
+
+ if (rename(newPath, path) != -1) {
+ ok = 1;
+ oldPreferencesEnabled = 0;
+ } else {
+ logSystemError("rename");
+ }
}
free(path);
@@ -3017,7 +3044,7 @@ brlttyStart (void) {
detachStandardInput();
detachStandardOutput();
- if (!opt_standardError) detachStandardError();
+ if (!opt_logToStandardError) detachStandardError();
#ifdef __MINGW32__
{
@@ -3031,7 +3058,7 @@ brlttyStart (void) {
SetStdHandle(STD_INPUT_HANDLE, h);
SetStdHandle(STD_OUTPUT_HANDLE, h);
- if (!opt_standardError) {
+ if (!opt_logToStandardError) {
SetStdHandle(STD_ERROR_HANDLE, h);
}
}
@@ -3066,6 +3093,7 @@ brlttyStart (void) {
logProperty(opt_configurationFile, "configurationFile", "Configuration File");
logProperty(opt_tablesDirectory, "tablesDirectory", "Tables Directory");
logProperty(opt_driversDirectory, "driversDirectory", "Drivers Directory");
+ logProperty(opt_helpersDirectory, "helpersDirectory", "Helpers Directory");
logProperty(opt_writableDirectory, "writableDirectory", "Writable Directory");
logProperty(opt_updatableDirectory, "updatableDirectory", "Updatable Directory");
logProperty(opt_preferencesFile, "preferencesFile", "Preferences File");
diff --git a/Programs/core.c b/Programs/core.c
index 99153ebd3..3510c8f60 100644
--- a/Programs/core.c
+++ b/Programs/core.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -72,6 +72,7 @@
#include "brl_utils.h"
#include "prefs.h"
#include "api_control.h"
+#include "options.h"
#include "core.h"
#ifdef ENABLE_SPEECH_SUPPORT
@@ -446,7 +447,7 @@ writeBrailleCharacters (const char *mode, const wchar_t *characters, size_t leng
fillStatusSeparator(textBuffer, brl.buffer);
- return writeBrailleWindow(&brl, textBuffer, 0);
+ return writeBrailleWindow(&brl, textBuffer, SCQ_GOOD);
}
int
@@ -1425,7 +1426,7 @@ showDotPattern (unsigned char dots, unsigned char duration) {
}
memset(brl.buffer, dots, brl.textColumns*brl.textRows);
- if (!writeBrailleWindow(&brl, NULL, 0)) return 0;
+ if (!writeBrailleWindow(&brl, NULL, SCQ_GOOD)) return 0;
drainBrailleOutput(&brl, duration);
return 1;
@@ -1477,7 +1478,7 @@ typedef struct {
struct {
AsyncEvent *event;
- unsigned finished:1;
+ unsigned char finished:1;
} wait;
} CoreTaskData;
diff --git a/Programs/core.h b/Programs/core.h
index 47d1bc1c0..28e88146e 100644
--- a/Programs/core.h
+++ b/Programs/core.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -92,16 +92,6 @@ extern void fillStatusSeparator (wchar_t *text, unsigned char *dots);
extern int writeBrailleText (const char *mode, const char *text);
extern int showBrailleText (const char *mode, const char *text, int minimumDelay);
-extern char *opt_driversDirectory;
-extern char *opt_tablesDirectory;
-extern char *opt_textTable;
-extern char *opt_contractionTable;
-extern char *opt_attributesTable;
-extern char *opt_keyboardTable;
-
-extern char *opt_brailleDevice;
-extern int opt_releaseDevice;
-
extern int isWordBreak (const ScreenCharacter *characters, int x);
extern int getWordWrapLength (int row, int from, int count);
extern void setWordWrapStart (int start);
@@ -199,7 +189,6 @@ extern int isAllSpaceCharacters (const ScreenCharacter *characters, int count);
#ifdef ENABLE_SPEECH_SUPPORT
extern SpeechSynthesizer spk;
extern int haveSpeechSynthesizer (void);
-extern int opt_quietIfNoBraille;
extern int isAutospeakActive (void);
extern unsigned int autospeakMinimumScreenContentQuality;
diff --git a/Programs/crc_algorithms.c b/Programs/crc_algorithms.c
index b173a894b..e18ab252a 100644
--- a/Programs/crc_algorithms.c
+++ b/Programs/crc_algorithms.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/crc_generate.c b/Programs/crc_generate.c
index bc22ceed2..1804ac679 100644
--- a/Programs/crc_generate.c
+++ b/Programs/crc_generate.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/crc_internal.h b/Programs/crc_internal.h
index 4f7c2d702..7f860838b 100644
--- a/Programs/crc_internal.h
+++ b/Programs/crc_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/crc_verify.c b/Programs/crc_verify.c
index c3cbd544f..5f442665b 100644
--- a/Programs/crc_verify.c
+++ b/Programs/crc_verify.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/crctest.c b/Programs/crctest.c
index a3ac775f3..739de2147 100644
--- a/Programs/crctest.c
+++ b/Programs/crctest.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ctb_compile.c b/Programs/ctb_compile.c
index f6bfe223d..1ba5c25e0 100644
--- a/Programs/ctb_compile.c
+++ b/Programs/ctb_compile.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ctb_external.c b/Programs/ctb_external.c
index 2efb4806d..9692db5ac 100644
--- a/Programs/ctb_external.c
+++ b/Programs/ctb_external.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ctb_internal.h b/Programs/ctb_internal.h
index 50be4b73b..9b4769cfe 100644
--- a/Programs/ctb_internal.h
+++ b/Programs/ctb_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ctb_louis.c b/Programs/ctb_louis.c
index 53eeede5e..95a56a688 100644
--- a/Programs/ctb_louis.c
+++ b/Programs/ctb_louis.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ctb_native.c b/Programs/ctb_native.c
index 740704ce3..f66def09d 100644
--- a/Programs/ctb_native.c
+++ b/Programs/ctb_native.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ctb_translate.c b/Programs/ctb_translate.c
index f5d0ad59a..05a15e42f 100644
--- a/Programs/ctb_translate.c
+++ b/Programs/ctb_translate.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -386,6 +386,38 @@ contractText (
*outputLength = getOutputConsumed(&bcd);
}
+int *
+makeInverseOffsetMap (const int *fromOffsets, int fromCount) {
+ int toCount = fromOffsets[fromCount];
+
+ int *toOffsets;
+ size_t toSize = (toCount + 1) * sizeof(*toOffsets);
+ toOffsets = malloc(toSize);
+
+ if (toOffsets) {
+ int fromOffset = 0;
+ int toOffset = 0;
+
+ while (fromOffset <= fromCount) {
+ int nextToOffset = fromOffsets[fromOffset];
+
+ if (nextToOffset != CTB_NO_OFFSET) {
+ while (toOffset < nextToOffset) {
+ toOffsets[toOffset++] = CTB_NO_OFFSET;
+ }
+
+ toOffsets[toOffset++] = fromOffset;
+ }
+
+ fromOffset += 1;
+ }
+ } else {
+ logMallocError();
+ }
+
+ return toOffsets;
+}
+
int
replaceContractionTable (const char *directory, const char *name) {
ContractionTable *newTable = NULL;
diff --git a/Programs/ctb_translate.h b/Programs/ctb_translate.h
index ee337a50c..6e80fed65 100644
--- a/Programs/ctb_translate.h
+++ b/Programs/ctb_translate.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/dataarea.c b/Programs/dataarea.c
index 1d6297adb..8839b9e7a 100644
--- a/Programs/dataarea.c
+++ b/Programs/dataarea.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/datafile.c b/Programs/datafile.c
index 5fd232cf6..7bdcb423a 100644
--- a/Programs/datafile.c
+++ b/Programs/datafile.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/defaults.h b/Programs/defaults.h
index a088dfd74..e9d66cf5f 100644
--- a/Programs/defaults.h
+++ b/Programs/defaults.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -90,6 +90,7 @@ extern "C" {
#define DEFAULT_AUTOREPEAT_ENABLED 1 /* 1 for on, 0 for off */
#define DEFAULT_AUTOREPEAT_INTERVAL 10 /* hundredths of a second */
#define DEFAULT_AUTOREPEAT_PANNING 0 /* 1 for on, 0 for off */
+#define DEFAULT_ALTERNATE_PASTE_MODE_ENABLED 0
#define DEFAULT_TOUCH_NAVIGATION 0
#define DEFAULT_TOUCH_SENSITIVITY BRL_SENSITIVITY_MEDIUM
diff --git a/Programs/device.c b/Programs/device.c
index 7e4c8484e..c48364a71 100644
--- a/Programs/device.c
+++ b/Programs/device.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/driver.c b/Programs/driver.c
index 522ec1db4..019c95088 100644
--- a/Programs/driver.c
+++ b/Programs/driver.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/drivers.c b/Programs/drivers.c
index 9aa6d8b87..ebdec38fd 100644
--- a/Programs/drivers.c
+++ b/Programs/drivers.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/dynld_dlfcn.c b/Programs/dynld_dlfcn.c
index 89ca29388..f21702d56 100644
--- a/Programs/dynld_dlfcn.c
+++ b/Programs/dynld_dlfcn.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/dynld_dyld.c b/Programs/dynld_dyld.c
index a8c6ad1e7..f662e807a 100644
--- a/Programs/dynld_dyld.c
+++ b/Programs/dynld_dyld.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/dynld_grub.c b/Programs/dynld_grub.c
index 07e696ac2..ff6192c54 100644
--- a/Programs/dynld_grub.c
+++ b/Programs/dynld_grub.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/dynld_none.c b/Programs/dynld_none.c
index 2a6bb3581..5697e2de8 100644
--- a/Programs/dynld_none.c
+++ b/Programs/dynld_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/dynld_shl.c b/Programs/dynld_shl.c
index 786a9212f..f1060fd20 100644
--- a/Programs/dynld_shl.c
+++ b/Programs/dynld_shl.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/dynld_windows.c b/Programs/dynld_windows.c
index c02a37e38..0da0a1ac1 100644
--- a/Programs/dynld_windows.c
+++ b/Programs/dynld_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ezusb.c b/Programs/ezusb.c
index 3ece744f2..2edcd042d 100644
--- a/Programs/ezusb.c
+++ b/Programs/ezusb.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -24,7 +24,7 @@
#include "ezusb.h"
#include "ihex.h"
#include "timing.h"
-#include "core.h"
+#include "options.h"
#define EZUSB_REQUEST_TIMEOUT 1000
#define EZUSB_CPUCS_DELAY 10
diff --git a/Programs/file.c b/Programs/file.c
index 7c47a2fb3..fb90854ac 100644
--- a/Programs/file.c
+++ b/Programs/file.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -45,6 +45,7 @@
#endif /* HAVE_TERMIOS_H */
#include "parameters.h"
+#include "options.h"
#include "log.h"
#include "strfmt.h"
#include "file.h"
@@ -210,6 +211,36 @@ makePath (const char *directory, const char *file) {
return joinPath(components, ARRAY_COUNT(components));
}
+int
+anchorRelativePath (char **path, const char *anchor) {
+ int ok = 0;
+ char *newPath = makePath(anchor, *path);
+
+ if (newPath) {
+ if (changeStringSetting(path, newPath)) ok = 1;
+ free(newPath);
+ }
+
+ return ok;
+}
+
+char *opt_helpersDirectory = HELPERS_DIRECTORY;
+
+char *
+makeHelperPath (const char *name) {
+ char *path = NULL;
+ char *directory = NULL;
+
+ if (changeStringSetting(&directory, opt_helpersDirectory)) {
+ if (toAbsoluteInstallPath(&directory)) {
+ path = makePath(directory, name);
+ }
+ }
+
+ if (directory) free(directory);
+ return path;
+}
+
int
hasFileExtension (const char *path, const char *extension) {
const char *tail = locatePathExtension(path);
@@ -484,13 +515,8 @@ ensurePathDirectory (const char *path) {
}
}
-static void
-setDirectory (const char **variable, const char *directory) {
- *variable = directory;
-}
-
static const char *
-getDirectory (const char *const *variable) {
+getDirectory (char *const *variable) {
if (*variable && **variable) {
if (ensureDirectory(*variable, 0)) {
return *variable;
@@ -501,44 +527,34 @@ getDirectory (const char *const *variable) {
}
static char *
-makeDirectoryPath (const char *const *variable, const char *file) {
+makeDirectoryPath (char *const *variable, const char *file) {
const char *directory = getDirectory(variable);
if (directory) return makePath(directory, file);
return NULL;
}
-static const char *updatableDirectory = NULL;
-
-void
-setUpdatableDirectory (const char *directory) {
- setDirectory(&updatableDirectory, directory);
-}
+char *opt_updatableDirectory = UPDATABLE_DIRECTORY;
const char *
getUpdatableDirectory (void) {
- return getDirectory(&updatableDirectory);
+ return getDirectory(&opt_updatableDirectory);
}
char *
makeUpdatablePath (const char *file) {
- return makeDirectoryPath(&updatableDirectory, file);
+ return makeDirectoryPath(&opt_updatableDirectory, file);
}
-static const char *writableDirectory = NULL;
-
-void
-setWritableDirectory (const char *directory) {
- setDirectory(&writableDirectory, directory);
-}
+char *opt_writableDirectory = WRITABLE_DIRECTORY;
const char *
getWritableDirectory (void) {
- return getDirectory(&writableDirectory);
+ return getDirectory(&opt_writableDirectory);
}
char *
makeWritablePath (const char *file) {
- return makeDirectoryPath(&writableDirectory, file);
+ return makeDirectoryPath(&opt_writableDirectory, file);
}
char *
diff --git a/Programs/fm_adlib.c b/Programs/fm_adlib.c
index 3ad672193..2d0949d0c 100644
--- a/Programs/fm_adlib.c
+++ b/Programs/fm_adlib.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/fm_none.c b/Programs/fm_none.c
index e1648ac41..7e60c412d 100644
--- a/Programs/fm_none.c
+++ b/Programs/fm_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/gio.c b/Programs/gio.c
index 9be76cbb3..640b1a40a 100644
--- a/Programs/gio.c
+++ b/Programs/gio.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/gio_bluetooth.c b/Programs/gio_bluetooth.c
index 2e2909072..ff6ec6bb7 100644
--- a/Programs/gio_bluetooth.c
+++ b/Programs/gio_bluetooth.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/gio_hid.c b/Programs/gio_hid.c
index bd5ab7c81..0c8df7470 100644
--- a/Programs/gio_hid.c
+++ b/Programs/gio_hid.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/gio_internal.h b/Programs/gio_internal.h
index 03165274b..41ebfa67e 100644
--- a/Programs/gio_internal.h
+++ b/Programs/gio_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/gio_null.c b/Programs/gio_null.c
index f4515ed6d..9581d8c0e 100644
--- a/Programs/gio_null.c
+++ b/Programs/gio_null.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/gio_serial.c b/Programs/gio_serial.c
index 788dddeeb..2ee324f9a 100644
--- a/Programs/gio_serial.c
+++ b/Programs/gio_serial.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/gio_usb.c b/Programs/gio_usb.c
index f66e34cfd..6b20e3ab1 100644
--- a/Programs/gio_usb.c
+++ b/Programs/gio_usb.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hid.c b/Programs/hid.c
index 79fe0529a..87f589fce 100644
--- a/Programs/hid.c
+++ b/Programs/hid.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hid_braille.c b/Programs/hid_braille.c
index 20b9db529..f8ef18ba7 100644
--- a/Programs/hid_braille.c
+++ b/Programs/hid_braille.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hid_inspect.c b/Programs/hid_inspect.c
index 4b92fdcc5..51aac847d 100644
--- a/Programs/hid_inspect.c
+++ b/Programs/hid_inspect.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hid_internal.h b/Programs/hid_internal.h
index e275f7b3f..749112329 100644
--- a/Programs/hid_internal.h
+++ b/Programs/hid_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hid_items.c b/Programs/hid_items.c
index 362aa3365..0d6e4852b 100644
--- a/Programs/hid_items.c
+++ b/Programs/hid_items.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hid_linux.c b/Programs/hid_linux.c
index f075589c8..2e2149eed 100644
--- a/Programs/hid_linux.c
+++ b/Programs/hid_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hid_none.c b/Programs/hid_none.c
index 057f312c2..8358f8f9d 100644
--- a/Programs/hid_none.c
+++ b/Programs/hid_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hid_tables.c b/Programs/hid_tables.c
index d57575447..6513e18da 100644
--- a/Programs/hid_tables.c
+++ b/Programs/hid_tables.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hidkeys.c b/Programs/hidkeys.c
index d6a00a845..dd6c6c0d4 100644
--- a/Programs/hidkeys.c
+++ b/Programs/hidkeys.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hidkeys.h b/Programs/hidkeys.h
index af84e9c23..19869aeb8 100644
--- a/Programs/hidkeys.h
+++ b/Programs/hidkeys.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hostcmd.c b/Programs/hostcmd.c
index 357e85167..8dbd09595 100644
--- a/Programs/hostcmd.c
+++ b/Programs/hostcmd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hostcmd_internal.h b/Programs/hostcmd_internal.h
index 0bdcd6396..b04ae91b3 100644
--- a/Programs/hostcmd_internal.h
+++ b/Programs/hostcmd_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hostcmd_none.c b/Programs/hostcmd_none.c
index 546035fd3..d20810e95 100644
--- a/Programs/hostcmd_none.c
+++ b/Programs/hostcmd_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hostcmd_none.h b/Programs/hostcmd_none.h
index 77f613dbd..dd79d7d34 100644
--- a/Programs/hostcmd_none.h
+++ b/Programs/hostcmd_none.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hostcmd_unix.c b/Programs/hostcmd_unix.c
index 76f1e5f90..bc33c5a89 100644
--- a/Programs/hostcmd_unix.c
+++ b/Programs/hostcmd_unix.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hostcmd_unix.h b/Programs/hostcmd_unix.h
index 73f2b8b98..516f6fd21 100644
--- a/Programs/hostcmd_unix.h
+++ b/Programs/hostcmd_unix.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hostcmd_windows.c b/Programs/hostcmd_windows.c
index b9c61c056..1ada34574 100644
--- a/Programs/hostcmd_windows.c
+++ b/Programs/hostcmd_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/hostcmd_windows.h b/Programs/hostcmd_windows.h
index 5a9416221..3f7962d89 100644
--- a/Programs/hostcmd_windows.h
+++ b/Programs/hostcmd_windows.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ihex.c b/Programs/ihex.c
index 8f6c455fc..085e3a16e 100644
--- a/Programs/ihex.c
+++ b/Programs/ihex.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/io_log.c b/Programs/io_log.c
index 97ee22e10..5dc72006e 100644
--- a/Programs/io_log.c
+++ b/Programs/io_log.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/io_log.h b/Programs/io_log.h
index 621a25f69..ed9f03fa3 100644
--- a/Programs/io_log.h
+++ b/Programs/io_log.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/io_misc.c b/Programs/io_misc.c
index 108e484cf..ecdd6f9e9 100644
--- a/Programs/io_misc.c
+++ b/Programs/io_misc.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/kbd.c b/Programs/kbd.c
index abe44be8b..47a5b14c1 100644
--- a/Programs/kbd.c
+++ b/Programs/kbd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/kbd.h b/Programs/kbd.h
index edd9be662..8429d99e3 100644
--- a/Programs/kbd.h
+++ b/Programs/kbd.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/kbd_android.c b/Programs/kbd_android.c
index 2ab9fda95..04d7aa090 100644
--- a/Programs/kbd_android.c
+++ b/Programs/kbd_android.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/kbd_android.h b/Programs/kbd_android.h
index 048075e4a..baa987771 100644
--- a/Programs/kbd_android.h
+++ b/Programs/kbd_android.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/kbd_internal.h b/Programs/kbd_internal.h
index 69ede2a51..e129dcd39 100644
--- a/Programs/kbd_internal.h
+++ b/Programs/kbd_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/kbd_keycodes.c b/Programs/kbd_keycodes.c
index a488777f8..cf79a0aa1 100644
--- a/Programs/kbd_keycodes.c
+++ b/Programs/kbd_keycodes.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/kbd_linux.c b/Programs/kbd_linux.c
index 024b56768..0c4920384 100644
--- a/Programs/kbd_linux.c
+++ b/Programs/kbd_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/kbd_none.c b/Programs/kbd_none.c
index 721d6cb5a..dce25ee63 100644
--- a/Programs/kbd_none.c
+++ b/Programs/kbd_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ktb_audit.c b/Programs/ktb_audit.c
index 100156d6d..c398e6ddc 100644
--- a/Programs/ktb_audit.c
+++ b/Programs/ktb_audit.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ktb_cmds.c b/Programs/ktb_cmds.c
index 10f52bb3a..be89b2763 100644
--- a/Programs/ktb_cmds.c
+++ b/Programs/ktb_cmds.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -111,7 +111,9 @@ static const CommandListEntry commandList_clipboard[] = {
{ .code = BRL_CMD_BLK(CLIP_COPY) },
{ .code = BRL_CMD_BLK(CLIP_APPEND) },
{ .code = BRL_CMD_PASTE },
+ { .code = BRL_CMD_PASTE_ALTMODE },
{ .code = BRL_CMD_BLK(PASTE_HISTORY) },
+ { .code = BRL_CMD_BLK(PASTE_HISTORY_ALTMODE) },
{ .code = BRL_CMD_PRSEARCH },
{ .code = BRL_CMD_NXSEARCH },
{ .code = BRL_CMD_CLIP_SAVE },
@@ -179,6 +181,7 @@ static const CommandListEntry commandList_say[] = {
{ .code = BRL_CMD_SAY_FASTER },
{ .code = BRL_CMD_SAY_LOWER },
{ .code = BRL_CMD_SAY_HIGHER },
+ { .code = BRL_CMD_SPK_PUNCT_LEVEL },
{ .code = BRL_CMD_AUTOSPEAK },
{ .code = BRL_CMD_ASPK_SEL_LINE },
{ .code = BRL_CMD_ASPK_EMP_LINE },
diff --git a/Programs/ktb_cmds.h b/Programs/ktb_cmds.h
index 8e3198a51..98e385623 100644
--- a/Programs/ktb_cmds.h
+++ b/Programs/ktb_cmds.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ktb_compile.c b/Programs/ktb_compile.c
index 54f31448d..cbcbf1b93 100644
--- a/Programs/ktb_compile.c
+++ b/Programs/ktb_compile.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ktb_inspect.h b/Programs/ktb_inspect.h
index f390fbb48..98e7fea43 100644
--- a/Programs/ktb_inspect.h
+++ b/Programs/ktb_inspect.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ktb_internal.h b/Programs/ktb_internal.h
index 3ab71c6e9..d7ecd025d 100644
--- a/Programs/ktb_internal.h
+++ b/Programs/ktb_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -162,6 +162,7 @@ struct KeyTableStruct {
struct {
int command;
+ unsigned char force:1;
} release;
struct {
diff --git a/Programs/ktb_keyboard.c b/Programs/ktb_keyboard.c
index 6dc6fdc23..c00380bd9 100644
--- a/Programs/ktb_keyboard.c
+++ b/Programs/ktb_keyboard.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ktb_keyboard.h b/Programs/ktb_keyboard.h
index fe225feaf..bc1a0b20c 100644
--- a/Programs/ktb_keyboard.h
+++ b/Programs/ktb_keyboard.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ktb_list.c b/Programs/ktb_list.c
index 312867840..b69341191 100644
--- a/Programs/ktb_list.c
+++ b/Programs/ktb_list.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ktb_list.h b/Programs/ktb_list.h
index 8fda56f95..00422d6f8 100644
--- a/Programs/ktb_list.h
+++ b/Programs/ktb_list.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ktb_translate.c b/Programs/ktb_translate.c
index 096e259b0..7764fc5ea 100644
--- a/Programs/ktb_translate.c
+++ b/Programs/ktb_translate.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -487,6 +487,8 @@ ASYNC_ALARM_CALLBACK(handleLongPressAlarm) {
}
table->release.command = BRL_CMD_NOOP;
+ table->release.force = 0;
+
processCommand(table, command);
}
@@ -684,6 +686,7 @@ processKeyEvent (
resetLongPressData(table);
table->release.command = BRL_CMD_NOOP;
+ table->release.force = 0;
if (binding) {
addCommandArguments(table, &command, binding->primaryCommand.entry, binding);
@@ -692,35 +695,35 @@ processKeyEvent (
addCommandArguments(table, &secondaryCommand, binding->secondaryCommand.entry, binding);
}
- if (context == KTB_CTX_WAITING) {
- table->release.command = BRL_CMD_NOOP;
- } else {
- if (secondaryCommand == BRL_CMD_NOOP) {
- if (isRepeatableCommand(command)) {
- secondaryCommand = command;
- }
+ if (secondaryCommand == BRL_CMD_NOOP) {
+ if (isRepeatableCommand(command)) {
+ secondaryCommand = command;
}
+ }
- if (isImmediate) {
- table->release.command = BRL_CMD_NOOP;
- } else {
- table->release.command = command;
- command = BRL_CMD_NOOP;
- }
+ if (isImmediate) {
+ table->release.command = BRL_CMD_NOOP;
+ } else {
+ table->release.command = command;
+ command = BRL_CMD_NOOP;
+ }
- if (secondaryCommand != BRL_CMD_NOOP) {
- table->longPress.command = secondaryCommand;
- table->longPress.repeat = isRepeatableCommand(secondaryCommand);
+ if (secondaryCommand != BRL_CMD_NOOP) {
+ table->longPress.command = secondaryCommand;
+ table->longPress.repeat = isRepeatableCommand(secondaryCommand);
- table->longPress.keyAction = "long";
- table->longPress.keyContext = context;
- table->longPress.keyValue = keyValue;
+ table->longPress.keyAction = "long";
+ table->longPress.keyContext = context;
+ table->longPress.keyValue = keyValue;
- setLongPressAlarm(table, prefs.longPressTime);
- }
+ setLongPressAlarm(table, prefs.longPressTime);
}
- processCommand(table, command);
+ if (command != BRL_CMD_NOOP) {
+ processCommand(table, command);
+ } else if (context == KTB_CTX_WAITING) {
+ table->release.force = 1;
+ }
}
} else {
resetLongPressData(table);
@@ -728,9 +731,10 @@ processKeyEvent (
if (prefs.onFirstRelease || (table->pressedKeys.count == 0)) {
int *cmd = &table->release.command;
- if (*cmd != BRL_CMD_NOOP) {
+ if ((*cmd != BRL_CMD_NOOP) || table->release.force) {
processCommand(table, (command = *cmd));
*cmd = BRL_CMD_NOOP;
+ table->release.force = 0;
}
}
}
diff --git a/Programs/learn.c b/Programs/learn.c
index 21ea0e7dc..dc78e9b50 100644
--- a/Programs/learn.c
+++ b/Programs/learn.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -18,12 +18,16 @@
#include "prologue.h"
+#include <stdio.h>
#include <string.h>
#include "log.h"
#include "learn.h"
#include "message.h"
+#include "async_handle.h"
#include "async_wait.h"
+#include "async_alarm.h"
+#include "timing_types.h"
#include "cmd.h"
#include "cmd_queue.h"
#include "brl.h"
@@ -40,17 +44,70 @@ typedef enum {
typedef struct {
const char *mode;
LearnModeState state;
+
+ struct {
+ const char *text;
+ AsyncHandle alarm;
+
+ struct {
+ int initial;
+ int left;
+ } seconds;
+ } prompt;
} LearnModeData;
-ASYNC_CONDITION_TESTER(testEndLearnWait) {
- LearnModeData *lmd = data;
+static int
+showText (const char *text, MessageOptions options, LearnModeData *lmd) {
+ return message(lmd->mode, text, (options | MSG_SYNC));
+}
- return lmd->state != LMS_TIMEOUT;
+ASYNC_ALARM_CALLBACK(updateLearnModePrompt) {
+ LearnModeData *lmd = parameters->data;
+ int *secondsLeft = &lmd->prompt.seconds.left;
+
+ {
+ char prompt[0X100];
+ snprintf(prompt, sizeof(prompt), "%s - %d", lmd->prompt.text, *secondsLeft);
+ showText(prompt, (MSG_NODELAY | MSG_SILENT), lmd);
+ }
+
+ *secondsLeft -= 1;
+}
+
+static void
+endPrompt (LearnModeData *lmd) {
+ AsyncHandle *alarm = &lmd->prompt.alarm;
+
+ if (*alarm) {
+ asyncCancelRequest(*alarm);
+ *alarm = NULL;
+ }
+}
+
+static int
+beginPrompt (LearnModeData *lmd) {
+ endPrompt(lmd);
+ AsyncHandle *alarm = &lmd->prompt.alarm;
+
+ lmd->prompt.seconds.left = lmd->prompt.seconds.initial;
+
+ if (asyncNewRelativeAlarm(alarm, 0, updateLearnModePrompt, lmd)) {
+ if (asyncResetAlarmInterval(*alarm, MSECS_PER_SEC)) {
+ sayMessage(lmd->prompt.text);
+ return 1;
+ }
+
+ asyncCancelRequest(*alarm);
+ *alarm = NULL;
+ }
+
+ return 0;
}
static int
handleLearnModeCommands (int command, void *data) {
LearnModeData *lmd = data;
+ endPrompt(lmd);
logMessage(LOG_DEBUG, "learn: command=%06X", command);
lmd->state = LMS_CONTINUE;
@@ -63,7 +120,7 @@ handleLearnModeCommands (int command, void *data) {
case BRL_CMD_NOOP:
return 1;
- default:
+ default: {
switch (command & BRL_MSK_BLK) {
case BRL_CMD_BLK(TOUCH_AT):
return 1;
@@ -71,26 +128,43 @@ handleLearnModeCommands (int command, void *data) {
default:
break;
}
+
break;
+ }
}
{
- char buffer[0X100];
+ char description[0X100];
- describeCommand(buffer, sizeof(buffer), command,
- (CDO_IncludeName | CDO_IncludeOperand));
+ describeCommand(
+ description, sizeof(description), command,
+ (CDO_IncludeName | CDO_IncludeOperand)
+ );
- logMessage(LOG_DEBUG, "learn: %s", buffer);
- if (!message(lmd->mode, buffer, MSG_SYNC|MSG_NODELAY)) lmd->state = LMS_ERROR;
+ logMessage(LOG_DEBUG, "learn: %s", description);
+ if (!showText(description, 0, lmd)) lmd->state = LMS_ERROR;
}
+ if (!beginPrompt(lmd)) lmd->state = LMS_ERROR;
return 1;
}
+ASYNC_CONDITION_TESTER(testEndLearnWait) {
+ LearnModeData *lmd = data;
+
+ return lmd->state != LMS_TIMEOUT;
+}
+
int
learnMode (int timeout) {
LearnModeData lmd = {
- .mode = "lrn"
+ .mode = "lrn",
+
+ .prompt = {
+ .text = gettext("Learn Mode"),
+ .alarm = NULL,
+ .seconds.initial = timeout / MSECS_PER_SEC,
+ },
};
pushCommandEnvironment("learnMode", NULL, NULL);
@@ -98,14 +172,16 @@ learnMode (int timeout) {
handleLearnModeCommands, NULL, &lmd);
if (setStatusText(&brl, lmd.mode)) {
- if (message(lmd.mode, gettext("Learn Mode"), MSG_SYNC|MSG_NODELAY)) {
+ if (beginPrompt(&lmd)) {
do {
lmd.state = LMS_TIMEOUT;
if (!asyncAwaitCondition(timeout, testEndLearnWait, &lmd)) break;
} while (lmd.state == LMS_CONTINUE);
+ endPrompt(&lmd);
+
if (lmd.state == LMS_TIMEOUT) {
- if (!message(lmd.mode, gettext("done"), MSG_SYNC)) {
+ if (!showText(gettext("done"), 0, &lmd)) {
lmd.state = LMS_ERROR;
}
}
diff --git a/Programs/learn.h b/Programs/learn.h
index 8a25ebd27..0dba5dd21 100644
--- a/Programs/learn.h
+++ b/Programs/learn.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/leds.c b/Programs/leds.c
index 2c48ce0c1..9e235fd88 100644
--- a/Programs/leds.c
+++ b/Programs/leds.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/leds_linux.c b/Programs/leds_linux.c
index f793530cc..829902826 100644
--- a/Programs/leds_linux.c
+++ b/Programs/leds_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/leds_none.c b/Programs/leds_none.c
index 1a58afffe..fd5981dff 100644
--- a/Programs/leds_none.c
+++ b/Programs/leds_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/lock.c b/Programs/lock.c
index 156466acd..3438c14fe 100644
--- a/Programs/lock.c
+++ b/Programs/lock.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/log.c b/Programs/log.c
index 57e84cca1..a77bee68f 100644
--- a/Programs/log.c
+++ b/Programs/log.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/log_history.c b/Programs/log_history.c
index b676c37f8..90594262f 100644
--- a/Programs/log_history.c
+++ b/Programs/log_history.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/menu.c b/Programs/menu.c
index a1a91ec35..6fe5b5e77 100644
--- a/Programs/menu.c
+++ b/Programs/menu.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -50,6 +50,11 @@
#include "parse.h"
#include "file.h"
+typedef struct {
+ const char *unit;
+ NumericMenuItemFormatter *formatter;
+} NumericData;
+
typedef struct {
char *directory;
const char *extension;
@@ -71,6 +76,10 @@ typedef struct {
char *pathsArea[3];
} FileData;
+typedef struct {
+ MenuToolFunction *function;
+} ToolData;
+
typedef struct {
Menu *menu;
unsigned opened:1;
@@ -122,19 +131,14 @@ struct MenuItemStruct {
unsigned char step; /* present only multiples of this value */
union {
- const char *text;
+ NumericData numeric;
const MenuString *strings;
FileData *files;
+ ToolData tool;
+ const char *text;
+ char *const *stringOption;
+ int *flagOption;
SubmenuData *submenu;
-
- struct {
- const char *unit;
- NumericMenuItemFormatter *formatter;
- } numeric;
-
- struct {
- MenuToolFunction *function;
- } tool;
} data;
};
@@ -355,27 +359,6 @@ setMenuItemChanged (MenuItem *item, MenuItemChanged *handler) {
item->changed = handler;
}
-static const char *
-getValue_text (const MenuItem *item) {
- return item->data.text;
-}
-
-static const MenuItemMethods menuItemMethods_text = {
- .getValue = getValue_text
-};
-
-MenuItem *
-newTextMenuItem (Menu *menu, const MenuString *name, const char *text) {
- MenuItem *item = newMenuItem(menu, NULL, name);
-
- if (item) {
- item->methods = &menuItemMethods_text;
- item->data.text = text;
- }
-
- return item;
-}
-
static const char *
getValue_numeric (const MenuItem *item) {
Menu *menu = item->menu;
@@ -517,14 +500,14 @@ newStringsMenuItem (
return item;
}
+static const MenuString booleanStrings[] = {
+ {.label=strtext("No")},
+ {.label=strtext("Yes")}
+};
+
MenuItem *
newBooleanMenuItem (Menu *menu, unsigned char *setting, const MenuString *name) {
- static const MenuString strings[] = {
- {.label=strtext("No")},
- {.label=strtext("Yes")}
- };
-
- return newEnumeratedMenuItem(menu, setting, name, strings);
+ return newEnumeratedMenuItem(menu, setting, name, booleanStrings);
}
static int
@@ -806,6 +789,75 @@ newToolMenuItem (Menu *menu, const MenuString *name, MenuToolFunction *function)
return item;
}
+static const char *
+getValue_text (const MenuItem *item) {
+ return item->data.text;
+}
+
+static const MenuItemMethods menuItemMethods_text = {
+ .getValue = getValue_text
+};
+
+MenuItem *
+newTextMenuItem (Menu *menu, const MenuString *name, const char *text) {
+ MenuItem *item = newMenuItem(menu, NULL, name);
+
+ if (item) {
+ item->methods = &menuItemMethods_text;
+ item->data.text = text;
+ }
+
+ return item;
+}
+
+static const char *
+getValue_stringOption (const MenuItem *item) {
+ const char *value = *item->data.stringOption;
+ if (!*value) value = gettext("not set");
+ return value;
+}
+
+static const MenuItemMethods menuItemMethods_stringOption = {
+ .getValue = getValue_stringOption
+};
+
+MenuItem *
+newStringOptionMenuItem (Menu *menu, const MenuString *name, char *const *option) {
+ MenuItem *item = newMenuItem(menu, NULL, name);
+
+ if (item) {
+ item->methods = &menuItemMethods_stringOption;
+ item->data.stringOption = option;
+ }
+
+ return item;
+}
+
+static const char *
+getValue_flagOption (const MenuItem *item) {
+ return gettext(
+ *item->data.flagOption?
+ booleanStrings[1].label:
+ booleanStrings[0].label
+ );
+}
+
+static const MenuItemMethods menuItemMethods_flagOption = {
+ .getValue = getValue_flagOption
+};
+
+MenuItem *
+newFlagOptionMenuItem (Menu *menu, const MenuString *name, int *option) {
+ MenuItem *item = newMenuItem(menu, NULL, name);
+
+ if (item) {
+ item->methods = &menuItemMethods_flagOption;
+ item->data.flagOption = option;
+ }
+
+ return item;
+}
+
static MenuItem *
getParentMenuItem (const MenuItem *item) {
return getSelectedMenuItem(item->menu->parent);
diff --git a/Programs/menu_prefs.c b/Programs/menu_prefs.c
index f5c24a7b2..5836418b8 100644
--- a/Programs/menu_prefs.c
+++ b/Programs/menu_prefs.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -29,6 +29,7 @@
#include "menu.h"
#include "menu_prefs.h"
#include "prefs.h"
+#include "file.h"
#include "profile.h"
#include "status_types.h"
#include "blink.h"
@@ -36,13 +37,14 @@
#include "brl.h"
#include "spk.h"
#include "ttb.h"
-#include "atb.h"
#include "ctb.h"
+#include "atb.h"
#include "ktb.h"
#include "tune.h"
#include "bell.h"
#include "leds.h"
#include "midi.h"
+#include "options.h"
#include "core.h"
#define PREFS_MENU_ITEM_VARIABLE(name) prefsMenuItemVariable_##name
@@ -677,21 +679,21 @@ makePreferencesMenu (void) {
}
{
- SUBMENU(optionsSubmenu, rootMenu, strtext("Menu Options"));
+ SUBMENU(menuSubmenu, rootMenu, strtext("Menu Options"));
{
NAME(strtext("Show Submenu Sizes"));
- ITEM(newBooleanMenuItem(optionsSubmenu, &prefs.showSubmenuSizes, &itemName));
+ ITEM(newBooleanMenuItem(menuSubmenu, &prefs.showSubmenuSizes, &itemName));
}
{
NAME(strtext("Show Advanced Submenus"));
- ITEM(newBooleanMenuItem(optionsSubmenu, &prefs.showAdvancedSubmenus, &itemName));
+ ITEM(newBooleanMenuItem(menuSubmenu, &prefs.showAdvancedSubmenus, &itemName));
}
{
NAME(strtext("Show All Items"));
- ITEM(newBooleanMenuItem(optionsSubmenu, &prefs.showAllItems, &itemName));
+ ITEM(newBooleanMenuItem(menuSubmenu, &prefs.showAllItems, &itemName));
}
}
@@ -1001,6 +1003,11 @@ makePreferencesMenu (void) {
TEST(AutorepeatEnabled);
}
+ {
+ NAME(strtext("Alternate Paste Mode Enabled"));
+ ITEM(newBooleanMenuItem(inputSubmenu, &prefs.alternatePasteModeEnabled, &itemName));
+ }
+
{
NAME(strtext("Touch Navigation"));
ITEM(newBooleanMenuItem(inputSubmenu, &prefs.touchNavigation, &itemName));
@@ -1208,11 +1215,11 @@ makePreferencesMenu (void) {
}
{
- static const MenuString strings[] = {
- [SPK_PUNCTUATION_NONE] = {.label=strtext("None")},
- [SPK_PUNCTUATION_SOME] = {.label=strtext("Some")},
- [SPK_PUNCTUATION_ALL] = {.label=strtext("All")},
- };
+ static MenuString strings[SPK_PUNCTUATION_ALL + 1];
+ strings[SPK_PUNCTUATION_NONE].label = getSpeechPunctuation(SPK_PUNCTUATION_NONE);
+ strings[SPK_PUNCTUATION_SOME].label = getSpeechPunctuation(SPK_PUNCTUATION_SOME);
+ strings[SPK_PUNCTUATION_MOST].label = getSpeechPunctuation(SPK_PUNCTUATION_MOST);
+ strings[SPK_PUNCTUATION_ALL].label = getSpeechPunctuation(SPK_PUNCTUATION_ALL);
NAME(strtext("Speech Punctuation"));
ITEM(newEnumeratedMenuItem(speechSubmenu, &prefs.speechPunctuation, &itemName, strings));
@@ -1440,6 +1447,28 @@ makePreferencesMenu (void) {
}
}
+ {
+ SUBMENU(toolsSubmenu, rootMenu, strtext("Tools"));
+ setAdvancedSubmenu(toolsSubmenu);
+
+ {
+ NAME(strtext("Restart Braille Driver"));
+ ITEM(newToolMenuItem(toolsSubmenu, &itemName, restartBrailleDriver));
+ }
+
+ #ifdef ENABLE_SPEECH_SUPPORT
+ {
+ NAME(strtext("Restart Speech Driver"));
+ ITEM(newToolMenuItem(toolsSubmenu, &itemName, restartSpeechDriver));
+ }
+ #endif /* ENABLE_SPEECH_SUPPORT */
+
+ {
+ NAME(strtext("Restart Screen Driver"));
+ ITEM(newToolMenuItem(toolsSubmenu, &itemName, restartScreenDriver));
+ }
+ }
+
{
SUBMENU(buildSubmenu, rootMenu, strtext("Build Information"));
setAdvancedSubmenu(buildSubmenu);
@@ -1464,14 +1493,34 @@ makePreferencesMenu (void) {
ITEM(newTextMenuItem(buildSubmenu, &itemName, PACKAGE_BUGREPORT));
}
+ {
+ NAME(strtext("Configuration File"));
+ ITEM(newTextMenuItem(buildSubmenu, &itemName, CONFIGURATION_FILE));
+ }
+
+ {
+ NAME(strtext("Preferences File"));
+ ITEM(newTextMenuItem(buildSubmenu, &itemName, PREFERENCES_FILE));
+ }
+
{
NAME(strtext("Configuration Directory"));
ITEM(newTextMenuItem(buildSubmenu, &itemName, CONFIGURATION_DIRECTORY));
}
{
- NAME(strtext("Configuration File"));
- ITEM(newTextMenuItem(buildSubmenu, &itemName, CONFIGURATION_FILE));
+ NAME(strtext("Tables Directory"));
+ ITEM(newTextMenuItem(buildSubmenu, &itemName, TABLES_DIRECTORY));
+ }
+
+ {
+ NAME(strtext("Drivers Directory"));
+ ITEM(newTextMenuItem(buildSubmenu, &itemName, DRIVERS_DIRECTORY));
+ }
+
+ {
+ NAME(strtext("Helpers Directory"));
+ ITEM(newTextMenuItem(buildSubmenu, &itemName, HELPERS_DIRECTORY));
}
{
@@ -1479,34 +1528,254 @@ makePreferencesMenu (void) {
ITEM(newTextMenuItem(buildSubmenu, &itemName, UPDATABLE_DIRECTORY));
}
+ {
+ NAME(strtext("Writable Directory"));
+ ITEM(newTextMenuItem(buildSubmenu, &itemName, WRITABLE_DIRECTORY));
+ }
+
+ {
+ NAME(strtext("Locale Directory"));
+ ITEM(newTextMenuItem(buildSubmenu, &itemName, LOCALE_DIRECTORY));
+ }
+ }
+
+ {
+ SUBMENU(optionsSubmenu, rootMenu, strtext("Command Options"));
+ setAdvancedSubmenu(optionsSubmenu);
+
+ {
+ NAME(strtext("Configuration File"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_configurationFile));
+ }
+
+ {
+ NAME(strtext("Environment Variables"));
+ ITEM(newFlagOptionMenuItem(optionsSubmenu, &itemName, &opt_environmentVariables));
+ }
+
+ {
+ NAME(strtext("Boot Parameters"));
+ ITEM(newFlagOptionMenuItem(optionsSubmenu, &itemName, &opt_bootParameters));
+ }
+
{
NAME(strtext("Preferences File"));
- ITEM(newTextMenuItem(buildSubmenu, &itemName, PREFERENCES_FILE));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_preferencesFile));
}
{
- NAME(strtext("Writable Directory"));
- ITEM(newTextMenuItem(buildSubmenu, &itemName, WRITABLE_DIRECTORY));
+ NAME(strtext("Override Preferences"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_overridePreferences));
+ }
+
+ {
+ NAME(strtext("Tables Directory"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_tablesDirectory));
}
{
NAME(strtext("Drivers Directory"));
- ITEM(newTextMenuItem(buildSubmenu, &itemName, DRIVERS_DIRECTORY));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_driversDirectory));
}
{
- NAME(strtext("Tables Directory"));
- ITEM(newTextMenuItem(buildSubmenu, &itemName, TABLES_DIRECTORY));
+ NAME(strtext("Helpers Directory"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_helpersDirectory));
+ }
+
+ {
+ NAME(strtext("Updatable Directory"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_updatableDirectory));
+ }
+
+ {
+ NAME(strtext("Writable Directory"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_writableDirectory));
}
{
NAME(strtext("Locale Directory"));
- ITEM(newTextMenuItem(buildSubmenu, &itemName, LOCALE_DIRECTORY));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_localeDirectory));
+ }
+
+ {
+ const char *const *directories = getAllOverrideDirectories();
+
+ if (directories) {
+ const char *const *directory = directories;
+ NAME(strtext("Override Directory"));
+
+ while (*directory) {
+ ITEM(newTextMenuItem(optionsSubmenu, &itemName, *directory));
+ directory += 1;
+ }
+ }
+ }
+
+ {
+ NAME(strtext("Text Table"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_textTable));
+ }
+
+ {
+ NAME(strtext("Contraction Table"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_contractionTable));
}
+
+ {
+ NAME(strtext("Attributes Table"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_attributesTable));
+ }
+
+ {
+ NAME(strtext("Keyboard Table"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_keyboardTable));
+ }
+
+ {
+ NAME(strtext("Keyboard Properties"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_keyboardProperties));
+ }
+
+ {
+ NAME(strtext("GUI Keyboard Enabled"));
+ ITEM(newFlagOptionMenuItem(optionsSubmenu, &itemName, &opt_guiKeyboardEnabled));
+ }
+
+ {
+ NAME(strtext("GUI Keyboard Table"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_guiKeyboardTable));
+ }
+
+ {
+ NAME(strtext("Braille Driver"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_brailleDriver));
+ }
+
+ {
+ NAME(strtext("Braille Parameters"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_brailleParameters));
+ }
+
+ {
+ NAME(strtext("Braille Device"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_brailleDevice));
+ }
+
+ {
+ NAME(strtext("Release Device"));
+ ITEM(newFlagOptionMenuItem(optionsSubmenu, &itemName, &opt_releaseDevice));
+ }
+
+#ifdef ENABLE_SPEECH_SUPPORT
+ {
+ NAME(strtext("Speech Driver"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_speechDriver));
+ }
+
+ {
+ NAME(strtext("Speech Parameters"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_speechParameters));
+ }
+
+ {
+ NAME(strtext("Quiet If No Braille"));
+ ITEM(newFlagOptionMenuItem(optionsSubmenu, &itemName, &opt_quietIfNoBraille));
+ }
+
+ {
+ NAME(strtext("Speech Input"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_speechInput));
+ }
+#endif /* ENABLE_SPEECH_SUPPORT */
+
+ {
+ NAME(strtext("Screen Driver"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_screenDriver));
+ }
+
+ {
+ NAME(strtext("Screen Parameters"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_screenParameters));
+ }
+
+#ifdef HAVE_PCM_SUPPORT
+ {
+ NAME(strtext("PCM Device"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_pcmDevice));
+ }
+#endif /* HAVE_PCM_SUPPORT */
+
+#ifdef HAVE_MIDI_SUPPORT
+ {
+ NAME(strtext("MIDI Device"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_midiDevice));
+ }
+#endif /* HAVE_MIDI_SUPPORT */
+
+ {
+ NAME(strtext("Log File"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_logFile));
+ }
+
+ {
+ NAME(strtext("Log to Standard Error"));
+ ITEM(newFlagOptionMenuItem(optionsSubmenu, &itemName, &opt_logToStandardError));
+ }
+
+ {
+ NAME(strtext("PID File"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_pidFile));
+ }
+
+ {
+ NAME(strtext("No Daemon"));
+ ITEM(newFlagOptionMenuItem(optionsSubmenu, &itemName, &opt_noDaemon));
+ }
+
+ {
+ NAME(strtext("Privilege Parameters"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_privilegeParameters));
+ }
+
+ {
+ NAME(strtext("Stay Privileged"));
+ ITEM(newFlagOptionMenuItem(optionsSubmenu, &itemName, &opt_stayPrivileged));
+ }
+
+ {
+ NAME(strtext("Start Message"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_startMessage));
+ }
+
+ {
+ NAME(strtext("Stop Message"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_stopMessage));
+ }
+
+ {
+ NAME(strtext("Prompt Patterns"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_promptPatterns));
+ }
+
+#ifdef ENABLE_API
+ {
+ NAME(strtext("No API"));
+ ITEM(newFlagOptionMenuItem(optionsSubmenu, &itemName, &opt_noApi));
+ }
+
+ {
+ NAME(strtext("API Parameters"));
+ ITEM(newStringOptionMenuItem(optionsSubmenu, &itemName, &opt_apiParameters));
+ }
+#endif /* ENABLE_API */
}
{
- static const MenuString logLevels[] = {
+ SUBMENU(logSettingsSubmenu, rootMenu, strtext("Log Settings"));
+ setAdvancedSubmenu(logSettingsSubmenu);
+
+ static const MenuString logLevelNames[] = {
[LOG_EMERG] = {.label=strtext("Emergency")},
[LOG_ALERT] = {.label=strtext("Alert")},
[LOG_CRIT] = {.label=strtext("Critical")},
@@ -1517,26 +1786,23 @@ makePreferencesMenu (void) {
[LOG_DEBUG] = {.label=strtext("Debug")},
};
- SUBMENU(internalSubmenu, rootMenu, strtext("Internal Parameters"));
- setAdvancedSubmenu(internalSubmenu);
-
{
NAME(strtext("System Log Level"));
- ITEM(newEnumeratedMenuItem(internalSubmenu, &systemLogLevel, &itemName, logLevels));
+ ITEM(newEnumeratedMenuItem(logSettingsSubmenu, &systemLogLevel, &itemName, logLevelNames));
}
{
NAME(strtext("Standard Error Log Level"));
- ITEM(newEnumeratedMenuItem(internalSubmenu, &stderrLogLevel, &itemName, logLevels));
+ ITEM(newEnumeratedMenuItem(logSettingsSubmenu, &stderrLogLevel, &itemName, logLevelNames));
}
{
NAME(strtext("Category Log Level"));
- ITEM(newEnumeratedMenuItem(internalSubmenu, &categoryLogLevel, &itemName, logLevels));
+ ITEM(newEnumeratedMenuItem(logSettingsSubmenu, &categoryLogLevel, &itemName, logLevelNames));
}
{
- SUBMENU(logCategoriesSubmenu, internalSubmenu, strtext("Log Categories"));
+ SUBMENU(logCategoriesSubmenu, logSettingsSubmenu, strtext("Log Categories"));
setAdvancedSubmenu(logCategoriesSubmenu);
{
@@ -1574,28 +1840,6 @@ makePreferencesMenu (void) {
}
}
- {
- SUBMENU(toolsSubmenu, rootMenu, strtext("Tools"));
- setAdvancedSubmenu(toolsSubmenu);
-
- {
- NAME(strtext("Restart Braille Driver"));
- ITEM(newToolMenuItem(toolsSubmenu, &itemName, restartBrailleDriver));
- }
-
- #ifdef ENABLE_SPEECH_SUPPORT
- {
- NAME(strtext("Restart Speech Driver"));
- ITEM(newToolMenuItem(toolsSubmenu, &itemName, restartSpeechDriver));
- }
- #endif /* ENABLE_SPEECH_SUPPORT */
-
- {
- NAME(strtext("Restart Screen Driver"));
- ITEM(newToolMenuItem(toolsSubmenu, &itemName, restartScreenDriver));
- }
- }
-
{
NAME(strtext("Log Messages"));
logMessagesMenu = newSubmenuMenuItem(rootMenu, &itemName);
diff --git a/Programs/menu_prefs.h b/Programs/menu_prefs.h
index cb4c7ed01..919e56824 100644
--- a/Programs/menu_prefs.h
+++ b/Programs/menu_prefs.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/message.c b/Programs/message.c
index 899bee767..83db27cd0 100644
--- a/Programs/message.c
+++ b/Programs/message.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -23,15 +23,19 @@
#include "embed.h"
#include "log.h"
#include "log_history.h"
+#include "alert.h"
#include "message.h"
#include "defaults.h"
#include "async_wait.h"
#include "async_task.h"
#include "utf8.h"
+#include "unicode.h"
#include "brl_utils.h"
#include "brl_cmds.h"
+#include "clipboard.h"
#include "spk.h"
#include "ktb_types.h"
+#include "ctb.h"
#include "update.h"
#include "cmd_queue.h"
#include "api_control.h"
@@ -42,8 +46,10 @@ int messageHoldTimeout = DEFAULT_MESSAGE_HOLD_TIMEOUT;
typedef struct {
const char *mode;
MessageOptions options;
- unsigned presented:1;
- unsigned deallocate:1;
+
+ unsigned char presented:1;
+ unsigned char deallocate:1;
+
char text[0];
} MessageParameters;
@@ -55,16 +61,28 @@ typedef struct {
typedef struct {
const MessageParameters *parameters;
+ int timeout;
+ unsigned char endWait:1;
+ unsigned char hold:1;
+ unsigned char touch:1;
+
struct {
const MessageSegment *first;
const MessageSegment *current;
const MessageSegment *last;
} segments;
- int timeout;
- unsigned endWait:1;
- unsigned hold:1;
- unsigned touch:1;
+ struct {
+ ClipboardObject *main;
+ const wchar_t *start;
+ size_t offset;
+ } clipboard;
+
+ struct {
+ const wchar_t *message;
+ const wchar_t *characters;
+ int *toMessageOffset;
+ } braille;
} MessageData;
ASYNC_CONDITION_TESTER(testEndMessageWait) {
@@ -72,6 +90,66 @@ ASYNC_CONDITION_TESTER(testEndMessageWait) {
return mgd->endWait;
}
+static const wchar_t *
+toMessageCharacter (int arg, int end, MessageData *mgd) {
+ if (arg < 0) return NULL;
+ int column = arg % brl.textColumns;
+ int row = arg / brl.textColumns;
+ if (row >= brl.textRows) return NULL;
+
+ if ((column -= textStart) < 0) return NULL;
+ if (column >= textCount) return NULL;
+
+ const MessageSegment *segment = mgd->segments.current;
+ size_t offset = (row * textCount) + column;
+
+ if (offset >= segment->length) {
+ if (!end) return NULL;
+ offset = segment->length - 1;
+ }
+
+ const wchar_t *character = segment->start + offset;
+ offset = character - mgd->braille.characters;
+
+ if (mgd->braille.characters != mgd->braille.message) {
+ const int *toMessageOffset = mgd->braille.toMessageOffset;
+
+ if (toMessageOffset) {
+ if (end) {
+ while (toMessageOffset[++offset] == CTB_NO_OFFSET);
+ // we're now at the start of the next contraction
+ } else {
+ while (toMessageOffset[offset] == CTB_NO_OFFSET) offset -= 1;
+ // we're now at the start of the current contraction
+ }
+
+ offset = toMessageOffset[offset];
+ if (end) offset -= 1;
+ }
+ }
+
+ return mgd->braille.message + offset;
+}
+
+static void
+beginClipboardCopy (const wchar_t *start, int append, MessageData *mgd) {
+ mgd->clipboard.start = start;
+ mgd->clipboard.offset = append? getClipboardContentLength(mgd->clipboard.main): 0;
+ alert(ALERT_CLIPBOARD_BEGIN);
+}
+
+static int
+endClipboardCopy (ClipboardObject *clipboard, const wchar_t *characters, size_t length, int insertCR, MessageData *mgd) {
+ lockMainClipboard();
+ int copied = copyClipboardContent(clipboard, characters, length, mgd->clipboard.offset, insertCR);
+ unlockMainClipboard();
+
+ if (!copied) return 0;
+ alert(ALERT_CLIPBOARD_END);
+ onMainClipboardUpdated();
+ return 1;
+}
+
static int
handleMessageCommands (int command, void *data) {
MessageData *mgd = data;
@@ -79,11 +157,14 @@ handleMessageCommands (int command, void *data) {
switch (command & BRL_MSK_CMD) {
case BRL_CMD_LNUP:
case BRL_CMD_PRDIFLN:
+ case BRL_CMD_PRNBWIN:
case BRL_CMD_FWINLTSKIP:
case BRL_CMD_FWINLT: {
if (mgd->segments.current > mgd->segments.first) {
mgd->segments.current -= 1;
mgd->endWait = 1;
+ } else {
+ alert(ALERT_BOUNCE);
}
mgd->hold = 1;
@@ -92,6 +173,7 @@ handleMessageCommands (int command, void *data) {
case BRL_CMD_LNDN:
case BRL_CMD_NXDIFLN:
+ case BRL_CMD_NXNBWIN:
case BRL_CMD_FWINRTSKIP:
case BRL_CMD_FWINRT: {
if ((mgd->hold = mgd->segments.current < mgd->segments.last)) {
@@ -102,14 +184,110 @@ handleMessageCommands (int command, void *data) {
}
default: {
- int arg = command & BRL_MSK_ARG;
+ int arg1 = BRL_CODE_GET(ARG, command);
+ int arg2 = BRL_CODE_GET(EXT, command);
switch (command & BRL_MSK_BLK) {
case BRL_CMD_BLK(TOUCH_AT):
- if ((mgd->touch = arg != BRL_MSK_ARG)) return 1;
+ if ((mgd->touch = arg1 != BRL_MSK_ARG)) return 1;
mgd->timeout = 1000;
break;
+ {
+ int append;
+
+ case BRL_CMD_BLK(CLIP_COPY):
+ append = 0;
+ goto doClipCopy;
+
+ case BRL_CMD_BLK(CLIP_APPEND):
+ append = 1;
+ goto doClipCopy;
+
+ doClipCopy:
+ {
+ const wchar_t *first = toMessageCharacter(arg1, 0, mgd);
+
+ if (first) {
+ const wchar_t *last = toMessageCharacter(arg2, 1, mgd);
+
+ if (last) {
+ beginClipboardCopy(first, append, mgd);
+ size_t count = last - first + 1;
+
+ if (endClipboardCopy(mgd->clipboard.main, first, count, 0, mgd)) {
+ mgd->hold = 1;
+ return 1;
+ }
+ }
+ }
+ }
+
+ alert(ALERT_COMMAND_REJECTED);
+ return 1;
+ }
+
+ {
+ int append;
+
+ case BRL_CMD_BLK(CLIP_NEW):
+ append = 0;
+ goto doClipBegin;
+
+ case BRL_CMD_BLK(CLIP_ADD):
+ append = 1;
+ goto doClipBegin;
+
+ doClipBegin:
+ {
+ const wchar_t *first = toMessageCharacter(arg1, 0, mgd);
+
+ if (first) {
+ beginClipboardCopy(first, append, mgd);
+ mgd->hold = 1;
+ return 1;
+ }
+ }
+
+ alert(ALERT_COMMAND_REJECTED);
+ return 1;
+ }
+
+ {
+ int insertCR;
+
+ case BRL_CMD_BLK(COPY_RECT):
+ insertCR = 1;
+ goto doClipEnd;
+
+ case BRL_CMD_BLK(COPY_LINE):
+ insertCR = 0;
+ goto doClipEnd;
+
+ doClipEnd:
+ {
+ const wchar_t *first = mgd->clipboard.start;
+
+ if (first) {
+ const wchar_t *last = toMessageCharacter(arg1, 1, mgd);
+
+ if (last) {
+ if (last > first) {
+ size_t count = last - first + 1;
+
+ if (endClipboardCopy(mgd->clipboard.main, first, count, insertCR, mgd)) {
+ mgd->hold = 1;
+ return 1;
+ }
+ }
+ }
+ }
+ }
+
+ alert(ALERT_COMMAND_REJECTED);
+ return 1;
+ }
+
default:
mgd->hold = 0;
break;
@@ -123,58 +301,172 @@ handleMessageCommands (int command, void *data) {
return 1;
}
+int
+sayMessage (const char *text) {
+#ifdef ENABLE_SPEECH_SUPPORT
+ if (isAutospeakActive()) {
+ if (!sayString(&spk, text, SAY_OPT_MUTE_FIRST)) {
+ return 0;
+ }
+ }
+#endif /* ENABLE_SPEECH_SUPPORT */
+
+ return 1;
+}
+
+static const MessageSegment *
+makeSegments (MessageSegment *segment, const wchar_t *characters, size_t characterCount, int wordWrap) {
+ const size_t windowLength = textCount * brl.textRows;
+
+ const wchar_t *character = characters;
+ const wchar_t *const charactersEnd = character + characterCount;
+
+ while (*character) {
+ /* strip leading spaces */
+ while ((character < charactersEnd) && iswspace(*character)) character += 1;
+
+ const size_t charactersLeft = charactersEnd - character;
+ if (!charactersLeft) break;
+ segment->start = character;
+
+ if (charactersLeft <= windowLength) {
+ segment->length = charactersLeft;
+ } else {
+ segment->length = windowLength;
+
+ if (wordWrap) {
+ const wchar_t *segmentEnd = segment->start + segment->length;
+
+ if (!iswspace(*segmentEnd)) {
+ while (--segmentEnd >= segment->start) {
+ if (iswspace(*segmentEnd)) break;
+ }
+
+ if (segmentEnd > segment->start) {
+ segment->length = segmentEnd - segment->start + 1;
+ }
+ }
+ }
+ }
+
+ character += segment->length;
+ segment += 1;
+ }
+
+ return segment - 1;
+}
+
+static wchar_t *
+makeBraille (const wchar_t *text, size_t textLength, size_t *brailleLength, int **offsetMap) {
+ wchar_t *braille = NULL;
+
+ *brailleLength = 0;
+ *offsetMap = NULL;
+
+ int cellsSize = MAX(0X10, textLength) * 2;
+ int cellsLimit = textLength * 10;
+
+ do {
+ unsigned char cells[cellsSize];
+ int toCellOffset[textLength + 1];
+
+ int textCount = textLength;
+ int cellCount = cellsSize;
+
+ contractText(
+ contractionTable, NULL,
+ text, &textCount,
+ cells, &cellCount,
+ toCellOffset, CTB_NO_CURSOR
+ );
+
+ // this sholdn't happen
+ if (textCount > textLength) break;
+
+ if (textCount == textLength) {
+ toCellOffset[textCount] = cellCount;
+
+ int *toTextOffset = makeInverseOffsetMap(toCellOffset, textLength);
+ if (!toTextOffset) break;
+
+ if ((braille = allocateCharacters(cellCount + 1))) {
+ const unsigned char *cell = cells;
+ const unsigned char *end = cell + cellCount;
+ wchar_t *character = braille;
+
+ while (cell < end) {
+ unsigned char dots = *cell++;
+ *character++ = dots? (dots | UNICODE_BRAILLE_ROW): WC_C(' ');
+ }
+
+ *character = 0;
+ *brailleLength = character - braille;
+ *offsetMap = toTextOffset;
+ } else {
+ free(toTextOffset);
+ }
+
+ break;
+ }
+ } while ((cellsSize <<= 1) <= cellsLimit);
+
+ return braille;
+}
+
ASYNC_TASK_CALLBACK(presentMessage) {
MessageParameters *mgp = data;
-#ifdef ENABLE_SPEECH_SUPPORT
if (!(mgp->options & MSG_SILENT)) {
- if (isAutospeakActive()) {
- sayString(&spk, mgp->text, SAY_OPT_MUTE_FIRST);
- }
+ sayMessage(mgp->text);
}
-#endif /* ENABLE_SPEECH_SUPPORT */
if (canBraille()) {
MessageData mgd = {
+ .parameters = mgp,
.hold = 0,
.touch = 0,
- .parameters = mgp
- };
-
- const size_t characterCount = countUtf8Characters(mgp->text);
- MessageSegment messageSegments[characterCount];
- wchar_t characters[characterCount + 1];
- makeWcharsFromUtf8(mgp->text, characters, ARRAY_COUNT(characters));
- const size_t brailleSize = textCount * brl.textRows;
- wchar_t brailleBuffer[brailleSize];
+ .clipboard = {
+ .main = getMainClipboard(),
+ .start = NULL,
+ .offset = 0,
+ },
+ };
- {
- const wchar_t *character = characters;
- const wchar_t *const end = character + characterCount;
+ const size_t textLength = countUtf8Characters(mgp->text);
+ wchar_t text[textLength + 1];
+ makeWcharsFromUtf8(mgp->text, text, ARRAY_COUNT(text));
- MessageSegment *segment = messageSegments;
- mgd.segments.current = mgd.segments.first = segment;
+ mgd.braille.message = text;
+ mgd.braille.characters = text;
+ mgd.braille.toMessageOffset = NULL;
- while (*character) {
- /* strip leading spaces */
- while ((character < end) && iswspace(*character)) character += 1;
+ wchar_t *characters = text;
+ size_t characterCount = textLength;
+ int wordWrap = prefs.wordWrap;
- const size_t charactersLeft = end - character;
- if (!charactersLeft) break;
+ if (isContracting()) {
+ size_t brailleLength;
+ int *offsetMap;
+ wchar_t *braille = makeBraille(text, textLength, &brailleLength, &offsetMap);
- segment->start = character;
- segment->length = MIN(charactersLeft, brailleSize);
+ if (braille) {
+ characters = braille;
+ characterCount = brailleLength;
+ wordWrap = 1;
- character += segment->length;
- segment += 1;
+ mgd.braille.characters = braille;
+ mgd.braille.toMessageOffset = offsetMap;
}
-
- mgd.segments.last = segment - 1;
}
- int wasLinked = api.isServerLinked();
- if (wasLinked) api.unlinkServer();
+ MessageSegment messageSegments[characterCount];
+ mgd.segments.current = mgd.segments.first = messageSegments;
+ mgd.segments.last = makeSegments(messageSegments, characters, characterCount, wordWrap);
+ mgd.clipboard.start = mgd.segments.first->start;
+
+ int apiWasLinked = api.isServerLinked();
+ if (apiWasLinked) api.unlinkServer();
suspendUpdates();
pushCommandEnvironment("message", NULL, NULL);
@@ -183,20 +475,17 @@ ASYNC_TASK_CALLBACK(presentMessage) {
while (1) {
const MessageSegment *segment = mgd.segments.current;
- size_t cellCount = segment->length;
- int lastSegment = segment == mgd.segments.last;
-
- wmemcpy(brailleBuffer, segment->start, cellCount);
+ int isLastSegment = segment == mgd.segments.last;
brl.cursor = BRL_NO_CURSOR;
- if (!writeBrailleCharacters(mgp->mode, brailleBuffer, cellCount)) {
+ if (!writeBrailleCharacters(mgp->mode, segment->start, segment->length)) {
mgp->presented = 0;
break;
}
mgd.timeout = messageHoldTimeout - brl.writeDelay;
drainBrailleOutput(&brl, 0);
- if (!mgd.hold && lastSegment && (mgp->options & MSG_NODELAY)) break;
+ if (!mgd.hold && isLastSegment && (mgp->options & MSG_NODELAY)) break;
mgd.timeout = MAX(mgd.timeout, 0);
while (1) {
@@ -210,7 +499,7 @@ ASYNC_TASK_CALLBACK(presentMessage) {
if (mgd.hold || mgd.touch) {
mgd.timeout = 1000000;
} else if (timedOut) {
- if (lastSegment) goto DONE;
+ if (isLastSegment) goto DONE;
mgd.segments.current += 1;
mgd.timeout = messageHoldTimeout;
break;
@@ -221,9 +510,12 @@ ASYNC_TASK_CALLBACK(presentMessage) {
}
DONE:
+ if (characters != text) free(characters);
+ if (mgd.braille.toMessageOffset) free(mgd.braille.toMessageOffset);
+
popCommandEnvironment();
resumeUpdates(1);
- if (wasLinked) api.linkServer();
+ if (apiWasLinked) api.linkServer();
}
if (mgp->deallocate) free(mgp);
diff --git a/Programs/messages.c b/Programs/messages.c
index b0e14089a..959eb76f4 100644
--- a/Programs/messages.c
+++ b/Programs/messages.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/midi.c b/Programs/midi.c
index 1e60e1ab9..dc6378465 100644
--- a/Programs/midi.c
+++ b/Programs/midi.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/midi_alsa.c b/Programs/midi_alsa.c
index 4da529b86..b5c67b3d5 100644
--- a/Programs/midi_alsa.c
+++ b/Programs/midi_alsa.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/midi_darwin.c b/Programs/midi_darwin.c
index 392ef9f9a..4aa932265 100644
--- a/Programs/midi_darwin.c
+++ b/Programs/midi_darwin.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/midi_none.c b/Programs/midi_none.c
index 2b518f60d..489befce6 100644
--- a/Programs/midi_none.c
+++ b/Programs/midi_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/midi_oss.c b/Programs/midi_oss.c
index 0511eca29..d1488e015 100644
--- a/Programs/midi_oss.c
+++ b/Programs/midi_oss.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/midi_windows.c b/Programs/midi_windows.c
index 857c43044..3e647eda1 100644
--- a/Programs/midi_windows.c
+++ b/Programs/midi_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mkdrvtab b/Programs/mkdrvtab
index 7ba17f240..e41b87d3a 100755
--- a/Programs/mkdrvtab
+++ b/Programs/mkdrvtab
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Programs/mntfs_linux.c b/Programs/mntfs_linux.c
index adebbfe71..0df4aca46 100644
--- a/Programs/mntfs_linux.c
+++ b/Programs/mntfs_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mntfs_none.c b/Programs/mntfs_none.c
index 24ef061d8..87819180f 100644
--- a/Programs/mntfs_none.c
+++ b/Programs/mntfs_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mntpt.c b/Programs/mntpt.c
index cc52df2aa..ab5493226 100644
--- a/Programs/mntpt.c
+++ b/Programs/mntpt.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mntpt_internal.h b/Programs/mntpt_internal.h
index f54bd8703..aecc2832d 100644
--- a/Programs/mntpt_internal.h
+++ b/Programs/mntpt_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mntpt_mntent.c b/Programs/mntpt_mntent.c
index 326879152..edd56ccf9 100644
--- a/Programs/mntpt_mntent.c
+++ b/Programs/mntpt_mntent.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mntpt_mntent.h b/Programs/mntpt_mntent.h
index 3ff8bd6c0..be6ff2c0e 100644
--- a/Programs/mntpt_mntent.h
+++ b/Programs/mntpt_mntent.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mntpt_mnttab.c b/Programs/mntpt_mnttab.c
index 0731b80d5..3fde09c1a 100644
--- a/Programs/mntpt_mnttab.c
+++ b/Programs/mntpt_mnttab.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mntpt_mnttab.h b/Programs/mntpt_mnttab.h
index 2455f3363..e33674f5f 100644
--- a/Programs/mntpt_mnttab.h
+++ b/Programs/mntpt_mnttab.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mntpt_none.c b/Programs/mntpt_none.c
index be3b79c1e..b27acbc6a 100644
--- a/Programs/mntpt_none.c
+++ b/Programs/mntpt_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/mntpt_none.h b/Programs/mntpt_none.h
index bfdbfd756..79c682368 100644
--- a/Programs/mntpt_none.h
+++ b/Programs/mntpt_none.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/morse.c b/Programs/morse.c
index 94f26622b..7ede018f1 100644
--- a/Programs/morse.c
+++ b/Programs/morse.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/msg_queue.c b/Programs/msg_queue.c
index fc0704ff5..f2ccb1ba7 100644
--- a/Programs/msg_queue.c
+++ b/Programs/msg_queue.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/msgtest.c b/Programs/msgtest.c
index 83f5007b2..8d6d1517d 100644
--- a/Programs/msgtest.c
+++ b/Programs/msgtest.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -41,7 +41,7 @@ BEGIN_OPTION_TABLE(programOptions)
.letter = 'd',
.argument = strtext("path"),
.setting.string = &opt_localeDirectory,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = strtext("the locale directory containing the translations")
},
diff --git a/Programs/notes.c b/Programs/notes.c
index 122ddf615..f316fe4c8 100644
--- a/Programs/notes.c
+++ b/Programs/notes.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/notes_beep.c b/Programs/notes_beep.c
index 2b3924f9f..847a16690 100644
--- a/Programs/notes_beep.c
+++ b/Programs/notes_beep.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/notes_fm.c b/Programs/notes_fm.c
index a48fc71b9..dedc52625 100644
--- a/Programs/notes_fm.c
+++ b/Programs/notes_fm.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/notes_midi.c b/Programs/notes_midi.c
index 3c4331810..1131012dc 100644
--- a/Programs/notes_midi.c
+++ b/Programs/notes_midi.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -25,8 +25,9 @@
#include "log.h"
#include "midi.h"
#include "notes.h"
+#include "options.h"
-char *opt_midiDevice;
+char *opt_midiDevice = "";
struct NoteDeviceStruct {
MidiDevice *midi;
diff --git a/Programs/notes_pcm.c b/Programs/notes_pcm.c
index 7f09ac6ab..95732ddf3 100644
--- a/Programs/notes_pcm.c
+++ b/Programs/notes_pcm.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -25,8 +25,9 @@
#include "log.h"
#include "pcm.h"
#include "notes.h"
+#include "options.h"
-char *opt_pcmDevice;
+char *opt_pcmDevice = "";
struct NoteDeviceStruct {
PcmDevice *pcm;
diff --git a/Programs/options.h b/Programs/options.h
new file mode 100644
index 000000000..7b92bd329
--- /dev/null
+++ b/Programs/options.h
@@ -0,0 +1,85 @@
+/*
+ * BRLTTY - A background process providing access to the console screen (when in
+ * text mode) for a blind person using a refreshable braille display.
+ *
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
+ *
+ * BRLTTY comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://brltty.app/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+#ifndef BRLTTY_INCLUDED_OPTIONS
+#define BRLTTY_INCLUDED_OPTIONS
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+extern char *opt_configurationFile;
+extern int opt_environmentVariables;
+extern int opt_bootParameters;
+
+extern char *opt_preferencesFile;
+extern char *opt_overridePreferences;
+
+extern char *opt_tablesDirectory;
+extern char *opt_driversDirectory;
+extern char *opt_helpersDirectory;
+extern char *opt_updatableDirectory;
+extern char *opt_writableDirectory;
+extern char *opt_localeDirectory;
+
+extern char *opt_textTable;
+extern char *opt_contractionTable;
+extern char *opt_attributesTable;
+extern char *opt_keyboardTable;
+extern char *opt_keyboardProperties;
+
+extern int opt_guiKeyboardEnabled;
+extern char *opt_guiKeyboardTable;
+
+extern char *opt_brailleDriver;
+extern char *opt_brailleParameters;
+extern char *opt_brailleDevice;
+extern int opt_releaseDevice;
+
+extern char *opt_speechDriver;
+extern char *opt_speechParameters;
+extern int opt_quietIfNoBraille;
+extern char *opt_speechInput;
+
+extern char *opt_screenDriver;
+extern char *opt_screenParameters;
+
+extern char *opt_pcmDevice;
+extern char *opt_midiDevice;
+
+extern char *opt_logFile;
+extern int opt_logToStandardError;
+
+extern char *opt_pidFile;
+extern int opt_noDaemon;
+
+extern char *opt_privilegeParameters;
+extern int opt_stayPrivileged;
+
+extern char *opt_startMessage;
+extern char *opt_stopMessage;
+extern char *opt_promptPatterns;
+
+extern int opt_noApi;
+extern char *opt_apiParameters;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* BRLTTY_INCLUDED_OPTIONS */
diff --git a/Programs/parameters.h b/Programs/parameters.h
index 5f25f41e4..67800471d 100644
--- a/Programs/parameters.h
+++ b/Programs/parameters.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/params_linux.c b/Programs/params_linux.c
index 5a4201d0a..e858743e1 100644
--- a/Programs/params_linux.c
+++ b/Programs/params_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/params_none.c b/Programs/params_none.c
index 800b18967..b9da92408 100644
--- a/Programs/params_none.c
+++ b/Programs/params_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/parse.c b/Programs/parse.c
index 08b892a81..c0bb72918 100644
--- a/Programs/parse.c
+++ b/Programs/parse.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pcm.c b/Programs/pcm.c
index 6d6df2aa1..615556cca 100644
--- a/Programs/pcm.c
+++ b/Programs/pcm.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pcm_alsa.c b/Programs/pcm_alsa.c
index b4e899dd3..4254ac3b5 100644
--- a/Programs/pcm_alsa.c
+++ b/Programs/pcm_alsa.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pcm_android.c b/Programs/pcm_android.c
index b3f7beb78..c7f65f1e0 100644
--- a/Programs/pcm_android.c
+++ b/Programs/pcm_android.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pcm_audio.c b/Programs/pcm_audio.c
index 67cbc2b86..94a066006 100644
--- a/Programs/pcm_audio.c
+++ b/Programs/pcm_audio.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pcm_hpux.c b/Programs/pcm_hpux.c
index 5de800fd4..b36857a0d 100644
--- a/Programs/pcm_hpux.c
+++ b/Programs/pcm_hpux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pcm_none.c b/Programs/pcm_none.c
index 7750c07f6..6cb91f8fe 100644
--- a/Programs/pcm_none.c
+++ b/Programs/pcm_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pcm_oss.c b/Programs/pcm_oss.c
index b27444c44..7dbb0c5e5 100644
--- a/Programs/pcm_oss.c
+++ b/Programs/pcm_oss.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pcm_qsa.c b/Programs/pcm_qsa.c
index 3edfa4d9f..f5daea252 100644
--- a/Programs/pcm_qsa.c
+++ b/Programs/pcm_qsa.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pcm_windows.c b/Programs/pcm_windows.c
index e55e95aac..b596a84cc 100644
--- a/Programs/pcm_windows.c
+++ b/Programs/pcm_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pgmpath_freebsd.c b/Programs/pgmpath_freebsd.c
index 584b2a3ba..44409cddd 100644
--- a/Programs/pgmpath_freebsd.c
+++ b/Programs/pgmpath_freebsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pgmpath_hurd.c b/Programs/pgmpath_hurd.c
index 2ffe701b9..b0e84a44e 100644
--- a/Programs/pgmpath_hurd.c
+++ b/Programs/pgmpath_hurd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pgmpath_linux.c b/Programs/pgmpath_linux.c
index 2ffe701b9..b0e84a44e 100644
--- a/Programs/pgmpath_linux.c
+++ b/Programs/pgmpath_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pgmpath_none.c b/Programs/pgmpath_none.c
index b7ccbc478..c90501ce1 100644
--- a/Programs/pgmpath_none.c
+++ b/Programs/pgmpath_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pgmpath_solaris.c b/Programs/pgmpath_solaris.c
index 019f3d9ef..547aaaad1 100644
--- a/Programs/pgmpath_solaris.c
+++ b/Programs/pgmpath_solaris.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pgmpath_windows.c b/Programs/pgmpath_windows.c
index 76fbd8c70..aa1afa66b 100644
--- a/Programs/pgmpath_windows.c
+++ b/Programs/pgmpath_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pgmprivs_linux.c b/Programs/pgmprivs_linux.c
index 9a553a618..4eb8b02b5 100644
--- a/Programs/pgmprivs_linux.c
+++ b/Programs/pgmprivs_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -342,6 +342,7 @@ processRequiredGroups (GroupsProcessor *processGroups, int logProblems, void *da
const char *path = rge->path;
if (path) {
+ logMessage(LOG_DEBUG, "checking group owner of path: %s", path);
struct stat status;
if (stat(path, &status) != -1) {
@@ -571,6 +572,7 @@ static const RequiredCapabilityEntry requiredCapabilityTable[] = {
static void
setRequiredCapabilities (int stayPrivileged) {
+ logCurrentCapabilities("temporary");
cap_t newCaps, oldCaps;
if (amPrivilegedUser()) {
@@ -2235,7 +2237,7 @@ getPrivilegeParametersPlatform (void) {
void
establishProgramPrivileges (char **parameters, int stayPrivileged) {
- logCurrentCapabilities("at start");
+ logCurrentCapabilities("initial");
setCommandSearchPath(parameters[PARM_PATH]);
setDefaultShell(parameters[PARM_SHELL]);
@@ -2279,7 +2281,7 @@ establishProgramPrivileges (char **parameters, int stayPrivileged) {
}
establishPrivileges(stayPrivileged);
- logCurrentCapabilities("after relinquish");
+ logCurrentCapabilities("permanent");
#ifdef SECCOMP_MODE_FILTER
scfInstallFilter(parameters[PARM_SCFMODE]);
diff --git a/Programs/pgmprivs_none.c b/Programs/pgmprivs_none.c
index ce6bdf36d..4e5598563 100644
--- a/Programs/pgmprivs_none.c
+++ b/Programs/pgmprivs_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pid.c b/Programs/pid.c
index a6f668a47..79fb78aa3 100644
--- a/Programs/pid.c
+++ b/Programs/pid.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pipe.c b/Programs/pipe.c
index 0c6d40e2e..05affb87a 100644
--- a/Programs/pipe.c
+++ b/Programs/pipe.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pipe.h b/Programs/pipe.h
index 6cb428338..3c3000e1a 100644
--- a/Programs/pipe.h
+++ b/Programs/pipe.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ports_glibc.c b/Programs/ports_glibc.c
index 199befde2..4233f9ea0 100644
--- a/Programs/ports_glibc.c
+++ b/Programs/ports_glibc.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ports_grub.c b/Programs/ports_grub.c
index e90a6d532..f89993c06 100644
--- a/Programs/ports_grub.c
+++ b/Programs/ports_grub.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ports_kfreebsd.c b/Programs/ports_kfreebsd.c
index e2eee4f8d..69c083146 100644
--- a/Programs/ports_kfreebsd.c
+++ b/Programs/ports_kfreebsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ports_msdos.c b/Programs/ports_msdos.c
index f205ff625..66ef2ed2a 100644
--- a/Programs/ports_msdos.c
+++ b/Programs/ports_msdos.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ports_none.c b/Programs/ports_none.c
index fb6a908c7..6af3154b2 100644
--- a/Programs/ports_none.c
+++ b/Programs/ports_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ports_windows.c b/Programs/ports_windows.c
index 357bd82c1..b878eeb56 100644
--- a/Programs/ports_windows.c
+++ b/Programs/ports_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ports_x86.h b/Programs/ports_x86.h
index 4f548233a..ac3c2b5ff 100644
--- a/Programs/ports_x86.h
+++ b/Programs/ports_x86.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pref_tables.c b/Programs/pref_tables.c
index 97e08dc49..b713988ab 100644
--- a/Programs/pref_tables.c
+++ b/Programs/pref_tables.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -118,6 +118,7 @@ PREFERENCE_STRING_TABLE(tuneDevice,
PREFERENCE_STRING_TABLE(speechPunctuation,
[SPK_PUNCTUATION_NONE] = "none",
[SPK_PUNCTUATION_SOME] = "some",
+ [SPK_PUNCTUATION_MOST] = "most",
[SPK_PUNCTUATION_ALL] = "all",
)
@@ -438,6 +439,12 @@ const PreferenceDefinition preferenceDefinitionTable[] = {
.setting = &prefs.autorepeatPanning
},
+ { .name = "alternate-paste-mode-enabled",
+ .defaultValue = DEFAULT_ALTERNATE_PASTE_MODE_ENABLED,
+ .settingNames = &preferenceStringTable_boolean,
+ .setting = &prefs.alternatePasteModeEnabled
+ },
+
{ .name = "touch-navigation",
.defaultValue = DEFAULT_TOUCH_NAVIGATION,
.settingNames = &preferenceStringTable_boolean,
diff --git a/Programs/pref_tables.h b/Programs/pref_tables.h
index 57c8a5fea..54f89b3b7 100644
--- a/Programs/pref_tables.h
+++ b/Programs/pref_tables.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/prefs.c b/Programs/prefs.c
index c6e359c43..d6030e3b8 100644
--- a/Programs/prefs.c
+++ b/Programs/prefs.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -560,7 +560,9 @@ putHeader (FILE *file) {
int
savePreferencesFile (const char *path) {
int ok = 0;
- FILE *file = openDataFile(path, "w", 0);
+
+ logMessage(LOG_DEBUG, "saving preferences: %s", path);
+ FILE *file = fopen(path, "w");
if (file) {
if (putHeader(file)) {
diff --git a/Programs/profile.c b/Programs/profile.c
index af18f9174..c4cbeb676 100644
--- a/Programs/profile.c
+++ b/Programs/profile.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/profile.h b/Programs/profile.h
index 3591e4031..c43b27b2e 100644
--- a/Programs/profile.h
+++ b/Programs/profile.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/profile_types.h b/Programs/profile_types.h
index 843eac06f..e97e5dc5b 100644
--- a/Programs/profile_types.h
+++ b/Programs/profile_types.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/program.c b/Programs/program.c
index 1523e9dab..8bf6a2876 100644
--- a/Programs/program.c
+++ b/Programs/program.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -158,28 +158,10 @@ getProgramDirectory (void) {
}
int
-fixInstallPath (char **path) {
+toAbsoluteInstallPath (char **path) {
const char *programDirectory = getProgramDirectory();
if (!programDirectory) programDirectory = CURRENT_DIRECTORY_NAME;
-
- const char *problem = strtext("cannot fix install path");
- char *newPath = makePath(programDirectory, *path);
-
- if (newPath) {
- if (changeStringSetting(path, newPath)) {
- if (isAbsolutePath(*path)) {
- problem = NULL;
- } else {
- problem = strtext("install path not absolute");
- }
- }
-
- free(newPath);
- }
-
- if (!problem) return 1;
- logMessage(LOG_WARNING, "%s: %s", gettext(problem), *path);
- return 0;
+ return anchorRelativePath(path, programDirectory);
}
char *
@@ -189,21 +171,6 @@ makeProgramPath (const char *name) {
return makePath(directory, name);
}
-char *
-makeCommandPath (const char *name) {
- char *path = NULL;
- char *directory = NULL;
-
- if (changeStringSetting(&directory, COMMANDS_DIRECTORY)) {
- if (fixInstallPath(&directory)) {
- path = makePath(directory, name);
- }
- }
-
- if (directory) free(directory);
- return path;
-}
-
int
createPidFile (const char *path, ProcessIdentifier pid) {
#if defined(GRUB_RUNTIME)
diff --git a/Programs/pty_object.c b/Programs/pty_object.c
index bfed2b992..34ea49049 100644
--- a/Programs/pty_object.c
+++ b/Programs/pty_object.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/pty_screen.c b/Programs/pty_screen.c
index 2d7e905f8..7db902f3b 100644
--- a/Programs/pty_screen.c
+++ b/Programs/pty_screen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -308,6 +308,13 @@ ptyEndScreen (void) {
destroySegment();
}
+void
+ptyResizeScreen (unsigned int lines, unsigned int columns) {
+ if (is_term_resized(lines, columns)) {
+ resize_term(lines, columns);
+ }
+}
+
void
ptyRefreshScreen (void) {
sendTerminalMessage(TERM_MSG_SEGMENT_UPDATED, NULL, 0);
diff --git a/Programs/pty_terminal.c b/Programs/pty_terminal.c
index 2d24211d0..99c5b9fd5 100644
--- a/Programs/pty_terminal.c
+++ b/Programs/pty_terminal.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -99,6 +99,11 @@ ptyEndTerminal (void) {
ptyEndScreen();
}
+void
+ptyResizeTerminal (unsigned int lines, unsigned int columns) {
+ ptyResizeScreen(lines, columns);
+}
+
static void
soundAlert (void) {
beep();
@@ -574,7 +579,21 @@ performBracketAction (unsigned char byte) {
return OBP_DONE;
}
- case 'H': {
+ {
+ const char *action;
+ int allowZero;
+
+ case 'f':
+ action = "hvp";
+ allowZero = 1;
+ goto doMoveCursor;
+
+ case 'H':
+ action = "cup";
+ allowZero = 0;
+ goto doMoveCursor;
+
+ doMoveCursor:
if (outputParserNumberCount == 0) {
addOutputParserNumber(1);
addOutputParserNumber(1);
@@ -585,10 +604,15 @@ performBracketAction (unsigned char byte) {
unsigned int *row = &outputParserNumberArray[0];
unsigned int *column = &outputParserNumberArray[1];
- if (!(*row)--) return OBP_UNEXPECTED;
- if (!(*column)--) return OBP_UNEXPECTED;
+ if (allowZero) {
+ if (*row) *row -= 1;
+ if (*column) *column -= 1;
+ } else {
+ if (!(*row)--) return OBP_UNEXPECTED;
+ if (!(*column)--) return OBP_UNEXPECTED;
+ }
- logOutputAction("cup", "set cursor position");
+ logOutputAction(action, "set cursor position");
ptySetCursorPosition(*row, *column);
return OBP_DONE;
}
diff --git a/Programs/queue.c b/Programs/queue.c
index e74105280..c0f9b0e3c 100644
--- a/Programs/queue.c
+++ b/Programs/queue.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/report.c b/Programs/report.c
index 7b7dc4275..1044f4b06 100644
--- a/Programs/report.c
+++ b/Programs/report.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/report.h b/Programs/report.h
index df7714c4b..310e9d93f 100644
--- a/Programs/report.h
+++ b/Programs/report.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/revision.c b/Programs/revision.c
index 199a42e93..c823398d0 100644
--- a/Programs/revision.c
+++ b/Programs/revision.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/rgx.c b/Programs/rgx.c
index dc59d7779..972716c29 100644
--- a/Programs/rgx.c
+++ b/Programs/rgx.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/rgx_internal.h b/Programs/rgx_internal.h
index 2fa1e0027..1fd2e109c 100644
--- a/Programs/rgx_internal.h
+++ b/Programs/rgx_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/rgx_libpcre2-32.c b/Programs/rgx_libpcre2-32.c
index b172aaaac..1cb7f6ae3 100644
--- a/Programs/rgx_libpcre2-32.c
+++ b/Programs/rgx_libpcre2-32.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/rgx_libpcre32.c b/Programs/rgx_libpcre32.c
index 6c158a783..fc725105e 100644
--- a/Programs/rgx_libpcre32.c
+++ b/Programs/rgx_libpcre32.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/rgx_none.c b/Programs/rgx_none.c
index 921448aa8..30eb76959 100644
--- a/Programs/rgx_none.c
+++ b/Programs/rgx_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/routing.c b/Programs/routing.c
index 519a477f2..b265986a9 100644
--- a/Programs/routing.c
+++ b/Programs/routing.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/routing.h b/Programs/routing.h
index 72fc32ee3..ab6eea20f 100644
--- a/Programs/routing.h
+++ b/Programs/routing.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr.c b/Programs/scr.c
index e7d87d557..d2bd2949e 100644
--- a/Programs/scr.c
+++ b/Programs/scr.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -96,7 +96,7 @@ refreshScreen (void) {
void
describeScreen (ScreenDescription *description) {
- describeBaseScreen(currentScreen, description);
+ describeScreenObject(description, currentScreen);
if (description->unreadable) description->quality = SCQ_NONE;
}
@@ -157,6 +157,11 @@ insertScreenKey (ScreenKey key) {
return currentScreen->insertKey(key);
}
+ScreenPasteMode
+getScreenPasteMode (void) {
+ return currentScreen->getPasteMode();
+}
+
int
routeScreenCursor (int column, int row, int screen) {
return currentScreen->routeCursor(column, row, screen);
diff --git a/Programs/scr.h b/Programs/scr.h
index 35dbdbaa3..0cfc931b7 100644
--- a/Programs/scr.h
+++ b/Programs/scr.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -36,6 +36,7 @@ extern void describeScreen (ScreenDescription *); /* get screen status */
extern int readScreen (short left, short top, short width, short height, ScreenCharacter *buffer);
extern int readScreenText (short left, short top, short width, short height, wchar_t *buffer);
extern int insertScreenKey (ScreenKey key);
+extern ScreenPasteMode getScreenPasteMode (void);
extern int routeScreenCursor (int column, int row, int screen);
extern int highlightScreenRegion (int left, int right, int top, int bottom);
extern int unhighlightScreenRegion (void);
diff --git a/Programs/scr_base.c b/Programs/scr_base.c
index 0673297b9..9558c3c9b 100644
--- a/Programs/scr_base.c
+++ b/Programs/scr_base.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -171,6 +171,11 @@ insertKey_BaseScreen (ScreenKey key) {
return 0;
}
+static ScreenPasteMode
+getPasteMode_BaseScreen (void) {
+ return SPM_UNKNOWN;
+}
+
static int
routeCursor_BaseScreen (int column, int row, int screen) {
return 0;
@@ -223,6 +228,7 @@ initializeBaseScreen (BaseScreen *base) {
base->readCharacters = readCharacters_BaseScreen;
base->insertKey = insertKey_BaseScreen;
+ base->getPasteMode = getPasteMode_BaseScreen;
base->routeCursor = routeCursor_BaseScreen;
base->highlightRegion = highlightRegion_BaseScreen;
@@ -243,18 +249,18 @@ initializeBaseScreen (BaseScreen *base) {
}
void
-describeBaseScreen (BaseScreen *base, ScreenDescription *description) {
+describeScreenObject (ScreenDescription *description, BaseScreen *screen) {
+ description->number = 0;
+ description->hasCursor = 1;
+ description->hasSelection = 0;
+
description->unreadable = NULL;
description->quality = SCQ_GOOD;
- description->number = 0;
description->cols = description->rows = 1;
description->posx = description->posy = 0;
- description->hasCursor = 1;
- description->hasSelection = 0;
-
- base->describe(description);
+ screen->describe(description);
if (description->unreadable) {
description->hasCursor = 0;
diff --git a/Programs/scr_driver.c b/Programs/scr_driver.c
index 1848010c3..8f4e2861c 100644
--- a/Programs/scr_driver.c
+++ b/Programs/scr_driver.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -81,16 +81,14 @@ describe_NoScreen (ScreenDescription *description) {
screenMessage = message;
}
- if (screenMessage)
- description->quality = SCQ_LOW;
- else
- description->quality = SCQ_NONE;
+ description->number = currentVirtualTerminal_NoScreen();
+ description->quality = screenMessage? SCQ_LOW: SCQ_NONE;
description->rows = 1;
description->cols = strlen(screenMessage);
+
description->posx = 0;
description->posy = 0;
- description->number = currentVirtualTerminal_NoScreen();
}
static int
diff --git a/Programs/scr_emulator.c b/Programs/scr_emulator.c
index f830d3cfc..edaab77c7 100644
--- a/Programs/scr_emulator.c
+++ b/Programs/scr_emulator.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_frozen.c b/Programs/scr_frozen.c
index b9f13bc0b..7ec07716d 100644
--- a/Programs/scr_frozen.c
+++ b/Programs/scr_frozen.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -61,7 +61,7 @@ stopFreezeReminderAlarm (void) {
static int
construct_FrozenScreen (BaseScreen *source) {
- describeBaseScreen(source, &screenDescription);
+ describeScreenObject(&screenDescription, source);
if ((screenCharacters = calloc(screenDescription.rows*screenDescription.cols, sizeof(*screenCharacters)))) {
const ScreenBox box = {
diff --git a/Programs/scr_frozen.h b/Programs/scr_frozen.h
index f73642b8d..86196aa05 100644
--- a/Programs/scr_frozen.h
+++ b/Programs/scr_frozen.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_gpm.c b/Programs/scr_gpm.c
index 9a2e8d54a..61883e9e8 100644
--- a/Programs/scr_gpm.c
+++ b/Programs/scr_gpm.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_help.c b/Programs/scr_help.c
index 2fd4adb8d..440da098b 100644
--- a/Programs/scr_help.c
+++ b/Programs/scr_help.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_help.h b/Programs/scr_help.h
index 07063871b..7e126100a 100644
--- a/Programs/scr_help.h
+++ b/Programs/scr_help.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_internal.h b/Programs/scr_internal.h
index ed43a1066..0ac3626fe 100644
--- a/Programs/scr_internal.h
+++ b/Programs/scr_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_main.c b/Programs/scr_main.c
index 41032feab..437657596 100644
--- a/Programs/scr_main.c
+++ b/Programs/scr_main.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_menu.c b/Programs/scr_menu.c
index 480862ba7..4cf4fe9c7 100644
--- a/Programs/scr_menu.c
+++ b/Programs/scr_menu.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_menu.h b/Programs/scr_menu.h
index c786a9949..7b43e1ca1 100644
--- a/Programs/scr_menu.h
+++ b/Programs/scr_menu.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_real.c b/Programs/scr_real.c
index 895a90816..94b317d84 100644
--- a/Programs/scr_real.c
+++ b/Programs/scr_real.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_special.c b/Programs/scr_special.c
index fbd9fa396..9d7732316 100644
--- a/Programs/scr_special.c
+++ b/Programs/scr_special.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_special.h b/Programs/scr_special.h
index bf844ac8e..e04238740 100644
--- a/Programs/scr_special.h
+++ b/Programs/scr_special.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_terminal.c b/Programs/scr_terminal.c
index b4d3fda7f..6c478edb4 100644
--- a/Programs/scr_terminal.c
+++ b/Programs/scr_terminal.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scr_utils.c b/Programs/scr_utils.c
index 1bd3e2bba..5f295b189 100644
--- a/Programs/scr_utils.c
+++ b/Programs/scr_utils.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/scrtest.c b/Programs/scrtest.c
index ab6175cff..161573672 100644
--- a/Programs/scrtest.c
+++ b/Programs/scrtest.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -25,6 +25,7 @@
#include "program.h"
#include "cmdline.h"
+#include "options.h"
#include "log.h"
#include "parse.h"
#include "scr.h"
@@ -33,8 +34,8 @@ static char *opt_boxLeft;
static char *opt_boxWidth;
static char *opt_boxTop;
static char *opt_boxHeight;
-static char *opt_screenDriver;
-static char *opt_driversDirectory;
+char *opt_screenDriver;
+char *opt_driversDirectory;
BEGIN_OPTION_TABLE(programOptions)
{ .word = "screen-driver",
@@ -78,7 +79,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = "directory",
.setting.string = &opt_driversDirectory,
.internal.setting = DRIVERS_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = "Path to directory for loading drivers."
},
END_OPTION_TABLE(programOptions)
diff --git a/Programs/serial.c b/Programs/serial.c
index a29574824..074821cfd 100644
--- a/Programs/serial.c
+++ b/Programs/serial.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -245,16 +245,6 @@ serialSetFlowControl (SerialDevice *serial, SerialFlowControl flow) {
return 0;
}
-int
-serialSetParameters (SerialDevice *serial, const SerialParameters *parameters) {
- if (!serialSetBaud(serial, parameters->baud)) return 0;
- if (!serialSetDataBits(serial, parameters->dataBits)) return 0;
- if (!serialSetStopBits(serial, parameters->stopBits)) return 0;
- if (!serialSetParity(serial, parameters->parity)) return 0;
- if (!serialSetFlowControl(serial, parameters->flowControl)) return 0;
- return 1;
-}
-
unsigned int
serialGetCharacterSize (const SerialParameters *parameters) {
unsigned int size = 1 /* start bit */ + parameters->dataBits;
@@ -351,6 +341,16 @@ serialFlushAttributes (SerialDevice *serial) {
return 1;
}
+int
+serialSetParameters (SerialDevice *serial, const SerialParameters *parameters) {
+ if (!serialSetBaud(serial, parameters->baud)) return 0;
+ if (!serialSetDataBits(serial, parameters->dataBits)) return 0;
+ if (!serialSetStopBits(serial, parameters->stopBits)) return 0;
+ if (!serialSetParity(serial, parameters->parity)) return 0;
+ if (!serialSetFlowControl(serial, parameters->flowControl)) return 0;
+ return serialFlushAttributes(serial);
+}
+
int
serialAwaitInput (SerialDevice *serial, int timeout) {
if (!serialFlushAttributes(serial)) return 0;
diff --git a/Programs/serial_grub.c b/Programs/serial_grub.c
index f76e7a76e..c22fae481 100644
--- a/Programs/serial_grub.c
+++ b/Programs/serial_grub.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_grub.h b/Programs/serial_grub.h
index c6fb6aa21..144eaf2f1 100644
--- a/Programs/serial_grub.h
+++ b/Programs/serial_grub.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_internal.h b/Programs/serial_internal.h
index 47008a5ff..98388c3eb 100644
--- a/Programs/serial_internal.h
+++ b/Programs/serial_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_msdos.c b/Programs/serial_msdos.c
index 27e096818..99ed4f1fa 100644
--- a/Programs/serial_msdos.c
+++ b/Programs/serial_msdos.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_msdos.h b/Programs/serial_msdos.h
index 6ab108a03..d7be617dc 100644
--- a/Programs/serial_msdos.h
+++ b/Programs/serial_msdos.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_none.c b/Programs/serial_none.c
index 936ac860a..e028c9b1c 100644
--- a/Programs/serial_none.c
+++ b/Programs/serial_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_none.h b/Programs/serial_none.h
index 71a9884bf..5632b5110 100644
--- a/Programs/serial_none.h
+++ b/Programs/serial_none.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_termios.c b/Programs/serial_termios.c
index d31665c2a..6c93e7c95 100644
--- a/Programs/serial_termios.c
+++ b/Programs/serial_termios.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_termios.h b/Programs/serial_termios.h
index 3a93f89c7..f2e223a49 100644
--- a/Programs/serial_termios.h
+++ b/Programs/serial_termios.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_uart.h b/Programs/serial_uart.h
index f1497f653..ebba5e078 100644
--- a/Programs/serial_uart.h
+++ b/Programs/serial_uart.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_windows.c b/Programs/serial_windows.c
index e9bb2a33b..4261109bb 100644
--- a/Programs/serial_windows.c
+++ b/Programs/serial_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/serial_windows.h b/Programs/serial_windows.h
index 369d571ae..3c7e84acd 100644
--- a/Programs/serial_windows.h
+++ b/Programs/serial_windows.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/service_libsystemd.c b/Programs/service_libsystemd.c
index cc82d14e6..49530f0c2 100644
--- a/Programs/service_libsystemd.c
+++ b/Programs/service_libsystemd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/service_none.c b/Programs/service_none.c
index d2ded176b..e6672b646 100644
--- a/Programs/service_none.c
+++ b/Programs/service_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/service_windows.c b/Programs/service_windows.c
index b22c6f146..0d7ed914e 100644
--- a/Programs/service_windows.c
+++ b/Programs/service_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ses.c b/Programs/ses.c
index 3d68b073d..aa8b92f7d 100644
--- a/Programs/ses.c
+++ b/Programs/ses.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ses.h b/Programs/ses.h
index f9e27654f..901367324 100644
--- a/Programs/ses.h
+++ b/Programs/ses.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/spk.c b/Programs/spk.c
index 53f188155..f2d2ea3f6 100644
--- a/Programs/spk.c
+++ b/Programs/spk.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -208,7 +208,7 @@ setSpeechVolume (SpeechSynthesizer *spk, int setting, int say) {
if (say) {
sayIntegerSetting(
- spk, gettext("volume"),
+ spk, gettext("Volume"),
toNormalizedSpeechVolume(setting)
);
}
@@ -234,7 +234,7 @@ setSpeechRate (SpeechSynthesizer *spk, int setting, int say) {
if (say) {
sayIntegerSetting(
- spk, gettext("rate"),
+ spk, gettext("Rate"),
toNormalizedSpeechRate(setting)
);
}
@@ -260,7 +260,7 @@ setSpeechPitch (SpeechSynthesizer *spk, int setting, int say) {
if (say) {
sayIntegerSetting(
- spk, gettext("pitch"),
+ spk, gettext("Pitch"),
toNormalizedSpeechPitch(setting)
);
}
@@ -273,10 +273,33 @@ canSetSpeechPunctuation (SpeechSynthesizer *spk) {
return spk->setPunctuation != NULL;
}
+const char *
+getSpeechPunctuation (unsigned char level) {
+ static const char *levels[] = {
+ [SPK_PUNCTUATION_NONE] = strtext("None"),
+ [SPK_PUNCTUATION_SOME] = strtext("Some"),
+ [SPK_PUNCTUATION_MOST] = strtext("Most"),
+ [SPK_PUNCTUATION_ALL] = strtext("All"),
+ };
+
+ int maximum = ARRAY_COUNT(levels) - 1;
+ level = MAX(level, 0);
+ level = MIN(level, maximum);
+ return gettext(levels[level]);
+}
+
int
setSpeechPunctuation (SpeechSynthesizer *spk, SpeechPunctuation setting, int say) {
if (!canSetSpeechPunctuation(spk)) return 0;
logMessage(LOG_CATEGORY(SPEECH_EVENTS), "set punctuation: %d", setting);
speechRequest_setPunctuation(spk->driver.thread, setting);
+
+ if (say) {
+ sayStringSetting(
+ spk, gettext("Punctuation"),
+ getSpeechPunctuation(setting)
+ );
+ }
+
return 1;
}
diff --git a/Programs/spk_base.c b/Programs/spk_base.c
index e4049319d..b9e84011c 100644
--- a/Programs/spk_base.c
+++ b/Programs/spk_base.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/spk_driver.c b/Programs/spk_driver.c
index 8c0bdfded..e3e370799 100644
--- a/Programs/spk_driver.c
+++ b/Programs/spk_driver.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/spk_input.c b/Programs/spk_input.c
index 5623aa8d8..cf77e3ab8 100644
--- a/Programs/spk_input.c
+++ b/Programs/spk_input.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/spk_input.h b/Programs/spk_input.h
index 45ea403e8..e1b84ed12 100644
--- a/Programs/spk_input.h
+++ b/Programs/spk_input.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/spk_thread.c b/Programs/spk_thread.c
index 4aab6acae..6ee99afa3 100644
--- a/Programs/spk_thread.c
+++ b/Programs/spk_thread.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/spk_thread.h b/Programs/spk_thread.h
index b938f6c8c..7616afab3 100644
--- a/Programs/spk_thread.h
+++ b/Programs/spk_thread.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/spktest.c b/Programs/spktest.c
index 8e9c2c46a..7b2ffd6c2 100644
--- a/Programs/spktest.c
+++ b/Programs/spktest.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -28,6 +28,7 @@
#include "program.h"
#include "cmdline.h"
+#include "options.h"
#include "log.h"
#include "spk.h"
#include "file.h"
@@ -37,8 +38,8 @@
static char *opt_textString;
static char *opt_speechVolume;
static char *opt_speechRate;
-static char *opt_pcmDevice;
-static char *opt_driversDirectory;
+char *opt_pcmDevice;
+char *opt_driversDirectory;
BEGIN_OPTION_TABLE(programOptions)
{ .word = "text-string",
@@ -74,7 +75,7 @@ BEGIN_OPTION_TABLE(programOptions)
.argument = "directory",
.setting.string = &opt_driversDirectory,
.internal.setting = DRIVERS_DIRECTORY,
- .internal.adjust = fixInstallPath,
+ .internal.adjust = toAbsoluteInstallPath,
.description = "Path to directory for loading drivers."
},
END_OPTION_TABLE(programOptions)
diff --git a/Programs/status.c b/Programs/status.c
index 5f7f1357b..1cb18cd58 100644
--- a/Programs/status.c
+++ b/Programs/status.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/status.h b/Programs/status.h
index c7b89dea5..125706bf4 100644
--- a/Programs/status.h
+++ b/Programs/status.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/sys_darwin.c b/Programs/sys_darwin.c
index b1ee6a398..0706afb7c 100644
--- a/Programs/sys_darwin.c
+++ b/Programs/sys_darwin.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/sys_freebsd.c b/Programs/sys_freebsd.c
index 28edecbe3..0f9bc12c1 100644
--- a/Programs/sys_freebsd.c
+++ b/Programs/sys_freebsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/sys_kfreebsd.c b/Programs/sys_kfreebsd.c
index 28edecbe3..0f9bc12c1 100644
--- a/Programs/sys_kfreebsd.c
+++ b/Programs/sys_kfreebsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/sys_netbsd.c b/Programs/sys_netbsd.c
index 7fb258c0c..326ebf61e 100644
--- a/Programs/sys_netbsd.c
+++ b/Programs/sys_netbsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/sys_openbsd.c b/Programs/sys_openbsd.c
index 7fb258c0c..326ebf61e 100644
--- a/Programs/sys_openbsd.c
+++ b/Programs/sys_openbsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/sys_solaris.c b/Programs/sys_solaris.c
index e944d97f6..22bfaefec 100644
--- a/Programs/sys_solaris.c
+++ b/Programs/sys_solaris.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/syscalls_linux.h b/Programs/syscalls_linux.h
index a94fbd6bf..3b53bdc60 100644
--- a/Programs/syscalls_linux.h
+++ b/Programs/syscalls_linux.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/system_darwin.c b/Programs/system_darwin.c
index 2aaa980ea..1a87e4397 100644
--- a/Programs/system_darwin.c
+++ b/Programs/system_darwin.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/system_java.c b/Programs/system_java.c
index 57eb4b419..5a15d3d05 100644
--- a/Programs/system_java.c
+++ b/Programs/system_java.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/system_linux.c b/Programs/system_linux.c
index 979b2255a..c08e6d01a 100644
--- a/Programs/system_linux.c
+++ b/Programs/system_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -26,6 +26,7 @@
#include <sys/stat.h>
#include <sys/statvfs.h>
#include <dirent.h>
+#include <sys/utsname.h>
#include <sys/sysmacros.h>
#include <linux/major.h>
@@ -41,6 +42,26 @@
#include "system.h"
#include "system_linux.h"
+int
+getKernelRelease (int *major, int *minor, int *patch) {
+ static struct utsname info = {.release[0] = 0};
+ static int majorVersion=0, minorVersion=0, patchLevel=0;
+
+ if (!info.release[0]) {
+ if (uname(&info) == -1) {
+ logSystemError("uname");
+ return 0;
+ }
+
+ sscanf(info.release, "%d.%d.%d", &majorVersion, &minorVersion, &patchLevel);
+ }
+
+ if (major) *major = majorVersion;
+ if (minor) *minor = minorVersion;
+ if (patch) *patch = patchLevel;
+ return 1;
+}
+
typedef struct {
PathProcessor *processor;
const PathProcessorParameters *parameters;
diff --git a/Programs/system_msdos.c b/Programs/system_msdos.c
index 8384d68dc..d6db1a004 100644
--- a/Programs/system_msdos.c
+++ b/Programs/system_msdos.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/system_none.c b/Programs/system_none.c
index 0d21dbc87..a8eb7b697 100644
--- a/Programs/system_none.c
+++ b/Programs/system_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/system_windows.c b/Programs/system_windows.c
index 168ddf978..1af373fec 100644
--- a/Programs/system_windows.c
+++ b/Programs/system_windows.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -184,9 +184,17 @@ setLocale (void) {
}
}
- char *locale = getWindowsLocaleName();
- setMessagesLocale(locale);
- if (locale) free(locale);
+#if defined(__MINGW32__)
+ {
+ char *locale = getWindowsLocaleName();
+
+ if (locale) {
+ setMessagesLocale(locale);
+ free(locale);
+ return;
+ }
+ }
+#endif /* defined(__MINGW32__) */
}
void
diff --git a/Programs/tbl2hex.c b/Programs/tbl2hex.c
index d9a69e87e..f03f409e6 100644
--- a/Programs/tbl2hex.c
+++ b/Programs/tbl2hex.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/thread.c b/Programs/thread.c
index cba5154f7..ca863b820 100644
--- a/Programs/thread.c
+++ b/Programs/thread.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/timing.c b/Programs/timing.c
index 2e7800b77..e3b780721 100644
--- a/Programs/timing.c
+++ b/Programs/timing.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ttb_compile.c b/Programs/ttb_compile.c
index bcf898264..0ecd79171 100644
--- a/Programs/ttb_compile.c
+++ b/Programs/ttb_compile.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ttb_compile.h b/Programs/ttb_compile.h
index 0db5361fc..8257215f4 100644
--- a/Programs/ttb_compile.h
+++ b/Programs/ttb_compile.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ttb_gnome.c b/Programs/ttb_gnome.c
index 637103fac..929d2c29c 100644
--- a/Programs/ttb_gnome.c
+++ b/Programs/ttb_gnome.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ttb_internal.h b/Programs/ttb_internal.h
index 051383d34..3cf9ef3ec 100644
--- a/Programs/ttb_internal.h
+++ b/Programs/ttb_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ttb_louis.c b/Programs/ttb_louis.c
index 080ec4c65..51e0bfadc 100644
--- a/Programs/ttb_louis.c
+++ b/Programs/ttb_louis.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ttb_native.c b/Programs/ttb_native.c
index 8d6f83b08..c5503d1cc 100644
--- a/Programs/ttb_native.c
+++ b/Programs/ttb_native.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/ttb_translate.c b/Programs/ttb_translate.c
index 2e8f4e030..344ec35bc 100644
--- a/Programs/ttb_translate.c
+++ b/Programs/ttb_translate.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/tune.c b/Programs/tune.c
index d06f1c49a..f923dd157 100644
--- a/Programs/tune.c
+++ b/Programs/tune.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/tune_builder.c b/Programs/tune_builder.c
index 178cfe15c..5fb75e5a4 100644
--- a/Programs/tune_builder.c
+++ b/Programs/tune_builder.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/tune_utils.c b/Programs/tune_utils.c
index 869996ac8..e9a02b1e2 100644
--- a/Programs/tune_utils.c
+++ b/Programs/tune_utils.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/unicode.c b/Programs/unicode.c
index d2038b7e0..45e43be29 100644
--- a/Programs/unicode.c
+++ b/Programs/unicode.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/update.c b/Programs/update.c
index 9c3caf3c9..a72d6a1e7 100644
--- a/Programs/update.c
+++ b/Programs/update.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -44,6 +44,7 @@
#include "blink.h"
#include "routing.h"
#include "api_control.h"
+#include "options.h"
#include "core.h"
static void
@@ -1097,8 +1098,10 @@ doUpdate (void) {
if (scr.unreadable) {
logMessage(LOG_CATEGORY(UPDATE_EVENTS), "screen unreadable: %s", scr.unreadable);
} else {
- logMessage(LOG_CATEGORY(UPDATE_EVENTS), "screen: #%d %dx%d [%d,%d]",
- scr.number, scr.cols, scr.rows, scr.posx, scr.posy);
+ logMessage(LOG_CATEGORY(UPDATE_EVENTS),
+ "screen: #%d %dx%d [%d,%d] scq:%u",
+ scr.number, scr.cols, scr.rows, scr.posx, scr.posy, scr.quality
+ );
}
if (opt_releaseDevice) {
diff --git a/Programs/update.h b/Programs/update.h
index 3a930c740..1dfbf14c1 100644
--- a/Programs/update.h
+++ b/Programs/update.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb.c b/Programs/usb.c
index b2409c2d9..308c6b0ff 100644
--- a/Programs/usb.c
+++ b/Programs/usb.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_adapters.c b/Programs/usb_adapters.c
index b22342763..76a92f7b7 100644
--- a/Programs/usb_adapters.c
+++ b/Programs/usb_adapters.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_adapters.h b/Programs/usb_adapters.h
index 31263e704..cbb1789e1 100644
--- a/Programs/usb_adapters.h
+++ b/Programs/usb_adapters.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_android.c b/Programs/usb_android.c
index c290e9778..833e8309e 100644
--- a/Programs/usb_android.c
+++ b/Programs/usb_android.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_belkin.c b/Programs/usb_belkin.c
index 035f5760b..76a290037 100644
--- a/Programs/usb_belkin.c
+++ b/Programs/usb_belkin.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_belkin.h b/Programs/usb_belkin.h
index f169643e3..af8e3d557 100644
--- a/Programs/usb_belkin.h
+++ b/Programs/usb_belkin.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_bsd.h b/Programs/usb_bsd.h
index 1ed1ee3ce..10578e31b 100644
--- a/Programs/usb_bsd.h
+++ b/Programs/usb_bsd.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_cdc_acm.c b/Programs/usb_cdc_acm.c
index e09da47b2..55818956c 100644
--- a/Programs/usb_cdc_acm.c
+++ b/Programs/usb_cdc_acm.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_cdc_acm.h b/Programs/usb_cdc_acm.h
index 6a64d0757..f718811c0 100644
--- a/Programs/usb_cdc_acm.h
+++ b/Programs/usb_cdc_acm.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_ch341.c b/Programs/usb_ch341.c
index 9ed52d040..303833cb1 100644
--- a/Programs/usb_ch341.c
+++ b/Programs/usb_ch341.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_ch341.h b/Programs/usb_ch341.h
index 9b715e991..85279f9dd 100644
--- a/Programs/usb_ch341.h
+++ b/Programs/usb_ch341.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_cp2101.c b/Programs/usb_cp2101.c
index f2c378ce8..acf355cd3 100644
--- a/Programs/usb_cp2101.c
+++ b/Programs/usb_cp2101.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_cp2101.h b/Programs/usb_cp2101.h
index 29f1d4f67..ea4f8b740 100644
--- a/Programs/usb_cp2101.h
+++ b/Programs/usb_cp2101.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_cp2110.c b/Programs/usb_cp2110.c
index 3100d94cf..a569af638 100644
--- a/Programs/usb_cp2110.c
+++ b/Programs/usb_cp2110.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_cp2110.h b/Programs/usb_cp2110.h
index ef6a0a961..3bd0bae83 100644
--- a/Programs/usb_cp2110.h
+++ b/Programs/usb_cp2110.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_darwin.c b/Programs/usb_darwin.c
index e716e0185..ae754f138 100644
--- a/Programs/usb_darwin.c
+++ b/Programs/usb_darwin.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_devices.c b/Programs/usb_devices.c
index bf0bf618e..c923ac1d8 100644
--- a/Programs/usb_devices.c
+++ b/Programs/usb_devices.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_devices.h b/Programs/usb_devices.h
index 57bde3bba..5776abb90 100644
--- a/Programs/usb_devices.h
+++ b/Programs/usb_devices.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_freebsd.c b/Programs/usb_freebsd.c
index 2d3316cc6..b42da2399 100644
--- a/Programs/usb_freebsd.c
+++ b/Programs/usb_freebsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_ftdi.c b/Programs/usb_ftdi.c
index 0c203d473..e55ab3eb0 100644
--- a/Programs/usb_ftdi.c
+++ b/Programs/usb_ftdi.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_ftdi.h b/Programs/usb_ftdi.h
index 7fda9e599..1d638416c 100644
--- a/Programs/usb_ftdi.h
+++ b/Programs/usb_ftdi.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_grub.c b/Programs/usb_grub.c
index 9db14e8fc..e4ab00eed 100644
--- a/Programs/usb_grub.c
+++ b/Programs/usb_grub.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_hid.c b/Programs/usb_hid.c
index ccf0ba9ca..39688937a 100644
--- a/Programs/usb_hid.c
+++ b/Programs/usb_hid.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_internal.h b/Programs/usb_internal.h
index 49c682c66..3ee712e5d 100644
--- a/Programs/usb_internal.h
+++ b/Programs/usb_internal.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_kfreebsd.c b/Programs/usb_kfreebsd.c
index 75b67451a..c611d804e 100644
--- a/Programs/usb_kfreebsd.c
+++ b/Programs/usb_kfreebsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_libusb-1.0.c b/Programs/usb_libusb-1.0.c
index 2f0b46ea8..00b788ed2 100644
--- a/Programs/usb_libusb-1.0.c
+++ b/Programs/usb_libusb-1.0.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_libusb.c b/Programs/usb_libusb.c
index 590f82493..e45590cf5 100644
--- a/Programs/usb_libusb.c
+++ b/Programs/usb_libusb.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_linux.c b/Programs/usb_linux.c
index f796d560c..bd5f8ce24 100644
--- a/Programs/usb_linux.c
+++ b/Programs/usb_linux.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -426,10 +426,17 @@ usbReapURB (UsbDevice *device, int wait) {
if ((endpoint = usbGetEndpoint(device, urb->endpoint))) {
UsbEndpointExtension *eptx = endpoint->extension;
+ switch (USB_ENDPOINT_DIRECTION(endpoint->descriptor)) {
+ case UsbEndpointDirection_Input:
+ deleteItem(endpoint->direction.input.pending.requests, urb);
+ break;
+ }
+
if (enqueueItem(eptx->completedRequests, urb)) return endpoint;
logSystemError("USB completed request enqueue");
- free(urb);
}
+
+ free(urb);
} else {
errno = EAGAIN;
}
@@ -955,8 +962,6 @@ usbReadDeviceDescriptor (UsbDevice *device) {
static int
usbHandleInputURB (UsbEndpoint *endpoint, struct usbdevfs_urb *urb) {
- deleteItem(endpoint->direction.input.pending.requests, urb);
-
if (urb->actual_length < 0) {
usbLogInputProblem(endpoint, "data not available");
return 0;
diff --git a/Programs/usb_netbsd.c b/Programs/usb_netbsd.c
index 196bd5f9b..816653ee6 100644
--- a/Programs/usb_netbsd.c
+++ b/Programs/usb_netbsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_none.c b/Programs/usb_none.c
index 9db14e8fc..e4ab00eed 100644
--- a/Programs/usb_none.c
+++ b/Programs/usb_none.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_openbsd.c b/Programs/usb_openbsd.c
index 196bd5f9b..816653ee6 100644
--- a/Programs/usb_openbsd.c
+++ b/Programs/usb_openbsd.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_serial.c b/Programs/usb_serial.c
index bd23a82ad..3c558232a 100644
--- a/Programs/usb_serial.c
+++ b/Programs/usb_serial.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_serial.h b/Programs/usb_serial.h
index 654bac300..47dbf5a53 100644
--- a/Programs/usb_serial.h
+++ b/Programs/usb_serial.h
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_solaris.c b/Programs/usb_solaris.c
index 13d0a09fc..0d1d085f9 100644
--- a/Programs/usb_solaris.c
+++ b/Programs/usb_solaris.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/usb_winusb.c b/Programs/usb_winusb.c
index 9c4a987db..2130f7c5b 100644
--- a/Programs/usb_winusb.c
+++ b/Programs/usb_winusb.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/utf8.c b/Programs/utf8.c
index a6431ed32..c88e2073f 100644
--- a/Programs/utf8.c
+++ b/Programs/utf8.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/variables.c b/Programs/variables.c
index 6fc537165..20d9b671a 100644
--- a/Programs/variables.c
+++ b/Programs/variables.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/xbrlapi.c b/Programs/xbrlapi.c
index 92c45c2e5..6745d6a99 100644
--- a/Programs/xbrlapi.c
+++ b/Programs/xbrlapi.c
@@ -1,7 +1,7 @@
/*
* XBrlAPI - A background process tinkering with X for proper BrlAPI behavior
*
- * Copyright (C) 2003-2024 by Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ * Copyright (C) 2003-2025 by Samuel Thibault <Samuel.Thibault@ens-lyon.org>
*
* XBrlAPI comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Programs/xsel.c b/Programs/xsel.c
index ce04083e2..96c7c92ed 100644
--- a/Programs/xsel.c
+++ b/Programs/xsel.c
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 2019-2024 by Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ * Copyright (C) 2019-2025 by Samuel Thibault <Samuel.Thibault@ens-lyon.org>
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/README b/README
index 73055c0c3..b78a5c55b 100644
--- a/README
+++ b/README
@@ -2,9 +2,9 @@ BRLTTY is a background process (daemon) providing access to the Linux/Unix
console (when in text mode) for a blind person using a refreshable braille
display.
-Version 6.6, Jul 2023
+Version 6.7, Oct 2024
-Copyright (C) 1995-2024 by The BRLTTY Developers.
+Copyright (C) 1995-2025 by The BRLTTY Developers.
Web Page: http://brltty.app/
diff --git a/Tables/Attributes/invleft_right.atb b/Tables/Attributes/invleft_right.atb
index 7491fe46a..4528a7a28 100644
--- a/Tables/Attributes/invleft_right.atb
+++ b/Tables/Attributes/invleft_right.atb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Attributes/left_right.atb b/Tables/Attributes/left_right.atb
index beac1111f..3d65d2068 100644
--- a/Tables/Attributes/left_right.atb
+++ b/Tables/Attributes/left_right.atb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Attributes/upper_lower.atb b/Tables/Attributes/upper_lower.atb
index 87cfde925..ef309ea66 100644
--- a/Tables/Attributes/upper_lower.atb
+++ b/Tables/Attributes/upper_lower.atb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/af.ctb b/Tables/Contraction/af.ctb
index 296d8ffbe..53c0fb6ca 100644
--- a/Tables/Contraction/af.ctb
+++ b/Tables/Contraction/af.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/am.ctb b/Tables/Contraction/am.ctb
index 675eaadbc..336ec591e 100644
--- a/Tables/Contraction/am.ctb
+++ b/Tables/Contraction/am.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/countries.cti b/Tables/Contraction/countries.cti
index 2d7bc8e0b..2c877096f 100644
--- a/Tables/Contraction/countries.cti
+++ b/Tables/Contraction/countries.cti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/de-1998.ctb b/Tables/Contraction/de-1998.ctb
index bec00b6a7..86830a418 100644
--- a/Tables/Contraction/de-1998.ctb
+++ b/Tables/Contraction/de-1998.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/de-2015.ctb b/Tables/Contraction/de-2015.ctb
index c2664def2..656cc7cbc 100644
--- a/Tables/Contraction/de-2015.ctb
+++ b/Tables/Contraction/de-2015.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -22,9 +22,7 @@
include de-g1.ctb
class b b
-class e e
class f f
-class g g
class h h
class i i
class m m
@@ -58,6 +56,8 @@ before g always aussagenklän 16-234-234-1245-14-13-123-345-1345
before s always aus 16-234
before t sufword aus 16-234
+always austerität 16-23456-12456-5-345
+always austern 16-23456-12456-1345
# Ausnahmen für Vokalgruppen aus de-g1.ctb
before e always arteri 356-2345-12456-24
@@ -73,8 +73,6 @@ always prämier 1234-1235-345-134-346-1235
always propriet 12345-1234-1235-24-15-2345 proprietär shouldn't use the ie-contraction
endword serie 234-12456-24-15
always spezies 234-1234-15-1356-24-123456 shouldn't use the ie-contraction
-always tragödie =
-always tragödien 2345-1235-1-1245-246-145-24-14
# Due to their low usage frequency in typical german text the letters
# c, q, x and y are reused for the en-, ll-, ex/mm/nis- and el-contractions.
@@ -107,23 +105,43 @@ always kohleintopf 13-135-125-123-1246-2345-135-1234-124
always kohleintöpf 13-135-125-123-1246-2345-246-1234-124
before g always kohleinla 13-135-125-123-1246-123-1
before e always kohleul 13-135-125-123-126-123 ⠨⠅⠕⠓⠇⠣⠇⠉
+
always ein 1246
always einnen 15-35-1345-14 ⠨⠯⠓⠌⠎⠑⠔⠝⠉⠎⠩⠦ ⠨⠯⠓⠌⠎⠑⠔⠝⠉⠞⠷⠏⠻⠁⠞⠥⠗ ⠨⠧⠊⠵⠑⠔⠝⠉⠍⠔⠊⠾⠻
always lateinisch 123-1-2345-1246-24-156 shouldn't use the ein-contraction
+always eillustration 15-24-12345-136-23456-1235-5-1345
+always eillustrier 15-24-12345-136-23456-1235-346-1235
+always einformation 15-35-124-26-134-5-1345
+always einitiativ 15-35-24-2345-24-5-1236
+before t always einstrumen 15-35-23456-1235-136-134-14
+always eintoleranz 15-35-2345-135-123-12456-235-1356
+
always el 13456
begmidword elineal 15-123-35-15-25
endword elineal 15-123-35-15-1-123
always eleist 15-123-146-23456
+
always em 12356
always emach 15-134-56
before e always emachs 12356-56-234 Systemachse
+always emagazin 15-134-1-1245-1-1356-35
+always emanagement 15-134-235-1-12346-134-14-2345
+always emedizin 15-134-15-145-24-1356-35
+
always en 14
always denunz 145-15-1345-256-1356 shouldn't use the en-contraction
always er 12456
+always eregister 15-1235-15-1245-24-23456-12456
+always eregistr 15-1235-15-1245-24-23456-1235
+always derealis 145-15-1235-15-25-24-234
always dereferenzier 145-15-1235-15-124-12456-14-1356-346-1235 shouldn't use the er-contraction
-always deregulier 145-15-1235-15-1245-136-123-346-1235 shouldn't use the er-contraction
+always deregul 145-15-1235-15-1245-136-123 shouldn't use the er-contraction
+
always es 123456
+always esammlung 15-234-1-1346-123-136
+
always ge 12346
+sufword gerst 1245-12456-23456
prfword gehe 1245-2356-15
prfword gehen 1245-2356-14
prfword gehend 1245-2356-14-145
@@ -161,9 +179,28 @@ always vorgehen 2-26-1245-2356-14
always vorgehst 2-26-1245-2356-23456
always vorgeht 2-26-1245-2356-2345
always weitgehen 2456-2345-1245-2356-14
-always zugehen 2-1356-1245-2356-14
-always zugehst 2-1356-1245-2356-23456
-always zugeht 2-1356-1245-2356-2345
+
+always geinbau 1245-1246-12-16
+always geinblick 1245-1246-12-123-24-46
+always geinfahr 1245-1246-2-1235
+always geinheit 1245-1246-125
+always geinnahm 1245-1246-1345-134
+always geinricht 1245-1246-2-3456
+always geinsatz 1245-1246-234-1356
+always geinsätz 1245-1246-5-234-1356
+always geinsamkeit 1245-1246-2346-13
+always geinschlag 1245-1246-156-1245
+always geinschläg 1245-1246-5-156-1245
+before t always geinschnit 1245-1246-156-1345-24-2345
+always geinstell 1245-1246-2-13456
+always geinstuf 1245-1246-23456-136-124
+always geintrag 1245-1246-2345-1245
+always geinträg 1245-1246-5-2345-1245
+always geinwirk 1245-1246-2456-13
+always gelektro 1245-13456-15-13-2345-1235-135
+
+
+
@@ -174,9 +211,14 @@ before konsonant always ben 12-14
before konsonant always ber 12-12456
before konsonant always gel 1245-13456 klingelton shouldn't use the ge-contraction
before konsonant always gen 1245-14
+always genetik 1245-14-15-2345-24-13
+always genetisch 1245-14-15-2345-24-156
+always halogen 125-25-135-1245-14
begword lungen 123-256-1245-14 shouldn't use the ge-contraction
begword magen 134-1-1245-14 shouldn't use the ge-contraction
before konsonant always ten 2345-14
+always piraten 1234-24-1235-1-2345-14
+always piraterie 1234-24-1235-1-2345-12456-346
always elefant 13456-15-124-235-2345
before konsonant always ter 2345-12456
always güter 1245-1256-2345-12456 should use the er-contraction
@@ -194,22 +236,10 @@ always bodenlicht 12-135-145-14-123-3456-2345 shouldn't use the lich-contraction
begword see =
begword neusee 1345-126-234-15-15
#before konsonant always seen 234-15-14
-word seele 234-15-13456-15
-sufword seelen 234-15-13456-14
-always seelisch 234-15-13456-24-156
-word teer 2345-15-12456
-sufword teerartig 2345-15-12456-356-2345-45
-before konsonant begword teer 2345-15-12456
-word teere 2345-15-12456-15
-word teeren 2345-15-12456-14
-word teerend 2345-15-12456-14-145
-word teerende 2345-15-12456-14-145-15
-word teerendem 2345-15-12456-14-145-12356
-word teerenden 2345-15-12456-14-145-14
-word teerender 2345-15-12456-14-145-12456
-word teerendes 2345-15-12456-14-145-123456
-word teerung 2345-15-12456-136
-word teerungen 2345-15-12456-136-14
+prfword seele 234-15-15-123-15
+prfword seelen 234-15-15-123-14
+sufword seelen 234-15-15-123-14
+always seelisch 234-15-15-123-24-156
always teelich 2345-15-15-456 shouldn't use the el-contraction
always teelöffel 2345-15-15-123-246-124-124-13456 shouldn't use the el-contraction
always teemaschin 2345-15-15-134-156 shouldn't use the em-contraction
@@ -229,6 +259,7 @@ always schip 234-1456-24-1234
always schippe 156-24-1234-1234-15
always schippen 156-24-1234-1234-14
always schipper 156-24-1234-1234-12456
+always schristen 234-1456-1235-24-23456-14
after konsonant midword ss =
after konsonant midendword ssatz 234-234-1356
after konsonant midendword ssätz 234-5-234-1356
@@ -236,7 +267,9 @@ after konsonant midendword ssaetz 234-5-234-1356
after konsonant endword sserie 234-234-12456-24-15
after konsonant endword sserien 234-234-12456-24-14
after konsonant midword ssch 234-156
+always sschablon 234-156-1-12-123-135-1345
always sschicht 234-156-3456-2345
+always sschild 234-156-24-123-145
always sschlag 234-156-1245
always sschläg 234-5-156-1245
always sschlaeg 234-5-156-1245
@@ -259,6 +292,7 @@ always ssolch 234-234-1456
after konsonant midendword ssoll 234-2-234
always ssondern 234-234-1345
always ssozial 234-234-123
+always sstruktur 234-23456-1235-136-13-2345-136-1235
always espiel 15-2-346
always sspiel 234-2-346
always esspiel 123456-2-346
@@ -284,14 +318,19 @@ always un 256
midendword tei 2345-146
midendword tein 2345-1246
+always telektro 2345-13456-15-13-2345-1235-135
+before t always telemen 2345-13456-15-134-14
+
always all 1-12345
always ell 15-12345
always emm 15-1346
always esch 15-156
+always eschließ 15-156-2346
always eschreib 15-156-12
always eschrift 15-156-2345
always eschwierig 15-156-45
+always esendung 15-234-14-145-136
always ess 15-2346
always est 15-23456
@@ -313,6 +352,7 @@ endword tene 2345-14-15
always ttel 2345-2345-13456 shouldn't use the te-contraction
always tten 2345-2345-14 shouldn't use the te-contraction
always tter 2345-2345-12456 shouldn't use the te-contraction
+always aorten 1-26-2345-14
always daten 145-1-2345-14
always karten 13-356-2345-14
midendword maten 134-1-2345-14 shouldn't use the te-contraction
@@ -324,6 +364,8 @@ endword tenes 2345-14-123456
endword tens 2345-14-234
endword ter 2345-12456
endword tere 2345-12456-15
+endword terei 2345-12456-146
+endword tereien 2345-12456-146-14
endword terem 2345-12456-12356
endword teren 2345-12456-14
endword terer 2345-12456-12456
@@ -383,11 +425,15 @@ endword bern 12-12456-1345 shouldn't use the be-contraction
endword bers 12-12456-234 shouldn't use the be-contraction
always ober 135-12-12456 shouldn't use the be-contraction
endword bes 12-123456 shouldn't use the be-contraction
+prfword besen 12-123456-14
+prfword besens 12-123456-14-234
+
always begeh 23-1245-2356 shouldn't use the ge-contraction
always getriebegehäus 12346-2345-1235-346-23-12346-125-34-234 shouldn't use the eh-contraction
always getriebegehaeus 12346-2345-1235-346-23-12346-125-34-234 shouldn't use the eh-contraction
always geig 1245-146-1245 should use the ei-contraction
+prfword geige 1245-146-12346
always geisel 1245-146-234-13456 shouldn't use the ge-contraction
always geist 1245-146-23456
prfword gel 1245-13456 shouldn't use the ge-contraction
@@ -405,6 +451,10 @@ prfword gen 1245-14 shouldn't use the ge-contraction
midendword gend 1245-14-145 shouldn't use the ge-contraction
endword gens 1245-14-234 shouldn't use the ge-contraction
midendword ger 1245-12456 should use er-contraction if not part of a word intro
+always gerinnsel 12346-1235-35-1345-234-13456
+always gerinnung 12346-1235-35-1345-136
+always geripp 12346-1235-24-1234-1234
+
before r begword abge 1-12-12346
before r begword ange 235-12346
word anger 235-1245-12456
@@ -415,7 +465,7 @@ before r begmidword aufge 2-16-12346
before r begmidword ausge 16-234-12346
before r begmidword einge 1246-12346
begword unger 256-12346-1235
-sufword ungerecht 256-12346-1235-2345
+always ungerecht 256-12346-1235-2345
always gerieben 12346-1235-346-12-14 should use the ge-contraction
sufword zuge 2-1356-12346
endword ges 1245-123456 shouldn't use the ge-contraction
@@ -453,7 +503,18 @@ begword ex 1346
begword pro 12345
begword ver 36
word verb 1236-12456-12
+word verben 1236-12456-12-14
+sufword verbendstell 1236-12456-12-14-145-2-13456
+sufword verbendung 1236-12456-12-14-145-136
word vers 1236-12456-234
+word verbal 1236-12456-12-1-123
+begword verbal 1236-12456-12-25
+begword verballer 36-12-1-12345-12456
+begword verballhorn 1236-12456-12-1-12345-125-26-1345
+before st begword verbeul 36-12-126-123
+sufword verifikation 1236-12456-24-124-24-13-5-1345
+sufword verifizier 1236-12456-24-124-24-1356-346-1235
+sufword version 1236-12456-234-24-135-1345
#begword auspiz 16-234-1234-24-1356 shouldn't use the aus-contraction
word ente 14-236 shouldn't use the ent-contraction
@@ -465,7 +526,15 @@ word vertikal 1236-12456-2345-24-13-1-123 shouldn't use the ver-contraction
# Nachsilbenkürzungen
endword falls 124
-endword unfalls 256-124-12345-234
+endword ausfalls 16-234-124-12345-234
+endword befalls 23-124-12345-234
+prfword beifalls 2-12-124-12345-234
+prfword einfalls 1246-124-12345-234
+prfword rückfalls 1235-46-124-12345-234
+prfword überfalls 2-1256-124-12345-234
+prfword unfalls 256-124-12345-234
+endword ungsfalls 136-234-124-12345-234
+endword zerfalls 1356-12456-124-12345-234
midendword heit 125
before s midword heits 125-234
@@ -487,6 +556,7 @@ sufword gemal 12346-134-25 gemalt shouldn't use the mal-contraction
midendword nis 1346
always adonis =
+always harmonisch 125-356-134-135-1345-24-156
always kolonis =
always kolonist 13-135-123-135-1345-24-23456
always kolonistisch 13-135-123-135-1345-5-156
@@ -496,20 +566,98 @@ before s always resynchroni 1235-15-234-6-13456-1345-1456-1235-135-1345-24
always männisch 134-345-1345-1345-24-156
always nisier 1345-24-234-346-1235 technisierung shouldn't use -nis
+always nischkennt 1345-24-156-13-14-1345-2345
+always nischkurs 1345-24-156-13-136-1235-234
+always nischsprach 1345-24-156-234-1234-1235-56
+always nischunter 1345-24-156-2-256
+
+always chronist 1456-1235-135-1345-24-23456
+always chronistisch 1456-1235-135-1345-5-156
+always einnist 1246-1345-24-23456
+always feminist 124-12356-35-24-23456
+always feministisch 124-12356-35-5-156
+always frankoromanist 124-1235-235-13-135-1235-135-134-235-24-23456
+always frankoromanistisch 124-1235-235-13-135-1235-135-134-235-5-156
+always iberoromanist 24-12-12456-135-1235-135-134-235-24-23456
+always iberoromanistisch 24-12-12456-135-1235-135-134-235-5-156
+always impressionist 24-134-1234-1235-15-2346-24-135-1345-24-23456
+always impressionistisch 24-134-1234-1235-15-2346-24-135-1345-5-156
+
+always nisolation 1345-24-234-135-123-5-1345
+endword nisolator 1345-24-234-135-123-1-2345-135-1235
+midword nisolator 1345-24-234-135-123-1-2345-26
+always nisolier 1345-24-234-135-123-346-1235
+
midendword sam 2346
-sufword balsam 12-25-234-1-134
+midendword sambition =
+midendword samplitud =
+sufword ansam 235-234-1-134
+sufword ansamm 235-234-1-1346
+always besamung 23-234-1-134-136
+begword gesam 12346-234-1-134 shouldn't use the sam-contraction
+begword gesamm 12346-234-1-1346 shouldn't use the sam-contraction
+midendword samariter 234-1-134-356-24-2345-12456
+midendword sammel 234-1-1346-13456 shouldn't use the sam-contraction
+always samml 234-1-1346-123 shouldn't use the sam-contraction
+sufword sesam 234-123456-1-134 shouldn't use the sam-contraction
+always disambiguier 145-24-234-1-134-12-45-136-346-1235 shouldn't use the sam-contraction
+sufword einsamig 1246-234-1-134-45
+always ahornsamen 1-125-26-1345-234-1-134-14
+always ampfersamen 1-134-1234-124-12456-234-1-134-14
+always anissamen 235-24-234-234-1-134-14
+always bärlappsamen 12-345-1235-123-1-1234-1234-234-1-134-14
+always bananensamen 12-235-235-14-234-1-134-14
+always baumsamen 12-16-134-234-1-134-14
+always baumwollsamen 12-16-134-2-135-234-1-134-14
+always birkensamen 12-24-1235-13-14-234-1-134-14
+always bohnensamen 12-135-125-1345-14-234-1-134-14
+always cannabissamen 6-14-235-1345-1-12-24-234-234-1-134-14 shouldn't use the bis-, ss- and sam-contractions
+always chiasamen 1456-24-1-234-1-134-14
+always chilisamen 1456-24-123-24-234-1-134-14
+always dattelsamen 145-1-2345-2345-13456-234-1-134-14
+always erbsensamen 12456-12-234-14-234-1-134-14
+always fenchelsamen 124-14-1456-13456-234-1-134-14
+always fichtensamen 124-3456-2345-14-234-1-134-14
+always gartensamen 1245-356-2345-14-234-1-134-14
+always gemüsesamen 12346-134-1256-234-15-234-1-134-14
+always getreidesamen 12346-2345-1235-146-145-15-234-1-134-14
+always grassamen 1245-1235-1-234-234-1-134-14
+always gurkensamen 1245-136-1235-13-14-234-1-134-14
+always hanfsamen 125-235-124-234-1-134-14
+always kakaosamen 13-1-13-1-135-234-1-134-14
+always karottensamen 13-356-135-2345-2345-14-234-1-134-14
+always kiefernsamen 13-346-124-12456-1345-234-1-134-14
+always kleesamen 13-123-15-15-234-1-134-14
+always kornsamen 13-26-1345-234-1-134-14
+always kümmelsamen 13-1256-1346-13456-234-1-134-14
+always kürbissamen 13-1256-1235-12-24-234-234-1-134-14
+always leinsamen 123-1246-234-1-134-14
+always linsensamen 123-35-234-14-234-1-134-14
+always mohnsamen 134-135-125-1345-234-1-134-14
+always möhrensamen 134-246-125-1235-14-234-1-134-14
+always pflanzensamen 1234-124-123-235-1356-14-234-1-134-14
+always senfsamen 234-14-124-234-1-134-14
+always tomatensamen 234-135-134-1-2345-14-234-1-134-14
+always weidensamen 2456-146-145-14-234-1-134-14
+prfword samens 234-1-134-14-234
+always balsam 12-25-234-1-134
sufword besam 23-234-1-134
+sufword besamm 23-234-1-1346
sufword bisam =
always bischofsamt 12-24-156-135-124-234-1-134-2345 shouldn't use the sam-contraction
-always beisammen 2-146-234-1-1346-14
+always beisammen 2-12-234-1-1346-14
midendword schaft 156
midendword ung 136
+always bungalow 12-256-1245-25-135-2456
always dschungel 145-156-256-1245-13456 shouldn't use the ung-contraction
+always drungen 145-1235-256-1245-14
+sufword dung 145-256-1245
always geklungen 12346-13-123-256-1245-14
always gelungen 12346-123-256-1245-14
+always riegelung 1235-346-1245-13456-136
always gesungen 12346-234-256-1245-14
before g always bezwun 23-1356-2456-256
before g always erzwun 12456-1356-2456-256
@@ -521,6 +669,7 @@ always ungenau 256-12346-1345-16
always ungeheuer 256-12346-125-126-12456
always schwung 156-2456-256-1245 shouldn't use the ung-contraction
always sprung 234-1234-1235-256-1245 shouldn't use the ung-contraction
+always ssprung 234-234-1234-1235-256-1245
endword wärts 2456
@@ -532,6 +681,7 @@ midendword ativ 5-1236
#always religion 1235-13456-45-245
midendword ismus 5-24
midendword istisch 5-156
+always atheistisch 1-2345-125-15-5-156
endword nismus 1345-5-24 shouldn't use the nis-contraction
midendword nistisch 1345-5-156
midendword ität 5-345
@@ -552,7 +702,6 @@ sufword erheiter 12456-125-146-2345-12456 shouldn't use the heit-contraction
prfword formal 124-26-134-1-123 shouldn't use the mal-contraction
begword formal 124-26-134-25 shouldn't use the mal-contraction
word firnis = shouldn't use the nis-contraction
-begword gesam 12346-234-1-134 shouldn't use the sam-contraction
always herrschaft 1235-1235-156-1-124-2345 can not use the shaft-contraction
always hoheit 125-135-125-146-2345 shouldn't use the heit-contraction
always kuhdung 13-136-125-145-256-1245 shouldn't use the ung-contraction
@@ -657,8 +806,46 @@ prfword laufes 123-16-124-123456
prfword laufs 123-16-124-234
prfword laufst 123-16-124-23456
prfword lauft 123-16-124-2345
+always lauffläch 123-16-124-124-123-345-1456
+always laufkäfer 123-16-124-13-345-124-12456
+always laufzahl 123-16-124-1356-123
+always laufzeit 123-16-124-1356-2345
+always ablauf 1-12-123-16-124 shouldn't use the auf-contraction
+always apfellauf 1-1234-124-13456-123-16-124
+always bandlauf 12-235-145-123-16-124
+always bachlauf 12-56-123-16-124
+always bahnlauf 12-1-125-1345-123-16-124
+always berglauf 12-12456-1245-123-16-124
+always bildlauf 12-24-123-145-123-16-124
+always drucklauf 145-46-123-16-124
+always einlauf 1246-123-16-124
+always einzellauf 1246-1356-13456-123-16-124
+sufword entlauf 2346-123-16-124
+always erstlauf 12456-23456-123-16-124
+always feuerlauf 124-126-12456-123-16-124
+always flusslauf 124-123-136-2346-123-16-124
+always gleichlauf 1245-1456-123-16-124
+always handlauf 125-145-123-16-124
+always kunstlauf 13-256-23456-123-16-124
+always lebenslauf 123-12-14-234-123-16-124
+always leerlauf 123-15-15-1235-123-16-124
+always leichtlauf 123-1456-123-16-124
+always mehrlauf 2-2356-123-16-124
+always notlauf 1345-135-2345-123-16-124
+always schnelllauf 156-1345-15-12345-123-16-124
+always suchlauf 234-136-1456-123-16-124
+always unterlauf 2-256-123-16-124
+always volkslauf 1236-13-234-123-16-124
always gelaufen 12346-123-16-124-14
always schlauf 156-123-16-124 shouldn't use the auf-contraction
+always schnauf 156-1345-16-124 shouldn't use the auf-contraction
+always ausrauf 16-234-1235-16-124
+prfword taufe 2345-16-124-15
+prfword taufen 2345-16-124-14
+before t always auforma 16-124-26-134-1
+always aufrequenz 16-124-1235-15-6-12345-136-14-1356
+
+
always abfragerate 1-12-124-1235-1-12346-1235-1-236 shouldn't use the er-contraction
always abfrageraten 1-12-124-1235-1-12346-1235-1-2345-14
always abgelauf 1-12-12346-123-16-124
@@ -675,13 +862,16 @@ always aufertig 16-124-45
always aufolg 16-124-1245
always auführ 16-124-125
always eislauf 146-234-123-16-124
-always laufzahl 123-16-124-1356-123
word bei 12
always bei 2-12
always beizung 12-146-1356-136 shouldn't use the bei-contraction
always beiß 12-146-6-2346 shouldn't use the bei-contraction
+prfword beil 12-146-123
+prfword beile 12-146-123-15
+prfword beilen 12-146-123-14
+prfword beils 12-146-123-234
endword bein 12-1246 shouldn't use the bei-contraction
endword beine 12-1246-15 shouldn't use the bei-contraction
endword beinen 12-1246-14 shouldn't use the bei-contraction
@@ -689,23 +879,36 @@ endword beines 12-1246-123456 shouldn't use the bei-contraction
endword beins 12-1246-234 shouldn't use the bei-contraction
before t always beinhal 23-35-125-25 shouldn't use the bei-contraction
always beinhalter 12-1246-125-25-2345-12456 should use the ei-contraction
+sufword beirr 23-24-1235-1235
always darmbein 145-356-134-12-1246
always gabeinvent 1245-1-23-35-1236-14-2345 Übergabeinventar shouldn't use the bei-contraction
before t always gebeiz 12346-12-146-1356
always kreuzbein 13-1235-126-1356-12-1246
always schienbein 156-346-1345-12-1246
always schlüsselbein 156-123-1256-2346-13456-12-1246 shouldn't use the bei-contraction
+always reibeisen 1235-146-12-146-234-14
word dem 12356
always dem 2-12356
endword dem 145-12356 shouldn't use the dem-contraction
+always sendemast 234-14-145-15-134-1-23456
always außerdem 16-6-2346-12456-2-12356
+word indem 35-2-12356
+word seitdem 234-146-2345-2-12356
+word trotzdem 2345-1356-2-12356
+word zudem 2-1356-2-12356
always demask = demaskiert shouldn't use the dem-contraction
+always dembleme 145-12356-12-123-12356-15
+always dempfänger 145-12356-1234-124-345-1345-1245-12456
always demilit = shouldn't use the dem-contraction
always demonstr 145-12356-135-1345-23456-1235 shouldn't use the dem-contraction
-word demo 145-12356-135 shouldn't use the dem-contraction
-word demos 145-12356-135-234 shouldn't use the dem-contraction
+sufword demo 145-12356-135 shouldn't use the dem-contraction
+prfword demo 145-12356-135
+prfword demos 145-12356-135-234
always epidem 15-1234-24-145-12356
+always ödem 246-145-12356
+always remmidemmi 1235-15-1346-24-145-15-1346-24
+always sendemast 234-14-145-15-134-1-23456
word durch 1456
@@ -723,6 +926,7 @@ always fürst 124-1256-1235-23456 shouldn't use the für-contraction
word gegen 1245
always gegen 2-1245
+always gegenauigkeit 12346-12346-1345-16-45-13
prfword gegend 12346-1245-14-145
prfword gegenden 12346-1245-14-145-14
prfword gegenzug 2-1245-1356-136-1245
@@ -737,9 +941,14 @@ always fürsorgewesen 2-124-234-26-12346-2456-123456-14 shouldn't use the gewese
word immer 1346
always immer 2-1346
+always abstimm 1-12-23456-24-1346
always immersion 24-1346-12456-234-24-135-1345 shouldn't use the immer-contraction
always immersiv 24-1346-12456-234-24-1236
always flimmer 124-123-24-1346-12456
+always glimmer 1245-123-24-1346-12456
+always schimmer 156-24-1346-12456
+always schlimmer 156-123-24-1346-12456
+always trimmer 2345-1235-24-1346-12456
always wimmer 2456-24-1346-12456 shouldn't use the immer-contraction
always zimmer 1356-24-1346-12456 shouldn't use the immer-contraction
@@ -754,7 +963,12 @@ always mit 2-2345
always mittl =
always mittwoch 134-24-2345-2345-2456-135-1456
always primitiv =
+before t always imita =
+always imitation 24-134-24-2345-5-1345
+always imitativ 24-134-24-2345-5-1236
before g always mitta 134-24-2345-2345-1
+always mittägig 134-24-2345-2345-345-1245-45
+always mittäglich 134-24-2345-2345-345-1245-456
@@ -767,9 +981,14 @@ always nichtzuck 2-1345-1356-136-46
word so 1234
always so 2-1234
always soper 234-135-1234-12456
+always sopfer 234-135-1234-124-12456
endword son =
+endword sor =
+endword sos =
always cursor = shouldn't use the so-contraction
+prfword korso 13-26-234-135 shouldn't use the so-contraction
begword absol =
+always absolu =
begword absorb 1-12-234-26-12
begword absorp 1-12-234-26-1234
always adsorbier 1-145-234-26-12-346-1235
@@ -786,23 +1005,36 @@ begmidword sensor 234-14-234-26
endword sensor 234-14-234-135-1235
endword sensor 234-14-234-135-1235
always sobjek =
-always sockel 234-135-46-13456
+always sobmann 234-135-12-134-235-1345
+always sobst 234-135-12-23456
+always sock 234-135-46
word soda =
-always soffizier 234-135-124-124-24-1356-346-1235
+prfword sofa =
+prfword sofas =
+always soff =
always soft =
always sohl =
always sohn =
sufword soja =
+always soktav =
always soldat =
sufword solo =
endword solo =
endword solos =
+always sombuds =
+always sommelier 234-135-1346-13456-24-12456
always sommer 234-135-1346-12456
before konsonant always son =
always sonogra =
always sonn =
always sonst 234-135-1345-23456
always sophokles 234-135-1234-125-135-13-123-123456
+begmidword sopran 234-135-1234-1235-235
+endword sopran =
+always soptik =
+always soptim =
+always ⠎⠕⠏⠞⠊⠕⠝ =
+always soratorium 234-26-1-2345-26-24-136-134
always sorientier 234-26-24-14-2345-346-1235
before konsonant always sor 234-26
sufword soul =
@@ -812,7 +1044,10 @@ always souvenir 234-135-136-1236-14-24-1235
always souverän 234-135-136-1236-12456-345-1345
always sowjet =
always sozio =
+always sponsor =
midword ungsopt 136-234-135-1234-2345 Abendgestaltungsoption shouldn't use the so-contraction
+prfword sensor 234-14-234-135-1235
+prfword sensoren 234-14-234-26-14
word über 1256
word ueber 1256
@@ -826,8 +1061,21 @@ always überlauf 2-1256-123-16-124
word und 136
always und 2-136
+always abgerund 1-12-12346-1235-256-145
+always aufgerund 2-16-12346-1235-256-145
+always ausgerund 16-234-12346-1235-256-145
+begword gerund 12346-1235-256-145
+always geschunden 12346-156-256-145-14
+always gerundium 1245-12456-256-145-24-136-134
+begword ungerund 256-12346-1235-256-145
+always wohlgerund 2456-123-12346-1235-256-145
sufword bund 12-256-145
-always diffundier 245-24-124-124-256-145-346-1235
+sufword bundes 12-256-145-123456
+prfword bund 12-256-145
+prfword bunde 12-256-145-15
+prfword bunden 12-256-145-14
+prfword bundes 12-256-145-123456
+always diffundier 145-24-124-124-256-145-346-1235
before t always fundamen 124-256-145-1-134-14
before t always aufundamen 16-124-256-145-1-134-14
prfword fund 124-256-145
@@ -840,14 +1088,27 @@ prfword fundener 124-256-145-14-12456
prfword fundenes 124-256-145-14-123456
prfword fundes 124-256-145-123456
prfword funds 124-256-145-234
+prfword fundus 124-256-145-136-234
+always gebunden 12346-12-256-145-14
sufword gesund 12346-234-256-145
+always holunder 125-135-123-256-145-12456
sufword hund 125-256-145 shouldn't use the und-contraction
before hilmnrsu sufword hunde 125-256-145-15 shouldn't use the und-contraction
-sufword blindenhunde 12-123-35-145-14-125-256-145-15 shouldn't use the und-contraction
-sufword diensthunde 145-346-1345-23456-125-256-145-15 shouldn't use the und-contraction
-sufword jagdhunde 245-1-1245-145-125-256-145-15 shouldn't use the und-contraction
-sufword kampfhunde 13-1-134-1234-124-125-256-145-15 shouldn't use the und-contraction
-sufword polizeihunde 1234-135-123-24-1356-146-125-256-145-15 shouldn't use the und-contraction
+always blindenhund 12-123-35-145-14-125-256-145 shouldn't use the und-contraction
+always diensthund 145-346-1345-23456-125-256-145 shouldn't use the und-contraction
+always flughund 124-123-136-1245-125-256-145
+always hatzhund 125-1-2345-1356-125-256-145
+always haushund 125-16-234-125-256-145
+always heereshund 125-15-15-1235-123456-125-256-145
+always hetzhund 125-15-2345-1356-125-256-145
+always hirtenhund 125-24-1235-2345-14-125-256-145
+always jagdhund 245-1-1245-145-125-256-145 shouldn't use the und-contraction
+always kampfhund 13-1-134-1234-124-125-256-145 shouldn't use the und-contraction
+always militärhund 134-24-123-24-2345-345-1235-125-256-145
+always polizeihund 1234-135-123-24-1356-146-125-256-145 shouldn't use the und-contraction
+always rettungshund 1235-15-2345-2345-136-234-125-256-145
+always schweinehund 156-2456-1246-15-125-256-145
+always windhund 2456-35-145-125-256-145
prfword hund 125-256-145 shouldn't use the und-contraction
prfword hunde 125-256-145-15 shouldn't use the und-contraction
prfword hunden 125-256-145-14 shouldn't use the und-contraction
@@ -857,15 +1118,44 @@ always hundert 125-256-145-12456-2345 shouldn't use the und-contraction
prfword hunderte 125-256-145-12456-236 shouldn't use the und-contraction
always kund 13-256-145 shouldn't use the und-contraction
always mund 134-256-145 shouldn't use the und-contraction
+always rundfahrt 1235-256-145-2-1235-2345
always rundfunk 1235-256-145-124-256-13 shouldn't use the und-contraction
always rundgang 1235-256-145-1245-235-1245
always rundgäng 1235-256-145-1245-345-1345-1245
+always kreisrund 13-1235-146-234-1235-256-145
+always schlund 156-123-256-145
sufword schrund 156-1235-256-145
always stundung 23456-256-145-136
always sstundung 234-23456-256-145-136
always umrund 136-134-1235-256-145
+always undamenhaft 256-145-1-134-14-125-124
+always undatier 256-145-1-2345-346-1235
+always undefinier 256-145-15-124-35-346-1235
+always undeformier 256-145-15-124-26-134-346-1235
+always undeklarier 256-145-15-13-123-356-346-1235
+always undeklinier 256-145-15-13-123-35-346-1235
+always undekorier 256-145-15-13-26-346-1235
+sufword undenk 256-145-14-13
+always undetaillier 256-145-15-2345-1-24-12345-346-1235
+always undeterminier 256-145-15-2345-12456-134-35-346-1235
+always undeutbar 256-145-126-2345-12-1-1235
+always undeutlich 256-145-126-2345-456
+always undeutsch 256-145-156
+before t begword undich 256-145-3456
+always undifferenzier 256-145-24-124-124-12456-14-1356-346-1235
+always undiplomat 256-145-24-1234-123-135-134-1-2345
+always undiskut 256-145-24-234-13-136-2345
+always undistanzier 256-145-24-23456-235-1356-346-1235
+always undisziplinier 256-145-24-234-1356-24-1234-123-35-346-1235
+always undogmat 256-145-135-1245-134-1-2345
+always undokumentier 256-145-135-13-136-134-14-2345-346-1235
+always undomestizier 256-145-135-134-15-23456-24-1356-346-1235
+always undotier 256-145-135-2345-346-1235
+always undramat 256-145-1235-1-134-1-2345
+always undruck 256-145-46
+always unduld 256-145-136-123-145
always undurch 256-2-1456
always wund 2456-256-145 shouldn't use the und-contraction
@@ -875,6 +1165,12 @@ always eunter 15-2-256
sufword kunter 13-256-2345-12456 shouldn't use the unter-contraction
sufword kunterbunter 13-256-2345-12456-12-256-2345-12456
sufword munter 134-256-2345-12456 shouldn't use the unter-contraction
+always aufmunter 2-16-134-256-2345-12456
+always aufgemunter 2-16-12346-134-256-2345-12456
+always aufzumunter 2-16-2-1356-134-256-2345-12456
+always ermunter 12456-134-256-2345-12456
+always putzmunter 1234-136-2345-1356-134-256-2345-12456
+
always virus =
word voll 12345
@@ -896,14 +1192,77 @@ always favorit 124-1-1236-26-24-2345 shouldn't use the vor-contraction
word wie 126
always wie 2-126
+always tätowier 2345-345-2345-135-2456-346-1235
+always zwieback 1356-2456-346-12-1-46
always zwiebel 1356-2456-346-12-13456 shouldn't use the wie-contraction
+always zwiefach 1356-2456-346-124-56
+before t always zwiegespal 1356-2456-346-12346-234-1234-25
+before t always zwiespal 1356-2456-346-234-1234-25
+before t always zwiespäl 1356-2456-346-234-1234-345-123
word zu 1356
always zu 2-1356
+always zucchini 1356-136-6-14-1456-35-24
+sufword azur =
+sufword mazurk =
+word zug =
+before konsonant always zug =
+sufword anzuglied 235-2-1356-1245-123-346-145
+sufword anzuglotz 235-2-1356-1245-123-135-2345-1356
+
+always zugegen 2-1356-2-1245
+always zugehör 2-1356-12346-125-246-1235
+always zugleich 2-1356-1245-1456
+always zugrenzen 2-1356-1245-1235-14-1356-14
+always zugriff 2-1356-1245-1235-24-124-124
+always zugabteil 1356-136-1245-1-12-2345-146-123
+sufword zuganzahl 1356-136-1245-235-1356-123
+always zugarbeit 1356-136-1245-356-12
+always zugauflös 1356-136-1245-2-16-123-246-234
+always zugaufsicht 1356-136-1245-2-16-234-3456-2345
+always zugausfall 1356-136-1245-16-234-124-12345
+always zugeinheit 1356-136-1245-1246-125
+always zugeinricht 1356-136-1245-1246-2-3456
+sufword zugeh 2-1356-1245-2356
+always zugeigenschaft 1356-136-1245-146-1245-14-156
+always zugeinsatz 1356-136-1245-1246-234-1356
+always zugeinsätz 1356-136-1245-1246-5-234-1356
+always zugeinwirk 1356-136-1245-1246-2456-13
+always zugentfern 1356-136-1245-14-2345-124-12456-1345
+always zugentführ 1356-136-1245-14-2345-124-125
+always zugentgleis 136-136-1245-14-2345-1245-123-146-234
always zugentlast 1356-136-1245-14-2345-123-1-23456 shouldn't use the zu- nor ge-contraction
-word indem 35-2-12356
-word trotzdem 2345-1356-2-12356
-word zudem 1356-2-12356
+always zugentscheid 1356-136-1245-14-2345-156-146-145
+before t always zugexper 1356-136-1245-15-6-1346-1234-12456
+sufword zugig 1356-136-1245-45
+always zugober 1356-136-1245-135-12-12456
+always zugrunde 2-1356-1245-145-15
+always zugüber 1356-136-1245-2-1256
+always zugunglück 1356-136-1245-256-1245-46
+always zugunter 1356-136-1245-2-256
+
+prfword zupf =
+prfword zupfe =
+prfword zupfen 1356-136-1234-124-14
+prfword zupfend 1356-136-1234-124-14-145
+prfword zupfende 1356-136-1234-124-14-145-15
+prfword zupfendem 1356-136-1234-124-14-145-12356
+prfword zupfenden 1356-136-1234-124-14-145-14
+prfword zupfender 1356-136-1234-124-14-145-12456
+prfword zupfendes 1356-136-1234-124-14-145-123456
+prfword zupfens 1356-136-1234-124-14-234
+prfword zupfst 1356-136-1234-124-23456
+prfword zupft 1356-136-1234-124-2345
+prfword zupfte 1356-136-1234-124-236
+prfword zupftem 1356-136-1234-124-2345-12356
+prfword zupften 1356-136-1234-124-2345-14
+prfword zupfter 1356-136-1234-124-2345-12456
+prfword zupftes 1356-136-1234-124-2345-123456
+prfword zupftest 1356-136-1234-124-236-23456
+prfword zupftet 1356-136-1234-124-236-2345
+
+
+
always zucht 1356-136-1456-2345 shouldn't use the zu-contraction
always zuck 1356-136-46 shouldn't use the zu-contraction
before g always zug =
@@ -943,19 +1302,62 @@ always aktuell 1-13-2345-136-15-12345 should use the ll-contraction
always all 1-12345
sufword alle 1-15
always allegor 1-12345-15-1245-26 Allegorie shouldn't use the ae-contraction
+always allegri 1-12345-15-1245-1235-24
+always allegro 1-12345-15-1245-1235-135
always allein 1-1246
word allem 1-12356
always allen 1-14
+prfword intervallen 35-2345-12456-1236-1-12345-14
+always krallen 13-1235-1-12345-14
+always knall 13-1345-1-12345
+sufword lallen 123-1-12345-14
+always prall 1234-1235-1-12345
+always schnall 156-1345-1-12345
+always korallen 13-26-1-12345-14
+always kristall 13-1235-24-23456-1-12345 shouldn't use any of the allen-contraction
+sufword ballen 12-1-12345-14
+
always aller 1-12456
+always abgeballer 1-12-12346-12-1-12345-12456
+always abzuballer 1-12-2-1356-12-1-12345-12456
+always aufballer 2-16-12-1-12345-12456
+always aufgeballer 2-16-12346-12-1-12345-12456
+always aufzuballer 2-16-2-1356-12-1-12345-12456
+always ballerina 12-1-12345-12456-35-1
+always ballerspiel 12-1-12345-12456-2-346
always basketball 12-1-234-13-15-2345-12-1-12345
always faustball 124-16-23456-12-1-12345
+always football 124-135-135-2345-12-1-12345
always fußball 124-136-6-2346-12-1-12345
+sufword geballer 12346-12-1-12345-12456
always handball 125-145-12-1-12345
+always herumballer 125-12456-136-134-12-1-12345-12456
+always losballer 123-135-234-12-1-12345-12456
+always losgeballer 123-135-234-12346-12-1-12345-12456
+always loszuballer 123-135-234-2-1356-12-1-12345-12456
always metall 134-15-2345-1-12345
+always radball 1235-1-145-12-1-12345
+always reinballer 1235-1246-12-1-12345-12456
+always reingeballer 1235-1246-12346-12-1-12345-12456
+always reinzuballer 1235-1246-2-1356-12-1-12345-12456
+always rumballer 1235-136-134-12-1-12345-12456
+always rumzuballer 1235-136-134-2-1356-12-1-12345-12456
always schneeball 156-1345-15-15-12-1-12345
always volleyball 1236-135-12345-15-6-13456-12-1-12345
always wasserball 2456-1-2346-12456-12-1-12345
-always allerg 1-12345-12456-1245 Allergiker
+always zerballer 1356-12456-12-1-12345-12456
+always zuballer 2-1356-12-1-12345-12456
+always zugeballer 2-1356-12346-12-1-12345-12456
+always zuzuballer 2-1356-2-1356-12-1-12345-12456
+
+always allergen 1-12345-12456-1245-14
+always allergenauest 1-12456-12346-1345-16-15-23456
+always allergie 1-12345-12456-1245-346
+prfword allergien 1-12345-12456-1245-24-14
+always allergik 1-12345-12456-1245-24-13
+always allergisch 1-12345-12456-1245-24-156
+always allergoderm 1-12345-12456-1245-135-145-12456-134
+before g always allergolo 1-12345-12456-1245-135-123-135
word alles 1-123456
always allesbesser 1-123456-234-234
@@ -965,7 +1367,7 @@ always alleskönn 1-123456-2-13
always alleswiss 1-123456-2456-2346
-always allesamt 1-12345-15-234-1-134-2345 shouldn't use the es-contraction
+always allesamt 1-15-234-1-134-2345 shouldn't use the es-contraction
before t always alphabe 25-1234-125-1-23 shouldn't use the hab-contraction
word also 1-135
always ander 2-12456
@@ -975,8 +1377,12 @@ always änder 5-12456
always abänder 1-12-5-12456
always bänder 12-345-1345-145-12456 shouldn't use the änder-contraction
always aender 5-12456
+prfword ränder 1235-345-1345-145-12456
+prfword rändern 1235-345-1345-145-12456-1345
always arbeit 356-12
always arbeits 356-12-234
+always arbeitsam 356-12-2346
+always arbeitsamt 356-12-234-1-134-2345
always arben 356-12-14
always kauf 13-16-124
@@ -1020,11 +1426,6 @@ always beere 12-15-15-1235-15
always beeren 12-15-15-1235-14
always behr 12-2356-1235 entbehren
begword beid 12-145 beiderseits
-always berg 12-12456-1245 shouldn't use the be-contraction
-always berge 12-12456-12346 shouldn't use the be-contraction
-always bergen 12-12456-1245-14 shouldn't use the be-contraction
-always berger 12-12456-1245-12456 shouldn't use the be-contraction
-always berges 12-12456-1245-123456 shouldn't use the be-contraction
always besonder 23
always besser 234-234
contraction ss
@@ -1039,11 +1440,22 @@ always bison =
always bist 12-23456
always bistum 12-24-23456-136-134 shouldn't use the bist-contraction
+always kubist 13-136-12-24-23456
+always kubistisch 13-136-12-5-156
+always snobistisch 234-1345-135-12-5-156
+
always bleib 12-12
contraction bb
+always bleiballast 12-123-346-12-1-12345-1-23456
+always bleibarren 12-123-346-12-356-1235-14
+always bleibehält 12-123-346-23-125-345-123-2345
+always bleibeschwer 12-123-346-23-156-2456-12456
+
always brauch 2-34
+sufword abrauch 1-12-1235-16-1456
always bräuch 5-34
always braeuch 5-34
+
always brief 12-124
contraction bf
always bring 12-1245
@@ -1087,6 +1499,7 @@ always dazubleib 145-1-2-1356-12-12 shouldn't use the dazu-contraction
always dazumal 145-1-2-1356-134
always deuten 145-126-2345-14 shouldn't use the te-contraction
always deal = dealer
+begmidword ideal 24-145-15-25
word dei = Agnus Dei
always demokrat 145-2345
contraction dt
@@ -1110,9 +1523,12 @@ word dir 145-1235
word doch 145-1456
always druck 145-46
always drück 5-145-46
+always bildrück 12-24-123-145-1235-46
always dürf 2-145
always eben 15-12-14
+prfword tebene 2345-15-12-14-15
+
word ebenso 15-135
contraction eo
sufword ehemal 15-125-15-134
@@ -1131,6 +1547,7 @@ contraction tw
always fahr 2-1235
always fahrts 2-1235-2345-234 shouldn't use the ss-contraction
+always fahrtschreib 2-1235-156-12
always fahrtstell 2-1235-2345-2-13456
always fahrtstreck 2-1235-2345-23456-1235-15-46
always fahrtsstell 2-1235-2345-234-2-13456
@@ -1149,6 +1566,7 @@ before hilmnrsu sufword folge 124-1245-15
word folgen 124-1245-14
before konsonant sufword folgen 124-1245-14
sufword folgenabschätz 124-1245-14-1-12-156-345-2345-1356
+always folgenahrung 124-1245-15-1345-1-125-1235-136
sufword folgenerschein 124-1245-14-12456-156-1246
before konsonant sufword folger 124-1245-12456
sufword folgerung 124-1245-12456-136
@@ -1165,10 +1583,11 @@ always aufreund 16-124-145
always führ 124-125
contraction fh
-always fürcht 124-1256-1235-1456-2345 shouldn't use the für-contraction
+before t always fürch 124-1256-1235-1456 shouldn't use the für-contraction
always ganz 1245-1356
contraction gz
+before g always analoganzei 235-25-135-1245-235-1356-146
always gänz 5-1245-1356
always gaenz 5-1245-1356
always garnison 1245-356-1345-24-234-135-1345 shouldn't use the nis-contraction
@@ -1176,7 +1595,9 @@ word gegend 12346-1245-14-145 shouldn't use the gegen-contraction
always gegenüber 1245-1256
contraction gü
+always gegenübernahm 2-1245-2-1256-1345-134
always gegenübertrag 2-1245-2-1256-2345-1245
+always gegenüberwachung 2-1245-2-1256-2456-56-136
always gegenwart 1245-2456
contraction gw
@@ -1192,7 +1613,6 @@ prfword genem 1245-14-12356
prfword genen 1245-14-14
prfword gener 1245-14-12456
prfword genes 1245-14-123456
-always geogra = Geographie shouldn't use the ge-contraction
prfword gern 1245-12456-1345
midendword gerlich 1245-12456-456 bürgerlich shouldn't use the ge-contraction
always gern 1245-12456-1345 we shouldn't use the ge-contraction here
@@ -1213,8 +1633,13 @@ always grund 1245-145
contraction gd
always gründ 5-1245-145
always gründonners 1245-1235-1256-1345-145-135-1345-1345-12456-234 gründonnerstag shouldn't use the gründ-contraction
+
always hab 2-125
+always frühab =
+always frühabsolut = shouldn't use the so-contraction
always habilit =
+always habitus =
+
always haft 125-124
contraction hf
always häft 5-125-124
@@ -1230,11 +1655,12 @@ always hat 125-2345
contraction ht
word hattest 125-15-23456 shouldn't use the es-contraction
word hattrick 125-1-2345-2345-24-46 shouldn't use the hatt-contraction
+before t always phospha =
always haupt 125-1234
contraction hp
always ehaupt 15-125-1234
-always soberfach 234-135-12-12456-124-45
+always soberfach 234-135-12-12456-124-56
always soberfläch 234-135-12-12456-124-123-345-1456
always sobergericht 234-135-12-12456-12346-2-3456
always sobergrenz 234-135-12-12456-1245-1235-14-1356
@@ -1247,6 +1673,8 @@ always soberteil 234-135-12-12456-2345-146-123
always häupt 5-125-1234
always herr 1235-1235
contraction rr
+always herruf 125-12456-1235-136-124
+always sherry 234-125-12456-125-6-13456
always hier 125-1235
contraction hr
@@ -1282,6 +1710,7 @@ word jedoch 245-1456
sufword jetzig 245-45
always johannisberg 245-135-125-235-1345-24-234-12-12456-1245 shouldn't use the nis-contraction
always jung 245-256-1245 shouldn't use the ung-contraction
+prfword junge 245-256-12346 shouldn't use the ung-contraction
word kannst 13-23456
always kapital 13-1234
@@ -1322,13 +1751,17 @@ always ausklang 16-234-13-123-235-1245
always basisklang 12-1-234-24-234-13-123-235-1245
always bassklang 12-1-2346-13-123-235-1245
always beiklang 2-12-13-123-235-1245
+always bildklang 12-24-123-145-13-123-235-1245
always chorklang 1456-26-13-123-235-1245
always donnerklang 145-135-1345-1345-12456-13-123-235-1245
always flötenklang 124-123-246-2345-14-13-123-235-1245
always gegenklang 2-1245-13-123-235-1245
+always gleichklang 1245-1456-13-123-235-1245
always mehrklang 2-2356-13-123-235-1245
always nebenklang 1345-12-13-123-235-1245
always vielklang 1236-123-13-123-235-1245
+always wohlklang 2456-123-13-123-235-1245
+before g always wohlklän 2456-123-13-123-345-1345
always dreiklang 145-1235-146-13-123-235-1245
always vierklang 1236-346-1235-13-123-235-1245
@@ -1337,6 +1770,7 @@ always fünfklang 124-1256-1345-124-13-123-235-1245
always läng 5-123-1245
always laeng 5-123-1245
+before g always abklän =
always jahrelang 245-1235-15-123-1245 shouldn't use the el-contraction
always jahrhundertelang 245-125-15-123-1245 shouldn't use the el-contraction
always jahrzehntelang 245-1356-15-123-1245 shouldn't use the el-contraction
@@ -1350,26 +1784,47 @@ always laess 5-123
sufword blass 12-123-1-2346
sufword blasst 12-123-1-234-23456
always class = shouldn't use the lass-contraction
-before s always glas =
sufword klass 13-123-1-2346 shouldn't use the lass-contraction
+always klasse 13-123-1-2346-15
+always klassen 13-123-1-2346-14
+always klassifi 13-123-1-2346-24-124-24 shouldn't use the lass-contraction
+always klassig 13-123-1-2346-45 shouldn't use the lass-contraction
+always klassisch 13-123-1-2346-24-156 shouldn't use the lass-contraction
+always klassik 13-123-1-2346-24-13
+always klassiz 13-123-1-2346-24-1356
+always deklassier 145-15-13-123-1-2346-346-1235
always lassist 123-1-2346-24-23456
+always klässler 13-123-345-2346-123-12456
+
always laich 123-1-24-1456 shouldn't use the ich-contraction
always lasagne = shouldn't use the sag-contraction
always lasso 123-1-2346-135 shouldn't use the lass-contraction
always länd =
always laend =
+always detailänder 145-15-2345-1-24-123-5-12456
+always stiländer 23456-24-123-5-12456
always leb 123-12
contraction lb
+before b always abkle =
+before b always ankle 235-13-123-15
before b always aufkle 2-16-13-123-15
+before b always bekle 23-13-123-15
+before b always einkle 1246-13-123-15
+before b always festkle 124-15-23456-13-123-15
before t always gekleb 12346-13-123-15-12
+before b begword kle =
always klebeband 13-123-15-23-12-235-145 shouldn't use the leb-contraction
always klebebänder 13-123-15-23-12-345-1345-145-12456 shouldn't use the leb- nor änder-contraction
always klebebild 13-123-15-23-12-24-123-145
always klebstoff 13-123-15-12-23456-135-124-124
+before b always überkle 2-1256-13-123-15
before b begword verkle 36-13-123-15
before b midword verkle 1236-12456-13-123-15
always leicht 123-1456
+before t begword bleich 12-123-146-1456
+prfword schleicht 156-123-146-1456-2345
+
always letzt 123-2345
contraction lt
always lieb 123-346-12
@@ -1383,6 +1838,50 @@ always mmaschin 134-134-156
always nähmaschin 1345-345-125-134-156
always zugmaschin 1356-136-1245-134-156
+before e always akazi =
+before e always amphibi =
+before e always argentini 356-1245-14-2345-35-24
+before e always armeni 356-134-14-24
+before e always australi 16-23456-1235-25-24
+before e always äthiopi =
+before e always babyloni =
+before e always belgi 12-13456-1245-24
+before e always bolivi =
+before e always bosni =
+before e always brasili =
+before e always flexitari 124-123-15-6-1346-24-2345-356-24
+before e always georgi 1245-15-26-1245-24
+before e always gerani 1245-12456-235-24
+before e always gradi =
+before e always histori 125-24-23456-26-24
+before e always hortensi 125-26-2345-14-234-24
+always hygiene 125-6-13456-1245-24-14-15
+always ehygiene 15-125-6-13456-1245-24-14-15
+before e always immobili 24-1346-135-12-24-123-24
+before e always indonesi 35-145-135-1345-123456-24
+before e always itali 24-2345-25-24
+before e always jordani 245-26-145-235-24
+before e always kaledoni 13-25-15-145-135-1345-24
+before e always kaliforni 13-25-24-124-26-1345-24
+before e always kanadi 13-235-1-145-24
+before e always kappadoki =
+before e always kataloni 13-1-2345-25-135-1345-24
+before e always makedoni =
+before e always malaysi 134-25-1-6-13456-234-24
+before e always malawi =
+before e always materi 134-1-2345-12456-24 materie shouldn't use the te- nor the ie-contraction
+before e always mazedoni =
+before e always mikronesi 134-24-13-1235-135-1345-123456-24
+before e always moldawi =
+before e always polynesi 1234-135-123-6-13456-1345-123456-24
+before e always skandinavi 234-13-235-145-35-1-1236-24
+before e always somali 234-135-134-25-24
+before e always spani 234-1234-235-24
+before e always terri 2345-12456-1235-24
+before e always tragödi =
+before e always trinitari 2345-1235-35-24-2345-356-24
+before e always tunesi 2345-256-123456-24
+
always material 134-123
contraction ml
always dematerial 145-15-134-123
@@ -1390,6 +1889,8 @@ always ematerial 15-134-123
always mmaterial 134-134-123
always materiell 134-12345
+always mmateriell 134-134-12345
+
word mir 134-1235
always mittel 134-2345
contraction mt
@@ -1420,20 +1921,48 @@ always enahm 15-1345-134
always natur 1345-2345
contraction nt
+always denatur 145-15-1345-2345
+always renatur 1235-15-1345-2345
+always signatur 234-45-1345-1-2345-136-1235
+always ssignatur 234-234-45-1345-1-2345-136-1235
+
always natürlich 1345-456
always neben 1345-12
contraction nb
always wohneben 2456-135-125-1345-15-12-14
+prfword nebene 1345-15-12-14-15
+prfword nebenen 1345-15-12-14-14
+
always nächst 1345-23456
always naechst 1345-23456
+
always nehm 1345-125
contraction nh
+always enehm 15-1345-125
+
endword nisch 1345-24-156 shouldn't use the nis-contraction
endword nische 1345-24-156-15 shouldn't use the nis-contraction
endword nischem 1345-24-156-12356 shouldn't use the nis-contraction
endword nischen 1345-24-156-14 shouldn't use the nis-contraction
endword nischer 1345-24-156-12456 shouldn't use the nis-contraction
+endword nischere 1345-24-156-12456-15 shouldn't use the nis-contraction
+endword nischerem 1345-24-156-12456-12356 shouldn't use the nis-contraction
+endword nischeren 1345-24-156-12456-14 shouldn't use the nis-contraction
+endword nischerer 1345-24-156-12456-12456 shouldn't use the nis-contraction
+endword nischeres 1345-24-156-12456-123456 shouldn't use the nis-contraction
endword nisches 1345-24-156-123456 shouldn't use the nis-contraction
+endword nischs 1345-24-156-234 shouldn't use the nis-contraction
+endword nischste 1345-24-156-23456-15 shouldn't use the nis-contraction
+endword nischstem 1345-24-156-23456-12356 shouldn't use the nis-contraction
+endword nischsten 1345-24-156-23456-14 shouldn't use the nis-contraction
+endword nischster 1345-24-156-23456-12456 shouldn't use the nis-contraction
+endword nischstes 1345-24-156-23456-123456 shouldn't use the nis-contraction
+endword nischt 1345-24-156-2345 shouldn't use the nis-contraction
+endword nischte 1345-24-156-236 shouldn't use the nis-contraction
+endword nischtem 1345-24-156-2345-12356 shouldn't use the nis-contraction
+endword nischten 1345-24-156-2345-14 shouldn't use the nis-contraction
+endword nischter 1345-24-156-2345-12456 shouldn't use the nis-contraction
+endword nischtes 1345-24-156-2345-123456 shouldn't use the nis-contraction
endword nist 1345-24-23456
endword nisten 1345-24-23456-14
endword nistin 1345-24-23456-35
@@ -1441,11 +1970,14 @@ endword nistinnen 1345-24-23456-35-1345-14
always nichts 1345-234
contraction ns
+always nichtsachs 2-1345-234-56-234
always nichtschimmel 2-1345-156-24-1346-13456
always nichtschlacht 2-1345-156-123-56-2345
always nichtschlag 2-1345-156-1245
+always nichtschlüssel 2-1345-156-123-1256-2346-13456
always nichtschneidend 2-1345-156-1345-146-145-14-145
always nichtschreib 2-1345-156-12
+always nichtschrumpf 2-1345-156-1235-136-134-1234-124
always nichtschuld 2-1345-156-136-123-145
always nichtschüler 2-1345-156-1256-123-12456
always nichtschwefel 2-1345-156-2456-15-124-13456
@@ -1455,9 +1987,14 @@ always nichtsee 2-1345-234-15-15
word nichtsein 2-1345-234-1246
always nichtselbst 2-1345-234-23456
always nichtsesshaft 2-1345-234-15-2346-125-124
+always nichtsequen 2-1345-234-15-6-12345-136-14
always nichtsetz 2-1345-2-15
+always nichtsicht 2-1345-234-3456-2345
+always nichtskandinavier 2-1345-234-13-235-145-35-1-1236-24-12456
always nichtsozial 2-1345-234-123
+always nichtspanier 2-1345-234-1234-235-24-12456
always nichtspanisch 2-1345-234-1234-235-24-156
+begword nichtspezial 2-1345-234-1234-15-1356-24-25
always nichtspezifisch 2-1345-234-1234-15-1356-24-124-24-156
always nichtspiel 2-1345-2-346
always nichtsprachlich 2-1345-234-1234-1235-56-456
@@ -1465,17 +2002,22 @@ always nichtsprech 2-1345-2-2346
always nichtstaat 2-1345-23456-2345
always nichtstand 2-1345-2-23456
always nichtständ 2-1345-5-23456
+always nichtstarter 2-1345-23456-356-2345-12456
+always nichtstatistik 2-1345-23456-1-2345-24-23456-24-13
always nichtstell 2-1345-2-13456
always nichtsteroid 2-1345-23456-12456-135-24-145
always nichtsteuer 2-1345-23456-126-12456
always nichtstreuung 2-1345-23456-1235-126-136
always nichtstruktur 2-1345-23456-1235-136-13-2345-136-1235
always nichtstudent 2-1345-23456-136-145-14-2345
+always nichtsubstantivisch 2-1345-234-136-12-23456-235-2345-24-1236-24-156
always nichtsuchend 2-1345-234-136-1456-14-145
always nichtsehen 2-1345-234-2356-14 shouldn't use the nichts-contraction
always nichtschwimm 2-1345-156-2456-24-1346 shouldn't use the nichts-contraction
always noch 1345-1456
+sufword monoch 134-135-1345-135-1456
+
always nommen 1345-1346
contraction nx
always genommen 12346-1345-1346
@@ -1488,6 +2030,8 @@ prfword normal 1345-26-134-1-123 shouldn't use the mal-contraction
always anim 235-24-134 animal shouldn't use the mal-contraction
always nur 1345-1235
contraction nr
+always knurr =
+
always nutz 1345-1356
contraction nz
always nebenutz 1345-15-23-1345-1356
@@ -1543,6 +2087,7 @@ always richt 2-3456
always gericht 12346-2-3456
always spricht 234-1234-1235-3456-2345 shoudln't use the richt-contraction
always herricht 125-12456-2-3456 shouldn't use the herr-contraction
+sufword trichter 2345-1235-3456-2345-12456
always rück 1235-46
always rueck 1235-46
@@ -1551,9 +2096,14 @@ always herrück 125-15-1235-1235-46 shouldn't use the herr-contraction
always sag 234-1245
contraction sg
+always lossag 123-135-234-234-1245
+always ausagier 16-234-1-1245-346-1235
+always corsage 6-14-26-234-1-12346
+always corsagen 6-14-26-234-1-1245-14
always korsage 13-26-234-1-12346
always korsagen 13-26-234-1-1245-14
always sagenda 234-1-1245-14-145-1
+#always sagenden 234-1-1245-14-145-14
prfword sagent 234-1-1245-14-2345
prfword sagenten 234-1-1245-14-2345-14
prfword sagentin 234-1-1245-14-2345-35
@@ -1561,6 +2111,11 @@ prfword sagentinnen 234-1-1245-14-2345-35-1345-14
prfword sagentur 234-1-1245-14-2345-136-1235
prfword sagenturen 234-1-1245-14-2345-136-1235-14
prfword sagenturs 234-1-1245-14-2345-136-1235-234
+always sagglomer 234-1-1245-123-135-134-12456
+before t always saggrega =
+always sagitation 234-1-1245-24-2345-5-1345
+always visage 1236-24-234-1-12346
+always visagen 1236-24-234-1-1245-14
always saal = shouldn't use the al-contraction
word samen 234-1-134-14 shouldn't use the sam-contraction
@@ -1585,19 +2140,22 @@ always schrieb 2-156
always schwierig 156-45
always schwillt 156-2456-24-12345-2345 shouldn't use the will-contraction
always schwoll 156-2456-135-12345 geschwollen shouldn't use the woll-contraction
+
word sehr 234-1235
+word sosehr 2-1234-234-1235
sufword versehr 36-234-1235
sufword unversehr 256-1236-12456-234-1235
+
always selbst 234-23456
always selbständig 234-13456-12-5-23456-45 shouldn't use the selbst-contraction
always selbstaendig 234-13456-12-5-23456-45 shouldn't use the selbst-contraction
always setz 2-15
before st always setzes 2-15-123456
+prfword setzest 2-15-15-23456
always esetz 15-2-15
always ssetz 234-2-15
-sufword sesam 234-123456-1-134 shouldn't use the sam-contraction
word sind 234-145
contraction sd
always gesinde 12346-234-35-145-15
@@ -1629,8 +2187,17 @@ always stand 2-23456
always ständ 5-23456
always staend 5-23456
+always dienständer 145-346-1345-23456-5-12456
+
always stell 2-13456
+before l sufword bastel 12-1-23456-13456
always sstell 234-2-13456 shouldn't use the ss-contraction
+prfword kastell 13-1-23456-15-12345
+prfword kastelle 13-1-23456-15-12345-15
+prfword kastellen 13-1-23456-15-12345-14
+prfword kastells 13-1-23456-15-12345-234
+
+
word stets 23456-234
always strahier 23456-1235-1-125-346-1235 abstrahieren
@@ -1699,8 +2266,11 @@ always während 345-145
contraction äd
always waehrend 345-145
sufword warm 2456-356-134 shouldn't use the war-contraction
+
always weg 2456-1245
contraction wg
+always norwegen 1345-26-2456-15-1245-14
+always norweger 1345-26-2456-15-1245-12456
always weis 2-146 Anweisung
always weispiel 2456-146-2-346
@@ -1712,10 +2282,15 @@ before s begword zwei 1356-2456-146
always weit 2456-2345
before konsonant begword zweit 1356-2456-146-2345 shouldn't use the weit-contraction
+always zweiteil 1356-2456-146-2345-146-123
+
always wenig 2456-45
sufword wenn 2456-1345
contraction wn
+
always werd 2-2456
+always schwerdonners 156-2456-12456-145-135-1345-1345-12456-234
+
always wesentlich 2456-456
always wiegend 2456-346-1245-14-145 shouldn't use the wie-contraction
always wieder 346-145
@@ -1749,14 +2324,30 @@ always ganzahl 1245-235-1356-123
always zähl 5-1356-123
always zeit 1356-2345
contraction zt
+always polizei 1234-135-123-24-1356-146 polizeitruppen
+
before st midendword zug =
word zum 1356-134
word zunächst 1356-1345
word zunaechst 1356-1345
word zur 1356-1235
+sufword zurkenntnis 1356-1235-13-14-1345-2345-1346
sufword zurschau 1356-1235-156-16
+word zurzeit 1356-1235-1356-2345
sufword zurück 1356-46
sufword zurueck 1356-46
+sufword zurückge 1356-46-12346
+word zurückgehe 1356-46-1245-2356-15
+sufword zurückgehen 1356-46-1245-2356-14
+word zurückgehst 1356-46-1245-2356-23456
+word zurückgeht 1356-46-1245-2356-2345
+sufword zurückgelaufen 1356-46-12346-123-16-124-14
+sufword zurückgelegen 1356-46-1245-1245
+before s sufword zurückverwie 1356-46-1236-12456-2456-346
+before s sufword zurückwie 1356-46-2456-346
+sufword zurückzu 1356-46-2-1356
+sufword zurückzuck 1356-46-1356-136-46
+
always zusammen 1356-234
always zwischen 1356-2456
contraction zw
@@ -1775,7 +2366,6 @@ always ausgaben 16-234-1245-1-12-14 shouldn't use the be-contraction
sufword ablageraum 1-12-123-1-12346-1235-16-134
always ablageräum 1-12-123-1-12346-1235-34-134
always ablageraeum 1-12-123-1-12346-1235-34-134
-always ablauf 1-12-123-16-124 shouldn't use the auf-contraction
always ablösesumm 1-12-123-246-234-15-234-136-1346 shouldn't use the es-contraction
always abloesesumm 1-12-123-246-234-15-234-136-1346 shouldn't use the es-contraction
always abnormität 1-12-1345-26-134-5-345 shouldn't use the mit-contraction
@@ -1788,10 +2378,6 @@ always afrikarefer 1-124-1235-24-13-1-1235-15-124-12456 shouldn't use the ar-con
sufword agent 1-1245-14-2345 shouldn't use the ge-contraction
always akadem 1-13-1-145-12356 shouldn't use the dem-contraction
sufword akten 1-13-2345-14 shouldn't use the te-contraction
-always akteur 1-13-2345-126-1235 shouldn't use the te-contraction
-always ingenieur 35-1245-14-24-126-1235
-always interieur 35-2345-12456-24-126-1235
-always porteur 1234-26-2345-126-1235
always alarm 25-356-134 Alarmmeldung shouldn't use the mm-contraction
always albern 25-12-12456-1345 shouldn't use the be-contraction
always albert 25-12-12456-2345 shouldn't use the be-contraction
@@ -1812,6 +2398,7 @@ always andalusier 235-145-25-136-234-24-12456 shouldn't use the ie-contraction
midendword anebel 1-1345-15-12-13456 Andromedanebel shouldn't use the an-contraction
before st always anfangs 235-124-235-1245-234
before st always angriffs 235-1245-1235-24-124-124-234
+word angriffst 235-1245-1235-24-124-124-23456
always anklage 235-13-123-1-12346 Anklagerede shouldn't use the er-contraction
prfword anklagen 235-13-123-1-1245-14
prfword anklagend 235-13-123-1-1245-14-145
@@ -1827,14 +2414,18 @@ begword anlagen 235-123-1-1245-14
always anlauf 235-123-16-124 shouldn't use the auf-contraction
before m always anleihe 235-123-146-125-15 Anleihemarkt shouldn't use the em-contraction
before m always film =
-class egn egn
-before egn begword anti 235-2345-24
-before egn begword mini 134-35-24
-before egn begword multi =
-before egn begword poli =
-before egn begword quasi =
-before egn begword semi 234-12356-24
-always antichrist 235-2345-24-1456-1235-24-23456 shouldn't use the ich-contraction
+class cegn cegn
+before cegn begword anti 235-2345-24
+before cegn always alkali 25-13-25-24
+before cegn begword epi =
+before cegn always milli 134-24-12345-24
+before cegn begword mini 134-35-24
+before cegn begword multi =
+before cegn begword poli =
+before cegn begword quasi =
+before cegn begword semi 234-12356-24
+word seminar 234-12356-35-1-1235
+begword seminar 234-12356-35-356
always anästh 235-345-234-2345-125 Anästhesie
begword armee 356-134-15-15
word armeen 356-134-15-14
@@ -1850,19 +2441,30 @@ word beines 12-1246-123456 shouldn't use the bei-contraction
always bauform 12-16-124-26-134 shouldn't use the auf-contraction
always beteuer 23-2345-126-12456 shouldn't use the te-contraction
always beute 12-126-236 should use the eu-contraction
+always freibeuter 124-1235-146-12-126-2345-12456
+always wildbeuter 2456-24-123-145-12-126-2345-12456
prfword beuten 12-126-2345-14 should use the eu-contraction
always beutel 12-126-2345-13456 should use the eu-contraction
always bssy 12-234-234-6-13456 shouldn't use the ss-contraction
always bundes 12-256-145-123456 shouldn't use the und-contraction
prfword chemikalie 1456-12356-24-13-25-24-15
-always donnerstag 145-135-1345-1345-12456-234-2345-1-1245 shouldn't use the st-contraction
-before g always samstag =
+
+always geheimdienst 12346-125-146-134-145-346-1345-23456 shouldn't overlap with dienstag
+before g always donnersta 145-135-1345-1345-12456-234-2345-1 shouldn't use the st-contraction
+before g always donnerstä 145-135-1345-1345-12456-234-2345-345 shouldn't use the st-contraction
+before g always samsta =
+before g always samstä =
+before g always ssamsta =
+before g always ssamstä =
endword stag = shouldn't use the st-contraction
endword stage 234-2345-1-12346
endword stages 234-2345-1-1245-123456
-sufword eheinstitut 15-125-15-35-23456-24-2345-136-2345
-begword eheleu 15-125-15-123-126
-before g begword eherin 15-125-15-1235-35 Ehering(e) shouldn't use the er-contraction
+
+sufword ehe =
+word ehen 15-125-14
+word eher 15-125-12456
+sufword ehern 15-125-12456-1345
+midendword ehelich 2356-15-456
midword ehilfs = Analysehilfsmittel shouldn't use the eh-contraction
always einter 15-35-2345-12456 shouldn't use the ein-contraction
always einteress 15-2-35 shouldn't use the ein-contraction
@@ -1871,7 +2473,8 @@ midendword enorm 15-1345-26-134 Aussprachenorm shouldn't use the en-contraction
always emuskel 15-134-136-234-13-13456 shouldn't use the em-contraction
always eschatolog 123456-1456-1-2345-135-123-135-1245 shouldn't use the sch-contraction
always esther 123456-2345-125-12456 shouldn't use the st-contraction
-always ästhe 345-23456-125-15 ästhetisch
+before t always ästhe 345-23456-125-15 ästhetisch
+always ästhes 345-234-2345-125-123456 ästhesie
midendword erecht 15-1235-2345
midendword ericht 15-2-3456
always erepublik 15-1235-13
@@ -1896,6 +2499,8 @@ always generation 1245-14-12456-5-1345
begmidword generator 1245-14-12456-1-2345-26
endword generator 1245-14-12456-1-2345-135-1235
always generier 1245-14-12456-346-1235
+begmidword genital 1245-14-24-2345-25
+always genitiv 1245-14-24-2345-24-1236
before t always gerä 12346-1235-345 should use the ge-contraction
always geraet 12346-1235-345-2345 should use the ge-contraction
always geräusch 12346-1235-34-156 should use the ge-contraction
@@ -1941,19 +2546,21 @@ always hotel 125-135-2345-13456 shouldn't use the te-contraction
always installer 35-23456-1-12345-12456 shouldn't use the aller-contraction
always internet 35-2345-12456-1345-15-2345 shouldn't use the te-contraction
always interview 35-2345-12456-1236-24-15-2456 shouldn't use the ie-contraction
-after st always ionstrieb 245-234-2345-1235-346-12
-after st always ionstrupp 245-234-2345-1235-136-1234-1234
+after st always ionstrieb 24-135-1345-234-2345-1235-346-12
+after st always ionstrupp 24-135-1345-234-2345-1235-136-1234-1234
always jubel 245-136-12-13456 shouldn't use the be-contraction
-always kaffee =
-endword kaffees 13-1-124-124-15-123456
always komponist 13-135-134-1234-135-1345-24-23456 shouldn't use the nis-contraction
always leselamp 123-123456-15-123-1-134-1234 shouldn't use the el-contraction
always liechtenstein 123-346-1456-2345-14-23456-1246 shouldn't use the te-contraction
prfword linie 123-35-24-15 shouldn't use the ie-contraction
+prfword llinie 123-123-35-24-15 shouldn't use the ie-contraction
always richtlini 2-3456-123-35-24
-prfword materie 134-1-2345-12456-24-15 shouldn't use the ie-contraction
always metallen 134-15-2345-1-12345-14 shouldn't use the allen-contraction
always regel 1235-15-1245-13456
+before t always geregel 12346-1235-15-1245-13456
+before t always irregeleite 24-1235-1235-15-12346-123-146-236
+always lageregel 123-1-12346-1235-15-1245-13456
+always eregel 15-1235-15-1245-13456
always release = shouldn't use the el-contraction
always roboter 1235-135-12-135-2345-12456 shouldn't use the te-contraction
always round 1235-135-256-145 shouldn't use the und-contraction
@@ -1964,19 +2571,20 @@ always bläschen 12-123-345-234-1456-14 shouldn't use the sch-contraction
always döschen 145-246-234-1456-14 shouldn't use the sch-contraction
always füsschen 124-1256-2346-1456-14
always gläschen 1245-123-345-234-1456-14 shouldn't use the sch-contraction
+always hälschen 125-345-123-234-1456-14
always häschen 125-345-234-1456-14 shouldn't use the sch-contraction
always häuschen 125-34-234-1456-14 shouldn't use the sch-contraction
always höschen 125-246-234-1456-14 should use the ch-contraction
always küsschen 13-1256-2346-1456-14 shouldn't use the sch-contraction
always lieschen 123-346-234-1456-14 shouldn't use the sch-contraction
+always mäuschen 134-34-234-1456-14
always möschen 134-246-234-1456-14 should use the ch-contraction
always näschen 1345-345-234-1456-14
always radieschen 1235-1-145-346-234-1456-14 shouldn't use the sch-contraction
always röschen 1235-246-234-1456-14 should use the ch-contraction
+always fröschen 124-1235-246-156-14 should use the sch-contraction
begword rosaro = shouldn't use the ar-contraction
-midendword sammel 234-1-1346-13456 shouldn't use the sam-contraction
-midendword samml 234-1-1346-123 shouldn't use the sam-contraction
endword schef 234-1456-15-124
endword schefin 234-1456-15-124-35
endword schefins 234-1456-15-124-35-234
@@ -2042,6 +2650,7 @@ always daenemark 145-345-1345-15-134-356-13 shouldn't use the em-contraction
# names
sufword aaron =
+word abbey =
word angela 235-1245-13456-1 shouldn't use the ge-contraction
word angeles 235-1245-13456-123456 shouldn't use the ge-contraction
word angelika 235-1245-13456-24-13-1 shouldn't use the ge-contraction
diff --git a/Tables/Contraction/de-g0.ctb b/Tables/Contraction/de-g0.ctb
index 18a1ad15d..e8dc7e39f 100644
--- a/Tables/Contraction/de-g0.ctb
+++ b/Tables/Contraction/de-g0.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/de-g1.ctb b/Tables/Contraction/de-g1.ctb
index 3e6f87536..91c368261 100644
--- a/Tables/Contraction/de-g1.ctb
+++ b/Tables/Contraction/de-g1.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -22,6 +22,8 @@
include de-g0.ctb
class cst cst
+class e e
+class g g
class s s
class t t
@@ -64,24 +66,28 @@ always andalusier = shouldn't use the ie-contraction
always asthma = shouldn't use the st-contraction
before t always bundes = shouldn't use the st-contraction
prfword chemikalie 1456-15-134-24-13-1-123-24-15 shouldn't use the ie-contraction
-always dienstag 145-346-1345-234-2345-1-1245 shouldn't use the st-contraction
-always donnerstag = shouldn't use the st-contraction
+
+before g always diensta 145-346-1345-234-2345-1 shouldn't use the st-contraction
+before g always dienstä 145-346-1345-234-2345-345 shouldn't use the st-contraction
+before g always donnersta = shouldn't use the st-contraction
+before g always donnerstä = shouldn't use the st-contraction
+before g always samsta = shouldn't use the st-contraction
+before g always samstä = shouldn't use the st-contraction
+
always eschatolog 15-234-1456-1-2345-135-123-135-1245 shouldn't use the sch-contraction
always esther = shouldn't use the st-contraction
prfword folie = shouldn't use the ie-contraction
sufword hoer 125-246-1235 should use the oe-symbol
always interview = shouldn't use the ie-contraction
always koffein = shouldn't use the ei-contraction
-always lilie = shouldn't use the ie-contraction
+before e always lili = shouldn't use the ie-contraction
prfword linie 123-24-1345-24-15 shouldn't use the ie-contraction
-prfword materie = shouldn't use the ie-contraction
always medien = shouldn't use the ie-contraction
always museum = shouldn't use the eu-contraction
always propriet = proprietär shouldn't use the ie-contraction
always döschen 145-246-234-1456-15-1345
always höschen 125-246-234-1456-15-1345 should use the ch-contraction
word röschen 1235-246-234-1456-15-1345 should use the ch-contraction
-always samstag = shouldn't use the st-contraction
word wisst = shouldn't use the st-contraction
always vietnam = shouldn't use the ie-contraction
diff --git a/Tables/Contraction/de-g2.ctb b/Tables/Contraction/de-g2.ctb
index 85b260be9..045c96040 100644
--- a/Tables/Contraction/de-g2.ctb
+++ b/Tables/Contraction/de-g2.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/de-wort.cti b/Tables/Contraction/de-wort.cti
index 2699af409..1b16d8f6c 100644
--- a/Tables/Contraction/de-wort.cti
+++ b/Tables/Contraction/de-wort.cti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -71,6 +71,7 @@ always schachtel 156-56-2345-13456 shouldn't use the te-contraction
always akkordeon 1-13-13-26-145-15-135-1345 Akkordeonist shouldn't use the nis-contraction
always altersteilzeit 25-2345-12456-234-2345-146-123-1356-2345
always alteurop 25-2345-126-1235-135-1234
+always sampel 234-1-134-1234-13456
before cost always amts = shouldn't use the sch-contraction
begmidword anachron 235-1-1456-1235-135-1345
always analyse 235-25-6-13456-234-15
@@ -85,7 +86,17 @@ always anzeigenummer 235-1356-146-12346-1345-136-1346-12456
always anzeigeröhr 235-1356-146-12346-1235-246-125-1235
-always appartement 1-1234-1234-356-2345-12356-14-2345
+always abonnement 1-12-135-1345-1345-15-134-14-2345
+always agreement 1-1245-1235-15-15-134-14-2345
+always amüsement 1-134-1256-234-15-134-14-2345
+always appartement 1-1234-1234-356-236-134-14-2345
+always bombardement 12-135-134-12-356-145-15-134-14-2345
+always implement 24-134-1234-123-15-134-14-2345
+always inkrement 35-13-1235-15-134-14-2345
+before t always komplemen 13-135-134-1234-123-15-134-14
+always konnossement 13-135-1345-1345-135-2346-15-134-14-2345
+before t always reglemen 1235-15-1245-123-15-134-14
+before t always temperamen 2345-12356-1234-12456-1-134-14
always arbeitgeber 356-12-12346-12-12456 shouldn't use the be-contraction
always auftraggeber 2-16-2345-1245-12346-12-12456
@@ -125,7 +136,9 @@ prfword badender 12-1-145-14-145-12456
prfword badendes 12-1-145-14-145-123456
prfword bades 12-1-145-123456
+always bacterium 12-1-6-14-2345-12456-24-136-134 shouldn't use the te-contraction
always bakteri 12-1-13-2345-12456-24 shouldn't use the te-contraction
+always deuterium 145-126-2345-12456-24-136-134 shouldn't use the te-contraction
always basis =
prfword basisch 12-1-234-24-156
prfword basische 12-1-234-24-156-15
@@ -198,6 +211,7 @@ always dünnbein 145-1256-1345-1345-12-1246
always eisbein 146-234-12-1246
before st begword eis 146-234
always elfenbein 13456-124-14-12-1246 shouldn't use the bei-contraction
+always telfenbein 2345-13456-124-14-12-1246 shouldn't use the bei-contraction
always federbein 124-15-145-12456-12-1246
always felsenbein 124-13456-234-14-12-1246
always fersenbein 124-12456-234-14-12-1246
@@ -306,6 +320,12 @@ always beschwerd 23-156-2456-12456-145 shouldn't use the werd-contraction
before hilmnrsu always beschwerde 23-156-2456-12456-145-15 shouldn't use the werd-contraction
prfword beschwerden 23-156-2456-12456-145-14 shouldn't use the werd-contraction
endword betrieben 23-2345-1235-346-12-14
+always binär =
+word binational 12-24-1345-5-1345-1-123
+begword binational 12-24-1345-5-1345-25
+word binomial 12-24-1345-135-134-24-1-123
+begword binomial 12-24-1345-135-134-24-25
+always binomisch 12-24-1345-135-134-24-156
always bindehaut 12-35-145-15-125-16-2345 shouldn't use the eh-contraction
always bindehäu 12-35-145-15-125-34 shouldn't use the eh-contraction
always bindemittel 12-35-145-15-134-2345 shouldn't use the dem-contraction
@@ -313,10 +333,8 @@ always schaummittel 156-16-134-134-2345 shouldn't use the mm-contraction
always bibel 12-24-12-13456 shouldn't use the be-contraction
sufword bistro 12-24-23456-1235-135 shouldn't use the bist-contraction
sufword blau 12-123-16
-always blaubeer 12-123-16-12-15-15-1235
before g always bleiber 12-123-146-12-12456 shouldn't use the bleib-contraction
sufword bogen 12-135-1245-14 shouldn't use the ge-contraction
-always brombeer =
before hilmnrsu always bronze =
before e always brück 12-1235-1256-46 shouldn't use the rück-contraction
always abrück 1-12-1235-46 should use the rück-contraction
@@ -325,6 +343,8 @@ always bibliograph = bibliographieren shouldn't use the hier-contraction
sufword bistum = shouldn't use the st-contraction
sufword bistüm = shouldn't use the st-contraction
+always blues =
+
always bomben 12-135-134-12-14
always bomber 12-135-134-12-12456
@@ -371,32 +391,40 @@ begword ideal 24-145-15-25
# Französische Berufsbezeichnungen mit -eur
always adapteur 1-145-1-1234-2345-126-1235
+always akteur 1-13-2345-126-1235 shouldn't use the te-contraction
always amateur 1-134-1-2345-126-1235
always samateur 234-1-134-1-2345-126-1235
always animateur 235-24-134-1-2345-126-1235
always akquisiteur 1-13-6-12345-136-24-234-24-2345-126-1235
always bankrotteur 12-235-13-1235-135-2345-2345-126-1235
always dekorateur 145-15-13-26-1-2345-126-1235 shouldn't use the te-contraction
+always demonteur 145-15-134-135-1345-2345-126-1235
always deserteur 145-123456-12456-2345-126-1235
always destillateur 145-15-23456-24-12345-1-2345-126-1235
always dompteur 145-135-134-1234-2345-126-1235
always eskamoteur 123456-13-1-134-135-2345-126-1235
sufword exporteur 1346-1234-26-2345-126-1235
midendword exporteur 15-6-1346-1234-26-2345-126-1235
+always ingenieur 35-1245-14-24-126-1235
always inspekteur 35-234-1234-15-13-2345-126-1235
always einspekteur 15-35-234-1234-15-13-2345-126-1235
always installateur 35-23456-1-12345-1-2345-126-1235
always einstallateur 15-35-23456-1-12345-1-2345-126-1235
always instrukteur 35-23456-1235-136-13-2345-126-1235
always einstrukteur 15-24-12456-135-136-13-2345-126-1235
+always interieur 35-2345-12456-24-126-1235
always kollaborateur 13-135-12345-1-12-26-1-2345-126-1235
always kompositeur 13-135-134-1234-135-234-24-2345-126-1235
always kondukteur 13-135-1345-145-136-13-2345-126-1235
always konstrukteur 13-135-1345-23456-1235-136-13-2345-126-1235
always monteur 134-135-1345-2345-126-1235
always operateur 135-1234-12456-1-2345-126-1235
+always porteur 1234-26-2345-126-1235
+sufword profiteur 12345-124-24-2345-126-1235
+midendword profiteur 1234-1235-135-124-24-2345-126-1235
sufword provokateur 12345-1236-135-13-1-2345-126-1235
midendword provokateur 1234-1235-135-1236-135-13-1-2345-126-1235
+always reparateur 1235-15-1234-356-1-2345-126-1235
always requisiteur 1235-15-6-12345-136-24-234-24-2345-126-1235
always restaurateur 1235-15-23456-16-1235-1-2345-126-1235
always saboteur 234-1-12-135-2345-126-1235
@@ -408,10 +436,31 @@ always sspediteur 234-234-1234-15-145-24-2345-126-1235
always stuckateur 23456-136-46-1-2345-126-1235
always dehydr =
-always demontage 145-15-134-135-1345-2345-1-12346 shoudln't use the dem-contraction
-always demoralis 145-15-13-26-25-24-234
+always deifizier 145-15-24-124-24-1356-346-1235
+begmidword deindustrial 145-15-35-145-136-23456-1235-24-25
+always deinstall 145-15-35-23456-1-12345
+always deinstitutionalis 145-15-35-23456-24-2345-136-2345-24-135-1345-25-24-234
+always deismus 145-15-5-24
+always deistisch 145-15-5-156
+always delokalis 145-15-123-135-13-25-24-234
+before g always demago 145-12356-1-1245-135
+word demand 145-12356-235-145
+always demarkation 145-15-134-356-13-5-1345
+always demarkier 145-15-134-356-13-346-1235
+always dementier 145-12356-14-2345-346-1235
+always demenz 145-12356-14-1356
+always demineralis 145-15-134-35-12456-25-24-234
+always demograph 145-12356-135-1245-1235-1-1234-125
+before g always demonta 145-15-134-135-1345-2345-1 shoudln't use the dem-contraction
+always demontier 145-15-134-135-1345-2345-346-1235
+always demoralis 145-15-134-26-25-24-234
begword demotiv =
+always demystifizier 145-15-134-6-13456-23456-24-124-24-1356-346-1235
+always degradier 145-15-1245-1235-1-145-346-1235 should use the ie-contraction
always delegation 145-15-123-15-1245-5-1345 shouldn't use the el-contraction
+always delegitim 145-15-123-15-1245-24-2345-24-134
+always deradikalis 145-15-1235-1-145-24-13-25-24-234
+
always diagnose =
prfword diagnosen 145-24-1-1245-1345-135-234-14
before konsonant always diagnosen 145-24-1-1245-1345-135-234-14
@@ -428,7 +477,9 @@ sufword drogen 145-1235-135-1245-14 shouldn't use the ge-contractionalways eheli
before e always einreise 1246-1235-146-234-15
always eissport 146-234-234-1234-26-2345
always eisstau 146-234-23456-16 eisstau eisstaub gleisstaub
-#before t always elemen 13456-15-134-14
+sufword eitel 146-2345-13456 shouldn't use the te-contraction
+sufword eiter 146-2345-12456 shouldn't use the te-contraction
+before t always elemen 13456-15-134-14
always erdbeben 12456-145-23-12-14
always erpresser 12456-1234-1235-15-2346-12456
always estragon 123456-2345-1235-1-1245-135-1345 # trag?
@@ -449,8 +500,12 @@ sufword meta =
sufword metalband 134-15-2345-25-12-235-145
prfword metalfan 134-15-2345-25-124-1-1345
prfword metalfans 134-15-2345-25-124-235-234
+sufword kontra =
+sufword kontrahier 13-135-1345-2345-1235-1-125-346-1235
+word kontrastabfalls 13-135-1345-2345-1235-1-23456-1-12-124-12345-234
sufword para 1234-356-1
sufword supra =
+always supraleit 234-136-1234-1235-1-123-146-2345
sufword ultra =
always fangein 124-235-1245-1246 shouldn't use the ge-contraction
@@ -462,6 +517,9 @@ sufword foto =
sufword fund 124-256-145 shouldn't use the und-contraction
sufword gallen 1245-1-12345-14 shouldn't use the allen-contraction
sufword gamma 1245-1-1346-1
+always altentages 25-2345-14-2345-1-1245-123456 shouldn't use the ge-contraction
+always ganztages 1245-1356-2345-1-1245-123456 shouldn't use the ge-contraction
+always garten 1245-356-2345-14 shouldn't use the te-contraction
always gaufürst 1245-16-124-1256-1235-2345 shouldn't use the auf-contraction
before hilmnrsu always gebäude 12346-12-34-145-15
@@ -477,6 +535,7 @@ always gefangenen 12346-124-235-1245-14-14
sufword gehäuse 12346-125-34-234-15
prfword gehäusen 12346-125-34-234-14
prfword gehäuses 12346-125-34-234-123456
+before cost always geistes 1245-146-23456-123456
always geruch 12346-1235-136-1456 shouldn't use the er-contraction
always gerüst 12346-1235-1256-23456 shouldn't use the er-contraction
always gesund 12346-234-256-145
@@ -526,7 +585,10 @@ always gorgonzola 1245-26-1245-135-1345-1356-135-123-1
sufword gottes 1245-135-2345-2345-123456
always gottesdienst 1245-135-2345-2345-123456-145-346-1345-23456
always grippeimpf = shouldn't use the ei-contraction
-always glastrepp = shouldn't use the st-contraction
+before cost always glas =
+always plexiglas 1234-123-15-6-1346-24-1245-123-1-234 shouldn't use the ig-contraction
+always schwinglasch 156-2456-35-1245-123-1-156
+prfword glast 1245-123-1-23456
before cost always abgas =
before cost always bonus =
word bonusse 12-135-1345-136-2346-15
@@ -545,6 +607,11 @@ always gürtel 1245-1256-1235-2345-13456 shouldn't use the te-contraction
always guertel 1245-1256-1235-2345-13456 shouldn't use the te-contraction
before t always habich 125-1-12-3456
prfword haie =
+prfword hain =
+prfword haine =
+prfword hainen 125-1-24-1345-14
+prfword haines 125-1-24-1345-123456
+prfword hains =
always häresie 125-345-1235-15-234-346 shouldn't use the es-contraction
always haeresie 125-345-1235-15-234-346 shouldn't use the es-contraction
sufword hallen 125-1-12345-14 shouldn't use the allen-contraction
@@ -556,7 +623,7 @@ always haustein 125-16-23456-1246
always health =
before cost always heeres 125-15-15-1235-123456
-always heidelbeer 125-146-145-13456-12-15-15-1235
+begword heimat 125-146-134-1-2345 shouldn't allow te-contraction and possibly overlaps with materi(e)
always ehebel 15-125-15-12-13456
always eherstell 15-125-12456-2-13456
always hetero 125-15-2345-12456-135 shoudln't use the te-contraction
@@ -568,10 +635,8 @@ always gehilfen 12346-125-24-123-124-14
before t always hilfs =
prfword hilfst 125-24-123-124-23456
-always himbeer =
sufword hirse =
sufword holunder 125-135-123-256-145-12456
-sufword holunderbeer 125-135-123-256-145-12456-12-15-15-1235
always hungrig 125-256-1245-1235-45 shouldn't use the ung-contraction
always hypnose =
prfword hypnosen 125-6-13456-1234-1345-135-234-14
@@ -582,7 +647,6 @@ always indoor 35-145-135-135-1235 shouldn't use the or-contraction
before t always infraro 35-124-1235-1-1235-135
always insolvenz 35-234-135-123-1236-14-1356 shouldn't use the so-contraction
always johannis 245-135-125-235-1345-24-234
-always johannisbeer 245-135-125-235-1345-24-234-12-15-15-1235
always jubiläum = shouldn't use the äu-contraction
always jubilaeum = shouldn't use the äu-contraction
always kabel 13-1-12-13456
@@ -596,17 +660,16 @@ always karies 13-356-24-123456
before hilmnrsu always karriere 13-356-1235-24-12456-15
prfword karrieren 13-356-1235-24-12456-14
prfword kastanie 13-1-23456-235-24-15
+always kaufpreis 13-16-124-1234-1235-146-234
always kavallerie 13-1-1236-1-12345-12456-346 shouldn't use the aller-contraction
prfword kavallerien 13-1-1236-1-12345-12456-24-14 shouldn't use the aller-contraction
always kavallerist 13-1-1236-1-12345-12456-24-23456 shouldn't use the aller-contraction
always keyboard =
+always kitaleit 13-24-2345-1-123-146-2345 shouldn't use the al-contraction
+always klageruf 13-123-1-12346-123-136-124
sufword klang 13-123-235-1245 shouldn't use the lang-contraction
-always klasse 13-123-1-2346-15
-always klassen 13-123-1-2346-14
-always klassifi 13-123-1-2346-24-124-24 shouldn't use the lass-contraction
-always klassisch 13-123-1-2346-24-156 shouldn't use the lass-contraction
sufword klebe 13-123-15-23 shouldn't use the leb-contraction
-endword klebe 13-123-15-23 shouldn't use the leb-contraction
+endword klebe = shouldn't use the leb-contraction
endword kleber 13-123-15-12-12456 shouldn't use the leb-contraction
endword klebern 13-123-15-12-12456-1345 shouldn't use the leb-contraction
endword klebers 13-123-15-12-12456-234 shouldn't use the leb-contraction
@@ -636,6 +699,7 @@ always palisander 1234-25-24-234-235-145-12456
always salamander 234-25-1-134-235-145-12456
always kriteri 13-1235-24-2345-12456-24 shouldn't use the te-contraction
+prfword kurie =
prfword kurzeit 13-136-1235-1356-146-2345
prfword kurzeiten 13-136-1235-1356-146-2345-14
always kurzentren 13-136-1235-1356-14-2345-1235-14
@@ -651,6 +715,7 @@ always auslauf 16-234-123-16-124
always laufbahn 123-16-124-12-1-125-1345
always laufband 123-16-124-12-235-145
always laufbänd 123-16-124-12-345-1345-145
+always laufgitter 123-16-124-1245-24-2345-2345-12456
always laufrad 123-16-124-1235-1-145
always laufräd 123-16-124-1235-345-145
always laufstall 123-16-124-23456-1-12345
@@ -779,10 +844,13 @@ always wolkenmeer 2456-135-123-13-14-134-15-15-1235
prfword beet =
prfword beete 12-15-15-236
prfword beeten 12-15-15-2345-14
+prfword beetes 12-15-15-2345-123456
prfword beets 12-15-15-2345-234
begword mengen 134-14-1245-14 shouldn't use the ge-contraction
+sufword mensa 134-14-234-1 mensagebäude, mensaleitung, mensamitglied
+
always merkmal 134-12456-13-134
before s always mess 134-15-2346
@@ -795,10 +863,12 @@ always milieu 134-24-123-24-126 shouldn't use the ie-contraction
prfword mitte 134-24-2345-236
prfword mitten 134-24-2345-2345-14
always mitternacht 134-24-2345-2345-12456-1345-56-2345 shoudln't use the mit-contraction
+always mitternächt 134-24-2345-2345-12456-1345-345-1456-2345 shoudln't use the mit-contraction
always mittlung 134-24-2345-2345-123-136 shouldn't use the mit-contraction
prfword moore =
prfword mooren 134-135-135-1235-14
prfword moores 134-135-135-1235-123456
+prfword moors =
always mmöbel 134-134-246-12-13456 shouldn't use the mm-contraction
@@ -850,12 +920,11 @@ always pegel 1234-15-1245-13456
always pestorahm 1234-15-23456-135-1235-1-125-134
begword pferde 1234-124-12456-145-15
always pferderass 1234-124-12456-145-15-1235-1-2346
-endword pferden 1234-124-12456-145-14
+prfword pferden 1234-124-12456-145-14
always philosoph = shouldn't use the so-contraction
before lnr always pizza =
always ⠏⠇⠁⠞⠑⠁⠥ =
always prall 1234-1235-1-12345 shouldn't use the aller- or allen-contraction
-always preiselbeer 1234-1235-146-234-13456-12-15-15-1235
always premier 1234-1235-12356-24-12456
before hilmnrsu always presse 1234-1235-15-2346-15
prfword pressen 1234-1235-15-2346-14
@@ -879,6 +948,11 @@ before m always arm 356-134
before m always baum 12-16-134
before m always konsum =
before m always raum 1235-16-134
+prfword eraum 15-1235-16-134
+prfword eraums 15-1235-16-134-234
+prfword eraumes 15-1235-16-134-123456
+prfword eräume 15-1235-34-134-15
+prfword eräumen 15-1235-34-134-14
before m always schirm 156-24-1235-134
before m always strom 23456-1235-135-134
before m always lärm =
@@ -910,16 +984,17 @@ prfword kriegst 13-1235-346-1245-23456
always rechteinhaber 1235-2345-15-35-2-125-12456 shouldn't use the ein-contraction
+always reichstag 1235-146-1456-234-2345-1-1245 shouldn't use the st-contraction
before e always reise 1235-146-234-15
always relief 1235-13456-24-15-124 shouldn't use the ie-contraction
sufword renten 1235-14-2345-14 shouldn't use the te-contraction
-always requiem 1235-15-6-12345-24-12356
+always requiem 1235-15-6-12345-136-24-12356
before hilmnrsu always reserve 1235-123456-12456-1236-15
prfword reserven 1235-123456-12456-1236-14
before t always resulta =
-always rhabarber 1235-125-1-12-1-1235-12-12456
+always rhabarber 1235-125-1-12-356-12-12456
always röntgen 1235-246-1345-2345-1245-14 shouldn't use the ge-contraction
prfword runde 1235-256-145-15
prfword runden 1235-256-145-14
@@ -951,6 +1026,10 @@ always speise 234-1234-146-234-15
prfword speisen 234-1234-146-234-14
prfword speisend 234-1234-146-234-14-145
prfword speisende 234-1234-146-234-14-145-15
+prfword speisendem 234-1234-146-234-14-145-12356
+prfword speisenden 234-1234-146-234-14-145-14
+prfword speisender 234-1234-146-234-14-145-12456
+prfword speisendes 234-1234-146-234-14-145-123456
always schaufel 156-16-124-13456 shouldn't use the auf-contraction
always schaufenster 156-16-124-14-23456-12456 shouldn't use the auf-contraction
before l always schul 156-136-123
@@ -983,6 +1062,7 @@ before hilmnrsu always see =
always seelen 234-15-15-123-14
always serie 234-12456-24-15 shouldn't use the ie-contraction
always serien 234-12456-24-14 shouldn't use the ie-contraction
+always inserier 35-234-12456-346-1235
before e always sohl = shouldn't use the so-contraction
sufword solar 234-135-123-356
begmidword solidar 234-135-123-24-145-356 shouldn't use the so-contraction
@@ -999,7 +1079,14 @@ always spielhall 2-346-125-1-12345 shouldn't use the all-contraction
before g always staublun 23456-16-12-123-256 shouldn't use the ung-contraction
before e always studi 23456-136-145-24 shouldn't use the ie-contraction
always studier 23456-136-145-346-1235
+
+always schromato 234-1456-1235-135-134-1-2345-135
+always schromosom 234-1456-1235-135-134-135-234-135-134
always schronik 234-1456-1235-135-1345-24-13
+always schronist 234-1456-1235-135-1345-24-23456
+always schronolo 234-1456-1235-135-1345-135-123-135
+always schronometer 234-1456-1235-135-1345-135-134-15-2345-12456
+
always srundfahr 234-1235-256-145-2-1235
before t always stranspor 234-2345-1235-235-234-1234-26
always stradition =
@@ -1011,6 +1098,64 @@ always tabasco =
always stabell 234-2345-1-23-12345
always teacher 2345-15-1-1456-12456
always teaching 2345-15-1-1456-35-1245
+
+always stafel 234-2345-1-124-13456
+always staktik =
+always stanzgrupp 234-2345-235-1356-1245-1235-136-1234-1234
+always starif 234-2345-356-24-124
+always statbestand 234-2345-1-2345-23-2-23456
+always statbeständ 234-2345-1-2345-23-5-23456
+always statsach 234-2345-1-2345-234-56
+always stauglich 234-2345-16-1245-456
+always stechnolog 234-236-1456-1345-135-123-135-1245
+always stelefon 234-2345-13456-15-124-135-1345
+always stelephon 234-2345-13456-15-1234-125-135-1345
+always stelegraf 234-2345-13456-15-1245-1235-1-124
+always stelegraph 234-1245-13456-15-1245-1235-1-1234-125
+always stelegramm 234-2345-13456-15-1245-1235-1-1346
+always stäuschung 234-2345-34-156-136
+always stheater 234-2345-125-15-1-2345-12456
+always sthema 234-2345-125-12356-1
+always sthemen 234-2345-125-12356-14
+always stheolog 234-2345-125-15-135-123-135-1245
+always stheoreti 234-2345-125-15-26-15-2345-24
+always stheorie 234-2345-125-15-26-346
+always stheorien 234-2345-125-15-26-24-14
+before t always stherapeu 234-2345-125-12456-1-1234-126
+always stilgung 234-2345-24-123-1245-136
+prfword stod =
+prfword stode =
+always stoleranz 234-2345-135-123-12456-235-1356
+always stourismus 234-2345-135-136-1235-5-24
+always stourist 234-2345-135-136-1235-24-23456
+always strainer 234-2345-1235-1-24-1345-12456
+always straining 234-2345-1235-1-24-1345-35-1245
+always strächtig 234-2345-1235-345-1456-2345-45
+always stransakt 234-2345-1235-235-234-1-13-2345
+always stransfer 234-2345-1235-235-234-124-12456
+always stransform 234-2345-1235-235-234-124-26-134
+endword stransistor 234-2345-1235-235-234-24-23456-135-1235
+midword stransistor 234-2345-1235-235-234-24-23456-26
+always stranszenden 234-2345-1235-235-234-1356-14-145-14
+always strennung 234-2345-1235-14-1345-136
+always strocknung 234-2345-1235-135-46-1345-136
+always strümmer 234-2345-1235-1256-1346-12456
+prfword stuch 234-2345-136-1456
+prfword stuches 234-2345-136-1456-123456
+prfword stuchs 234-2345-136-1456-234
+prfword stücher 234-2345-1256-1456-12456
+prfword stüchern 234-2345-1256-1456-12456-1345
+always stüchtig 234-2345-1256-1456-2345-45
+always sturnier 234-2345-136-1235-1345-346-1235
+prfword stests 234-236-23456-234
+prfword styp =
+prfword stypen 234-2345-6-13456-1234-14
+prfword styps =
+always stypisch 234-2345-6-13456-1234-24-156
+prfword stypus =
+
+
+
prfword tee =
prfword tees =
@@ -1022,18 +1167,28 @@ always steilheit 23456-146-123-125
before hilmnrsu always teilnahme 2345-146-123-1345-134-15
prfword teilnahmen 2345-146-123-1345-134-14
always steilnehm 234-2345-146-123-1345-125
+
always telefon 2345-13456-15-124-135-1345
-always stelefon 234-2345-13456-15-124-135-1345
+always telephon 2345-13456-15-1234-125-135-1345
+always telegraf 2345-13456-15-1245-1235-1-124
+always telegraph 2345-13456-15-1245-1235-1-1234-125
+always telegramm 2345-13456-15-1245-1235-1-1346
+always telematik 2345-13456-12356-1-2345-24-13
+always telemetr 2345-13456-12356-15-2345-1235
+always telekomm 2345-13456-15-13-1346
always teleskop 2345-13456-123456-13-135-1234
always temperatur 2345-12356-1234-12456-1-2345-136-1235 prefer em-contraction over te-contraction
always stemperatur 234-2345-12356-1234-12456-1-2345-136-1235 prefer em-contraction over te-contraction
+always temperier 2345-12356-1234-12456-346-1235 prefer em-contraction over te-contraction
always tempo 2345-12356-1234-135
prfword temporal 2345-12356-1234-26-1-123
begmidword temporal 2345-12356-1234-26-25
always temporär 2345-12356-1234-26-345-1235
+always stermin 234-2345-12456-134-35
always stochter 234-2345-135-1456-2345-12456
always stöchter 234-2345-246-1456-2345-12456
always strubel 234-2345-1235-136-12-13456 shouldnt use the st- nor the be-contraction
+always tempel 2345-12356-1234-13456 shouldn't use the te-contraction
word tempore 2345-12356-1234-26-15
always stendenz 234-2345-14-145-14-1356
prfword teuer 2345-126-12456 shouldn't use the te-contraction
@@ -1055,6 +1210,10 @@ midendword ungsobjek 136-234-135-12-245-15-13 shouldn't use the so-contraction
always überbrück 2-1256-12-1235-1256-46
sufword vasallen 1236-1-234-1-12345-14 shouldn't use the allen-contraction
always vegetarier 1236-15-12346-2345-356-24-12456
+midendword vergeud 1236-12456-1245-126-145
+begword vergeud 36-1245-126-145
+midendword verteuer 1236-12456-2345-126-12456
+begword verteuer 36-2345-126-12456
begword verwalter 36-2456-25-2345-12456 shouldn't use the te-contraction
midendword verwalter 1236-12456-2456-25-2345-12456 shouldn't use the te-contraction
before hilmnrsu always vize =
@@ -1077,6 +1236,8 @@ prfword wärmerem 2456-345-1235-134-12456-12356
prfword wärmeren 2456-345-1235-134-12456-14
prfword wärmerer 2456-345-1235-134-12456-23456
prfword wärmeres 2456-345-1235-134-12456-123456
+prfword wärmern 2456-345-1235-134-12456-1345
+prfword wärmers 2456-345-1235-134-12456-234
always wärmend 2456-345-1235-134-14-145
always wärmens 2456-345-1235-134-14-234
@@ -1085,6 +1246,8 @@ always wiese 2456-346-234-15 shouldn't use the wie-contraction
always wiesen 2456-346-234-14 shouldn't use the wie-contraction
before cost always wirtschafts 2456-156-234
before cost always wissenschafts 2456-2346-14-156-234
+before l always wurzel 2456-136-1235-1356-13456
+
before lnr always yoga =
always ziegel 1356-346-1245-13456 shouldn't use the ge-contraction
sufword ziel 1356-346-123
@@ -1104,10 +1267,62 @@ always zypressen 1356-6-13456-1234-1235-15-2346-14
# Doppelvokale
always cherokee 1456-12456-135-13-15-15
+always dekolletee 145-15-13-135-12345-15-2345-15-15
+always ackerbeer 1-46-12456-12-15-15-1235
+always apfelbeer 1-1234-124-13456-12-15-15-1235
+always beerenart 12-15-15-1235-14-356-2345
+always beerenförmig 12-15-15-1235-14-124-246-1235-134-45
+always bickbeer 12-24-46-12-15-15-1235
+always blaubeer 12-123-16-12-15-15-1235
+always blutbeer =
+always bockbeer 12-135-46-12-15-15-1235
+always brombeer =
+always boysenbeer 12-135-6-13456-234-14-12-15-15-1235
always erdbeer 12456-145-12-15-15-1235
+always essigbeer 15-2346-45-12-15-15-1235
+always felsenbeer 124-13456-234-14-12-15-15-1235
+always fliederbeer 124-123-346-145-12456-12-15-15-1235
+always gewürzbeer 12346-2456-1256-1235-1356-12-15-15-1235
+always giftbeer =
+always heidelbeer 125-146-145-13456-12-15-15-1235
+always himbeer =
+always holunderbeer 125-135-123-256-145-12456-12-15-15-1235
+always johannisbeer 245-135-125-235-1345-24-234-12-15-15-1235
+always kermesbeer 13-12456-134-123456-12-15-15-1235
+always korallenbeer 13-135-1235-1-12345-14-12-15-15-1235
+always krähenbeer 13-1235-345-125-14-12-15-15-1235
+always lorbeer 123-26-12-15-15-1235
+always maibeer =
+always maulbeer 134-16-123-12-15-15-1235
+always mehlbeer 134-2356-123-12-15-15-1235
+always moorbeer =
+always moosbeer =
+always nachtbeer 1345-56-2345-12-15-15-1235
+always nagelbeer 1345-1-1245-13456-12-15-15-1235
+always nebelbeer 1345-15-12-13456-12-15-15-1235
+always panzerbeer 1234-235-1356-12456-12-15-15-1235
+always pfefferbeer 1234-124-15-124-124-12456-12-15-15-1235
+always pimentbeer 1234-24-134-14-2345-12-15-15-1235
+always preiselbeer 1234-1235-146-234-13456-12-15-15-1235
+always sandbeer 234-235-145-12-15-15-1235
+always schneebeer 156-1345-15-15-12-15-15-1235
+always schwarzbeer 156-2456-356-1356-12-15-15-1235
+always stachelbeer 23456-56-13456-12-15-15-1235
+always stechbeer 23456-15-1456-12-15-15-1235
+always steinbeer 23456-1246-12-15-15-1235
+always sumpfbeer =
+always vogelbeer 1236-135-1245-13456-12-15-15-1235
+always wacholderbeer 2456-56-135-123-145-12456-12-15-15-1235
always waldbeer 2456-25-145-12-15-15-1235
+always weinbeer 2456-1246-12-15-15-1235
+always weißbeer 2456-146-6-2346-12-15-15-1235
+always winterbeer 2456-35-2345-12456-12-15-15-1235
+always wolfsbeer =
+always wunderbeer 2456-256-145-12456-12-15-15-1235
always zwergerdbeer 1356-2456-12456-1245-12456-145-12-15-15-1235
+always zwieselbeer 1356-2456-346-234-13456-12-15-15-1235
always frisbee 124-1235-24-234-12-15-15
+before e always galeer 1245-25-15-15-1235
always haar =
always heer =
always leer =
@@ -1118,6 +1333,7 @@ always dragee =
always bungee 12-256-1245-15-15
always dorothee 145-26-135-2345-125-15-15
always cheese 1456-15-15-234-15
+always paneel 1234-235-15-15-123
always pappmaschee 1234-1-1234-1234-134-1-156-15-15
always klischee 13-123-24-156-15-15
always yankee 6-13456-235-13-15-15
@@ -1167,5 +1383,142 @@ always shampoo =
always tattoo =
always daewoo =
always zoo =
-always zücht 1356-1256-1456-2345
+sufword teer =
+sufword geteer 12346-2345-15-15-1235
+prfword teer =
+prfword teeren 2345-15-15-1235-14
+prfword teers =
+always teergeschmack 2345-15-15-1235-12346-156-134-1-46
+
+always birkenmoor 12-24-1235-13-14-134-135-135-1235
+always buschmoor 12-136-156-134-135-135-1235
+always ekelmoor 15-13-13456-134-135-135-1235
+always flachmoor 124-123-56-134-135-135-1235
+always galgenmoor 1245-25-1245-14-134-135-135-1235
+always grasmoor =
+always hangmoor 125-235-1245-134-135-135-1235
+always heidemoor 125-146-145-15-134-135-135-1235 shouldn't use the dem-contraction
+
+before t always züch 1356-1256-1456
+
+always käse 13-345-234-15
+always käserei 13-345-234-12456-146
+always käsereib 13-345-234-15-1235-146-12
+always käsereibetrie 13-345-234-12456-146-23-2345-1235-346
+always käsereifen 13-345-234-15-1235-146-124-14
+always käsereifung 13-345-234-15-1235-146-124-136
+prfword käsen 13-345-234-14
+prfword käses 13-345-234-123456
+
+always niveau 1345-24-1236-15-16
+always plateau 1234-123-1-2345-15-16
+
+always busschaffner 12-136-234-156-1-124-124-1345-12456
+before t always busschnit 12-136-234-156-1345-24-2345
+prfword bussektor =
+always bussektor 12-136-234-234-15-13-2345-26
+always bussteuer 12-136-234-23456-126-12456
+always busstreck 12-136-234-23456-1235-15-46
+always bussystem 12-136-234-234-6-13456-23456-12356
+
+always reisehafen 1235-146-234-15-125-1-124-14
+always reisehäfen 1235-146-234-15-125-345-124-14
+always reiseland 1235-146-234-15-123-235-145 shouldn't use the el-contraction
+always reiseländer 1235-146-234-15-123-345-1345-145-12456 shouldn't use the el-contraction
+before e always autoreis 16-2345-135-1235-146-234
+always autorennbahn 16-2345-135-1235-14-1345-12-1-125-1345
+word autorennen 16-2345-135-1235-14-1345-14
+word autorennens 16-2345-135-1235-14-1345-14-234
+always autorennfahr 16-2345-135-1235-14-1345-2-1235
+always reisespezialist 1235-146-234-15-234-1234-15-1356-24-25-24-23456
+before hilmnrsu always service 234-12456-1236-24-6-14-15
+prfword services 234-12456-1236-24-6-14-123456
+before t always reiserou 1235-146-234-15-1235-135-136
+before t always reisemona 1235-146-234-15-134-135-1345-1
+always reisesaison 1235-146-234-15-234-1-24-234-135-1345 shouldn't use the es-contraction
+before e always rundreis 1235-256-145-1235-146-234
+
+before hilmnrsu begword lade =
+word laden 123-1-145-14
+sufword ladenadress 123-1-145-14-1-145-1235-15-2346
+sufword ladenangebo 123-1-145-14-235-12346-12-135
+sufword ladenanschlag 123-1-145-14-235-156-1245
+sufword ladenartikel 123-1-145-14-356-2345-24-13-13456
+sufword ladenatelier 123-1-145-14-1-2345-13456-24-12456
+sufword ladenauf 123-1-145-14-2-16
+sufword ladenaus 123-1-145-14-16-234
+sufword ladeneigen 123-1-145-14-146-1245-14
+sufword ladenein 123-1-145-14-1246
+sufword ladeneröffn 123-1-145-14-12456-246-124-124-1345
+sufword ladeninhab 123-1-145-14-35-2-125
+sufword ladeninvent 123-1-145-14-35-1236-14-2345
+sufword ladenöffn 123-1-145-14-246-124-124-1345
+sufword ladenumbau 123-1-145-14-136-134-12-16
+word lader 123-1-145-12456
+word ladern 123-1-145-12456-1345
+word laders 123-1-145-12456-234
+
+
+before konsonant begword laden 123-1-145-14
+
+before hilmnrsu begword lese 123-123456-15
+word lesen 123-123456-14
+sufword lesend 123-123456-14-145
+sufword lesens 123-123456-14-234
+word leser 123-123456-12456
+sufword leseranaly 123-123456-12456-235-25-6-13456
+before g begword leseranfra 123-123456-12456-235-124-1235-1
+sufword leseranteil 123-123456-12456-235-2345-146-123
+sufword leserartikel 123-123456-12456-356-2345-24-13-13456
+word leserei 123-123456-12456-146
+sufword lesereinbind 123-123456-12456-1246-12-35-145
+sufword leserempfehl 123-123456-12456-12356-1234-124-2356-123
+sufword lesererwart 123-123456-12456-12456-2456-356-2345
+word leserin 123-123456-12456-35
+sufword leserinnen 123-123456-12456-35-1356-14
+sufword leserinteress 123-123456-12456-2-35
+sufword leserorientier 123-123456-12456-26-24-14-2345-346-1235
+before e sufword leserumfra 123-123456-12456-136-134-124-1235-1
+before konsonant begword leser 123-123456-12456
+
+before hilmnrsu begword reise 1235-146-234-15
+word reisen 1235-146-234-14
+sufword reisend 1235-146-234-14-145
+word reisens 1235-146-234-14-234
+before t sufword reisern 1235-146-234-12456-1345
+word reises 1235-146-234-123456
+before cost sufword reis 1235-146-234
+
+always avantgarde 1-1236-235-2345-1245-356-145-15
+always firmware 124-24-1235-134-2456-356-15
+always hardcore 125-356-145-6-14-26-15
+always hardware 125-356-145-2456-356-15
+always lactose =
+always renaissance 1235-14-1-24-2346-235-6-14-15
+always software 234-135-124-2345-2456-356-15
+
+before cost always kreis 13-1235-146-234
+before cost always praxis =
+before cost always preis 1234-1235-146-234
+
+always reimplant 1235-15-24-134-1234-123-235-2345
+always reimplement 1235-15-24-134-1234-123-15-134-14-2345
+before t always reimpor 1235-15-24-134-1234-26
+always reindustrialis 1235-15-35-145-136-23456-1235-24-25-24-234
+always reinfizier 1235-15-35-124-24-1356-346-1235
+always reinitialis 1235-15-35-24-2345-24-25-24-234
+always reinkarn 1235-15-35-13-356-1345
+always reinstall 1235-15-35-23456-1-12345
+always reinszenier 1235-15-35-234-1356-14-346-1235
+always reintegr 1235-15-35-236-1245-1235
+always reinterpret 1235-15-35-2345-12456-1234-1235-15-2345
+always remineralis 1235-15-134-35-12456-25-24-234
+always reunion 1235-15-256-24-135-1345
+always reuelos 1235-126-15-123-135-234
+
+always abgeordneten 1-12-12346-26-145-1345-15-2345-14
+always abiturienten 1-12-24-2345-136-1235-24-14-2345-14
+always abonnenten 1-12-135-1345-1345-14-2345-14
+always adressaten 1-145-1235-15-2346-1-2345-14
+always studenten 23456-136-145-14-2345-14
diff --git a/Tables/Contraction/de.ctb b/Tables/Contraction/de.ctb
index 85ac5b5a5..2fa3258aa 100644
--- a/Tables/Contraction/de.ctb
+++ b/Tables/Contraction/de.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/en-ueb-g1.ctb b/Tables/Contraction/en-ueb-g1.ctb
index 251a66af3..7a1aae2a9 100644
--- a/Tables/Contraction/en-ueb-g1.ctb
+++ b/Tables/Contraction/en-ueb-g1.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/en-ueb-g2.ctb b/Tables/Contraction/en-ueb-g2.ctb
index 19836de70..85ad781d0 100644
--- a/Tables/Contraction/en-ueb-g2.ctb
+++ b/Tables/Contraction/en-ueb-g2.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/en-us-g2.ctb b/Tables/Contraction/en-us-g2.ctb
index 912b2cc80..fd713cbbc 100644
--- a/Tables/Contraction/en-us-g2.ctb
+++ b/Tables/Contraction/en-us-g2.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/en.ctb b/Tables/Contraction/en.ctb
index 08cce8bb6..b264fa336 100644
--- a/Tables/Contraction/en.ctb
+++ b/Tables/Contraction/en.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/en_US.ctb b/Tables/Contraction/en_US.ctb
index a2a330f4b..ec3d5f1fe 100644
--- a/Tables/Contraction/en_US.ctb
+++ b/Tables/Contraction/en_US.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/es.ctb b/Tables/Contraction/es.ctb
index 6121b93a7..b7398b8b6 100644
--- a/Tables/Contraction/es.ctb
+++ b/Tables/Contraction/es.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/fr-g1.ctb b/Tables/Contraction/fr-g1.ctb
index 22efe2244..b5382580b 100644
--- a/Tables/Contraction/fr-g1.ctb
+++ b/Tables/Contraction/fr-g1.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/fr-g2.ctb b/Tables/Contraction/fr-g2.ctb
index 81277af29..4e6ac4ee8 100644
--- a/Tables/Contraction/fr-g2.ctb
+++ b/Tables/Contraction/fr-g2.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/fr.ctb b/Tables/Contraction/fr.ctb
index f205963d6..0f51a5238 100644
--- a/Tables/Contraction/fr.ctb
+++ b/Tables/Contraction/fr.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/ha.ctb b/Tables/Contraction/ha.ctb
index 4bca3c434..b929ff2a7 100644
--- a/Tables/Contraction/ha.ctb
+++ b/Tables/Contraction/ha.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/id.ctb b/Tables/Contraction/id.ctb
index f5729ea9a..dfdc9ecf2 100644
--- a/Tables/Contraction/id.ctb
+++ b/Tables/Contraction/id.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/ipa.ctb b/Tables/Contraction/ipa.ctb
index 7d16283dd..99f03041c 100644
--- a/Tables/Contraction/ipa.ctb
+++ b/Tables/Contraction/ipa.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/ja.ctb b/Tables/Contraction/ja.ctb
index cda55e988..3c95b2f55 100644
--- a/Tables/Contraction/ja.ctb
+++ b/Tables/Contraction/ja.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/ko-g0.ctb b/Tables/Contraction/ko-g0.ctb
index bfeccd51b..428b76bca 100644
--- a/Tables/Contraction/ko-g0.ctb
+++ b/Tables/Contraction/ko-g0.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/ko-g1.ctb b/Tables/Contraction/ko-g1.ctb
index 24acc779f..a68d1d9c2 100644
--- a/Tables/Contraction/ko-g1.ctb
+++ b/Tables/Contraction/ko-g1.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/ko-g2.ctb b/Tables/Contraction/ko-g2.ctb
index 78b3dfd25..a4f41174c 100644
--- a/Tables/Contraction/ko-g2.ctb
+++ b/Tables/Contraction/ko-g2.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/ko.ctb b/Tables/Contraction/ko.ctb
index d0f99b7b0..31868085d 100644
--- a/Tables/Contraction/ko.ctb
+++ b/Tables/Contraction/ko.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/latex-access.ctb b/Tables/Contraction/latex-access.ctb
index 82ca4295a..97ad6c616 100755
--- a/Tables/Contraction/latex-access.ctb
+++ b/Tables/Contraction/latex-access.ctb
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/letters-latin.cti b/Tables/Contraction/letters-latin.cti
index c003c5342..22645bea8 100644
--- a/Tables/Contraction/letters-latin.cti
+++ b/Tables/Contraction/letters-latin.cti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/lt.ctb b/Tables/Contraction/lt.ctb
index 50972092a..77a1148c7 100644
--- a/Tables/Contraction/lt.ctb
+++ b/Tables/Contraction/lt.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/mg.ctb b/Tables/Contraction/mg.ctb
index ca22dfc7f..bca97c8f5 100644
--- a/Tables/Contraction/mg.ctb
+++ b/Tables/Contraction/mg.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/mun.ctb b/Tables/Contraction/mun.ctb
index 99681407f..4854c7643 100644
--- a/Tables/Contraction/mun.ctb
+++ b/Tables/Contraction/mun.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/nabcc.cti b/Tables/Contraction/nabcc.cti
index bd9508fc4..c3ccfa49c 100644
--- a/Tables/Contraction/nabcc.cti
+++ b/Tables/Contraction/nabcc.cti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/nl.ctb b/Tables/Contraction/nl.ctb
index 63380c649..67110eb91 100644
--- a/Tables/Contraction/nl.ctb
+++ b/Tables/Contraction/nl.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/none.ctb b/Tables/Contraction/none.ctb
index 037f0988f..70d83ef1e 100644
--- a/Tables/Contraction/none.ctb
+++ b/Tables/Contraction/none.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/ny.ctb b/Tables/Contraction/ny.ctb
index 36cae3fc4..ebff6b545 100644
--- a/Tables/Contraction/ny.ctb
+++ b/Tables/Contraction/ny.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/pt.ctb b/Tables/Contraction/pt.ctb
index 048327884..f3c9f2df8 100644
--- a/Tables/Contraction/pt.ctb
+++ b/Tables/Contraction/pt.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/ru.ctb b/Tables/Contraction/ru.ctb
index 95de1a6d7..469e3a018 100644
--- a/Tables/Contraction/ru.ctb
+++ b/Tables/Contraction/ru.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/si.ctb b/Tables/Contraction/si.ctb
index 2ce064323..9866a6960 100644
--- a/Tables/Contraction/si.ctb
+++ b/Tables/Contraction/si.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/spaces.cti b/Tables/Contraction/spaces.cti
index dc8772fef..0bdad157d 100644
--- a/Tables/Contraction/spaces.cti
+++ b/Tables/Contraction/spaces.cti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/sw.ctb b/Tables/Contraction/sw.ctb
index 893e526b1..a89c88625 100644
--- a/Tables/Contraction/sw.ctb
+++ b/Tables/Contraction/sw.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/th.ctb b/Tables/Contraction/th.ctb
index fa155ea07..146a22660 100644
--- a/Tables/Contraction/th.ctb
+++ b/Tables/Contraction/th.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/zh-tw.ctb b/Tables/Contraction/zh-tw.ctb
index 8f73dca5b..da7639ded 100644
--- a/Tables/Contraction/zh-tw.ctb
+++ b/Tables/Contraction/zh-tw.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/zh-tw.cti b/Tables/Contraction/zh-tw.cti
index 0e30c5d77..e04f8fbf9 100644
--- a/Tables/Contraction/zh-tw.cti
+++ b/Tables/Contraction/zh-tw.cti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/zh_TW.ctb b/Tables/Contraction/zh_TW.ctb
index da87bbe34..9071c8b57 100644
--- a/Tables/Contraction/zh_TW.ctb
+++ b/Tables/Contraction/zh_TW.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Contraction/zu.ctb b/Tables/Contraction/zu.ctb
index fb0c969a1..9d1de2446 100644
--- a/Tables/Contraction/zu.ctb
+++ b/Tables/Contraction/zu.ctb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/abt_basic.kti b/Tables/Input/al/abt_basic.kti
index d72c393a4..b4f756e2d 100644
--- a/Tables/Input/al/abt_basic.kti
+++ b/Tables/Input/al/abt_basic.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -55,7 +55,7 @@ bind Home+Cursor+!RoutingKey1 SETLEFT
bind Prog+!RoutingKey1 CLIP_NEW
bind Home+!RoutingKey1 COPY_RECT
-bind Prog+Home+!Down PASTE
+bind Prog+Home+Down PASTE:PASTE_ALTMODE
bind Prog HELP
bind Prog+Home DISPMD
diff --git a/Tables/Input/al/abt_extra.kti b/Tables/Input/al/abt_extra.kti
index a442d1fab..d5c46b206 100644
--- a/Tables/Input/al/abt_extra.kti
+++ b/Tables/Input/al/abt_extra.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/abt_large.ktb b/Tables/Input/al/abt_large.ktb
index db5db67bf..a344acf6a 100644
--- a/Tables/Input/al/abt_large.ktb
+++ b/Tables/Input/al/abt_large.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/abt_small.ktb b/Tables/Input/al/abt_small.ktb
index d6b5fedc4..2f8ae00f5 100644
--- a/Tables/Input/al/abt_small.ktb
+++ b/Tables/Input/al/abt_small.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/bc-etouch.kti b/Tables/Input/al/bc-etouch.kti
index 17b240d91..01a612a88 100644
--- a/Tables/Input/al/bc-etouch.kti
+++ b/Tables/Input/al/bc-etouch.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/bc-smartpad.kti b/Tables/Input/al/bc-smartpad.kti
index c5b8538ee..6c4908e0b 100644
--- a/Tables/Input/al/bc-smartpad.kti
+++ b/Tables/Input/al/bc-smartpad.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -33,7 +33,7 @@ bind SmartpadLeft KEY_CURSOR_LEFT
bind SmartpadRight KEY_CURSOR_RIGHT
bind SmartpadUp KEY_CURSOR_UP
bind SmartpadDown KEY_CURSOR_DOWN
-bind SmartpadEnter PASTE
+bind SmartpadEnter PASTE:PASTE_ALTMODE
bind SmartpadF2 TIME
diff --git a/Tables/Input/al/bc-thumb.kti b/Tables/Input/al/bc-thumb.kti
index 774c4dc16..f93fb47c8 100644
--- a/Tables/Input/al/bc-thumb.kti
+++ b/Tables/Input/al/bc-thumb.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/bc.kti b/Tables/Input/al/bc.kti
index 40a08165b..d41ead4b0 100644
--- a/Tables/Input/al/bc.kti
+++ b/Tables/Input/al/bc.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -65,7 +65,7 @@ bind ETouchLeftRear+RoutingKey1 CLIP_NEW
bind ETouchLeftFront+RoutingKey1 CLIP_ADD
bind ETouchRightRear+RoutingKey1 COPY_LINE
bind ETouchRightFront+RoutingKey1 COPY_RECT
-bind ETouchRightRear+ETouchRightFront PASTE
+bind ETouchRightRear+ETouchRightFront PASTE:PASTE_ALTMODE
bind ThumbLeft+RoutingKey1 PRINDENT
bind ThumbRight+RoutingKey1 NXINDENT
diff --git a/Tables/Input/al/bc640.ktb b/Tables/Input/al/bc640.ktb
index 03b035b3e..760618991 100644
--- a/Tables/Input/al/bc640.ktb
+++ b/Tables/Input/al/bc640.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/bc680.ktb b/Tables/Input/al/bc680.ktb
index e271d1b16..9d4e96c48 100644
--- a/Tables/Input/al/bc680.ktb
+++ b/Tables/Input/al/bc680.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/el.ktb b/Tables/Input/al/el.ktb
index ba7869deb..8e8e2424e 100644
--- a/Tables/Input/al/el.ktb
+++ b/Tables/Input/al/el.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/sat_common.kti b/Tables/Input/al/sat_common.kti
index f264ebf4d..ab389d28a 100644
--- a/Tables/Input/al/sat_common.kti
+++ b/Tables/Input/al/sat_common.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/sat_large.ktb b/Tables/Input/al/sat_large.ktb
index 8f64e131e..7e1f56641 100644
--- a/Tables/Input/al/sat_large.ktb
+++ b/Tables/Input/al/sat_large.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/sat_nav.kti b/Tables/Input/al/sat_nav.kti
index ba2258c49..ea6250943 100644
--- a/Tables/Input/al/sat_nav.kti
+++ b/Tables/Input/al/sat_nav.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -37,7 +37,7 @@ bind NavPadLeft PREFMENU
bind NavPadRight INFO
bind NavPadF1+NavPadLeft FREEZE
bind NavPadF1+NavPadRight SIXDOTS
-bind NavPadF2+NavPadLeft PASTE
+bind NavPadF2+NavPadLeft PASTE:PASTE_ALTMODE
bind NavPadF2+NavPadRight CSRJMP_VERT
bind NavPadUp PRPROMPT
diff --git a/Tables/Input/al/sat_small.ktb b/Tables/Input/al/sat_small.ktb
index bbf607325..91fd80a68 100644
--- a/Tables/Input/al/sat_small.ktb
+++ b/Tables/Input/al/sat_small.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/sat_speech.kti b/Tables/Input/al/sat_speech.kti
index 9fade0265..fc9e6fa2a 100644
--- a/Tables/Input/al/sat_speech.kti
+++ b/Tables/Input/al/sat_speech.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/sat_tumblers.kti b/Tables/Input/al/sat_tumblers.kti
index ea28f0df0..dae8104b6 100644
--- a/Tables/Input/al/sat_tumblers.kti
+++ b/Tables/Input/al/sat_tumblers.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/al/voyager.ktb b/Tables/Input/al/voyager.ktb
index 5b941d264..b64b165a7 100644
--- a/Tables/Input/al/voyager.ktb
+++ b/Tables/Input/al/voyager.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/android-chords.kti b/Tables/Input/android-chords.kti
index d6993f49a..2385db42e 100644
--- a/Tables/Input/android-chords.kti
+++ b/Tables/Input/android-chords.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/at/all.ktb b/Tables/Input/at/all.ktb
index 784e92097..ec8419d2e 100644
--- a/Tables/Input/at/all.ktb
+++ b/Tables/Input/at/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bg/all.ktb b/Tables/Input/bg/all.ktb
index a85ab296e..afdb5ff1a 100644
--- a/Tables/Input/bg/all.ktb
+++ b/Tables/Input/bg/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/NLS_Zoomax.ktb b/Tables/Input/bm/NLS_Zoomax.ktb
index 51bcbf1e0..6b908be5b 100644
--- a/Tables/Input/bm/NLS_Zoomax.ktb
+++ b/Tables/Input/bm/NLS_Zoomax.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -97,7 +97,7 @@ bind Select+S4 SIXDOTS
bind BL+S3 DISPMD
bind BL+S4 FREEZE
-bind Left+Right PASTE
+bind Left+Right PASTE:PASTE_ALTMODE
bind S2+S3 CSRJMP_VERT
include display6.kti
diff --git a/Tables/Input/bm/b2g.ktb b/Tables/Input/bm/b2g.ktb
index 954d23f60..7e5ef54c9 100644
--- a/Tables/Input/bm/b2g.ktb
+++ b/Tables/Input/bm/b2g.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -43,5 +43,5 @@ bind B11+Up TOP
bind B11+Down BOT
bind B11+Left FWINLTSKIP
bind B11+Right FWINRTSKIP
-bind B11+Select PASTE
+bind B11+Select PASTE:PASTE_ALTMODE
diff --git a/Tables/Input/bm/b9b10.kti b/Tables/Input/bm/b9b10.kti
index 59e17136a..9a7af564e 100644
--- a/Tables/Input/bm/b9b10.kti
+++ b/Tables/Input/bm/b9b10.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/b9b11b10.kti b/Tables/Input/bm/b9b11b10.kti
index f3d31e80d..a7778de45 100644
--- a/Tables/Input/bm/b9b11b10.kti
+++ b/Tables/Input/bm/b9b11b10.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -34,5 +34,5 @@ bind B11+Up TOP
bind B11+Down BOT
bind B11+Left FWINLTSKIP
bind B11+Right FWINRTSKIP
-bind B11+Press PASTE
+bind B11+Press PASTE:PASTE_ALTMODE
diff --git a/Tables/Input/bm/command.kti b/Tables/Input/bm/command.kti
index db866dc22..f44c5b4d9 100644
--- a/Tables/Input/bm/command.kti
+++ b/Tables/Input/bm/command.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/connect.ktb b/Tables/Input/bm/connect.ktb
index d00375d77..4ec56ee4d 100644
--- a/Tables/Input/bm/connect.ktb
+++ b/Tables/Input/bm/connect.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/conny.ktb b/Tables/Input/bm/conny.ktb
index a5cafb9ef..b29284ed1 100644
--- a/Tables/Input/bm/conny.ktb
+++ b/Tables/Input/bm/conny.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/d6.kti b/Tables/Input/bm/d6.kti
index a6e9ff9c9..4c6140136 100644
--- a/Tables/Input/bm/d6.kti
+++ b/Tables/Input/bm/d6.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -65,7 +65,7 @@ bind Display1+Display5 TIME
bind Display1+Display2+Display4 FREEZE
bind Display1+Display2+Display5 HELP
bind Display1+Display3+Display4 PREFMENU
-bind Display1+Display2+Display3+Display4 PASTE
+bind Display1+Display2+Display3+Display4 PASTE:PASTE_ALTMODE
bind Display1+Display2+Display3+Display5 PREFLOAD
bind Display2+Display3+Display4 RESTARTSPEECH
bind Display2+Display3+Display4+Display5 ATTRVIS
diff --git a/Tables/Input/bm/default.ktb b/Tables/Input/bm/default.ktb
index 9eac611f2..79dba8b79 100644
--- a/Tables/Input/bm/default.ktb
+++ b/Tables/Input/bm/default.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/display6.kti b/Tables/Input/bm/display6.kti
index 4d6429b80..2874f1b64 100644
--- a/Tables/Input/bm/display6.kti
+++ b/Tables/Input/bm/display6.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/display7.kti b/Tables/Input/bm/display7.kti
index db0e2dde3..1e97d4b6c 100644
--- a/Tables/Input/bm/display7.kti
+++ b/Tables/Input/bm/display7.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -62,5 +62,5 @@ bind Display3+Display6 PREFLOAD
bind Display4+Display7 PREFSAVE
bind Display5+Display3+Display6 CSRJMP_VERT
-bind Display5+Display4+Display7 PASTE
+bind Display5+Display4+Display7 PASTE:PASTE_ALTMODE
diff --git a/Tables/Input/bm/dm80p.ktb b/Tables/Input/bm/dm80p.ktb
index e9ba470c9..f1229f45b 100644
--- a/Tables/Input/bm/dm80p.ktb
+++ b/Tables/Input/bm/dm80p.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/emulate6.kti b/Tables/Input/bm/emulate6.kti
index c50bcb0d6..d4fc184ad 100644
--- a/Tables/Input/bm/emulate6.kti
+++ b/Tables/Input/bm/emulate6.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/front10.kti b/Tables/Input/bm/front10.kti
index b4f073fbb..b55ad3507 100644
--- a/Tables/Input/bm/front10.kti
+++ b/Tables/Input/bm/front10.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/front6.kti b/Tables/Input/bm/front6.kti
index 5fe20b810..9582c58f0 100644
--- a/Tables/Input/bm/front6.kti
+++ b/Tables/Input/bm/front6.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/horizontal.kti b/Tables/Input/bm/horizontal.kti
index 73723ed40..03ff590cc 100644
--- a/Tables/Input/bm/horizontal.kti
+++ b/Tables/Input/bm/horizontal.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/inka.ktb b/Tables/Input/bm/inka.ktb
index bc65e928f..5e4303924 100644
--- a/Tables/Input/bm/inka.ktb
+++ b/Tables/Input/bm/inka.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/joystick.kti b/Tables/Input/bm/joystick.kti
index be9afd378..bebe0746e 100644
--- a/Tables/Input/bm/joystick.kti
+++ b/Tables/Input/bm/joystick.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/keyboard.kti b/Tables/Input/bm/keyboard.kti
index bdb164e3c..45008919b 100644
--- a/Tables/Input/bm/keyboard.kti
+++ b/Tables/Input/bm/keyboard.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/navpad.kti b/Tables/Input/bm/navpad.kti
index 02ed28d81..d60cf7c42 100644
--- a/Tables/Input/bm/navpad.kti
+++ b/Tables/Input/bm/navpad.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/orbit.ktb b/Tables/Input/bm/orbit.ktb
index 048ff774c..134504c59 100644
--- a/Tables/Input/bm/orbit.ktb
+++ b/Tables/Input/bm/orbit.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/pro.ktb b/Tables/Input/bm/pro.ktb
index 933a53423..f0656113c 100644
--- a/Tables/Input/bm/pro.ktb
+++ b/Tables/Input/bm/pro.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/pronto.ktb b/Tables/Input/bm/pronto.ktb
index 54c82272e..2261bab3d 100644
--- a/Tables/Input/bm/pronto.ktb
+++ b/Tables/Input/bm/pronto.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/pv.ktb b/Tables/Input/bm/pv.ktb
index 5d133c043..038c8959d 100644
--- a/Tables/Input/bm/pv.ktb
+++ b/Tables/Input/bm/pv.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/rb.ktb b/Tables/Input/bm/rb.ktb
index 0784208cf..24667b9fc 100644
--- a/Tables/Input/bm/rb.ktb
+++ b/Tables/Input/bm/rb.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/routing.kti b/Tables/Input/bm/routing.kti
index c40ff35cb..0cbd6a715 100644
--- a/Tables/Input/bm/routing.kti
+++ b/Tables/Input/bm/routing.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/routing6.kti b/Tables/Input/bm/routing6.kti
index fe762c547..3f7dfc6ea 100644
--- a/Tables/Input/bm/routing6.kti
+++ b/Tables/Input/bm/routing6.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/routing7.kti b/Tables/Input/bm/routing7.kti
index 73273ae97..06472923e 100644
--- a/Tables/Input/bm/routing7.kti
+++ b/Tables/Input/bm/routing7.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/status.kti b/Tables/Input/bm/status.kti
index c453f54ba..b237f8f32 100644
--- a/Tables/Input/bm/status.kti
+++ b/Tables/Input/bm/status.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/sv.ktb b/Tables/Input/bm/sv.ktb
index 5cf5d506e..6108bfeed 100644
--- a/Tables/Input/bm/sv.ktb
+++ b/Tables/Input/bm/sv.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/ultra.ktb b/Tables/Input/bm/ultra.ktb
index 6a4273c50..6f2694469 100644
--- a/Tables/Input/bm/ultra.ktb
+++ b/Tables/Input/bm/ultra.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/v40.ktb b/Tables/Input/bm/v40.ktb
index 8f880862d..00ba0f496 100644
--- a/Tables/Input/bm/v40.ktb
+++ b/Tables/Input/bm/v40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/v80.ktb b/Tables/Input/bm/v80.ktb
index 8e93cf340..69aeaa0ee 100644
--- a/Tables/Input/bm/v80.ktb
+++ b/Tables/Input/bm/v80.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/vertical.kti b/Tables/Input/bm/vertical.kti
index 07d776b9f..891b4eeb6 100644
--- a/Tables/Input/bm/vertical.kti
+++ b/Tables/Input/bm/vertical.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/vk.ktb b/Tables/Input/bm/vk.ktb
index 923d1bbc4..791aa2c44 100644
--- a/Tables/Input/bm/vk.ktb
+++ b/Tables/Input/bm/vk.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bm/wheels.kti b/Tables/Input/bm/wheels.kti
index db4e88aea..036267c8c 100644
--- a/Tables/Input/bm/wheels.kti
+++ b/Tables/Input/bm/wheels.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bn/all.ktb b/Tables/Input/bn/all.ktb
index 8c62a7ae2..422ccba8e 100644
--- a/Tables/Input/bn/all.ktb
+++ b/Tables/Input/bn/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bn/input.kti b/Tables/Input/bn/input.kti
index 3445599c9..cc7597ca5 100644
--- a/Tables/Input/bn/input.kti
+++ b/Tables/Input/bn/input.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/bp/all.kti b/Tables/Input/bp/all.kti
index 7b1495b4c..546363e1b 100644
--- a/Tables/Input/bp/all.kti
+++ b/Tables/Input/bp/all.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/cb/all.ktb b/Tables/Input/cb/all.ktb
index 84f123bfd..5a8911603 100644
--- a/Tables/Input/cb/all.ktb
+++ b/Tables/Input/cb/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ce/all.ktb b/Tables/Input/ce/all.ktb
index 1fff0fb78..8b5556258 100644
--- a/Tables/Input/ce/all.ktb
+++ b/Tables/Input/ce/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ce/novem.ktb b/Tables/Input/ce/novem.ktb
index b7f6f6b45..d35eefd0f 100644
--- a/Tables/Input/ce/novem.ktb
+++ b/Tables/Input/ce/novem.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/chords.kti b/Tables/Input/chords.kti
index 81852cd4b..25309f0cb 100644
--- a/Tables/Input/chords.kti
+++ b/Tables/Input/chords.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -121,7 +121,7 @@ assign toggleCommand SLIDEWIN
include toggle.kti
endVariables
-bind \{chord}\{x} PASTE
+bind \{chord}\{x} PASTE:PASTE_ALTMODE
bind \{chord}\{x}+\{toggleOff} CLIP_RESTORE
bind \{chord}\{x}+\{toggleOn} CLIP_SAVE
diff --git a/Tables/Input/cn/all.ktb b/Tables/Input/cn/all.ktb
index 6a449d8c0..98bf01ef5 100644
--- a/Tables/Input/cn/all.ktb
+++ b/Tables/Input/cn/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/dp/all.ktb b/Tables/Input/dp/all.ktb
index b66cb34e0..cd13e1bda 100644
--- a/Tables/Input/dp/all.ktb
+++ b/Tables/Input/dp/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/dp/function.kti b/Tables/Input/dp/function.kti
index 047d63db9..d09f439a8 100644
--- a/Tables/Input/dp/function.kti
+++ b/Tables/Input/dp/function.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/dp/keyboard.kti b/Tables/Input/dp/keyboard.kti
index 037345ada..45bdfb72c 100644
--- a/Tables/Input/dp/keyboard.kti
+++ b/Tables/Input/dp/keyboard.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/dp/navigation.kti b/Tables/Input/dp/navigation.kti
index 528594133..231b8da05 100644
--- a/Tables/Input/dp/navigation.kti
+++ b/Tables/Input/dp/navigation.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/dp/panfn4.ktb b/Tables/Input/dp/panfn4.ktb
index 8ef758ba5..66b51b160 100644
--- a/Tables/Input/dp/panfn4.ktb
+++ b/Tables/Input/dp/panfn4.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/dp/panning.kti b/Tables/Input/dp/panning.kti
index 8693ebb17..e21633298 100644
--- a/Tables/Input/dp/panning.kti
+++ b/Tables/Input/dp/panning.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/dp/routing.kti b/Tables/Input/dp/routing.kti
index 063f23e33..54e4ab78b 100644
--- a/Tables/Input/dp/routing.kti
+++ b/Tables/Input/dp/routing.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/dp/scroll.kti b/Tables/Input/dp/scroll.kti
index a49dc4587..16e9a75a7 100644
--- a/Tables/Input/dp/scroll.kti
+++ b/Tables/Input/dp/scroll.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/braille.kti b/Tables/Input/eu/braille.kti
index 79b2d69a8..35f92ecf5 100644
--- a/Tables/Input/eu/braille.kti
+++ b/Tables/Input/eu/braille.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/clio.ktb b/Tables/Input/eu/clio.ktb
index b6c051db4..eed7ca14c 100644
--- a/Tables/Input/eu/clio.ktb
+++ b/Tables/Input/eu/clio.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/common.kti b/Tables/Input/eu/common.kti
index 70b2f0b90..da5b7532e 100644
--- a/Tables/Input/eu/common.kti
+++ b/Tables/Input/eu/common.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/esys_large.ktb b/Tables/Input/eu/esys_large.ktb
index 8e90f861a..0b9240825 100644
--- a/Tables/Input/eu/esys_large.ktb
+++ b/Tables/Input/eu/esys_large.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/esys_medium.ktb b/Tables/Input/eu/esys_medium.ktb
index 88195faaf..da71d1e33 100644
--- a/Tables/Input/eu/esys_medium.ktb
+++ b/Tables/Input/eu/esys_medium.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/esys_small.ktb b/Tables/Input/eu/esys_small.ktb
index e240096de..6e14afcaa 100644
--- a/Tables/Input/eu/esys_small.ktb
+++ b/Tables/Input/eu/esys_small.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/esytime.ktb b/Tables/Input/eu/esytime.ktb
index 89e63eb11..afb0e40fe 100644
--- a/Tables/Input/eu/esytime.ktb
+++ b/Tables/Input/eu/esytime.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/iris.ktb b/Tables/Input/eu/iris.ktb
index 5115692d3..62ea8b5a3 100644
--- a/Tables/Input/eu/iris.ktb
+++ b/Tables/Input/eu/iris.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/joysticks.kti b/Tables/Input/eu/joysticks.kti
index c23133950..42798262d 100644
--- a/Tables/Input/eu/joysticks.kti
+++ b/Tables/Input/eu/joysticks.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/routing.kti b/Tables/Input/eu/routing.kti
index 48e4b5ba4..377266a34 100644
--- a/Tables/Input/eu/routing.kti
+++ b/Tables/Input/eu/routing.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/sw12.kti b/Tables/Input/eu/sw12.kti
index e7e4e10ae..8b4831fae 100644
--- a/Tables/Input/eu/sw12.kti
+++ b/Tables/Input/eu/sw12.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/sw34.kti b/Tables/Input/eu/sw34.kti
index cdf59066c..776dc902e 100644
--- a/Tables/Input/eu/sw34.kti
+++ b/Tables/Input/eu/sw34.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/eu/sw56.kti b/Tables/Input/eu/sw56.kti
index 27ad47038..0ff0753cf 100644
--- a/Tables/Input/eu/sw56.kti
+++ b/Tables/Input/eu/sw56.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fa/all.ktb b/Tables/Input/fa/all.ktb
index 61ccc977b..aa64af9d6 100644
--- a/Tables/Input/fa/all.ktb
+++ b/Tables/Input/fa/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -82,7 +82,7 @@ bind K8+K7 TOP
bind K8+K9 BOT
bind K8 SAY_LINE:MUTE
-bind K7+K8+K9 PASTE
+bind K7+K8+K9 PASTE:PASTE_ALTMODE
bind K1+K7 PRPROMPT
bind K1+K9 NXPROMPT
diff --git a/Tables/Input/fs/bumpers.kti b/Tables/Input/fs/bumpers.kti
index 6f6ca9ee6..d5f78c32e 100644
--- a/Tables/Input/fs/bumpers.kti
+++ b/Tables/Input/fs/bumpers.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fs/common.kti b/Tables/Input/fs/common.kti
index c2e1602ab..7ef6db4a3 100644
--- a/Tables/Input/fs/common.kti
+++ b/Tables/Input/fs/common.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -21,7 +21,7 @@ bind Right\{navKeyType}Press LNEND
bind LeftSelector BACK:TOP_LEFT
bind RightSelector HOME:BOT_LEFT
-bind LeftSelector+RightSelector PASTE
+bind LeftSelector+RightSelector PASTE:PASTE_ALTMODE
bind PanLeft FWINLT
bind PanRight FWINRT
diff --git a/Tables/Input/fs/focus.kti b/Tables/Input/fs/focus.kti
index 5774448c7..33229d859 100644
--- a/Tables/Input/fs/focus.kti
+++ b/Tables/Input/fs/focus.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fs/focus1.ktb b/Tables/Input/fs/focus1.ktb
index a0f55900e..a8aca36fe 100644
--- a/Tables/Input/fs/focus1.ktb
+++ b/Tables/Input/fs/focus1.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fs/focus14.ktb b/Tables/Input/fs/focus14.ktb
index 30a31c189..6ae883eb2 100644
--- a/Tables/Input/fs/focus14.ktb
+++ b/Tables/Input/fs/focus14.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fs/focus40.ktb b/Tables/Input/fs/focus40.ktb
index 702834d22..6e89cba42 100644
--- a/Tables/Input/fs/focus40.ktb
+++ b/Tables/Input/fs/focus40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fs/focus80.ktb b/Tables/Input/fs/focus80.ktb
index c635fecb8..4d66f1913 100644
--- a/Tables/Input/fs/focus80.ktb
+++ b/Tables/Input/fs/focus80.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fs/keyboard.kti b/Tables/Input/fs/keyboard.kti
index 093e36c83..9606f73f4 100644
--- a/Tables/Input/fs/keyboard.kti
+++ b/Tables/Input/fs/keyboard.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fs/pacmate.ktb b/Tables/Input/fs/pacmate.ktb
index 15708a625..2901f3c84 100644
--- a/Tables/Input/fs/pacmate.ktb
+++ b/Tables/Input/fs/pacmate.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fs/rockers.kti b/Tables/Input/fs/rockers.kti
index 3a11b7cfd..2a54a8b92 100644
--- a/Tables/Input/fs/rockers.kti
+++ b/Tables/Input/fs/rockers.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/fs/speech.kti b/Tables/Input/fs/speech.kti
index e23c3cf95..20307267a 100644
--- a/Tables/Input/fs/speech.kti
+++ b/Tables/Input/fs/speech.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hd/mbl.ktb b/Tables/Input/hd/mbl.ktb
index f8c1d91e2..9476791ff 100644
--- a/Tables/Input/hd/mbl.ktb
+++ b/Tables/Input/hd/mbl.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -64,7 +64,7 @@ bind B2+K3 FWINRTSKIP
bind B3+K1 LNBEG
bind B3+K3 LNEND
-bind B4+K1 PASTE
+bind B4+K1 PASTE:PASTE_ALTMODE
bind B4+K3 CSRJMP_VERT
bind B5+K1 TIME
diff --git a/Tables/Input/hd/pfl.ktb b/Tables/Input/hd/pfl.ktb
index 0681c603a..1797927f9 100644
--- a/Tables/Input/hd/pfl.ktb
+++ b/Tables/Input/hd/pfl.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -67,7 +67,7 @@ bind B3+K3 FWINRTSKIP
bind B7+K1 LNBEG
bind B7+K3 LNEND
-bind B5+K1 PASTE
+bind B5+K1 PASTE:PASTE_ALTMODE
bind B5+K3 CSRJMP_VERT
bind B6+K1 TIME
diff --git a/Tables/Input/hm/beetle.ktb b/Tables/Input/hm/beetle.ktb
index e2cbbc177..e2af721c7 100644
--- a/Tables/Input/hm/beetle.ktb
+++ b/Tables/Input/hm/beetle.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/braille.kti b/Tables/Input/hm/braille.kti
index 1aa087b4b..b905788d3 100644
--- a/Tables/Input/hm/braille.kti
+++ b/Tables/Input/hm/braille.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/common.kti b/Tables/Input/hm/common.kti
index d5a2618f7..1c11a9c59 100644
--- a/Tables/Input/hm/common.kti
+++ b/Tables/Input/hm/common.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/contexts.kti b/Tables/Input/hm/contexts.kti
index a506d5c4b..1df4b257f 100644
--- a/Tables/Input/hm/contexts.kti
+++ b/Tables/Input/hm/contexts.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/edge.ktb b/Tables/Input/hm/edge.ktb
index 389eae7c2..969c11990 100644
--- a/Tables/Input/hm/edge.ktb
+++ b/Tables/Input/hm/edge.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/emotion.ktb b/Tables/Input/hm/emotion.ktb
index 092e252e6..0b7467307 100644
--- a/Tables/Input/hm/emotion.ktb
+++ b/Tables/Input/hm/emotion.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/f14.kti b/Tables/Input/hm/f14.kti
index 3ecb08d1c..dbaef174d 100644
--- a/Tables/Input/hm/f14.kti
+++ b/Tables/Input/hm/f14.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/f18.kti b/Tables/Input/hm/f18.kti
index 936d46fc0..74176c0d5 100644
--- a/Tables/Input/hm/f18.kti
+++ b/Tables/Input/hm/f18.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/fnkey.kti b/Tables/Input/hm/fnkey.kti
index 5963db436..93cd47cde 100644
--- a/Tables/Input/hm/fnkey.kti
+++ b/Tables/Input/hm/fnkey.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/left.kti b/Tables/Input/hm/left.kti
index 3001e2a2d..4eeb59c87 100644
--- a/Tables/Input/hm/left.kti
+++ b/Tables/Input/hm/left.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/letters.kti b/Tables/Input/hm/letters.kti
index a112708ba..27c8bb1b9 100644
--- a/Tables/Input/hm/letters.kti
+++ b/Tables/Input/hm/letters.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/pan.ktb b/Tables/Input/hm/pan.ktb
index 8a97a574e..7755b5549 100644
--- a/Tables/Input/hm/pan.ktb
+++ b/Tables/Input/hm/pan.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/pan.kti b/Tables/Input/hm/pan.kti
index a33274bda..a76fae8ea 100644
--- a/Tables/Input/hm/pan.kti
+++ b/Tables/Input/hm/pan.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/qwerty.ktb b/Tables/Input/hm/qwerty.ktb
index 2c53eca9a..f10843a38 100644
--- a/Tables/Input/hm/qwerty.ktb
+++ b/Tables/Input/hm/qwerty.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/qwerty.kti b/Tables/Input/hm/qwerty.kti
index e12f3c78a..6350c3178 100644
--- a/Tables/Input/hm/qwerty.kti
+++ b/Tables/Input/hm/qwerty.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/right.kti b/Tables/Input/hm/right.kti
index 5d3c03428..e631da7dc 100644
--- a/Tables/Input/hm/right.kti
+++ b/Tables/Input/hm/right.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/scroll.ktb b/Tables/Input/hm/scroll.ktb
index ea2bb3e1e..a2461c04d 100644
--- a/Tables/Input/hm/scroll.ktb
+++ b/Tables/Input/hm/scroll.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/scroll.kti b/Tables/Input/hm/scroll.kti
index e6f1111ab..fc8e7f4c1 100644
--- a/Tables/Input/hm/scroll.kti
+++ b/Tables/Input/hm/scroll.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hm/sync.ktb b/Tables/Input/hm/sync.ktb
index 9ea9b6817..b8c9aa3fd 100644
--- a/Tables/Input/hm/sync.ktb
+++ b/Tables/Input/hm/sync.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/ab.ktb b/Tables/Input/ht/ab.ktb
index 46d9a729a..22b1f5fc7 100644
--- a/Tables/Input/ht/ab.ktb
+++ b/Tables/Input/ht/ab.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/ab.kti b/Tables/Input/ht/ab.kti
index 92022d78d..f1c0c8767 100644
--- a/Tables/Input/ht/ab.kti
+++ b/Tables/Input/ht/ab.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/ab_s.ktb b/Tables/Input/ht/ab_s.ktb
index f2f1402d8..eb1a5aaa7 100644
--- a/Tables/Input/ht/ab_s.ktb
+++ b/Tables/Input/ht/ab_s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/ac4.ktb b/Tables/Input/ht/ac4.ktb
index a19cac92f..efbd03720 100644
--- a/Tables/Input/ht/ac4.ktb
+++ b/Tables/Input/ht/ac4.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -27,7 +27,7 @@ bind SpaceRight+RoutingKey NXINDENT
bind SpaceLeft FWINLT
bind SpaceRight FWINRT
-bind SpaceLeft+SpaceRight PASTE
+bind SpaceLeft+SpaceRight PASTE:PASTE_ALTMODE
bind B1+SpaceLeft LNBEG
bind B1+SpaceRight LNEND
diff --git a/Tables/Input/ht/acp.ktb b/Tables/Input/ht/acp.ktb
new file mode 100644
index 000000000..3604772e3
--- /dev/null
+++ b/Tables/Input/ht/acp.ktb
@@ -0,0 +1,63 @@
+###############################################################################
+# BRLTTY - A background process providing access to the console screen (when in
+# text mode) for a blind person using a refreshable braille display.
+#
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
+#
+# BRLTTY comes with ABSOLUTELY NO WARRANTY.
+#
+# This is free software, placed under the terms of the
+# GNU Lesser General Public License, as published by the Free Software
+# Foundation; either version 2.1 of the License, or (at your option) any
+# later version. Please see the file LICENSE-LGPL for details.
+#
+# Web Page: http://brltty.app/
+#
+# This software is maintained by Dave Mielke <dave@mielke.cc>.
+###############################################################################
+
+title HandyTech Activator Pro
+
+bind B1+B4+SpaceLeft TOUCH_NAV
+
+bind SpaceLeft+RoutingKey PRINDENT
+bind SpaceRight+RoutingKey NXINDENT
+
+bind SpaceLeft FWINLT
+bind SpaceRight FWINRT
+bind SpaceLeft+SpaceRight PASTE:PASTE_ALTMODE
+
+bind B1+SpaceLeft LNBEG
+bind B1+SpaceRight LNEND
+bind B2+SpaceLeft TOP
+bind B2+SpaceRight BOT
+bind B3+SpaceLeft HWINLT
+bind B3+SpaceRight HWINRT
+bind B6+SpaceLeft CHRLT
+bind B6+SpaceRight CHRRT
+bind B2+B3+SpaceLeft MUTE
+bind B2+B3+SpaceRight SAY_LINE
+
+include dots.kti
+
+context braille Braille Input Mode
+map B4 DOT1
+map B3 DOT2
+map B2 DOT3
+map B5 DOT4
+map B6 DOT5
+map B7 DOT6
+map B1 DOT7
+map B8 DOT8
+bind SpaceLeft PASSDOTS
+bind SpaceRight KEY_ENTER
+bind SpaceLeft+B1 KEY_BACKSPACE
+map SpaceLeft CONTROL
+map SpaceRight META
+bind B1+B8+SpaceLeft CONTEXT+default
+
+context default
+bind B1+B8+SpaceLeft CONTEXT+braille
+
+include ../bm/display6.kti
+include ../bm/routing6.kti
diff --git a/Tables/Input/ht/alo.ktb b/Tables/Input/ht/alo.ktb
index 299506421..37b703220 100644
--- a/Tables/Input/ht/alo.ktb
+++ b/Tables/Input/ht/alo.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/as40.ktb b/Tables/Input/ht/as40.ktb
index df955a5ed..9cbdb9cd1 100644
--- a/Tables/Input/ht/as40.ktb
+++ b/Tables/Input/ht/as40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/bb.ktb b/Tables/Input/ht/bb.ktb
index 4ca94c1ef..dfafc2ff6 100644
--- a/Tables/Input/ht/bb.ktb
+++ b/Tables/Input/ht/bb.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/bbp.ktb b/Tables/Input/ht/bbp.ktb
index 9e0157deb..c607f914c 100644
--- a/Tables/Input/ht/bbp.ktb
+++ b/Tables/Input/ht/bbp.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/bkwm.ktb b/Tables/Input/ht/bkwm.ktb
index d09b1dfa7..653dca1f5 100644
--- a/Tables/Input/ht/bkwm.ktb
+++ b/Tables/Input/ht/bkwm.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/brln.ktb b/Tables/Input/ht/brln.ktb
index 687e6b1aa..07ad05379 100644
--- a/Tables/Input/ht/brln.ktb
+++ b/Tables/Input/ht/brln.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/bs.kti b/Tables/Input/ht/bs.kti
index 86788d677..01dad796e 100644
--- a/Tables/Input/ht/bs.kti
+++ b/Tables/Input/ht/bs.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -26,7 +26,7 @@ bind SpaceRight+RoutingKey NXINDENT
bind SpaceLeft FWINLT
bind SpaceRight FWINRT
-bind SpaceLeft+SpaceRight PASTE
+bind SpaceLeft+SpaceRight PASTE:PASTE_ALTMODE
bind B1+SpaceLeft LNBEG
bind B1+SpaceRight LNEND
diff --git a/Tables/Input/ht/bs40.ktb b/Tables/Input/ht/bs40.ktb
index 8c8890257..a93345237 100644
--- a/Tables/Input/ht/bs40.ktb
+++ b/Tables/Input/ht/bs40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/bs80.ktb b/Tables/Input/ht/bs80.ktb
index a51c76116..98183742d 100644
--- a/Tables/Input/ht/bs80.ktb
+++ b/Tables/Input/ht/bs80.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/cb40.ktb b/Tables/Input/ht/cb40.ktb
index 15cce07bc..5e3a617a0 100644
--- a/Tables/Input/ht/cb40.ktb
+++ b/Tables/Input/ht/cb40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/dots.kti b/Tables/Input/ht/dots.kti
index 941c1583f..62a2bc59b 100644
--- a/Tables/Input/ht/dots.kti
+++ b/Tables/Input/ht/dots.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/easy.ktb b/Tables/Input/ht/easy.ktb
index b34dc6499..9baa55959 100644
--- a/Tables/Input/ht/easy.ktb
+++ b/Tables/Input/ht/easy.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -27,7 +27,7 @@ bind RoutingKey+!RoutingKey CLIP_COPY
bind Left+RoutingKey PRINDENT
bind Right+RoutingKey NXINDENT
-bind Left+Right PASTE
+bind Left+Right PASTE:PASTE_ALTMODE
bind B1+Left LNBEG
bind B1+Right LNEND
diff --git a/Tables/Input/ht/input.kti b/Tables/Input/ht/input.kti
index 18c60eeea..5466850d6 100644
--- a/Tables/Input/ht/input.kti
+++ b/Tables/Input/ht/input.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/joystick.kti b/Tables/Input/ht/joystick.kti
index f24f5d4d1..7771bb433 100644
--- a/Tables/Input/ht/joystick.kti
+++ b/Tables/Input/ht/joystick.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/keypad.kti b/Tables/Input/ht/keypad.kti
index e78103711..1beff1835 100644
--- a/Tables/Input/ht/keypad.kti
+++ b/Tables/Input/ht/keypad.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/mc88.ktb b/Tables/Input/ht/mc88.ktb
index 1ef4ba204..b1809ee9a 100644
--- a/Tables/Input/ht/mc88.ktb
+++ b/Tables/Input/ht/mc88.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/mdlr.ktb b/Tables/Input/ht/mdlr.ktb
index 319720961..90b3f76aa 100644
--- a/Tables/Input/ht/mdlr.ktb
+++ b/Tables/Input/ht/mdlr.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -26,7 +26,7 @@ bind Right+RoutingKey NXINDENT
bind Left FWINLT
bind Right FWINRT
-bind Left+Right PASTE
+bind Left+Right PASTE:PASTE_ALTMODE
bind B1+Left LNBEG
bind B1+Right LNEND
diff --git a/Tables/Input/ht/me.kti b/Tables/Input/ht/me.kti
index 8adf3744a..351410ef8 100644
--- a/Tables/Input/ht/me.kti
+++ b/Tables/Input/ht/me.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -28,7 +28,7 @@ bind RoutingKey+!RoutingKey CLIP_COPY
bind Left+RoutingKey PRINDENT
bind Right+RoutingKey NXINDENT
-bind Left+Right PASTE
+bind Left+Right PASTE:PASTE_ALTMODE
bind B1+Left LNBEG
bind B1+Right LNEND
diff --git a/Tables/Input/ht/me64.ktb b/Tables/Input/ht/me64.ktb
index f423e5e0e..6a3123307 100644
--- a/Tables/Input/ht/me64.ktb
+++ b/Tables/Input/ht/me64.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/me88.ktb b/Tables/Input/ht/me88.ktb
index fb33fd868..4bab6aa4b 100644
--- a/Tables/Input/ht/me88.ktb
+++ b/Tables/Input/ht/me88.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/rockers.kti b/Tables/Input/ht/rockers.kti
index f8bb2aaf7..3c6cbd445 100644
--- a/Tables/Input/ht/rockers.kti
+++ b/Tables/Input/ht/rockers.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ht/wave.ktb b/Tables/Input/ht/wave.ktb
index a9a06608e..0ac310b78 100644
--- a/Tables/Input/ht/wave.ktb
+++ b/Tables/Input/ht/wave.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -27,7 +27,7 @@ bind RoutingKey+!RoutingKey CLIP_COPY
bind Left+RoutingKey PRINDENT
bind Right+RoutingKey NXINDENT
-bind Left+Right PASTE
+bind Left+Right PASTE:PASTE_ALTMODE
include dots.kti
diff --git a/Tables/Input/hw/B80.ktb b/Tables/Input/hw/B80.ktb
index fec3f0382..377cd8f81 100644
--- a/Tables/Input/hw/B80.ktb
+++ b/Tables/Input/hw/B80.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/BI14.ktb b/Tables/Input/hw/BI14.ktb
index 9f61c0e6b..2eb826a46 100644
--- a/Tables/Input/hw/BI14.ktb
+++ b/Tables/Input/hw/BI14.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/BI20X.ktb b/Tables/Input/hw/BI20X.ktb
index 2123a4a19..870b643e9 100644
--- a/Tables/Input/hw/BI20X.ktb
+++ b/Tables/Input/hw/BI20X.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/BI32.ktb b/Tables/Input/hw/BI32.ktb
index e99eb6d77..c2e32f7a8 100644
--- a/Tables/Input/hw/BI32.ktb
+++ b/Tables/Input/hw/BI32.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/BI40.ktb b/Tables/Input/hw/BI40.ktb
index c779547e1..bfd70f96a 100644
--- a/Tables/Input/hw/BI40.ktb
+++ b/Tables/Input/hw/BI40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/BI40X.ktb b/Tables/Input/hw/BI40X.ktb
index 2146555c1..3747c0689 100644
--- a/Tables/Input/hw/BI40X.ktb
+++ b/Tables/Input/hw/BI40X.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/C20.ktb b/Tables/Input/hw/C20.ktb
index 009fe623a..b5e312979 100644
--- a/Tables/Input/hw/C20.ktb
+++ b/Tables/Input/hw/C20.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/M40.ktb b/Tables/Input/hw/M40.ktb
index 672c93f33..01a8dca09 100644
--- a/Tables/Input/hw/M40.ktb
+++ b/Tables/Input/hw/M40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/NLS.ktb b/Tables/Input/hw/NLS.ktb
index 3ed4efaff..8d32560d4 100644
--- a/Tables/Input/hw/NLS.ktb
+++ b/Tables/Input/hw/NLS.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/braille.kti b/Tables/Input/hw/braille.kti
index a53dce16a..cb9ecc904 100644
--- a/Tables/Input/hw/braille.kti
+++ b/Tables/Input/hw/braille.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/command.kti b/Tables/Input/hw/command.kti
index 506d93e86..67b7e9be0 100644
--- a/Tables/Input/hw/command.kti
+++ b/Tables/Input/hw/command.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/joystick.kti b/Tables/Input/hw/joystick.kti
index 734fb50be..8c8fa2d61 100644
--- a/Tables/Input/hw/joystick.kti
+++ b/Tables/Input/hw/joystick.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/one.ktb b/Tables/Input/hw/one.ktb
index a1ed598f7..032fafe68 100644
--- a/Tables/Input/hw/one.ktb
+++ b/Tables/Input/hw/one.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/routing.kti b/Tables/Input/hw/routing.kti
index c40ff35cb..0cbd6a715 100644
--- a/Tables/Input/hw/routing.kti
+++ b/Tables/Input/hw/routing.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/thumb.kti b/Tables/Input/hw/thumb.kti
index b014b41d0..b5b54e5ac 100644
--- a/Tables/Input/hw/thumb.kti
+++ b/Tables/Input/hw/thumb.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -45,7 +45,7 @@ bind ThumbPrevious+RoutingKey CLIP_NEW
bind ThumbLeft+RoutingKey CLIP_ADD
bind \{right}+RoutingKey COPY_LINE
bind \{next}+RoutingKey COPY_RECT
-bind ThumbPrevious+ThumbNext PASTE
+bind ThumbPrevious+ThumbNext PASTE:PASTE_ALTMODE
#################
diff --git a/Tables/Input/hw/thumb_legacy.kti b/Tables/Input/hw/thumb_legacy.kti
index 5ce49dbc3..c79980f82 100644
--- a/Tables/Input/hw/thumb_legacy.kti
+++ b/Tables/Input/hw/thumb_legacy.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/hw/touch.ktb b/Tables/Input/hw/touch.ktb
index 9043b2168..641b85d05 100644
--- a/Tables/Input/hw/touch.ktb
+++ b/Tables/Input/hw/touch.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ic/bb.ktb b/Tables/Input/ic/bb.ktb
index b67dc375b..6d4ac15ae 100644
--- a/Tables/Input/ic/bb.ktb
+++ b/Tables/Input/ic/bb.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ic/chords.kti b/Tables/Input/ic/chords.kti
index c11d043ce..0baf6d7da 100644
--- a/Tables/Input/ic/chords.kti
+++ b/Tables/Input/ic/chords.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ic/common.kti b/Tables/Input/ic/common.kti
index 3e116b67f..b16c5cade 100644
--- a/Tables/Input/ic/common.kti
+++ b/Tables/Input/ic/common.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ic/nvda.ktb b/Tables/Input/ic/nvda.ktb
index 5e3180cd2..5fe221a53 100644
--- a/Tables/Input/ic/nvda.ktb
+++ b/Tables/Input/ic/nvda.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ic/route.kti b/Tables/Input/ic/route.kti
index 0a336a958..18dc60dbf 100644
--- a/Tables/Input/ic/route.kti
+++ b/Tables/Input/ic/route.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ic/toggle.kti b/Tables/Input/ic/toggle.kti
index 342fd3869..418c896d1 100644
--- a/Tables/Input/ic/toggle.kti
+++ b/Tables/Input/ic/toggle.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ir/all.kti b/Tables/Input/ir/all.kti
index 27249905c..6df4285c8 100644
--- a/Tables/Input/ir/all.kti
+++ b/Tables/Input/ir/all.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ir/brl.ktb b/Tables/Input/ir/brl.ktb
index 9430bf151..fb2d273ee 100644
--- a/Tables/Input/ir/brl.ktb
+++ b/Tables/Input/ir/brl.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ir/pc.ktb b/Tables/Input/ir/pc.ktb
index 6ea4bda2c..42f6e0646 100644
--- a/Tables/Input/ir/pc.ktb
+++ b/Tables/Input/ir/pc.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/lt/all.txt b/Tables/Input/lt/all.txt
index 6698cdaef..d5a9a6b8c 100644
--- a/Tables/Input/lt/all.txt
+++ b/Tables/Input/lt/all.txt
@@ -1,14 +1,14 @@
Help: LogText (Danish)
Specielle kommandoer til brltty startes med dot 37,
-efterfulgt af nedenstende koder.
+efterfulgt af nedenstående koder.
Fx. 37 12357 for genstart af brltty.
-124: f Frys skrm
-1247: F Opt skrm
+124: f Frys skærm
+1247: F Optø skærm
368: - Forrige virtuelle konsol
-2358: + Nste virtuelle konsol
+2358: + Næste virtuelle konsol
18: 1 1. virtuelle konsol
128: 2 2. virtuelle konsol
148: 3 3. virtuelle konsol
@@ -19,15 +19,15 @@ Fx. 37 12357 for genstart af brltty.
Download data fra computer til LogText:
1: Tast dot 37 og derefter et stort D (dot 1457)
2: Skriv stien til filen der skal downloades og tast enter
-3: Tast Ctrl+5 p LogTexten og tast p enter 2 gange
+3: Tast Ctrl+5 på LogTexten og tast på enter 2 gange
247: I Information om brltty
12357: R Genstart brltty
1457: D Download menu
-12347: P Opstning
-2347: S Gem opstning
-1237: L Hent opstning
+12347: P Opsætning
+2347: S Gem opsætning
+1237: L Hent opsætning
136: u Side op (page up)
145: d Side ned (page down)
diff --git a/Tables/Input/md/common.kti b/Tables/Input/md/common.kti
index e5b18dcb1..4ae979dfd 100644
--- a/Tables/Input/md/common.kti
+++ b/Tables/Input/md/common.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/md/default.ktb b/Tables/Input/md/default.ktb
index 4dfd08afc..5e9dc3c5b 100644
--- a/Tables/Input/md/default.ktb
+++ b/Tables/Input/md/default.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/md/fk.ktb b/Tables/Input/md/fk.ktb
index 7130cd304..07a5d2671 100644
--- a/Tables/Input/md/fk.ktb
+++ b/Tables/Input/md/fk.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/md/fk_s.ktb b/Tables/Input/md/fk_s.ktb
index 7a0b6ad60..5a421cb62 100644
--- a/Tables/Input/md/fk_s.ktb
+++ b/Tables/Input/md/fk_s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/md/fkeys.kti b/Tables/Input/md/fkeys.kti
index 35f2ad4a3..79d0e6165 100644
--- a/Tables/Input/md/fkeys.kti
+++ b/Tables/Input/md/fkeys.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/md/kbd.ktb b/Tables/Input/md/kbd.ktb
index da4f9c2fe..154278493 100644
--- a/Tables/Input/md/kbd.ktb
+++ b/Tables/Input/md/kbd.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/md/keyboard.kti b/Tables/Input/md/keyboard.kti
index c25f0bcca..c9883409c 100644
--- a/Tables/Input/md/keyboard.kti
+++ b/Tables/Input/md/keyboard.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/md/status.kti b/Tables/Input/md/status.kti
index c6839308c..90a3d75f7 100644
--- a/Tables/Input/md/status.kti
+++ b/Tables/Input/md/status.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/menu.kti b/Tables/Input/menu.kti
index f52aa98e7..974ad991e 100644
--- a/Tables/Input/menu.kti
+++ b/Tables/Input/menu.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mm/common.kti b/Tables/Input/mm/common.kti
index 1f6c738dd..f41d76b11 100644
--- a/Tables/Input/mm/common.kti
+++ b/Tables/Input/mm/common.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mm/nt.ktb b/Tables/Input/mm/nt.ktb
index 141c2b36f..bf2ee940c 100644
--- a/Tables/Input/mm/nt.ktb
+++ b/Tables/Input/mm/nt.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mm/pocket.ktb b/Tables/Input/mm/pocket.ktb
index 5f5a49ba4..d2bf90dc9 100644
--- a/Tables/Input/mm/pocket.ktb
+++ b/Tables/Input/mm/pocket.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mm/smart.ktb b/Tables/Input/mm/smart.ktb
index 3b966a538..8df0fff7c 100644
--- a/Tables/Input/mm/smart.ktb
+++ b/Tables/Input/mm/smart.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mt/bd1_3.ktb b/Tables/Input/mt/bd1_3.ktb
index cdefbd8fe..3d7eeae0b 100644
--- a/Tables/Input/mt/bd1_3.ktb
+++ b/Tables/Input/mt/bd1_3.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mt/bd1_3.kti b/Tables/Input/mt/bd1_3.kti
index 7bbdfdaa9..0e70e1e71 100644
--- a/Tables/Input/mt/bd1_3.kti
+++ b/Tables/Input/mt/bd1_3.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mt/bd1_3s.ktb b/Tables/Input/mt/bd1_3s.ktb
index 5b662a571..efdbf5d27 100644
--- a/Tables/Input/mt/bd1_3s.ktb
+++ b/Tables/Input/mt/bd1_3s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mt/bd1_6.ktb b/Tables/Input/mt/bd1_6.ktb
index 8429f1e8e..273f3ef9f 100644
--- a/Tables/Input/mt/bd1_6.ktb
+++ b/Tables/Input/mt/bd1_6.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mt/bd1_6.kti b/Tables/Input/mt/bd1_6.kti
index dbeefe2f9..ed5968e6e 100644
--- a/Tables/Input/mt/bd1_6.kti
+++ b/Tables/Input/mt/bd1_6.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mt/bd1_6s.ktb b/Tables/Input/mt/bd1_6s.ktb
index 99ac48e23..18d26f31f 100644
--- a/Tables/Input/mt/bd1_6s.ktb
+++ b/Tables/Input/mt/bd1_6s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mt/bd2.ktb b/Tables/Input/mt/bd2.ktb
index e0a226f68..f4e794669 100644
--- a/Tables/Input/mt/bd2.ktb
+++ b/Tables/Input/mt/bd2.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/mt/status.kti b/Tables/Input/mt/status.kti
index eae323e7b..fc204e023 100644
--- a/Tables/Input/mt/status.kti
+++ b/Tables/Input/mt/status.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/nav.kti b/Tables/Input/nav.kti
index 39cdc2136..01902ccec 100644
--- a/Tables/Input/nav.kti
+++ b/Tables/Input/nav.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/np/all.ktb b/Tables/Input/np/all.ktb
index 2a9836538..a2cb53c39 100644
--- a/Tables/Input/np/all.ktb
+++ b/Tables/Input/np/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pg/all.ktb b/Tables/Input/pg/all.ktb
index b98f4f227..8bd451a04 100644
--- a/Tables/Input/pg/all.ktb
+++ b/Tables/Input/pg/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/2d_l.ktb b/Tables/Input/pm/2d_l.ktb
index b19b1d4f1..6bdf9299a 100644
--- a/Tables/Input/pm/2d_l.ktb
+++ b/Tables/Input/pm/2d_l.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/2d_s.ktb b/Tables/Input/pm/2d_s.ktb
index 12fc5b844..0d76a824a 100644
--- a/Tables/Input/pm/2d_s.ktb
+++ b/Tables/Input/pm/2d_s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/bar.kti b/Tables/Input/pm/bar.kti
index 0c04f53b7..118223de9 100644
--- a/Tables/Input/pm/bar.kti
+++ b/Tables/Input/pm/bar.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/c.ktb b/Tables/Input/pm/c.ktb
index c12ff1d35..df3e57419 100644
--- a/Tables/Input/pm/c.ktb
+++ b/Tables/Input/pm/c.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/c_486.ktb b/Tables/Input/pm/c_486.ktb
index f49ee0460..eeba5eac9 100644
--- a/Tables/Input/pm/c_486.ktb
+++ b/Tables/Input/pm/c_486.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el2d_80s.ktb b/Tables/Input/pm/el2d_80s.ktb
index 8e2dbf4fd..5f225497c 100644
--- a/Tables/Input/pm/el2d_80s.ktb
+++ b/Tables/Input/pm/el2d_80s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el40c.ktb b/Tables/Input/pm/el40c.ktb
index 8d79bd1ab..77e3c49b4 100644
--- a/Tables/Input/pm/el40c.ktb
+++ b/Tables/Input/pm/el40c.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el40s.ktb b/Tables/Input/pm/el40s.ktb
index 0e2e3774f..801c6ba9f 100644
--- a/Tables/Input/pm/el40s.ktb
+++ b/Tables/Input/pm/el40s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el60c.ktb b/Tables/Input/pm/el60c.ktb
index 02f452451..84aaf1f03 100644
--- a/Tables/Input/pm/el60c.ktb
+++ b/Tables/Input/pm/el60c.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el66s.ktb b/Tables/Input/pm/el66s.ktb
index 853cddb83..cf3d34b23 100644
--- a/Tables/Input/pm/el66s.ktb
+++ b/Tables/Input/pm/el66s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el70s.ktb b/Tables/Input/pm/el70s.ktb
index e93818aab..eaca89911 100644
--- a/Tables/Input/pm/el70s.ktb
+++ b/Tables/Input/pm/el70s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el80_ii.ktb b/Tables/Input/pm/el80_ii.ktb
index e1c1d8abb..d1d2f17f9 100644
--- a/Tables/Input/pm/el80_ii.ktb
+++ b/Tables/Input/pm/el80_ii.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el80c.ktb b/Tables/Input/pm/el80c.ktb
index 8006bc8a2..7208f9ec7 100644
--- a/Tables/Input/pm/el80c.ktb
+++ b/Tables/Input/pm/el80c.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el80s.ktb b/Tables/Input/pm/el80s.ktb
index fa8b70829..cea4ff4d7 100644
--- a/Tables/Input/pm/el80s.ktb
+++ b/Tables/Input/pm/el80s.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el_2d_40.ktb b/Tables/Input/pm/el_2d_40.ktb
index fab4c17d1..5bdfab106 100644
--- a/Tables/Input/pm/el_2d_40.ktb
+++ b/Tables/Input/pm/el_2d_40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el_2d_66.ktb b/Tables/Input/pm/el_2d_66.ktb
index e9ff9d526..318538173 100644
--- a/Tables/Input/pm/el_2d_66.ktb
+++ b/Tables/Input/pm/el_2d_66.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el_2d_80.ktb b/Tables/Input/pm/el_2d_80.ktb
index 9c16b318a..b753db706 100644
--- a/Tables/Input/pm/el_2d_80.ktb
+++ b/Tables/Input/pm/el_2d_80.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el_40_p.ktb b/Tables/Input/pm/el_40_p.ktb
index ae220ef4c..5c0a4ba78 100644
--- a/Tables/Input/pm/el_40_p.ktb
+++ b/Tables/Input/pm/el_40_p.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/el_80.ktb b/Tables/Input/pm/el_80.ktb
index 724b239c9..8316c7f48 100644
--- a/Tables/Input/pm/el_80.ktb
+++ b/Tables/Input/pm/el_80.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/elb_tr_20.ktb b/Tables/Input/pm/elb_tr_20.ktb
index 4d3385be5..7de113ad4 100644
--- a/Tables/Input/pm/elb_tr_20.ktb
+++ b/Tables/Input/pm/elb_tr_20.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/elb_tr_32.ktb b/Tables/Input/pm/elb_tr_32.ktb
index a1076ecb2..1ab3fda80 100644
--- a/Tables/Input/pm/elb_tr_32.ktb
+++ b/Tables/Input/pm/elb_tr_32.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/elba_20.ktb b/Tables/Input/pm/elba_20.ktb
index cdc3702e7..1a48e4cdc 100644
--- a/Tables/Input/pm/elba_20.ktb
+++ b/Tables/Input/pm/elba_20.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/elba_32.ktb b/Tables/Input/pm/elba_32.ktb
index e050785a1..c7cb0ae2b 100644
--- a/Tables/Input/pm/elba_32.ktb
+++ b/Tables/Input/pm/elba_32.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/front13.kti b/Tables/Input/pm/front13.kti
index 60fef2d38..5b7dfe556 100644
--- a/Tables/Input/pm/front13.kti
+++ b/Tables/Input/pm/front13.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/front9.kti b/Tables/Input/pm/front9.kti
index 4a84170dc..3df72e6d1 100644
--- a/Tables/Input/pm/front9.kti
+++ b/Tables/Input/pm/front9.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -52,7 +52,7 @@ bind Attribute+!RoutingKey1 COPY_RECT
bind Cursor+!RoutingKey1 PRINDENT
bind Braille+!RoutingKey1 NXINDENT
-bind Function+Attribute PASTE
+bind Function+Attribute PASTE:PASTE_ALTMODE
include routing.kti
diff --git a/Tables/Input/pm/ib_80.ktb b/Tables/Input/pm/ib_80.ktb
index d46fb1f27..7e6b482ec 100644
--- a/Tables/Input/pm/ib_80.ktb
+++ b/Tables/Input/pm/ib_80.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/keyboard.kti b/Tables/Input/pm/keyboard.kti
index 24fced38e..8667d5be2 100644
--- a/Tables/Input/pm/keyboard.kti
+++ b/Tables/Input/pm/keyboard.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/keys.kti b/Tables/Input/pm/keys.kti
index e60c3a6a4..656a4666b 100644
--- a/Tables/Input/pm/keys.kti
+++ b/Tables/Input/pm/keys.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -41,7 +41,7 @@ bind LeftKeyFront HOME
bind LeftKeyRear+BarLeft1 DISPMD
bind LeftKeyRear+BarRight1 CSRTRK
bind LeftKeyRear+BarUp1 SIXDOTS
-bind LeftKeyRear+BarDown1 PASTE
+bind LeftKeyRear+BarDown1 PASTE:PASTE_ALTMODE
bind LeftKeyRear+BarLeft2 ATTRVIS
bind LeftKeyRear+BarRight2 CSRVIS
diff --git a/Tables/Input/pm/live.ktb b/Tables/Input/pm/live.ktb
index 5f7f0999d..23884225c 100644
--- a/Tables/Input/pm/live.ktb
+++ b/Tables/Input/pm/live.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/routing.kti b/Tables/Input/pm/routing.kti
index 076ac2401..83d1c2035 100644
--- a/Tables/Input/pm/routing.kti
+++ b/Tables/Input/pm/routing.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/status0.kti b/Tables/Input/pm/status0.kti
index 0938f52c1..047a568b9 100644
--- a/Tables/Input/pm/status0.kti
+++ b/Tables/Input/pm/status0.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/status13.kti b/Tables/Input/pm/status13.kti
index 1a09a5511..718975074 100644
--- a/Tables/Input/pm/status13.kti
+++ b/Tables/Input/pm/status13.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -48,4 +48,4 @@ assign toggleCommand ATTRVIS
include ../toggle.kti
bind !Status.12 TIME
-bind !Status.13 PASTE
+bind Status.13 PASTE:PASTE_ALTMODE
diff --git a/Tables/Input/pm/status2.kti b/Tables/Input/pm/status2.kti
index 6c6b91c07..3bf744b51 100644
--- a/Tables/Input/pm/status2.kti
+++ b/Tables/Input/pm/status2.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/status20.kti b/Tables/Input/pm/status20.kti
index 14dead426..95b649a38 100644
--- a/Tables/Input/pm/status20.kti
+++ b/Tables/Input/pm/status20.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -68,4 +68,4 @@ assign toggleCommand AUTOREPEAT
include ../toggle.kti
bind Status.19 TIME
-bind !Status.20 PASTE
+bind Status.20 PASTE:PASTE_ALTMODE
diff --git a/Tables/Input/pm/status22.kti b/Tables/Input/pm/status22.kti
index 741cbcf6f..765fc499b 100644
--- a/Tables/Input/pm/status22.kti
+++ b/Tables/Input/pm/status22.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -73,4 +73,4 @@ assign toggleCommand BRLUCDOTS
include ../toggle.kti
bind !Status.21 TIME
-bind !Status.22 PASTE
+bind Status.22 PASTE:PASTE_ALTMODE
diff --git a/Tables/Input/pm/status4.kti b/Tables/Input/pm/status4.kti
index 9c1ef7e90..a98fedd73 100644
--- a/Tables/Input/pm/status4.kti
+++ b/Tables/Input/pm/status4.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/switches.kti b/Tables/Input/pm/switches.kti
index bfa63e9b6..ff2af747e 100644
--- a/Tables/Input/pm/switches.kti
+++ b/Tables/Input/pm/switches.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/pm/trio.ktb b/Tables/Input/pm/trio.ktb
index 2a4136549..bdff7dcd6 100644
--- a/Tables/Input/pm/trio.ktb
+++ b/Tables/Input/pm/trio.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/sk/bdp.ktb b/Tables/Input/sk/bdp.ktb
index f88f6c161..1ddd6a5cd 100644
--- a/Tables/Input/sk/bdp.ktb
+++ b/Tables/Input/sk/bdp.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -38,7 +38,7 @@ bind K2+K3 LNBEG
bind K6 FWINLTSKIP
bind K7 FWINRTSKIP
-bind K6+K7 PASTE
+bind K6+K7 PASTE:PASTE_ALTMODE
bind K4 CSRTRK
bind K5 RETURN
diff --git a/Tables/Input/sk/ntk.ktb b/Tables/Input/sk/ntk.ktb
index 0b55b17d4..d1790a86f 100644
--- a/Tables/Input/sk/ntk.ktb
+++ b/Tables/Input/sk/ntk.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -74,7 +74,7 @@ bind RightJoystickRight+RoutingKey NXDIFCHAR
bind LeftJoystickPress+RoutingKey SETMARK
bind RightJoystickPress+RoutingKey GOTOMARK
-bind LeftJoystickPress+RightJoystickPress PASTE
+bind LeftJoystickPress+RightJoystickPress PASTE:PASTE_ALTMODE
bind RoutingKey+RoutingKey CLIP_COPY
bind LeftJoystickUp+RoutingKey+RoutingKey CLIP_APPEND
bind LeftJoystickLeft+RoutingKey CLIP_NEW
diff --git a/Tables/Input/speech.kti b/Tables/Input/speech.kti
index 226fee149..6189ee569 100644
--- a/Tables/Input/speech.kti
+++ b/Tables/Input/speech.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/toggle.kti b/Tables/Input/toggle.kti
index 2eb75c991..e090c1438 100644
--- a/Tables/Input/toggle.kti
+++ b/Tables/Input/toggle.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/nav.kti b/Tables/Input/ts/nav.kti
index 4ba0374a1..1b588feb4 100644
--- a/Tables/Input/ts/nav.kti
+++ b/Tables/Input/ts/nav.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/nav20.ktb b/Tables/Input/ts/nav20.ktb
index f6e51503f..b55a76040 100644
--- a/Tables/Input/ts/nav20.ktb
+++ b/Tables/Input/ts/nav20.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/nav40.ktb b/Tables/Input/ts/nav40.ktb
index ef4553e2e..c910af522 100644
--- a/Tables/Input/ts/nav40.ktb
+++ b/Tables/Input/ts/nav40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/nav80.ktb b/Tables/Input/ts/nav80.ktb
index 3ce1fbe87..2313cdd46 100644
--- a/Tables/Input/ts/nav80.ktb
+++ b/Tables/Input/ts/nav80.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/nav_large.kti b/Tables/Input/ts/nav_large.kti
index 1c03fcb58..d145636ca 100644
--- a/Tables/Input/ts/nav_large.kti
+++ b/Tables/Input/ts/nav_large.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/nav_small.kti b/Tables/Input/ts/nav_small.kti
index f1e6a93fe..cf56170a9 100644
--- a/Tables/Input/ts/nav_small.kti
+++ b/Tables/Input/ts/nav_small.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/pb.kti b/Tables/Input/ts/pb.kti
index bd4201a95..7a51ebc21 100644
--- a/Tables/Input/ts/pb.kti
+++ b/Tables/Input/ts/pb.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/pb40.ktb b/Tables/Input/ts/pb40.ktb
index 6238ba4cd..a9536f090 100644
--- a/Tables/Input/ts/pb40.ktb
+++ b/Tables/Input/ts/pb40.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/pb65.ktb b/Tables/Input/ts/pb65.ktb
index e6ff93dae..31add9a18 100644
--- a/Tables/Input/ts/pb65.ktb
+++ b/Tables/Input/ts/pb65.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/pb80.ktb b/Tables/Input/ts/pb80.ktb
index dc89f70b8..3aad0b656 100644
--- a/Tables/Input/ts/pb80.ktb
+++ b/Tables/Input/ts/pb80.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/pb_large.kti b/Tables/Input/ts/pb_large.kti
index efb52fded..cb15d06a0 100644
--- a/Tables/Input/ts/pb_large.kti
+++ b/Tables/Input/ts/pb_large.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/pb_small.kti b/Tables/Input/ts/pb_small.kti
index 6927069ef..cb580c02a 100644
--- a/Tables/Input/ts/pb_small.kti
+++ b/Tables/Input/ts/pb_small.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/ts/routing.kti b/Tables/Input/ts/routing.kti
index ef77d1b6c..e8ad0c993 100644
--- a/Tables/Input/ts/routing.kti
+++ b/Tables/Input/ts/routing.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/vo/all.ktb b/Tables/Input/vo/all.ktb
index b869974e4..4ad965b79 100644
--- a/Tables/Input/vo/all.ktb
+++ b/Tables/Input/vo/all.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/vo/all.kti b/Tables/Input/vo/all.kti
index 95f79db95..e51212d21 100644
--- a/Tables/Input/vo/all.kti
+++ b/Tables/Input/vo/all.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -54,7 +54,7 @@ bind Thumb2+RoutingKey CLIP_ADD
bind Thumb3+RoutingKey COPY_LINE
bind Thumb4+RoutingKey COPY_RECT
bind RoutingKey+!RoutingKey CLIP_COPY
-bind Thumb2+Thumb3 PASTE
+bind Thumb2+Thumb3 PASTE:PASTE_ALTMODE
bind Thumb1+Up ATTRUP
bind Thumb1+Down ATTRDN
diff --git a/Tables/Input/vo/bp.ktb b/Tables/Input/vo/bp.ktb
index e08b65077..fcfba74f1 100644
--- a/Tables/Input/vo/bp.ktb
+++ b/Tables/Input/vo/bp.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Input/vs/all.txt b/Tables/Input/vs/all.txt
index 1b25ddcab..01738aca4 100644
--- a/Tables/Input/vs/all.txt
+++ b/Tables/Input/vs/all.txt
@@ -1,9 +1,9 @@
Help: VisioBraille
Les touches du clavier auxiliaire s'utilisent comme sous DOS/Windows.
-Les oprations de changement de mode d'affichage (6-8 points), de simulation de
-touches... se font galement comme sous DOS/Windows.
+Les opérations de changement de mode d'affichage (6-8 points), de simulation de
+touches... se font également comme sous DOS/Windows.
En outre, quelques commandes ~~ suivi d'une lettre sont disponibles,
-reportez-vous au fichier README du rpertoire VisioBraille pour en savoir
+reportez-vous au fichier README du répertoire VisioBraille pour en savoir
plus.
diff --git a/Tables/Keyboard/braille.ktb b/Tables/Keyboard/braille.ktb
index bfa9a248a..1956a426c 100644
--- a/Tables/Keyboard/braille.ktb
+++ b/Tables/Keyboard/braille.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -37,7 +37,7 @@ bind RoutingKey ROUTE
bind Backward+RoutingKey SETLEFT
bind Forward+RoutingKey DESCCHAR
-bind Backward+Forward PASTE
+bind Backward+Forward PASTE:PASTE_ALTMODE
bind RoutingKey+!RoutingKey CLIP_COPY
bind ArrowLeft+RoutingKey CLIP_NEW
bind ArrowUp+RoutingKey CLIP_ADD
diff --git a/Tables/Keyboard/braille.kti b/Tables/Keyboard/braille.kti
index e486ea8fc..909d0c9cc 100644
--- a/Tables/Keyboard/braille.kti
+++ b/Tables/Keyboard/braille.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Keyboard/desktop.ktb b/Tables/Keyboard/desktop.ktb
index aa4db253f..f4bac531d 100644
--- a/Tables/Keyboard/desktop.ktb
+++ b/Tables/Keyboard/desktop.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Keyboard/desktop.kti b/Tables/Keyboard/desktop.kti
index db3a3b745..79fa63359 100644
--- a/Tables/Keyboard/desktop.kti
+++ b/Tables/Keyboard/desktop.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -39,7 +39,7 @@ bind KP0+!KPEnter HOME
bind KP0+!KPDivide CLIP_NEW
bind KP0+!KPMultiply COPY_LINE
bind KP0+!KPMinus COPY_RECT
-bind KP0+!KPPlus PASTE
+bind KP0+KPPlus PASTE:PASTE_ALTMODE
bind ControlLeft+KP0+!KPPlus CLIP_ADD
bind ControlLeft+ShiftLeft+KP0+!KP2 PREFMENU
bind ControlLeft+ShiftLeft+KP0+!KP4 PREFLOAD
diff --git a/Tables/Keyboard/keypad.ktb b/Tables/Keyboard/keypad.ktb
index 83f4aeb87..5e2b4020f 100644
--- a/Tables/Keyboard/keypad.ktb
+++ b/Tables/Keyboard/keypad.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -70,7 +70,7 @@ bind KPMinus+!KP3 DESCCHAR
bind KPMinus+!KPDivide RESTARTBRL
bind KPMinus+!KPMultiply RESTARTSPEECH
-bind KPMultiply+!KP5 PASTE
+bind KPMultiply+KP5 PASTE:PASTE_ALTMODE
bind KPMultiply+!KP7 CLIP_NEW
bind KPMultiply+!KP1 CLIP_ADD
bind KPMultiply+!KP9 COPY_LINE
diff --git a/Tables/Keyboard/kp_say.kti b/Tables/Keyboard/kp_say.kti
index 1c872faee..e86bc47db 100644
--- a/Tables/Keyboard/kp_say.kti
+++ b/Tables/Keyboard/kp_say.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Keyboard/kp_speak.kti b/Tables/Keyboard/kp_speak.kti
index a95b32802..7525ee2d8 100644
--- a/Tables/Keyboard/kp_speak.kti
+++ b/Tables/Keyboard/kp_speak.kti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Keyboard/laptop.ktb b/Tables/Keyboard/laptop.ktb
index a03e83b84..9a9adb58a 100644
--- a/Tables/Keyboard/laptop.ktb
+++ b/Tables/Keyboard/laptop.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -76,7 +76,7 @@ bind CapsLock+!X CLIP_NEW
bind CapsLock+ShiftLeft+!X CLIP_ADD
bind CapsLock+!C COPY_RECT
bind CapsLock+ShiftLeft+!C COPY_LINE
-bind CapsLock+!V PASTE
+bind CapsLock+V PASTE:PASTE_ALTMODE
# speech
bind ControlLeft MUTE
diff --git a/Tables/Keyboard/sun_type6.ktb b/Tables/Keyboard/sun_type6.ktb
index 18bf5e16b..413b7bca5 100644
--- a/Tables/Keyboard/sun_type6.ktb
+++ b/Tables/Keyboard/sun_type6.ktb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/alias.tti b/Tables/Text/alias.tti
index 0ed9eb98b..249eb4136 100644
--- a/Tables/Text/alias.tti
+++ b/Tables/Text/alias.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -33,6 +33,7 @@ alias \u2007 \s # figure space
alias \u2008 \s # punctuation space
alias \u2009 \s # thin space
alias \u200A \s # hair space
+alias \u200B \s # zero width space
alias \u202F \s # narrow no-break space
alias \u205F \s # medium mathematical space
diff --git a/Tables/Text/ar.ttb b/Tables/Text/ar.ttb
index 0ec8978b0..3e28131f0 100644
--- a/Tables/Text/ar.ttb
+++ b/Tables/Text/ar.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/as.ttb b/Tables/Text/as.ttb
index 0ab3717d5..57e40a647 100644
--- a/Tables/Text/as.ttb
+++ b/Tables/Text/as.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ascii-basic.tti b/Tables/Text/ascii-basic.tti
index 1966e3ad2..b67a943dd 100644
--- a/Tables/Text/ascii-basic.tti
+++ b/Tables/Text/ascii-basic.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/awa.ttb b/Tables/Text/awa.ttb
index 49587a9f2..bdcfc9145 100644
--- a/Tables/Text/awa.ttb
+++ b/Tables/Text/awa.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/bengali.tti b/Tables/Text/bengali.tti
index ab13def5c..86aff4ce9 100644
--- a/Tables/Text/bengali.tti
+++ b/Tables/Text/bengali.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/bg.ttb b/Tables/Text/bg.ttb
index 6d952fd9e..927ecaf84 100644
--- a/Tables/Text/bg.ttb
+++ b/Tables/Text/bg.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/bh.ttb b/Tables/Text/bh.ttb
index 05dfa15df..0981b79f5 100644
--- a/Tables/Text/bh.ttb
+++ b/Tables/Text/bh.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/blocks.tti b/Tables/Text/blocks.tti
index 7a6a3b0df..e540160b3 100644
--- a/Tables/Text/blocks.tti
+++ b/Tables/Text/blocks.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/bn.ttb b/Tables/Text/bn.ttb
index c4d771c51..6c0e0004d 100644
--- a/Tables/Text/bn.ttb
+++ b/Tables/Text/bn.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/bo.ttb b/Tables/Text/bo.ttb
index 861546a1b..7f5bf66b2 100644
--- a/Tables/Text/bo.ttb
+++ b/Tables/Text/bo.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/boxes.tti b/Tables/Text/boxes.tti
index 3c16c109c..d258916cd 100644
--- a/Tables/Text/boxes.tti
+++ b/Tables/Text/boxes.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/bra.ttb b/Tables/Text/bra.ttb
index 1be177196..ae99c9bb4 100644
--- a/Tables/Text/bra.ttb
+++ b/Tables/Text/bra.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/brf.ttb b/Tables/Text/brf.ttb
index e9ef61e23..9ff446bf3 100644
--- a/Tables/Text/brf.ttb
+++ b/Tables/Text/brf.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/common.tti b/Tables/Text/common.tti
index 268874997..cee1cc623 100644
--- a/Tables/Text/common.tti
+++ b/Tables/Text/common.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/cs.ttb b/Tables/Text/cs.ttb
index 5da42ef6f..ef6b33699 100644
--- a/Tables/Text/cs.ttb
+++ b/Tables/Text/cs.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ctl-latin.tti b/Tables/Text/ctl-latin.tti
index 65939c73d..099e8bb83 100644
--- a/Tables/Text/ctl-latin.tti
+++ b/Tables/Text/ctl-latin.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/cy.ttb b/Tables/Text/cy.ttb
index a68243a66..03bfba94c 100644
--- a/Tables/Text/cy.ttb
+++ b/Tables/Text/cy.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/da-1252.ttb b/Tables/Text/da-1252.ttb
index 1886c8b8c..bef42dd0e 100644
--- a/Tables/Text/da-1252.ttb
+++ b/Tables/Text/da-1252.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/da-lt.ttb b/Tables/Text/da-lt.ttb
index 7f14867d6..7a927b904 100644
--- a/Tables/Text/da-lt.ttb
+++ b/Tables/Text/da-lt.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/da.ttb b/Tables/Text/da.ttb
index 0a09f0919..253e87534 100644
--- a/Tables/Text/da.ttb
+++ b/Tables/Text/da.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/de-chess.tti b/Tables/Text/de-chess.tti
index a72277ff2..0a1785a4e 100644
--- a/Tables/Text/de-chess.tti
+++ b/Tables/Text/de-chess.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/de.ttb b/Tables/Text/de.ttb
index 6279542b8..337cf260e 100644
--- a/Tables/Text/de.ttb
+++ b/Tables/Text/de.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/devanagari.tti b/Tables/Text/devanagari.tti
index 26a9236da..1dbe41fd8 100644
--- a/Tables/Text/devanagari.tti
+++ b/Tables/Text/devanagari.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/dra.ttb b/Tables/Text/dra.ttb
index 786e71a7f..6fa6f22fc 100644
--- a/Tables/Text/dra.ttb
+++ b/Tables/Text/dra.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/el.ttb b/Tables/Text/el.ttb
index f05f8e8bd..f979a2ff2 100644
--- a/Tables/Text/el.ttb
+++ b/Tables/Text/el.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/en-chess.tti b/Tables/Text/en-chess.tti
index cafaf8ca1..f34c10484 100644
--- a/Tables/Text/en-chess.tti
+++ b/Tables/Text/en-chess.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/en-na-ascii.tti b/Tables/Text/en-na-ascii.tti
index 581703a59..4341b271e 100644
--- a/Tables/Text/en-na-ascii.tti
+++ b/Tables/Text/en-na-ascii.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/en-nabcc.ttb b/Tables/Text/en-nabcc.ttb
index 3da5031f4..c93b96ffd 100644
--- a/Tables/Text/en-nabcc.ttb
+++ b/Tables/Text/en-nabcc.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/en.ttb b/Tables/Text/en.ttb
index 3e249935e..327427cf3 100644
--- a/Tables/Text/en.ttb
+++ b/Tables/Text/en.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/en_CA.ttb b/Tables/Text/en_CA.ttb
index 436066e84..953e29e54 100644
--- a/Tables/Text/en_CA.ttb
+++ b/Tables/Text/en_CA.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/en_GB.ttb b/Tables/Text/en_GB.ttb
index ffbe63391..6a716fc8e 100644
--- a/Tables/Text/en_GB.ttb
+++ b/Tables/Text/en_GB.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/en_US.ttb b/Tables/Text/en_US.ttb
index 2c2e5feca..f74ef2da8 100644
--- a/Tables/Text/en_US.ttb
+++ b/Tables/Text/en_US.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/eo.ttb b/Tables/Text/eo.ttb
index c3af53965..963777b92 100644
--- a/Tables/Text/eo.ttb
+++ b/Tables/Text/eo.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/es.ttb b/Tables/Text/es.ttb
index 52e09fec2..7cd7b09c3 100644
--- a/Tables/Text/es.ttb
+++ b/Tables/Text/es.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/et.ttb b/Tables/Text/et.ttb
index 47b8fb37f..b1300874a 100644
--- a/Tables/Text/et.ttb
+++ b/Tables/Text/et.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/fi.ttb b/Tables/Text/fi.ttb
index 94f6d0e68..98aea07b6 100644
--- a/Tables/Text/fi.ttb
+++ b/Tables/Text/fi.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/fr-2007.ttb b/Tables/Text/fr-2007.ttb
index fb838f5ec..cb509054f 100644
--- a/Tables/Text/fr-2007.ttb
+++ b/Tables/Text/fr-2007.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/fr-cbifs.ttb b/Tables/Text/fr-cbifs.ttb
index ab2ffe628..db640d917 100644
--- a/Tables/Text/fr-cbifs.ttb
+++ b/Tables/Text/fr-cbifs.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/fr-vs.ttb b/Tables/Text/fr-vs.ttb
index 60fb7a57b..533b43b7f 100644
--- a/Tables/Text/fr-vs.ttb
+++ b/Tables/Text/fr-vs.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/fr.ttb b/Tables/Text/fr.ttb
index 9a8e9688a..f79977d6c 100644
--- a/Tables/Text/fr.ttb
+++ b/Tables/Text/fr.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/fr_CA.ttb b/Tables/Text/fr_CA.ttb
index 964f348f2..2197053a4 100644
--- a/Tables/Text/fr_CA.ttb
+++ b/Tables/Text/fr_CA.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/fr_FR.ttb b/Tables/Text/fr_FR.ttb
index 1c4f85ea5..b19ee3c75 100644
--- a/Tables/Text/fr_FR.ttb
+++ b/Tables/Text/fr_FR.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ga.ttb b/Tables/Text/ga.ttb
index b0a9e6452..a3d11d545 100644
--- a/Tables/Text/ga.ttb
+++ b/Tables/Text/ga.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/gd.ttb b/Tables/Text/gd.ttb
index b30c30586..9e093a977 100644
--- a/Tables/Text/gd.ttb
+++ b/Tables/Text/gd.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/gon.ttb b/Tables/Text/gon.ttb
index 137f3940f..84d4447e9 100644
--- a/Tables/Text/gon.ttb
+++ b/Tables/Text/gon.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/greek.tti b/Tables/Text/greek.tti
index 4b9328739..00ff9d06e 100644
--- a/Tables/Text/greek.tti
+++ b/Tables/Text/greek.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/gu.ttb b/Tables/Text/gu.ttb
index f4773375c..44432f6d5 100644
--- a/Tables/Text/gu.ttb
+++ b/Tables/Text/gu.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/gujarati.tti b/Tables/Text/gujarati.tti
index b2f8f0994..120120aa3 100644
--- a/Tables/Text/gujarati.tti
+++ b/Tables/Text/gujarati.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/gurmukhi.tti b/Tables/Text/gurmukhi.tti
index 65a798c22..e54ba324e 100644
--- a/Tables/Text/gurmukhi.tti
+++ b/Tables/Text/gurmukhi.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/he-old.ttb b/Tables/Text/he-old.ttb
new file mode 100644
index 000000000..bc12e81d1
--- /dev/null
+++ b/Tables/Text/he-old.ttb
@@ -0,0 +1,108 @@
+###############################################################################
+# BRLTTY - A background process providing access to the console screen (when in
+# text mode) for a blind person using a refreshable braille display.
+#
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
+#
+# BRLTTY comes with ABSOLUTELY NO WARRANTY.
+#
+# This is free software, placed under the terms of the
+# GNU Lesser General Public License, as published by the Free Software
+# Foundation; either version 2.1 of the License, or (at your option) any
+# later version. Please see the file LICENSE-LGPL for details.
+#
+# Web Page: http://brltty.app/
+#
+# This software is maintained by Dave Mielke <dave@mielke.cc>.
+###############################################################################
+
+# BRLTTY Text Table - Hebrew
+#
+# Adi Kushnir <adikushnir@gmail.com>
+
+include ltr-latin.tti
+include num-nemeth.tti
+
+char \x21 ( 23 5 8) # ⢖ ! [EXCLAMATION MARK]
+char \x22 ( 5 ) # ⠐ " [QUOTATION MARK]
+char \x23 ( 3456 ) # ⠼ # [NUMBER SIGN]
+char \x24 (12 4 6 ) # ⠫ $ [DOLLAR SIGN]
+char \x25 (1 4 67 ) # ⡩ % [PERCENT SIGN]
+char \x26 ( 234 6 ) # ⠮ & [AMPERSAND]
+char \x27 ( 3 ) # ⠄ ' [APOSTROPHE]
+char \x28 (123 56 ) # ⠷ ( [LEFT PARENTHESIS]
+char \x29 ( 23456 ) # ⠾ ) [RIGHT PARENTHESIS]
+char \x2A (1 6 ) # ⠡ * [ASTERISK]
+char \x2B ( 34 6 ) # ⠬ + [PLUS SIGN]
+char \x2C ( 6 ) # ⠠ , [COMMA]
+char \x2D ( 3 6 ) # ⠤ - [HYPHEN-MINUS]
+char \x2E ( 4 6 ) # ⠨ . [FULL STOP]
+char \x2F ( 34 ) # ⠌ / [SOLIDUS]
+char \x3A (1 56 ) # ⠱ : [COLON]
+char \x3B ( 56 ) # ⠰ ; [SEMICOLON]
+char \x3C (12 6 ) # ⠣ < [LESS-THAN SIGN]
+char \x3D (123456 ) # ⠿ = [EQUALS SIGN]
+char \x3E ( 345 ) # ⠜ > [GREATER-THAN SIGN]
+char \x3F ( 2 6 8) # ⢢ ? [QUESTION MARK]
+char \x40 ( 4 7 ) # ⡈ @ [COMMERCIAL AT]
+char \x5B ( 2 4 67 ) # ⡪ [ [LEFT SQUARE BRACKET]
+char \x5C (12 567 ) # ⡳ \ [REVERSE SOLIDUS]
+char \x5D (12 4567 ) # ⡻ ] [RIGHT SQUARE BRACKET]
+char \x5E ( 45 7 ) # ⡘ ^ [CIRCUMFLEX ACCENT]
+char \x5F ( 4567 ) # ⡸ _ [LOW LINE]
+char \x60 ( 4 ) # ⠈ ` [GRAVE ACCENT]
+glyph \x7B ( 23 6 ) # ⠦ { [LEFT CURLY BRACKET]
+char \x7C (12 56 ) # ⠳ | [VERTICAL LINE]
+char \x7D (12 456 ) # ⠻ } [RIGHT CURLY BRACKET]
+char \x7E ( 45 ) # ⠘ ~ [TILDE]
+
+glyph \u05B1 ( 2 6 ) # ⠢ ֱ [HEBREW POINT HATAF SEGOL]
+glyph \u05B2 ( 2 5 ) # ⠒ ֲ [HEBREW POINT HATAF PATAH]
+glyph \u05B3 ( 345 ) # ⠜ ֳ [HEBREW POINT HATAF QAMATS]
+glyph \u05B4 ( 2 4 ) # ⠊ ִ [HEBREW POINT HIRIQ]
+glyph \u05B5 ( 34 ) # ⠌ ֵ [HEBREW POINT TSERE]
+glyph \u05B6 (1 5 ) # ⠑ ֶ [HEBREW POINT SEGOL]
+glyph \u05B7 (1 4 ) # ⠉ ַ [HEBREW POINT PATAH]
+glyph \u05B8 (12 6 ) # ⠣ ָ [HEBREW POINT QAMATS]
+glyph \u05B9 (1 3 5 ) # ⠕ ֹ [HEBREW POINT HOLAM]
+glyph \u05BB (1 3 6 ) # ⠥ ֻ [HEBREW POINT QUBUTS]
+glyph \u05D0 (1 ) # ⠁ א [HEBREW LETTER ALEF]
+glyph \u05D1 (123 6 ) # ⠧ ב [HEBREW LETTER BET]
+glyph \u05D2 (12 45 ) # ⠛ ג [HEBREW LETTER GIMEL]
+glyph \u05D3 (1 45 ) # ⠙ ד [HEBREW LETTER DALET]
+glyph \u05D4 (12 5 ) # ⠓ ה [HEBREW LETTER HE]
+glyph \u05D5 ( 2 456 ) # ⠺ ו [HEBREW LETTER VAV]
+glyph \u05D6 (1 3 56 ) # ⠵ ז [HEBREW LETTER ZAYIN]
+glyph \u05D7 (1 34 6 ) # ⠭ ח [HEBREW LETTER HET]
+glyph \u05D8 ( 2345 ) # ⠞ ט [HEBREW LETTER TET]
+glyph \u05D9 ( 2 45 ) # ⠚ י [HEBREW LETTER YOD]
+char \u05DA (1 6 8) # ⢡ ך [HEBREW LETTER FINAL KAF]
+glyph \u05DB (1 6 ) # ⠡ כ [HEBREW LETTER KAF]
+glyph \u05DC (123 ) # ⠇ ל [HEBREW LETTER LAMED]
+char \u05DD (1 34 8) # ⢍ ם [HEBREW LETTER FINAL MEM]
+glyph \u05DE (1 34 ) # ⠍ מ [HEBREW LETTER MEM]
+char \u05DF (1 345 8) # ⢝ ן [HEBREW LETTER FINAL NUN]
+glyph \u05E0 (1 345 ) # ⠝ נ [HEBREW LETTER NUN]
+glyph \u05E1 ( 234 ) # ⠎ ס [HEBREW LETTER SAMEKH]
+glyph \u05E2 (12 4 6 ) # ⠫ ע [HEBREW LETTER AYIN]
+char \u05E3 (12 4 8) # ⢋ ף [HEBREW LETTER FINAL PE]
+glyph \u05E4 (1234 ) # ⠏ פ [HEBREW LETTER PE]
+char \u05E5 ( 234 6 8) # ⢮ ץ [HEBREW LETTER FINAL TSADI]
+glyph \u05E6 ( 234 6 ) # ⠮ צ [HEBREW LETTER TSADI]
+glyph \u05E7 (12345 ) # ⠟ ק [HEBREW LETTER QOF]
+glyph \u05E8 (123 5 ) # ⠗ ר [HEBREW LETTER RESH]
+char \u05E9 (1 4 6 ) # ⠩ ש [HEBREW LETTER SHIN]
+char \u05EA (1 456 ) # ⠹ ת [HEBREW LETTER TAV]
+
+glyph \uFB1D ( 3 5 ) # ⠔ יִ [HEBREW LETTER YOD WITH HIRIQ]
+glyph \uFB2A (1 4 6 ) # ⠩ שׁ [HEBREW LETTER SHIN WITH SHIN DOT]
+glyph \uFB2B (1 56 ) # ⠱ שׂ [HEBREW LETTER SHIN WITH SIN DOT]
+glyph \uFB31 (12 ) # ⠃ בּ [HEBREW LETTER BET WITH DAGESH]
+glyph \uFB35 ( 34 6 ) # ⠬ וּ [HEBREW LETTER VAV WITH DAGESH]
+glyph \uFB3A (1 3 ) # ⠅ ךּ [HEBREW LETTER FINAL KAF WITH DAGESH]
+glyph \uFB3B (1 3 ) # ⠅ כּ [HEBREW LETTER KAF WITH DAGESH]
+glyph \uFB43 (1234 ) # ⠏ ףּ [HEBREW LETTER FINAL PE WITH DAGESH]
+glyph \uFB44 (1234 ) # ⠏ פּ [HEBREW LETTER PE WITH DAGESH]
+glyph \uFB4A (12 56 ) # ⠳ תּ [HEBREW LETTER TAV WITH DAGESH]
+
+include common.tti
diff --git a/Tables/Text/he.ttb b/Tables/Text/he.ttb
index 91aaaf66f..c766b80c9 100644
--- a/Tables/Text/he.ttb
+++ b/Tables/Text/he.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -17,92 +17,5 @@
###############################################################################
# BRLTTY Text Table - Hebrew
-#
-# Adi Kushnir <adikushnir@gmail.com>
-
-include ltr-latin.tti
-include num-nemeth.tti
-
-char \x21 ( 23 5 8) # ⢖ ! [EXCLAMATION MARK]
-char \x22 ( 5 ) # ⠐ " [QUOTATION MARK]
-char \x23 ( 3456 ) # ⠼ # [NUMBER SIGN]
-char \x24 (12 4 6 ) # ⠫ $ [DOLLAR SIGN]
-char \x25 (1 4 67 ) # ⡩ % [PERCENT SIGN]
-char \x26 ( 234 6 ) # ⠮ & [AMPERSAND]
-char \x27 ( 3 ) # ⠄ ' [APOSTROPHE]
-char \x28 (123 56 ) # ⠷ ( [LEFT PARENTHESIS]
-char \x29 ( 23456 ) # ⠾ ) [RIGHT PARENTHESIS]
-char \x2A (1 6 ) # ⠡ * [ASTERISK]
-char \x2B ( 34 6 ) # ⠬ + [PLUS SIGN]
-char \x2C ( 6 ) # ⠠ , [COMMA]
-char \x2D ( 3 6 ) # ⠤ - [HYPHEN-MINUS]
-char \x2E ( 4 6 ) # ⠨ . [FULL STOP]
-char \x2F ( 34 ) # ⠌ / [SOLIDUS]
-char \x3A (1 56 ) # ⠱ : [COLON]
-char \x3B ( 56 ) # ⠰ ; [SEMICOLON]
-char \x3C (12 6 ) # ⠣ < [LESS-THAN SIGN]
-char \x3D (123456 ) # ⠿ = [EQUALS SIGN]
-char \x3E ( 345 ) # ⠜ > [GREATER-THAN SIGN]
-char \x3F ( 2 6 8) # ⢢ ? [QUESTION MARK]
-char \x40 ( 4 7 ) # ⡈ @ [COMMERCIAL AT]
-char \x5B ( 2 4 67 ) # ⡪ [ [LEFT SQUARE BRACKET]
-char \x5C (12 567 ) # ⡳ \ [REVERSE SOLIDUS]
-char \x5D (12 4567 ) # ⡻ ] [RIGHT SQUARE BRACKET]
-char \x5E ( 45 7 ) # ⡘ ^ [CIRCUMFLEX ACCENT]
-char \x5F ( 4567 ) # ⡸ _ [LOW LINE]
-char \x60 ( 4 ) # ⠈ ` [GRAVE ACCENT]
-glyph \x7B ( 23 6 ) # ⠦ { [LEFT CURLY BRACKET]
-char \x7C (12 56 ) # ⠳ | [VERTICAL LINE]
-char \x7D (12 456 ) # ⠻ } [RIGHT CURLY BRACKET]
-char \x7E ( 45 ) # ⠘ ~ [TILDE]
-
-glyph \u05B1 ( 2 6 ) # ⠢ ֱ [HEBREW POINT HATAF SEGOL]
-glyph \u05B2 ( 2 5 ) # ⠒ ֲ [HEBREW POINT HATAF PATAH]
-glyph \u05B3 ( 345 ) # ⠜ ֳ [HEBREW POINT HATAF QAMATS]
-glyph \u05B4 ( 2 4 ) # ⠊ ִ [HEBREW POINT HIRIQ]
-glyph \u05B5 ( 34 ) # ⠌ ֵ [HEBREW POINT TSERE]
-glyph \u05B6 (1 5 ) # ⠑ ֶ [HEBREW POINT SEGOL]
-glyph \u05B7 (1 4 ) # ⠉ ַ [HEBREW POINT PATAH]
-glyph \u05B8 (12 6 ) # ⠣ ָ [HEBREW POINT QAMATS]
-glyph \u05B9 (1 3 5 ) # ⠕ ֹ [HEBREW POINT HOLAM]
-glyph \u05BB (1 3 6 ) # ⠥ ֻ [HEBREW POINT QUBUTS]
-glyph \u05D0 (1 ) # ⠁ א [HEBREW LETTER ALEF]
-glyph \u05D1 (123 6 ) # ⠧ ב [HEBREW LETTER BET]
-glyph \u05D2 (12 45 ) # ⠛ ג [HEBREW LETTER GIMEL]
-glyph \u05D3 (1 45 ) # ⠙ ד [HEBREW LETTER DALET]
-glyph \u05D4 (12 5 ) # ⠓ ה [HEBREW LETTER HE]
-glyph \u05D5 ( 2 456 ) # ⠺ ו [HEBREW LETTER VAV]
-glyph \u05D6 (1 3 56 ) # ⠵ ז [HEBREW LETTER ZAYIN]
-glyph \u05D7 (1 34 6 ) # ⠭ ח [HEBREW LETTER HET]
-glyph \u05D8 ( 2345 ) # ⠞ ט [HEBREW LETTER TET]
-glyph \u05D9 ( 2 45 ) # ⠚ י [HEBREW LETTER YOD]
-char \u05DA (1 6 8) # ⢡ ך [HEBREW LETTER FINAL KAF]
-glyph \u05DB (1 6 ) # ⠡ כ [HEBREW LETTER KAF]
-glyph \u05DC (123 ) # ⠇ ל [HEBREW LETTER LAMED]
-char \u05DD (1 34 8) # ⢍ ם [HEBREW LETTER FINAL MEM]
-glyph \u05DE (1 34 ) # ⠍ מ [HEBREW LETTER MEM]
-char \u05DF (1 345 8) # ⢝ ן [HEBREW LETTER FINAL NUN]
-glyph \u05E0 (1 345 ) # ⠝ נ [HEBREW LETTER NUN]
-glyph \u05E1 ( 234 ) # ⠎ ס [HEBREW LETTER SAMEKH]
-glyph \u05E2 (12 4 6 ) # ⠫ ע [HEBREW LETTER AYIN]
-char \u05E3 (12 4 8) # ⢋ ף [HEBREW LETTER FINAL PE]
-glyph \u05E4 (1234 ) # ⠏ פ [HEBREW LETTER PE]
-char \u05E5 ( 234 6 8) # ⢮ ץ [HEBREW LETTER FINAL TSADI]
-glyph \u05E6 ( 234 6 ) # ⠮ צ [HEBREW LETTER TSADI]
-glyph \u05E7 (12345 ) # ⠟ ק [HEBREW LETTER QOF]
-glyph \u05E8 (123 5 ) # ⠗ ר [HEBREW LETTER RESH]
-char \u05E9 (1 4 6 ) # ⠩ ש [HEBREW LETTER SHIN]
-char \u05EA (1 456 ) # ⠹ ת [HEBREW LETTER TAV]
-
-glyph \uFB1D ( 3 5 ) # ⠔ יִ [HEBREW LETTER YOD WITH HIRIQ]
-glyph \uFB2A (1 4 6 ) # ⠩ שׁ [HEBREW LETTER SHIN WITH SHIN DOT]
-glyph \uFB2B (1 56 ) # ⠱ שׂ [HEBREW LETTER SHIN WITH SIN DOT]
-glyph \uFB31 (12 ) # ⠃ בּ [HEBREW LETTER BET WITH DAGESH]
-glyph \uFB35 ( 34 6 ) # ⠬ וּ [HEBREW LETTER VAV WITH DAGESH]
-glyph \uFB3A (1 3 ) # ⠅ ךּ [HEBREW LETTER FINAL KAF WITH DAGESH]
-glyph \uFB3B (1 3 ) # ⠅ כּ [HEBREW LETTER KAF WITH DAGESH]
-glyph \uFB43 (1234 ) # ⠏ ףּ [HEBREW LETTER FINAL PE WITH DAGESH]
-glyph \uFB44 (1234 ) # ⠏ פּ [HEBREW LETTER PE WITH DAGESH]
-glyph \uFB4A (12 56 ) # ⠳ תּ [HEBREW LETTER TAV WITH DAGESH]
-include common.tti
+include he_IL.ttb
diff --git a/Tables/Text/he_IL.ttb b/Tables/Text/he_IL.ttb
new file mode 100644
index 000000000..91e00d858
--- /dev/null
+++ b/Tables/Text/he_IL.ttb
@@ -0,0 +1,400 @@
+###############################################################################
+# BRLTTY - A background process providing access to the console screen (when in
+# text mode) for a blind person using a refreshable braille display.
+#
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
+#
+# BRLTTY comes with ABSOLUTELY NO WARRANTY.
+#
+# This is free software, placed under the terms of the
+# GNU Lesser General Public License, as published by the Free Software
+# Foundation; either version 2.1 of the License, or (at your option) any
+# later version. Please see the file LICENSE-LGPL for details.
+#
+# Web Page: http://brltty.app/
+#
+# This software is maintained by Dave Mielke <dave@mielke.cc>.
+###############################################################################
+
+# BRLTTY Text Table - Hebrew (Israel)
+#
+# This table is the official Hebrew computer Braille table for Israel,
+# based on the official standard that was approved by the Central
+# library for the blind in Israel in 2016.
+#
+# The table has been created by Erez Kugler from TSR Gaash, Pavel
+# Kaplan, and Adi Kushnir, experts in assistive technologies in
+# Israel.
+#
+# This table supports Hebrew, English, Arabic and Russian, the 4
+# commonly used languages in Israel.
+#
+# Each language in it's native form has different Braille standards,
+# and this table is based on the official Israeli Hebrew standard for
+# treeting things like punctuation and special symbols.
+#
+# Refer to World Braille Usage (3rd edition), page 74
+# <http://liblouis.io/braille-specs/world-braille-usage-third-edition.pdf>
+# and <http://liblouis.io/braille-specs/hebrew>.
+
+# digits
+char \x30 356 # digit zero
+char \x31 2 # digit one
+char \x32 23 # digit two
+char \x33 25 # digit three
+char \x34 256 # digit four
+char \x35 26 # digit five
+char \x36 235 # digit six
+char \x37 2356 # digit seven
+char \x38 236 # digit eight
+char \x39 35 # digit nine
+
+# punctuation
+char \x21 2358 # exclamation mark
+char \x22 5 # quotation mark
+char \x23 3456 # number sign
+char \x24 12468 # dollar sign
+char \x25 1467 # percent sign
+char \x26 123468 # ampersand
+char \x27 3 # apostrophe
+char \x28 123568 # left parenthesis
+char \x29 234568 # right parenthesis
+char \x2A 167 # asterisk
+char \x2B 346 # plus sign
+char \x2C 6 # comma
+char \x2D 36 # hyphen-minus
+char \x2E 46 # full stop
+char \x2F 34 # solidus
+char \x3A 1568 # colon
+char \x3B 56 # semicolon
+char \x3C 1268 # less-than sign
+char \x3D 123456 # equals sign
+char \x3E 3458 # greater-than sign
+char \x3F 268 # question mark
+char \x40 47 # commercial at
+char \x5B 2467 # left square bracket
+char \x5C 12568 # reverse solidus
+char \x5D 124567 # right square bracket
+char \x5E 457 # circumflex accent
+char \x5F 4567 # low line
+char \x60 4 # grave accent
+char \x7C 1256 # vertical line
+char \u20AA 1468 # new sheqel sign
+char \u20AC 158 # euro sign
+
+# Hebrew letters
+char \u05D0 1 # hebrew letter alef
+char \u05D1 1236 # hebrew letter bet
+char \u05D2 1245 # hebrew letter gimel
+char \u05D3 145 # hebrew letter dalet
+char \u05D4 125 # hebrew letter he
+char \u05D5 2456 # hebrew letter vav
+char \u05D6 1356 # hebrew letter zayin
+char \u05D7 1346 # hebrew letter het
+char \u05D8 2345 # hebrew letter tet
+char \u05D9 245 # hebrew letter yod
+char \u05DA 168 # hebrew letter final kaf
+char \u05DB 16 # hebrew letter kaf
+char \u05DC 123 # hebrew letter lamed
+char \u05DD 1348 # hebrew letter final mem
+char \u05DE 134 # hebrew letter mem
+char \u05DF 13458 # hebrew letter final nun
+char \u05E0 1345 # hebrew letter nun
+char \u05E1 234 # hebrew letter samekh
+char \u05E2 1246 # hebrew letter ayin
+char \u05E3 1248 # hebrew letter final pe
+char \u05E4 124 # hebrew letter pe
+char \u05E5 23468 # hebrew letter final tsadi
+char \u05E6 2346 # hebrew letter tsadi
+char \u05E7 12345 # hebrew letter qof
+char \u05E8 1235 # hebrew letter resh
+char \u05E9 146 # hebrew letter shin
+char \u05EA 1456 # hebrew letter tav
+
+# Hebrew symbols
+glyph \u05B0 3 # hebrew point sheva
+glyph \u05B1 26 # hebrew point hataf segol
+glyph \u05B2 25 # hebrew point hataf patah
+char \u05B3 345 # hebrew point hataf qamats
+char \u05B4 24 # hebrew point hiriq
+glyph \u05B5 34 # hebrew point tsere
+char \u05B6 15 # hebrew point segol
+char \u05B7 14 # hebrew point patah
+glyph \u05B8 126 # hebrew point qamats
+glyph \u05B9 135 # hebrew point holam
+glyph \u05BA 135 # hebrew point holam haser for vav
+glyph \u05BB 346 # hebrew point qubuts
+glyph \u05BC 5 # hebrew point dagesh or mapiq
+char \u05C1 2348 # hebrew point shin dot
+glyph \u05C2 1568 # hebrew point sin dot
+glyph \u05C7 126 # hebrew point qamats qatan
+
+# Hebrew accented letters
+glyph \uFB1D 35 # hebrew letter yod with hiriq
+glyph \uFB2A 146 # hebrew letter shin with shin dot
+char \uFB2B 156 # hebrew letter shin with sin dot
+char \uFB31 12 # hebrew letter bet with dagesh
+glyph \uFB35 346 # hebrew letter vav with dagesh
+glyph \uFB3A 13 # hebrew letter final kaf with dagesh
+glyph \uFB3B 13 # hebrew letter kaf with dagesh
+glyph \uFB43 1234 # hebrew letter final pe with dagesh
+glyph \uFB44 1234 # hebrew letter pe with dagesh
+glyph \uFB4A 1256 # hebrew letter tav with dagesh
+
+# Russian uppercase letters
+glyph \u0410 17 # cyrillic capital letter a
+glyph \u0411 127 # cyrillic capital letter be
+glyph \u0412 24567 # cyrillic capital letter ve
+glyph \u0413 12457 # cyrillic capital letter ghe
+glyph \u0414 1457 # cyrillic capital letter de
+glyph \u0415 157 # cyrillic capital letter ie
+glyph \u0416 2457 # cyrillic capital letter zhe
+glyph \u0417 13567 # cyrillic capital letter ze
+glyph \u0418 247 # cyrillic capital letter i
+glyph \u0419 123467 # cyrillic capital letter short i
+glyph \u041A 137 # cyrillic capital letter ka
+glyph \u041B 1237 # cyrillic capital letter el
+glyph \u041C 1347 # cyrillic capital letter em
+glyph \u041D 13457 # cyrillic capital letter en
+glyph \u041E 1357 # cyrillic capital letter o
+glyph \u041F 12347 # cyrillic capital letter pe
+glyph \u0420 12357 # cyrillic capital letter er
+glyph \u0421 2347 # cyrillic capital letter es
+glyph \u0422 23457 # cyrillic capital letter te
+glyph \u0423 1367 # cyrillic capital letter u
+glyph \u0424 1247 # cyrillic capital letter ef
+glyph \u0425 1257 # cyrillic capital letter ha
+glyph \u0426 147 # cyrillic capital letter tse
+glyph \u0427 123457 # cyrillic capital letter che
+glyph \u0428 1567 # cyrillic capital letter sha
+glyph \u0429 13467 # cyrillic capital letter shcha
+glyph \u042A 123567 # cyrillic capital letter hard sign
+glyph \u042B 23467 # cyrillic capital letter yeru
+glyph \u042C 234567 # cyrillic capital letter soft sign
+glyph \u042D 2467 # cyrillic capital letter e
+glyph \u042E 12567 # cyrillic capital letter yu
+glyph \u042F 12467 # cyrillic capital letter ya
+glyph \u0401 167 # cyrillic capital letter io
+
+# Russian lowercase letters
+glyph \u0430 1 # cyrillic small letter a
+glyph \u0431 12 # cyrillic small letter be
+glyph \u0432 2456 # cyrillic small letter ve
+glyph \u0433 1245 # cyrillic small letter ghe
+glyph \u0434 145 # cyrillic small letter de
+glyph \u0435 15 # cyrillic small letter ie
+glyph \u0436 245 # cyrillic small letter zhe
+glyph \u0437 1356 # cyrillic small letter ze
+glyph \u0438 24 # cyrillic small letter i
+glyph \u0439 12346 # cyrillic small letter short i
+glyph \u043A 13 # cyrillic small letter ka
+glyph \u043B 123 # cyrillic small letter el
+glyph \u043C 134 # cyrillic small letter em
+glyph \u043D 1345 # cyrillic small letter en
+glyph \u043E 135 # cyrillic small letter o
+glyph \u043F 1234 # cyrillic small letter pe
+glyph \u0440 1235 # cyrillic small letter er
+glyph \u0441 234 # cyrillic small letter es
+glyph \u0442 2345 # cyrillic small letter te
+glyph \u0443 136 # cyrillic small letter u
+glyph \u0444 124 # cyrillic small letter ef
+glyph \u0445 125 # cyrillic small letter ha
+glyph \u0446 14 # cyrillic small letter tse
+glyph \u0447 12345 # cyrillic small letter che
+glyph \u0448 156 # cyrillic small letter sha
+glyph \u0449 1346 # cyrillic small letter shcha
+glyph \u044A 12356 # cyrillic small letter hard sign
+glyph \u044B 2346 # cyrillic small letter yeru
+glyph \u044C 23456 # cyrillic small letter soft sign
+glyph \u044D 246 # cyrillic small letter e
+glyph \u044E 1256 # cyrillic small letter yu
+glyph \u044F 1246 # cyrillic small letter ya
+glyph \u0451 16 # cyrillic small letter io
+
+# Latin uppercase letters
+glyph \x41 17 # latin capital letter a
+glyph \x42 127 # latin capital letter b
+glyph \x43 147 # latin capital letter c
+glyph \x44 1457 # latin capital letter d
+glyph \x45 157 # latin capital letter e
+glyph \x46 1247 # latin capital letter f
+glyph \x47 12457 # latin capital letter g
+glyph \x48 1257 # latin capital letter h
+glyph \x49 247 # latin capital letter i
+glyph \x4A 2457 # latin capital letter j
+glyph \x4B 137 # latin capital letter k
+glyph \x4C 1237 # latin capital letter l
+glyph \x4D 1347 # latin capital letter m
+glyph \x4E 13457 # latin capital letter n
+glyph \x4F 1357 # latin capital letter o
+glyph \x50 12347 # latin capital letter p
+glyph \x51 123457 # latin capital letter q
+glyph \x52 12357 # latin capital letter r
+glyph \x53 2347 # latin capital letter s
+glyph \x54 23457 # latin capital letter t
+glyph \x55 1367 # latin capital letter u
+glyph \x56 12367 # latin capital letter v
+glyph \x57 24567 # latin capital letter w
+glyph \x58 13467 # latin capital letter x
+glyph \x59 134567 # latin capital letter y
+glyph \x5A 13567 # latin capital letter z
+
+# Latin lowercase letters
+glyph \x61 1 # latin small letter a
+glyph \x62 12 # latin small letter b
+glyph \x63 14 # latin small letter c
+glyph \x64 145 # latin small letter d
+glyph \x65 15 # latin small letter e
+glyph \x66 124 # latin small letter f
+glyph \x67 1245 # latin small letter g
+glyph \x68 125 # latin small letter h
+glyph \x69 24 # latin small letter i
+glyph \x6A 245 # latin small letter j
+glyph \x6B 13 # latin small letter k
+glyph \x6C 123 # latin small letter l
+glyph \x6D 134 # latin small letter m
+glyph \x6E 1345 # latin small letter n
+glyph \x6F 135 # latin small letter o
+glyph \x70 1234 # latin small letter p
+glyph \x71 12345 # latin small letter q
+glyph \x72 1235 # latin small letter r
+glyph \x73 234 # latin small letter s
+glyph \x74 2345 # latin small letter t
+glyph \x75 136 # latin small letter u
+glyph \x76 1236 # latin small letter v
+glyph \x77 2456 # latin small letter w
+glyph \x78 1346 # latin small letter x
+glyph \x79 13456 # latin small letter y
+glyph \x7A 1356 # latin small letter z
+
+# Latin uppercase accented letters
+glyph \xC0 23678 # latin capital letter a with grave
+glyph \xC1 28 # latin capital letter a with acute
+glyph \xC2 167 # latin capital letter a with circumflex
+glyph \xC3 3467 # latin capital letter a with tilde
+glyph \xC4 567 # latin capital letter a with diaeresis
+glyph \xC5 34567 # latin capital letter a with ring above
+glyph \xC6 47 # latin capital letter ae
+glyph \xC7 123467 # latin capital letter c with cedilla
+glyph \xC8 3578 # latin capital letter e with grave
+glyph \xC9 1234567 # latin capital letter e with acute
+glyph \xCA 1267 # latin capital letter e with circumflex
+glyph \xCB 2358 # latin capital letter e with diaeresis
+glyph \xCC 57 # latin capital letter i with grave
+glyph \xCD 258 # latin capital letter i with acute
+glyph \xCE 1467 # latin capital letter i with circumflex
+glyph \xCF 23568 # latin capital letter i with diaeresis
+glyph \xD0 3567 # latin capital letter eth
+glyph \xD1 2567 # latin capital letter n with tilde
+glyph \xD2 578 # latin capital letter o with grave
+glyph \xD3 2568 # latin capital letter o with acute
+glyph \xD4 14567 # latin capital letter o with circumflex
+glyph \xD5 267 # latin capital letter o with tilde
+glyph \xD6 358 # latin capital letter o with diaeresis
+glyph \xD8 2467 # latin capital letter o with stroke
+glyph \xD9 35678 # latin capital letter u with grave
+glyph \xDA 268 # latin capital letter u with acute
+glyph \xDB 1567 # latin capital letter u with circumflex
+glyph \xDC 2368 # latin capital letter u with diaeresis
+glyph \xDD 3568 # latin capital letter y with acute
+glyph \xDE 2357 # latin capital letter thorn
+
+# Latin lowercase accented letters
+glyph \xDF 34568 # latin small letter sharp s
+glyph \xE0 123568 # latin small letter a with grave
+glyph \xE1 168 # latin small letter a with acute
+glyph \xE2 1678 # latin small letter a with circumflex
+glyph \xE3 34678 # latin small letter a with tilde
+glyph \xE4 3458 # latin small letter a with diaeresis
+glyph \xE5 345678 # latin small letter a with ring above
+glyph \xE6 478 # latin small letter ae
+glyph \xE7 1234678 # latin small letter c with cedilla
+glyph \xE8 23468 # latin small letter e with grave
+glyph \xE9 1234568 # latin small letter e with acute
+glyph \xEA 12678 # latin small letter e with circumflex
+glyph \xEB 12468 # latin small letter e with diaeresis
+glyph \xEC 348 # latin small letter i with grave
+glyph \xED 1468 # latin small letter i with acute
+glyph \xEE 14678 # latin small letter i with circumflex
+glyph \xEF 124568 # latin small letter i with diaeresis
+glyph \xF0 23458 # latin small letter eth
+glyph \xF1 13458 # latin small letter n with tilde
+glyph \xF2 3468 # latin small letter o with grave
+glyph \xF3 14568 # latin small letter o with acute
+glyph \xF4 145678 # latin small letter o with circumflex
+glyph \xF5 1358 # latin small letter o with tilde
+glyph \xF6 2468 # latin small letter o with diaeresis
+glyph \xF8 24678 # latin small letter o with stroke
+glyph \xF9 234568 # latin small letter u with grave
+glyph \xFA 1568 # latin small letter u with acute
+glyph \xFB 15678 # latin small letter u with circumflex
+glyph \xFC 12568 # latin small letter u with diaeresis
+glyph \xFD 24568 # latin small letter y with acute
+glyph \xFE 12348 # latin small letter thorn
+glyph \xFF 134568 # latin small letter y with diaeresis
+
+# Latin symbols
+glyph \x7B 2468 # left curly bracket
+glyph \x7D 12456 # right curly bracket
+glyph \x7E 45 # tilde
+glyph \xB0 4568 # degree sign
+
+# Arabic letters
+glyph \u0621 3 # arabic letter hamza
+glyph \u0622 345 # arabic letter alef with madda above
+glyph \u0623 34 # arabic letter alef with hamza above
+glyph \u0624 1256 # arabic letter waw with hamza above
+glyph \u0625 46 # arabic letter alef with hamza below
+glyph \u0626 13456 # arabic letter yeh with hamza above
+glyph \u0627 1 # arabic letter alef
+glyph \u0628 12 # arabic letter beh
+glyph \u0629 16 # arabic letter teh marbuta
+glyph \u062A 2345 # arabic letter teh
+glyph \u062B 1456 # arabic letter theh
+glyph \u062C 245 # arabic letter jeem
+glyph \u062D 156 # arabic letter hah
+glyph \u062E 1346 # arabic letter khah
+glyph \u062F 145 # arabic letter dal
+glyph \u0630 2346 # arabic letter thal
+glyph \u0631 1235 # arabic letter reh
+glyph \u0632 1356 # arabic letter zain
+glyph \u0633 234 # arabic letter seen
+glyph \u0634 146 # arabic letter sheen
+glyph \u0635 12346 # arabic letter sad
+glyph \u0636 1246 # arabic letter dad
+glyph \u0637 23456 # arabic letter tah
+glyph \u0638 123456 # arabic letter zah
+glyph \u0639 12356 # arabic letter ain
+glyph \u063A 126 # arabic letter ghain
+glyph \u0641 124 # arabic letter feh
+glyph \u0642 12345 # arabic letter qaf
+glyph \u0643 13 # arabic letter kaf
+glyph \u0644 123 # arabic letter lam
+glyph \u0645 134 # arabic letter meem
+glyph \u0646 1345 # arabic letter noon
+glyph \u0647 125 # arabic letter heh
+glyph \u0648 2456 # arabic letter waw
+glyph \u0649 135 # arabic letter alef maksura
+glyph \u064A 24 # arabic letter yeh
+glyph \u064B 23 # arabic fathatan
+glyph \u064C 26 # arabic dammatan
+glyph \u064D 35 # arabic kasratan
+glyph \u064E 2 # arabic fatha
+glyph \u064F 136 # arabic damma
+glyph \u0650 15 # arabic kasra
+glyph \u0651 6 # arabic shadda
+glyph \u0652 25 # arabic sukun
+glyph \u067E 1234 # arabic letter peh
+glyph \u0686 14 # arabic letter tcheh
+glyph \u0698 13568 # arabic letter jeh
+glyph \u06A4 12368 # arabic letter veh
+glyph \u06AF 1245 # arabic letter gaf
+glyph \uFEFC 1236 # arabic ligature lam with alef final form
+
+# Arabic punctuation
+glyph \u060C 57 # arabic comma
+glyph \u061B 567 # arabic semicolon
+glyph \u061F 236 # arabic question mark
+glyph \u06D4 256 # arabic full stop
+
+include common.tti
diff --git a/Tables/Text/hi.ttb b/Tables/Text/hi.ttb
index e428dd209..839a34b60 100644
--- a/Tables/Text/hi.ttb
+++ b/Tables/Text/hi.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/hr.ttb b/Tables/Text/hr.ttb
index 91a41eb59..8149f45ff 100644
--- a/Tables/Text/hr.ttb
+++ b/Tables/Text/hr.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/hu.ttb b/Tables/Text/hu.ttb
index af5341d7b..2b1d69939 100644
--- a/Tables/Text/hu.ttb
+++ b/Tables/Text/hu.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/hy.ttb b/Tables/Text/hy.ttb
index 02b7fb08f..1954d2f1e 100644
--- a/Tables/Text/hy.ttb
+++ b/Tables/Text/hy.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/is.ttb b/Tables/Text/is.ttb
index ea60dd355..faf6d0502 100644
--- a/Tables/Text/is.ttb
+++ b/Tables/Text/is.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/it.ttb b/Tables/Text/it.ttb
index 7efeeaa3e..eee0eefbe 100644
--- a/Tables/Text/it.ttb
+++ b/Tables/Text/it.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/kannada.tti b/Tables/Text/kannada.tti
index 78c86c135..3f8886e33 100644
--- a/Tables/Text/kannada.tti
+++ b/Tables/Text/kannada.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/kha.ttb b/Tables/Text/kha.ttb
index 8cebc0353..ef0586e91 100644
--- a/Tables/Text/kha.ttb
+++ b/Tables/Text/kha.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/kn.ttb b/Tables/Text/kn.ttb
index 4a7153af3..61e008d4b 100644
--- a/Tables/Text/kn.ttb
+++ b/Tables/Text/kn.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/kok.ttb b/Tables/Text/kok.ttb
index 12c3cd6cf..82cc52fa6 100644
--- a/Tables/Text/kok.ttb
+++ b/Tables/Text/kok.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/kru.ttb b/Tables/Text/kru.ttb
index 6b6723338..1429c334e 100644
--- a/Tables/Text/kru.ttb
+++ b/Tables/Text/kru.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/lt.ttb b/Tables/Text/lt.ttb
index db71c0e49..4df5b433d 100644
--- a/Tables/Text/lt.ttb
+++ b/Tables/Text/lt.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ltr-alias.tti b/Tables/Text/ltr-alias.tti
index 12420093f..89c1bb1a5 100644
--- a/Tables/Text/ltr-alias.tti
+++ b/Tables/Text/ltr-alias.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ltr-cyrillic.tti b/Tables/Text/ltr-cyrillic.tti
index c0d7b7b75..8a4ae51ef 100644
--- a/Tables/Text/ltr-cyrillic.tti
+++ b/Tables/Text/ltr-cyrillic.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ltr-dot8.tti b/Tables/Text/ltr-dot8.tti
index be182934f..5a693cb6d 100644
--- a/Tables/Text/ltr-dot8.tti
+++ b/Tables/Text/ltr-dot8.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ltr-latin.tti b/Tables/Text/ltr-latin.tti
index 82a74d8cc..e774aabfc 100644
--- a/Tables/Text/ltr-latin.tti
+++ b/Tables/Text/ltr-latin.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ltr-tibetan.tti b/Tables/Text/ltr-tibetan.tti
index 38726c438..d8d5c3427 100644
--- a/Tables/Text/ltr-tibetan.tti
+++ b/Tables/Text/ltr-tibetan.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/lv.ttb b/Tables/Text/lv.ttb
index ebd71600f..e0f770738 100644
--- a/Tables/Text/lv.ttb
+++ b/Tables/Text/lv.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/malayalam.tti b/Tables/Text/malayalam.tti
index 00ebd8cf9..6c17e78d0 100644
--- a/Tables/Text/malayalam.tti
+++ b/Tables/Text/malayalam.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/mg.ttb b/Tables/Text/mg.ttb
index 552d6153b..b765f03df 100644
--- a/Tables/Text/mg.ttb
+++ b/Tables/Text/mg.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/mi.ttb b/Tables/Text/mi.ttb
index c9db2cdee..b701f1404 100644
--- a/Tables/Text/mi.ttb
+++ b/Tables/Text/mi.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ml.ttb b/Tables/Text/ml.ttb
index 8138610cc..c92c3d663 100644
--- a/Tables/Text/ml.ttb
+++ b/Tables/Text/ml.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/mni.ttb b/Tables/Text/mni.ttb
index 6f0db2f6b..3fae53453 100644
--- a/Tables/Text/mni.ttb
+++ b/Tables/Text/mni.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/mr.ttb b/Tables/Text/mr.ttb
index 86c34ef67..4ee399d56 100644
--- a/Tables/Text/mr.ttb
+++ b/Tables/Text/mr.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/mt.ttb b/Tables/Text/mt.ttb
index 526ee2c08..b45ef2639 100644
--- a/Tables/Text/mt.ttb
+++ b/Tables/Text/mt.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/mun.ttb b/Tables/Text/mun.ttb
index b7822e716..037866e5b 100644
--- a/Tables/Text/mun.ttb
+++ b/Tables/Text/mun.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/mwr.ttb b/Tables/Text/mwr.ttb
index e12776a09..9f79c68ad 100644
--- a/Tables/Text/mwr.ttb
+++ b/Tables/Text/mwr.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ne.ttb b/Tables/Text/ne.ttb
index d66b48bba..dec22f416 100644
--- a/Tables/Text/ne.ttb
+++ b/Tables/Text/ne.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/new.ttb b/Tables/Text/new.ttb
index 05ad94c83..da69a0e70 100644
--- a/Tables/Text/new.ttb
+++ b/Tables/Text/new.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/nl.ttb b/Tables/Text/nl.ttb
index 3fd421385..d9e2ccd4b 100644
--- a/Tables/Text/nl.ttb
+++ b/Tables/Text/nl.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/nl_BE.ttb b/Tables/Text/nl_BE.ttb
index b2bb4a488..453e06b4e 100644
--- a/Tables/Text/nl_BE.ttb
+++ b/Tables/Text/nl_BE.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/nl_NL.ttb b/Tables/Text/nl_NL.ttb
index 1b9c22ad6..405198285 100644
--- a/Tables/Text/nl_NL.ttb
+++ b/Tables/Text/nl_NL.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/no-generic.ttb b/Tables/Text/no-generic.ttb
index 6f22d9769..935a39cd2 100644
--- a/Tables/Text/no-generic.ttb
+++ b/Tables/Text/no-generic.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/no-oup.ttb b/Tables/Text/no-oup.ttb
index 05198674e..623772e0d 100644
--- a/Tables/Text/no-oup.ttb
+++ b/Tables/Text/no-oup.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/no.ttb b/Tables/Text/no.ttb
index 4e88679fd..646a0161b 100644
--- a/Tables/Text/no.ttb
+++ b/Tables/Text/no.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/num-alias.tti b/Tables/Text/num-alias.tti
index 00264909a..d4f9ad7d2 100644
--- a/Tables/Text/num-alias.tti
+++ b/Tables/Text/num-alias.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/num-dot6.tti b/Tables/Text/num-dot6.tti
index f085b1d80..2e2cd54cb 100644
--- a/Tables/Text/num-dot6.tti
+++ b/Tables/Text/num-dot6.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/num-dot8.tti b/Tables/Text/num-dot8.tti
index f1e9b3722..165a747a6 100644
--- a/Tables/Text/num-dot8.tti
+++ b/Tables/Text/num-dot8.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/num-french.tti b/Tables/Text/num-french.tti
index b4b578d4f..6daf3d04b 100644
--- a/Tables/Text/num-french.tti
+++ b/Tables/Text/num-french.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/num-nemd8.tti b/Tables/Text/num-nemd8.tti
index 61b117fbf..e20086a31 100644
--- a/Tables/Text/num-nemd8.tti
+++ b/Tables/Text/num-nemd8.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/num-nemeth.tti b/Tables/Text/num-nemeth.tti
index 60eae4317..484f166fb 100644
--- a/Tables/Text/num-nemeth.tti
+++ b/Tables/Text/num-nemeth.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/nwc.ttb b/Tables/Text/nwc.ttb
index f690fbe84..d46154e3d 100644
--- a/Tables/Text/nwc.ttb
+++ b/Tables/Text/nwc.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/or.ttb b/Tables/Text/or.ttb
index 32060e293..85c8ef7a5 100644
--- a/Tables/Text/or.ttb
+++ b/Tables/Text/or.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/oriya.tti b/Tables/Text/oriya.tti
index e828cc3cf..3fbd8530a 100644
--- a/Tables/Text/oriya.tti
+++ b/Tables/Text/oriya.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/pa.ttb b/Tables/Text/pa.ttb
index b40d0c059..4af2e1f04 100644
--- a/Tables/Text/pa.ttb
+++ b/Tables/Text/pa.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/pi.ttb b/Tables/Text/pi.ttb
index fc8704d35..af77095e5 100644
--- a/Tables/Text/pi.ttb
+++ b/Tables/Text/pi.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/pl.ttb b/Tables/Text/pl.ttb
index 0ec85666d..33a0d2678 100644
--- a/Tables/Text/pl.ttb
+++ b/Tables/Text/pl.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/pt.ttb b/Tables/Text/pt.ttb
index dfcfc3024..bb6c07e39 100644
--- a/Tables/Text/pt.ttb
+++ b/Tables/Text/pt.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -17,6 +17,24 @@
###############################################################################
# BRLTTY Text Table - Portuguese
+#
+# Tiago Melo Casal <tcasal@intervox.nce.ufrj.br>, 2025.
+#
+# This table is mainly based on the official Portuguese 8-dot computer
+# braille code; defines accented letters, punctuation marks, currency
+# signs, Greek letters, and other characters.
+#
+# For the omissions in the official documentation, they were solved
+# using approximate character definitions of this table itself and
+# resources from other tables so that such gaps would not be left
+# uncovered.
+#
+# Official Braille Code reference:
+# "Grafia Braille para Informática" [Braille Writing for Computing (in
+# Portuguese)], 2005, by "Comissão Brasileira do Braille e Comissão de
+# Braille de Portugal" [both Brazilian Braille Commission and Braille
+# Commission of Portugal].
+# https://www.gov.br/mec/pt-br/media/publicacoes/semesp/grafiainfo.pdf
# the standard representations for the letters of the Latin alphabet
include ltr-latin.tti
@@ -27,7 +45,7 @@ include ctl-latin.tti
# the numbers 0-9 are represented by the letters j,a-i with dot 8 added
include num-dot8.tti
-# generated by ttbtest: charset=iso-8859-1
+# originally generated by ttbtest: charset=iso-8859-1
char \x00 ( 234 678) # 00 ⣮ [NULL]
# Latin control characters # 01-1A
char \x1B (123 5678) # 1B ⣷ [ESCAPE]
@@ -39,10 +57,10 @@ char \x20 ( ) # 20 ⠀ [SPACE]
char \x21 ( 23 5 8) # 21 ⢖ ! [EXCLAMATION MARK]
char \x22 ( 23 6 ) # 22 ⠦ " [QUOTATION MARK]
char \x23 ( 3456 ) # 23 ⠼ # [NUMBER SIGN]
-char \x24 ( 56 ) # 24 ⠰ $ [DOLLAR SIGN]
+char \x24 ( 4 6 ) # 24 ⠨ $ [cifrão ou dólar | DOLLAR SIGN]
char \x25 ( 3 5678) # 25 ⣴ % [PERCENT SIGN]
char \x26 (1234 6 8) # 26 ⢯ & [AMPERSAND]
-char \x27 ( 3 7 ) # 27 ⡄ ' [APOSTROPHE]
+char \x27 ( 6 ) # 27 ⠠ ' [apóstrofo genérico ou plica genérica | APOSTROPHE]
char \x28 (12 6 8) # 28 ⢣ ( [LEFT PARENTHESIS]
char \x29 ( 345 8) # 29 ⢜ ) [RIGHT PARENTHESIS]
char \x2A ( 3 5 ) # 2A ⠔ * [ASTERISK]
@@ -50,7 +68,7 @@ char \x2B ( 23 5 ) # 2B ⠖ + [PLUS SIGN]
char \x2C ( 2 ) # 2C ⠂ , [COMMA]
char \x2D ( 3 6 ) # 2D ⠤ - [HYPHEN-MINUS]
char \x2E ( 3 ) # 2E ⠄ . [FULL STOP]
-char \x2F ( 67 ) # 2F ⡠ / [SOLIDUS]
+char \x2F ( 2 56 ) # 2F ⠲ / [barra | SOLIDUS]
# Hindu-Arabic numerals # 30-39
char \x3A ( 2 5 ) # 3A ⠒ : [COLON]
char \x3B ( 23 ) # 3B ⠆ ; [SEMICOLON]
@@ -58,55 +76,55 @@ char \x3C ( 2 4 6 8) # 3C ⢪ < [LESS-THAN SIGN]
char \x3D ( 23 56 ) # 3D ⠶ = [EQUALS SIGN]
char \x3E (1 3 5 8) # 3E ⢕ > [GREATER-THAN SIGN]
char \x3F ( 2 6 ) # 3F ⠢ ? [QUESTION MARK]
-char \x40 (1 56 8) # 40 ⢱ @ [COMMERCIAL AT]
+char \x40 (1 56 ) # 40 ⠱ @ [arroba | COMMERCIAL AT]
# uppercase Latin alphabet # 41-5A
char \x5B (123 56 8) # 5B ⢷ [ [LEFT SQUARE BRACKET]
char \x5C ( 3 8) # 5C ⢄ \ [REVERSE SOLIDUS]
char \x5D ( 23456 8) # 5D ⢾ ] [RIGHT SQUARE BRACKET]
-char \x5E ( 4 ) # 5E ⠈ ^ [CIRCUMFLEX ACCENT]
-char \x5F ( 3 5 8) # 5F ⢔ _ [LOW LINE]
-char \x60 ( 2 6 8) # 60 ⢢ ` [GRAVE ACCENT]
+char \x5E ( 234 678) # 5E ⣮ ^ [acento circunflexo | CIRCUMFLEX ACCENT]
+char \x5F ( 3 67 ) # 5F ⡤ _ [sublinha | LOW LINE]
+char \x60 (1 4 678) # 60 ⣩ ` [acento grave | GRAVE ACCENT]
# lowercase Latin alphabet # 61-7A
char \x7B (123 8) # 7B ⢇ { [LEFT CURLY BRACKET]
char \x7C ( 456 ) # 7C ⠸ | [VERTICAL LINE]
char \x7D ( 4567 ) # 7D ⡸ } [RIGHT CURLY BRACKET]
-char \x7E ( 5 ) # 7E ⠐ ~ [TILDE]
+char \x7E ( 234 6 ) # 7E ⠮ ~ [til | TILDE]
char \x7F ( 5 7 ) # 7F ⡐ [DELETE]
-char \xA1 ( 3 67 ) # A1 ⡤ ¡ [INVERTED EXCLAMATION MARK]
-char \xA2 ( 56 8) # A2 ⢰ ¢ [CENT SIGN]
-char \xA3 ( 4 6 ) # A3 ⠨ £ [POUND SIGN]
+char \xA1 ( 23 5 7 ) # A1 ⡖ ¡ [ponto de exclamação invertido | INVERTED EXCLAMATION MARK]
+char \xA2 (1 4 78) # A2 ⣉ ¢ [centavos de dólar | CENT SIGN]
+char \xA3 (123 78) # A3 ⣇ £ [libra | POUND SIGN]
char \xA4 ( 3 678) # A4 ⣤ ¤ [CURRENCY SIGN]
-char \xA5 ( 4 6 8) # A5 ⢨ ¥ [YEN SIGN]
-char \xA6 ( 2 678) # A6 ⣢ ¦ [BROKEN BAR]
-char \xA7 (12345678) # A7 ⣿ § [SECTION SIGN]
-char \xA8 ( 2 78) # A8 ⣂ ¨ [DIAERESIS]
+char \xA5 (1 345678) # A5 ⣽ ¥ [iene | YEN SIGN]
+char \xA6 ( 45 8) # A6 ⢘ ¦ [barra cortada | BROKEN BAR]
+char \xA7 ( 234 8) # A7 ⢎ § [parágrafo jurídico ou secção | SECTION SIGN]
+char \xA8 ( 234 67 ) # A8 ⡮ ¨ [trema | DIAERESIS]
char \xA9 (1 4 7 ) # A9 ⡉ © [COPYRIGHT SIGN]
-char \xAA ( 4 7 ) # AA ⡈ ª [FEMININE ORDINAL INDICATOR]
-char \xAB ( 23 67 ) # AB ⡦ « [LEFT-POINTING DOUBLE ANGLE QUOTATION MARK]
-char \xAC ( 2 5678) # AC ⣲ ¬ [NOT SIGN]
-char \xAD (12 4 8) # AD ⢋ [SOFT HYPHEN]
+char \xAA (1 78) # AA ⣁ ª [indicador ordinal feminino | FEMININE ORDINAL INDICATOR]
+char \xAB ( 23 6 8) # AB ⢦ « [abre aspas angulares | LEFT-POINTING DOUBLE ANGLE QUOTATION MARK]
+char \xAC ( 3 78) # AC ⣄ ¬ [negação | NOT SIGN]
+char \xAD ( 3 6 ) # AD ⠤ [hífen discricionário | SOFT HYPHEN]
char \xAE (123 5 8) # AE ⢗ ® [REGISTERED SIGN]
char \xAF ( 5 8) # AF ⢐ ¯ [MACRON]
-char \xB0 ( 3 567 ) # B0 ⡴ ° [DEGREE SIGN]
+char \xB0 ( 3 56 ) # B0 ⠴ ° [grau | DEGREE SIGN]
char \xB1 ( 23 5 78) # B1 ⣖ ± [PLUS-MINUS SIGN]
char \xB2 ( 23 8) # B2 ⢆ ² [SUPERSCRIPT TWO]
char \xB3 ( 2 5 8) # B3 ⢒ ³ [SUPERSCRIPT THREE]
-char \xB4 ( 3 5 7 ) # B4 ⡔ ´ [ACUTE ACCENT]
-char \xB5 (1 34 8) # B5 ⢍ µ [MICRO SIGN]
+char \xB4 ( 234 6 8) # B4 ⢮ ´ [acento agudo | ACUTE ACCENT]
+char \xB5 (1 34 78) # B5 ⣍ µ [micro | MICRO SIGN]
char \xB6 (12345678) # B6 ⣿ ¶ [PILCROW SIGN]
-char \xB7 ( 3 7 ) # B7 ⡄ · [MIDDLE DOT]
+char \xB7 ( 3 ) # B7 ⠄ · [ponto mediano | MIDDLE DOT]
char \xB8 (1 4 8) # B8 ⢉ ¸ [CEDILLA]
char \xB9 ( 45 7 ) # B9 ⡘ ¹ [SUPERSCRIPT ONE]
-char \xBA ( 34 6 8) # BA ⢬ º [MASCULINE ORDINAL INDICATOR]
-char \xBB ( 23 6 8) # BB ⢦ » [RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK]
+char \xBA (1 3 5 78) # BA ⣕ º [indicador ordinal masculino | MASCULINE ORDINAL INDICATOR]
+char \xBB ( 3 56 8) # BB ⢴ » [fecha aspas angulares | RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK]
char \xBC (1 3 6 8) # BC ⢥ ¼ [VULGAR FRACTION ONE QUARTER]
char \xBD (123 6 8) # BD ⢧ ½ [VULGAR FRACTION ONE HALF]
char \xBE ( 34 78) # BE ⣌ ¾ [VULGAR FRACTION THREE QUARTERS]
-char \xBF ( 3 8) # BF ⢄ ¿ [INVERTED QUESTION MARK]
+char \xBF ( 2 6 8) # BF ⢢ ¿ [ponto de interrogação invertido | INVERTED QUESTION MARK]
char \xC0 (12 4 67 ) # C0 ⡫ À [LATIN CAPITAL LETTER A WITH GRAVE]
char \xC1 (123 567 ) # C1 ⡷ Á [LATIN CAPITAL LETTER A WITH ACUTE]
char \xC2 (1 67 ) # C2 ⡡ Â [LATIN CAPITAL LETTER A WITH CIRCUMFLEX]
-char \xC3 ( 3 567 ) # C3 ⡴ Ã [LATIN CAPITAL LETTER A WITH TILDE]
+char \xC3 ( 345 7 ) # C3 ⡜ Ã [a til maiúsculo | LATIN CAPITAL LETTER A WITH TILDE]
char \xC4 ( 567 ) # C4 ⡰ Ä [LATIN CAPITAL LETTER A WITH DIAERESIS]
char \xC5 ( 34567 ) # C5 ⡼ Å [LATIN CAPITAL LETTER A WITH RING ABOVE]
char \xC6 ( 4 7 ) # C6 ⡈ Æ [LATIN CAPITAL LETTER AE]
@@ -120,7 +138,7 @@ char \xCD ( 34 7 ) # CD ⡌ Í [LATIN CAPITAL LETTER I WITH ACUTE]
char \xCE (1 4 678) # CE ⣩ Î [LATIN CAPITAL LETTER I WITH CIRCUMFLEX]
char \xCF (12 4567 ) # CF ⡻ Ï [LATIN CAPITAL LETTER I WITH DIAERESIS]
char \xD0 ( 345 7 ) # D0 ⡜ Ð [LATIN CAPITAL LETTER ETH]
-char \xD1 (12 45678) # D1 ⣻ Ñ [LATIN CAPITAL LETTER N WITH TILDE]
+char \xD1 (12 4567 ) # D1 ⡻ Ñ [n maiúsculo til | LATIN CAPITAL LETTER N WITH TILDE]
char \xD2 ( 2 456 8) # D2 ⢺ Ò [LATIN CAPITAL LETTER O WITH GRAVE]
char \xD3 ( 34 67 ) # D3 ⡬ Ó [LATIN CAPITAL LETTER O WITH ACUTE]
char \xD4 (1 4567 ) # D4 ⡹ Ô [LATIN CAPITAL LETTER O WITH CIRCUMFLEX]
@@ -152,7 +170,7 @@ char \xED ( 34 ) # ED ⠌ í [LATIN SMALL LETTER I WITH ACUTE]
char \xEE (1 4 678) # EE ⣩ î [LATIN SMALL LETTER I WITH CIRCUMFLEX]
char \xEF (12 456 ) # EF ⠻ ï [LATIN SMALL LETTER I WITH DIAERESIS]
char \xF0 ( 23 56 8) # F0 ⢶ ð [LATIN SMALL LETTER ETH]
-char \xF1 (1 345 8) # F1 ⢝ ñ [LATIN SMALL LETTER N WITH TILDE]
+char \xF1 (12 456 ) # F1 ⠻ ñ [n til | LATIN SMALL LETTER N WITH TILDE]
char \xF2 ( 2 456 8) # F2 ⢺ ò [LATIN SMALL LETTER O WITH GRAVE]
char \xF3 ( 34 6 ) # F3 ⠬ ó [LATIN SMALL LETTER O WITH ACUTE]
char \xF4 (1 456 ) # F4 ⠹ ô [LATIN SMALL LETTER O WITH CIRCUMFLEX]
@@ -168,4 +186,93 @@ char \xFD (12 56 8) # FD ⢳ ý [LATIN SMALL LETTER Y WITH ACUTE]
char \xFE ( 3 8) # FE ⢄ þ [LATIN SMALL LETTER THORN]
char \xFF (1 3456 8) # FF ⢽ ÿ [LATIN SMALL LETTER Y WITH DIAERESIS]
+# Greek letters
+char \u0391 (1 7 ) # ⡁ Α [alfa maiúsculo | GREEK CAPITAL LETTER ALPHA]
+char \u03B1 (1 78) # ⣁ α [alfa minúsculo | GREEK SMALL LETTER ALPHA]
+char \u0392 (12 7 ) # ⡃ Β [beta maiúsculo | GREEK CAPITAL LETTER BETA]
+char \u03B2 (12 78) # ⣃ β [beta minúsculo | GREEK SMALL LETTER BETA]
+char \u039A (1 3 7 ) # ⡅ Κ [capa maiúsculo | GREEK CAPITAL LETTER KAPPA]
+char \u03BA (1 3 78) # ⣅ κ [capa minúsculo | GREEK SMALL LETTER KAPPA]
+char \u0394 (1 45 7 ) # ⡙ Δ [delta maiúsculo | GREEK CAPITAL LETTER DELTA]
+char \u03B4 (1 45 78) # ⣙ δ [delta minúsculo | GREEK SMALL LETTER DELTA]
+char \u0395 (1 5 7 ) # ⡑ Ε [épsilon maiúsculo | GREEK CAPITAL LETTER EPSILON]
+char \u03B5 (1 5 78) # ⣑ ε [épsilon minúsculo | GREEK SMALL LETTER EPSILON]
+char \u0397 (1 567 ) # ⡱ Η [eta maiúsculo | GREEK CAPITAL LETTER ETA]
+char \u03B7 (1 5678) # ⣱ η [eta minúsculo | GREEK SMALL LETTER ETA]
+char \u03A6 (12 4 7 ) # ⡋ Φ [fi maiúsculo | GREEK CAPITAL LETTER PHI]
+char \u03C6 (12 4 78) # ⣋ φ [fi minúsculo | GREEK SMALL LETTER PHI]
+char \u0393 (12 45 7 ) # ⡛ Γ [gama maiúsculo | GREEK CAPITAL LETTER GAMMA]
+char \u03B3 (12 45 78) # ⣛ γ [gama minúsculo | GREEK SMALL LETTER GAMMA]
+char \u0399 ( 2 4 7 ) # ⡊ Ι [iota maiúsculo | GREEK CAPITAL LETTER IOTA]
+char \u03B9 ( 2 4 78) # ⣊ ι [iota minúsculo | GREEK SMALL LETTER IOTA]
+char \u03A7 (1234 67 ) # ⡯ Χ [khi maiúsculo | GREEK CAPITAL LETTER CHI]
+char \u03C7 (1234 678) # ⣯ χ [khi minúsculo | GREEK SMALL LETTER CHI]
+char \u039B (123 7 ) # ⡇ Λ [lambda maiúsculo | GREEK CAPITAL LETTER LAMDA]
+char \u03BB (123 78) # ⣇ λ [lambda minúsculo | GREEK SMALL LETTER LAMDA]
+char \u039C (1 34 7 ) # ⡍ Μ [mi ou mu maiúsculo | GREEK CAPITAL LETTER MU]
+char \u03BC (1 34 78) # ⣍ μ [mi ou mu minúsculo | GREEK SMALL LETTER MU]
+char \u039D (1 345 7 ) # ⡝ Ν [ni ou nu maiúsculo | GREEK CAPITAL LETTER NU]
+char \u03BD (1 345 78) # ⣝ ν [ni ou nu minúsculo | GREEK SMALL LETTER NU]
+char \u03A9 ( 2 4567 ) # ⡺ Ω [ômega maiúsculo | GREEK CAPITAL LETTER OMEGA]
+char \u03C9 ( 2 45678) # ⣺ ω [ômega minúsculo | GREEK SMALL LETTER OMEGA]
+char \u039F (1 3 5 7 ) # ⡕ Ο [omicron maiúsculo | GREEK CAPITAL LETTER OMICRON]
+char \u03BF (1 3 5 78) # ⣕ ο [omicron minúsculo | GREEK SMALL LETTER OMICRON]
+char \u03A0 (1234 7 ) # ⡏ Π [pi maiúsculo | GREEK CAPITAL LETTER PI]
+char \u03C0 (1234 78) # ⣏ π [pi minúsculo | GREEK SMALL LETTER PI]
+char \u03A8 (1 34567 ) # ⡽ Ψ [psi maiúsculo | GREEK CAPITAL LETTER PSI]
+char \u03C8 (1 345678) # ⣽ ψ [psi minúsculo | GREEK SMALL LETTER PSI]
+char \u03A1 (123 5 7 ) # ⡗ Ρ [rô maiúsculo | GREEK CAPITAL LETTER RHO]
+char \u03C1 (123 5 78) # ⣗ ρ [rô minúsculo | GREEK SMALL LETTER RHO]
+char \u03A3 ( 234 7 ) # ⡎ Σ [sigma maiúsculo | GREEK CAPITAL LETTER SIGMA]
+char \u03C3 ( 234 78) # ⣎ σ [sigma minúsculo | GREEK SMALL LETTER SIGMA]
+char \u03C2 ( 234 78) # ⣎ ς [sigma minúsculo [em fim de palavra] | GREEK SMALL LETTER FINAL SIGMA]
+char \u03A4 ( 2345 7 ) # ⡞ Τ [tau maiúsculo | GREEK CAPITAL LETTER TAU]
+char \u03C4 ( 2345 78) # ⣞ τ [tau minúsculo | GREEK SMALL LETTER TAU]
+char \u0398 (1 4567 ) # ⡹ Θ [teta maiúsculo | GREEK CAPITAL LETTER THETA]
+char \u03B8 (1 45678) # ⣹ θ [teta minúsculo | GREEK SMALL LETTER THETA]
+char \u03A5 (1 3 67 ) # ⡥ Υ [úpsilon maiúsculo | GREEK CAPITAL LETTER UPSILON]
+char \u03C5 (1 3 678) # ⣥ υ [úpsilon minúsculo | GREEK SMALL LETTER UPSILON]
+char \u039E (1 34 67 ) # ⡭ Ξ [xi maiúsculo | GREEK CAPITAL LETTER XI]
+char \u03BE (1 34 678) # ⣭ ξ [xi minúsculo | GREEK SMALL LETTER XI]
+char \u0396 (1 3 567 ) # ⡵ Ζ [zeta maiúsculo | GREEK CAPITAL LETTER ZETA]
+char \u03B6 (1 3 5678) # ⣵ ζ [zeta minúsculo | GREEK SMALL LETTER ZETA]
+
+# More symbols
+char \u20AC (1 5 78) # ⣑ € [euro | EURO SIGN]
+char \u2227 (1 7 ) # ⡁ ∧ ["e" lógico ou conjunção | LOGICAL AND]
+char \u2228 ( 2 7 ) # ⡂ ∨ ["ou" lógico ou disjunção | LOGICAL OR]
+char \u2229 (1 5678) # ⣱ ∩ [interseção | INTERSECTION]
+char \u222A ( 345 78) # ⣜ ∪ [união | UNION]
+char \u2260 ( 23 567 ) # ⡶ ≠ [diferente | NOT EQUAL TO]
+
+# Accented letters of Esperanto
+char \u0108 (1 4 67 ) # ⡩ Ĉ [c circunflexo maiúsculo | LATIN CAPITAL LETTER C WITH CIRCUMFLEX]
+char \u0109 (1 4 6 ) # ⠩ ĉ [c circunflexo minúsculo | LATIN SMALL LETTER C WITH CIRCUMFLEX]
+char \u011C (12 4567 ) # ⡻ Ĝ [g circunflexo maiúsculo | LATIN CAPITAL LETTER G WITH CIRCUMFLEX]
+char \u011D (12 456 ) # ⠻ ĝ [g circunflexo minúsculo | LATIN SMALL LETTER G WITH CIRCUMFLEX]
+char \u0124 (12 567 ) # ⡳ Ĥ [h circunflexo maiúsculo | LATIN CAPITAL LETTER H WITH CIRCUMFLEX]
+char \u0125 (12 56 ) # ⠳ ĥ [h circunflexo minúsculo | LATIN SMALL LETTER H WITH CIRCUMFLEX]
+char \u0134 ( 2 4567 ) # ⡺ Ĵ [j circunflexo maiúsculo | LATIN CAPITAL LETTER J WITH CIRCUMFLEX]
+char \u0135 ( 2 456 ) # ⠺ ĵ [j circunflexo minúsculo | LATIN SMALL LETTER J WITH CIRCUMFLEX]
+char \u015C ( 234 67 ) # ⡮ Ŝ [s circunflexo maiúsculo | LATIN CAPITAL LETTER S WITH CIRCUMFLEX]
+char \u015D ( 234 6 ) # ⠮ ŝ [s circunflexo minúsculo | LATIN SMALL LETTER S WITH CIRCUMFLEX]
+char \u016C ( 34 67 ) # ⡬ Ŭ [u breve maiúsculo | LATIN CAPITAL LETTER U WITH BREVE]
+char \u016D ( 34 6 ) # ⠬ ŭ [u breve minúsculo | LATIN SMALL LETTER U WITH BREVE]
+
+# Other characters that the official braille code documentation does not defined
+char \u2022 ( 3 5 ) # ⠔ • [bolinha | BULLET]
+char \u2026 ( 3 7 ) # ⠄ … [reticências | HORIZONTAL ELLIPSIS]
+char \u2044 ( 2 56 ) # ⠲ ⁄ [barra de fração | FRACTION SLASH]
+char \u2122 ( 2345 8) # ⢞ ™ [marca registrada | TRADE MARK SIGN]
+char \u2215 ( 2 56 ) # ⠲ ∕ [barra de divisão | DIVISION SLASH]
+
+# Other bullets
+char \u25A0 ( 3 5 ) # ⠔ ■ [quadrado preto | BLACK SQUARE]
+char \u25A1 ( 3 5 ) # ⠔ □ [quadrado branco | WHITE SQUARE]
+char \u25AA ( 3 5 ) # ⠔ ▪ [quadradinho preto | BLACK SMALL SQUARE]
+char \u25CB ( 3 5 ) # ⠔ ○ [círculo branco | WHITE CIRCLE]
+char \u25CF ( 3 5 ) # ⠔ ● [círculo | BLACK CIRCLE]
+char \u25E6 ( 3 5 ) # ⠔ ◦ [bolinha branca | WHITE BULLET]
+char \u25FE ( 3 5 ) # ⠔ ◾ [quadradinho médio preto | BLACK MEDIUM SMALL SQUARE]
+
include common.tti
diff --git a/Tables/Text/punc-alternate.tti b/Tables/Text/punc-alternate.tti
index 02be78333..170537a4d 100644
--- a/Tables/Text/punc-alternate.tti
+++ b/Tables/Text/punc-alternate.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/punc-basic.tti b/Tables/Text/punc-basic.tti
index c1b33b934..34bff92bb 100644
--- a/Tables/Text/punc-basic.tti
+++ b/Tables/Text/punc-basic.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/punc-tibetan.tti b/Tables/Text/punc-tibetan.tti
index b60eb0542..27cf8ca90 100644
--- a/Tables/Text/punc-tibetan.tti
+++ b/Tables/Text/punc-tibetan.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ro.ttb b/Tables/Text/ro.ttb
index ec00eb72b..2a6a1f4cb 100644
--- a/Tables/Text/ro.ttb
+++ b/Tables/Text/ro.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ru.ttb b/Tables/Text/ru.ttb
index 787f6c1be..e99a00c58 100644
--- a/Tables/Text/ru.ttb
+++ b/Tables/Text/ru.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/sa.ttb b/Tables/Text/sa.ttb
index a4101049a..2fc5235b7 100644
--- a/Tables/Text/sa.ttb
+++ b/Tables/Text/sa.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/sat.ttb b/Tables/Text/sat.ttb
index 22542544f..72cb3f8a4 100644
--- a/Tables/Text/sat.ttb
+++ b/Tables/Text/sat.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/sd.ttb b/Tables/Text/sd.ttb
index d38a1101f..4aa660b5f 100644
--- a/Tables/Text/sd.ttb
+++ b/Tables/Text/sd.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/se.ttb b/Tables/Text/se.ttb
index 15e97d6c6..6509ed6fe 100644
--- a/Tables/Text/se.ttb
+++ b/Tables/Text/se.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/sk.ttb b/Tables/Text/sk.ttb
index 6870da3af..6960ef148 100644
--- a/Tables/Text/sk.ttb
+++ b/Tables/Text/sk.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/sl.ttb b/Tables/Text/sl.ttb
index 92a530391..b3f06575a 100644
--- a/Tables/Text/sl.ttb
+++ b/Tables/Text/sl.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/sv-1989.ttb b/Tables/Text/sv-1989.ttb
index 9ddfa5dc5..180b932e9 100644
--- a/Tables/Text/sv-1989.ttb
+++ b/Tables/Text/sv-1989.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/sv-1996.ttb b/Tables/Text/sv-1996.ttb
index 308ab1d60..30f0fc603 100644
--- a/Tables/Text/sv-1996.ttb
+++ b/Tables/Text/sv-1996.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/sv.ttb b/Tables/Text/sv.ttb
index da92cc565..fde653035 100644
--- a/Tables/Text/sv.ttb
+++ b/Tables/Text/sv.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/sw.ttb b/Tables/Text/sw.ttb
index 7321c45f3..426989787 100644
--- a/Tables/Text/sw.ttb
+++ b/Tables/Text/sw.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/ta.ttb b/Tables/Text/ta.ttb
index 5386c99fb..d6a0d09e5 100644
--- a/Tables/Text/ta.ttb
+++ b/Tables/Text/ta.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/tamil.tti b/Tables/Text/tamil.tti
index 977c2de46..af10e07ff 100644
--- a/Tables/Text/tamil.tti
+++ b/Tables/Text/tamil.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/te.ttb b/Tables/Text/te.ttb
index 0572007e4..d8b439dfd 100644
--- a/Tables/Text/te.ttb
+++ b/Tables/Text/te.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/telugu.tti b/Tables/Text/telugu.tti
index 94a9b77a5..612873902 100644
--- a/Tables/Text/telugu.tti
+++ b/Tables/Text/telugu.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 2008-2024 by The BRLTTY Developers.
+# Copyright (C) 2008-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/tr.ttb b/Tables/Text/tr.ttb
index 467247ae9..336d104d4 100644
--- a/Tables/Text/tr.ttb
+++ b/Tables/Text/tr.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/uk.ttb b/Tables/Text/uk.ttb
index ae8a79ed7..8fb1b4038 100644
--- a/Tables/Text/uk.ttb
+++ b/Tables/Text/uk.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/vi.ttb b/Tables/Text/vi.ttb
index f5427a0fa..7dc720f96 100644
--- a/Tables/Text/vi.ttb
+++ b/Tables/Text/vi.ttb
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tables/Text/win-1252.tti b/Tables/Text/win-1252.tti
index f6f8d85c4..2dfdcaff4 100644
--- a/Tables/Text/win-1252.tti
+++ b/Tables/Text/win-1252.tti
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/braille.tcl b/Tools/braille.tcl
index 4c0e0b238..6e3c08d46 100644
--- a/Tools/braille.tcl
+++ b/Tools/braille.tcl
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/cfbrltty b/Tools/cfbrltty
index a120a17f6..b61646cb3 100755
--- a/Tools/cfbrltty
+++ b/Tools/cfbrltty
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/csv.tcl b/Tools/csv.tcl
index 196f2e7eb..5e06a47c7 100644
--- a/Tools/csv.tcl
+++ b/Tools/csv.tcl
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/gendeps b/Tools/gendeps
index 8ad83e8c3..8a408bff6 100755
--- a/Tools/gendeps
+++ b/Tools/gendeps
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/javacmd b/Tools/javacmd
index 5b861ebb3..c00e7e6f1 100755
--- a/Tools/javacmd
+++ b/Tools/javacmd
@@ -3,7 +3,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
diff --git a/Tools/ktbcheck b/Tools/ktbcheck
index 4370f7fa0..d3109840e 100755
--- a/Tools/ktbcheck
+++ b/Tools/ktbcheck
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/luacmd b/Tools/luacmd
index d58e23d20..2d0c74f2c 100755
--- a/Tools/luacmd
+++ b/Tools/luacmd
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/luacmd.lua b/Tools/luacmd.lua
index a142ea42c..65178632c 100644
--- a/Tools/luacmd.lua
+++ b/Tools/luacmd.lua
@@ -1,7 +1,7 @@
--[[
libbrlapi - A library providing access to braille terminals for applications.
- Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+ Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
libbrlapi comes with ABSOLUTELY NO WARRANTY.
diff --git a/Tools/mkbrltty b/Tools/mkbrltty
index eb1ac78a7..5ba53a24d 100755
--- a/Tools/mkbrltty
+++ b/Tools/mkbrltty
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/mkctbchars b/Tools/mkctbchars
index 099e9d0ff..98f103c23 100755
--- a/Tools/mkctbchars
+++ b/Tools/mkctbchars
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/apk.sh b/Tools/packages.d/apk.sh
index b0a562f6c..16534e61f 100644
--- a/Tools/packages.d/apk.sh
+++ b/Tools/packages.d/apk.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/apt.sh b/Tools/packages.d/apt.sh
index 506f3e9ae..f0bc60245 100644
--- a/Tools/packages.d/apt.sh
+++ b/Tools/packages.d/apt.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/brew.sh b/Tools/packages.d/brew.sh
index 9223ee870..493a294e0 100644
--- a/Tools/packages.d/brew.sh
+++ b/Tools/packages.d/brew.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/dnf.sh b/Tools/packages.d/dnf.sh
index 3b9e8decc..456700f92 100644
--- a/Tools/packages.d/dnf.sh
+++ b/Tools/packages.d/dnf.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/pacman.sh b/Tools/packages.d/pacman.sh
index 169a075f5..4438c24a3 100644
--- a/Tools/packages.d/pacman.sh
+++ b/Tools/packages.d/pacman.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/pkg.sh b/Tools/packages.d/pkg.sh
index c815d4c75..7a9decb19 100644
--- a/Tools/packages.d/pkg.sh
+++ b/Tools/packages.d/pkg.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/pkg_info.sh b/Tools/packages.d/pkg_info.sh
index c67923c38..29cde9b5c 100644
--- a/Tools/packages.d/pkg_info.sh
+++ b/Tools/packages.d/pkg_info.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/stubs.sh b/Tools/packages.d/stubs.sh
index 5195b16a8..320d8d8fb 100644
--- a/Tools/packages.d/stubs.sh
+++ b/Tools/packages.d/stubs.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/xbps.sh b/Tools/packages.d/xbps.sh
index 0aea05d62..317b8b316 100644
--- a/Tools/packages.d/xbps.sh
+++ b/Tools/packages.d/xbps.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.d/zypper.sh b/Tools/packages.d/zypper.sh
index 631dfbc4f..e7b1013a8 100644
--- a/Tools/packages.d/zypper.sh
+++ b/Tools/packages.d/zypper.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/packages.sh b/Tools/packages.sh
index 7dd63fa21..b41d6fb43 100644
--- a/Tools/packages.sh
+++ b/Tools/packages.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/pkg-describe b/Tools/pkg-describe
index 5817ffeb5..86a846a13 100755
--- a/Tools/pkg-describe
+++ b/Tools/pkg-describe
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/pkg-install b/Tools/pkg-install
index 336e1f962..972c7a9b3 100755
--- a/Tools/pkg-install
+++ b/Tools/pkg-install
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/pkg-list b/Tools/pkg-list
index ef810a2d9..fb193a7d1 100755
--- a/Tools/pkg-list
+++ b/Tools/pkg-list
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/pkg-remove b/Tools/pkg-remove
index 80a336dd2..eca378af2 100755
--- a/Tools/pkg-remove
+++ b/Tools/pkg-remove
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/pkg-search b/Tools/pkg-search
index d58e5d135..e5da7ba37 100755
--- a/Tools/pkg-search
+++ b/Tools/pkg-search
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/pkg-which b/Tools/pkg-which
index 36c310ee2..0287ac588 100755
--- a/Tools/pkg-which
+++ b/Tools/pkg-which
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/pkgvars b/Tools/pkgvars
index d16441259..aad6cb34a 100755
--- a/Tools/pkgvars
+++ b/Tools/pkgvars
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/pythoncmd b/Tools/pythoncmd
index b75b9d360..e745c50f6 100755
--- a/Tools/pythoncmd
+++ b/Tools/pythoncmd
@@ -2,7 +2,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2025 by
# Alexis Robert <alexissoft@free.fr>
# Samuel Thibault <Samuel.Thibault@ens-lyon.org>
#
diff --git a/Tools/reqpkgs b/Tools/reqpkgs
index 33df1635f..60f8230a4 100755
--- a/Tools/reqpkgs
+++ b/Tools/reqpkgs
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/tclcmd b/Tools/tclcmd
index b019e1891..92273658a 100755
--- a/Tools/tclcmd
+++ b/Tools/tclcmd
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/tcltest b/Tools/tcltest
index b3581506f..e187fa670 100755
--- a/Tools/tcltest
+++ b/Tools/tcltest
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/ttytest b/Tools/ttytest
index 4f425b780..9313b7c15 100755
--- a/Tools/ttytest
+++ b/Tools/ttytest
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/updcmdref b/Tools/updcmdref
index 296d1654d..fd86ca549 100755
--- a/Tools/updcmdref
+++ b/Tools/updcmdref
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/updcsvs b/Tools/updcsvs
index 431bb726a..8fb39eea1 100755
--- a/Tools/updcsvs
+++ b/Tools/updcsvs
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/updfiles b/Tools/updfiles
index 05e194794..b962188df 100755
--- a/Tools/updfiles
+++ b/Tools/updfiles
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Tools/updusbdevs b/Tools/updusbdevs
index 28fb7a629..d11afcc1c 100755
--- a/Tools/updusbdevs
+++ b/Tools/updusbdevs
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Windows/mingw.sh b/Windows/mingw.sh
index acfd2f07e..f4831952a 100644
--- a/Windows/mingw.sh
+++ b/Windows/mingw.sh
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Windows/mkwin b/Windows/mkwin
index f82138e91..7507507bd 100755
--- a/Windows/mkwin
+++ b/Windows/mkwin
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/Windows/winsetup b/Windows/winsetup
index 53b62cff9..f5887cdd3 100755
--- a/Windows/winsetup
+++ b/Windows/winsetup
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/acdir/config.guess b/acdir/config.guess
index 568769cff..c7087e507 100755
--- a/acdir/config.guess
+++ b/acdir/config.guess
@@ -1,6 +1,6 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2024 Free Software Foundation, Inc.
+# Copyright 1992-2025 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
@@ -60,7 +60,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2025 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/acdir/config.sub b/acdir/config.sub
index 153097af5..d9e04b188 100755
--- a/acdir/config.sub
+++ b/acdir/config.sub
@@ -1,6 +1,6 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2024 Free Software Foundation, Inc.
+# Copyright 1992-2025 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
@@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2025 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/acdir/install-sh b/acdir/install-sh
index 3e94e441b..a354d663d 100755
--- a/acdir/install-sh
+++ b/acdir/install-sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/apitest.sh b/apitest.sh
index e88ace549..ef149ffb8 100644
--- a/apitest.sh
+++ b/apitest.sh
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/appveyor.yml b/appveyor.yml
index c18e5e2a9..beeadd6e5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/autogen b/autogen
index 5aecfbc3e..49d72b811 100755
--- a/autogen
+++ b/autogen
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/bindings.mk b/bindings.mk
index 8bc212d04..292073b9f 100644
--- a/bindings.mk
+++ b/bindings.mk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/braille.mk b/braille.mk
index bdf6adc3a..3ccb01875 100644
--- a/braille.mk
+++ b/braille.mk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/brltty-config.sh.in b/brltty-config.sh.in
index 05959e799..d746ace3c 100644
--- a/brltty-config.sh.in
+++ b/brltty-config.sh.in
@@ -4,7 +4,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/brltty-genkey b/brltty-genkey
index 90f4ff010..afa76d19d 100755
--- a/brltty-genkey
+++ b/brltty-genkey
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/brltty-mkuser b/brltty-mkuser
index 64d149b34..1f068cf3b 100755
--- a/brltty-mkuser
+++ b/brltty-mkuser
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
###############################################################################
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -38,7 +38,7 @@ readonly defaultLoginShell="/sbin/nologin"
showProgramUsageNotes() {
cat <<END_OF_PROGRAM_USAGE_NOTES
When creating a new user, these options have the following defaults:
- -d ${defaultHomeDirectory:-the home directory isn't defined}
+ -d ${defaultHomeDirectory:-the home directory is not defined}
-g a new group with the same name as the user
-i ${defaultUserInformation}
-l ${defaultLoginShell}
@@ -66,6 +66,7 @@ addGroups() {
[ -n "${group}" ] || continue
[ "${group#*/}" = "${group}" ] || {
+ [ -e "${group}" ] || continue
group="$(stat -c "%G" "${group}")" || :
[ -n "${group}" ] || continue
}
@@ -120,7 +121,18 @@ else
[ -n "${homeDirectory}" ] || homeDirectory="${defaultHomeDirectory}"
[ -n "${loginShell}" ] || loginShell="${defaultLoginShell}"
- if [ -n "${homeDirectory}" ]
+ if [ -z "${homeDirectory}" ]
+ then
+ createHomeDirectory=false
+ elif [ -e "${homeDirectory}" ]
+ then
+ [ -d "${homeDirectory}" ] || semanticError "not a directory: ${homeDirectory}"
+ createHomeDirectory=false
+ else
+ createHomeDirectory=true
+ fi
+
+ if "${createHomeDirectory}"
then
command+=(--create-home)
else
diff --git a/brltty-prologue.bash b/brltty-prologue.bash
index 84f530953..762972de7 100644
--- a/brltty-prologue.bash
+++ b/brltty-prologue.bash
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/brltty-prologue.lua b/brltty-prologue.lua
index 456632cbe..2ab97f693 100644
--- a/brltty-prologue.lua
+++ b/brltty-prologue.lua
@@ -1,7 +1,7 @@
--[[
libbrlapi - A library providing access to braille terminals for applications.
- Copyright (C) 2006-2024 by Dave Mielke <dave@mielke.cc>
+ Copyright (C) 2006-2025 by Dave Mielke <dave@mielke.cc>
libbrlapi comes with ABSOLUTELY NO WARRANTY.
diff --git a/brltty-prologue.sh b/brltty-prologue.sh
index 066e265ae..9bcfbdb0d 100644
--- a/brltty-prologue.sh
+++ b/brltty-prologue.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/brltty-prologue.tcl b/brltty-prologue.tcl
index 88f9587c1..f86bd4e24 100644
--- a/brltty-prologue.tcl
+++ b/brltty-prologue.tcl
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/brltty-setcaps b/brltty-setcaps
index 349710f7b..5dd88d10c 100755
--- a/brltty-setcaps
+++ b/brltty-setcaps
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/brltty-term b/brltty-term
index d3f8a787a..77cb3d3d9 100755
--- a/brltty-term
+++ b/brltty-term
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/brltty-ttysize b/brltty-ttysize
index 581cb6aa0..01f4710ec 100755
--- a/brltty-ttysize
+++ b/brltty-ttysize
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/brltty.pc.in b/brltty.pc.in
index ea2a3cb11..655f4ee28 100644
--- a/brltty.pc.in
+++ b/brltty.pc.in
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -43,7 +43,7 @@ writable_directory=@writable_directory@
execute_root=@execute_root@
program_directory=${execute_root}@program_directory@
-commands_directory=${execute_root}@commands_directory@
+helpers_directory=${execute_root}@helpers_directory@
drivers_directory=${execute_root}@drivers_directory@
tables_directory=${execute_root}@tables_directory@
include_directory=${execute_root}@include_directory@
diff --git a/brltty.spec.in b/brltty.spec.in
index 2e5c455c7..ad6a0b480 100644
--- a/brltty.spec.in
+++ b/brltty.spec.in
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -97,7 +97,49 @@ has also been incorporated.
Install this package if you use a refreshable braille display.
-%package -n brltty-braille-brlapi
+%package utils
+Version: @PACKAGE_VERSION@
+Release: 1
+Group: Development/Tools
+License: LGPL
+
+Requires: libicu
+Requires: expat
+Requires: cldr-emoji-annotation
+
+BuildRequires: libicu-devel
+BuildRequires: expat-devel
+BuildRequires: ncurses-devel
+
+AutoProv: no
+AutoReq: yes
+
+Summary: Commands for maintaining BRLTTY data files.
+%description utils
+This package provides a set of commands for maintaining BRLTTY's datafiles.
+
+
+%package devel
+Version: @PACKAGE_VERSION@
+Release: 1
+Group: Development/Tools
+License: LGPL
+
+AutoProv: no
+AutoReq: yes
+
+Summary: Headers for BRLTTY.
+%description devel
+This package provides many of the header files for BRLTTY's core, as well as
+header files which define the packets and keys for several braille devices.
+
+Install this package if you're developing or maintaining an application which
+needs to (or wishes to) use functionality provided by BRLTTY's core, which
+needs to interpret and/or create raw braille device packets, or which needs to
+interpret key codes as delivered by BrlAPI's raw mode.
+
+
+%package braille-brlapi
Version: @PACKAGE_VERSION@
Release: 1
Group: System Environment/Daemons
@@ -107,7 +149,7 @@ AutoProv: no
AutoReq: yes
Summary: BrlAPI braille driver for BRLTTY.
-%description -n brltty-braille-brlapi
+%description braille-brlapi
This package provides the BrlAPI braille driver for BRLTTY.
Install this package if you need to communicate with
@@ -115,7 +157,7 @@ another instance of BRLTTY which is actually in control
of the braille device.
-%package -n brltty-braille-xwindow
+%package braille-xwindow
Version: @PACKAGE_VERSION@
Release: 1
Group: System Environment/Daemons
@@ -132,7 +174,7 @@ AutoProv: no
AutoReq: yes
Summary: XWindow braille driver for BRLTTY.
-%description -n brltty-braille-xwindow
+%description braille-xwindow
This package provides the XWindow braille driver for BRLTTY.
This driver presents a virtual braille device within a graphical
user interface. It is primarily intended for sighted developers
@@ -143,7 +185,7 @@ Install this package if you would like to see how usable an
application would be by a blind person using a braille device.
-%package -n brltty-speech-espeak
+%package speech-espeak
Version: @PACKAGE_VERSION@
Release: 1
Group: System Environment/Daemons
@@ -157,14 +199,14 @@ AutoProv: no
AutoReq: yes
Summary: eSpeak speech driver for BRLTTY.
-%description -n brltty-speech-espeak
+%description speech-espeak
This package provides the eSpeak speech driver for BRLTTY.
Install this package if you would like to be able to use the
eSpeak text-to-speech engine.
-%package -n brltty-speech-espeak-ng
+%package speech-espeak-ng
Version: @PACKAGE_VERSION@
Release: 1
Group: System Environment/Daemons
@@ -178,14 +220,14 @@ AutoProv: no
AutoReq: yes
Summary: eSpeak-NG speech driver for BRLTTY.
-%description -n brltty-speech-espeak-ng
+%description speech-espeak-ng
This package provides the eSpeak-NG speech driver for BRLTTY.
Install this package if you would like to be able to use the
eSpeak-NG text-to-speech engine.
-%package -n brltty-speech-festival
+%package speech-festival
Version: @PACKAGE_VERSION@
Release: 1
Group: System Environment/Daemons
@@ -197,14 +239,14 @@ AutoProv: no
AutoReq: yes
Summary: Festival speech driver for BRLTTY.
-%description -n brltty-speech-festival
+%description speech-festival
This package provides the Festival speech driver for BRLTTY.
Install this package if you would like to be able to use the
Festival text-to-speech engine.
-%package -n brltty-speech-flite
+%package speech-flite
Version: @PACKAGE_VERSION@
Release: 1
Group: System Environment/Daemons
@@ -218,14 +260,14 @@ AutoProv: no
AutoReq: yes
Summary: Festival Lite speech driver for BRLTTY.
-%description -n brltty-speech-flite
+%description speech-flite
This package provides the Festival Lite speech driver for BRLTTY.
Install this package if you would like to be able to use the
Festival Lite text-to-speech engine.
-%package -n brltty-speech-speechd
+%package speech-speechd
Version: @PACKAGE_VERSION@
Release: 1
Group: System Environment/Daemons
@@ -239,14 +281,14 @@ AutoProv: no
AutoReq: yes
Summary: Speech Dispatcher speech driver for BRLTTY.
-%description -n brltty-speech-speechd
+%description speech-speechd
This package provides the Speech Dispatcher speech driver for BRLTTY.
Install this package if you would like to be able to use the
Speech Dispatcher text-to-speech server.
-%package -n brltty-screen-atspi2
+%package screen-atspi2
Version: @PACKAGE_VERSION@
Release: 1
Group: System Environment/Daemons
@@ -262,7 +304,7 @@ AutoProv: no
AutoReq: yes
Summary: AT-SPI2 screen driver for BRLTTY.
-%description -n brltty-screen-atspi2
+%description screen-atspi2
This package provides the AT-SPI2 screen driver for BRLTTY.
Install this package if you would like to be able to
@@ -270,7 +312,7 @@ access graphical applications via the D-Bus port of
the Assistive Technology Service Provider Interface.
-%package -n brltty-screen-screen
+%package screen-screen
Version: @PACKAGE_VERSION@
Release: 1
Group: System Environment/Daemons
@@ -281,7 +323,7 @@ AutoReq: yes
Requires: screen
Summary: Screen screen driver for BRLTTY.
-%description -n brltty-screen-screen
+%description screen-screen
This package provides the Screen screen driver for BRLTTY.
Install this package if you would like to be able to
@@ -289,122 +331,6 @@ directly access session windows maintained by the
screen program.
-%package -n brltty-utils
-Version: @PACKAGE_VERSION@
-Release: 1
-Group: Development/Tools
-License: LGPL
-
-Requires: libicu
-Requires: expat
-Requires: cldr-emoji-annotation
-
-BuildRequires: libicu-devel
-BuildRequires: expat-devel
-BuildRequires: ncurses-devel
-
-AutoProv: no
-AutoReq: yes
-
-Summary: Commands for maintaining BRLTTY data files.
-%description -n brltty-utils
-This package provides a set of commands for maintaining BRLTTY's datafiles.
-
-
-%package -n brltty-devel
-Version: @PACKAGE_VERSION@
-Release: 1
-Group: Development/Tools
-License: LGPL
-
-AutoProv: no
-AutoReq: yes
-
-Summary: Headers for BRLTTY.
-%description -n brltty-devel
-This package provides many of the header files for BRLTTY's core, as well as
-header files which define the packets and keys for several braille devices.
-
-Install this package if you're developing or maintaining an application which
-needs to (or wishes to) use functionality provided by BRLTTY's core, which
-needs to interpret and/or create raw braille device packets, or which needs to
-interpret key codes as delivered by BrlAPI's raw mode.
-
-
-%package -n brltty-systemd
-Version: @PACKAGE_VERSION@
-Release: 1
-Group: System Environment/Daemons
-License: LGPL
-BuildArch: noarch
-
-AutoProv: no
-AutoReq: yes
-Requires: systemd
-
-Summary: Systemd units and wrappers for BRLTTY.
-%description -n brltty-systemd
-This package provides the units and wrapper for managing BRLTTY via Systemd.
-
-Install this package if you'd like to manage BRLTTY processes via Systemd.
-
-
-%package -n brltty-udev
-Version: @PACKAGE_VERSION@
-Release: 1
-Group: System Environment/Daemons
-License: LGPL
-BuildArch: noarch
-
-AutoProv: no
-AutoReq: yes
-Requires: systemd-udev
-
-Summary: BRLTTY Udev rules.
-%description -n brltty-udev
-This package provides the rules and the wrapper for managing BRLTTY via Udev.
-
-Install this package if you'd like to manage BRLTTY processes via Udev.
-It doesn't include the rules for braille devices that use generic USB to serial adapters.
-
-
-%package -n brltty-udev-generic
-Version: @PACKAGE_VERSION@
-Release: 1
-Group: System Environment/Daemons
-License: LGPL
-BuildArch: noarch
-
-AutoProv: no
-AutoReq: yes
-Requires: systemd-udev
-
-Summary: BRLTTY Udev rules for braille devices that use a generic USB to serial adapter.
-%description -n brltty-udev-generic
-This package provides additional rules for managing BRLTTY via Udev.
-
-Install this package in order to support braille devices that use a generic USB to serial adapter.
-
-
-%package -n brltty-dracut
-Version: @PACKAGE_VERSION@
-Release: 1
-Group: System Environment/Daemons
-License: LGPL
-BuildArch: noarch
-
-AutoProv: no
-AutoReq: yes
-Requires: dracut
-Requires: brltty-utils
-
-Summary: Dracut module for BRLTTY.
-%description -n brltty-dracut
-This package provides the module for adding BRLTTY to an initial ramdisk image.
-
-Install this package if you'd like to have braille accessibility BRLTTY processes via Udev.
-
-
%package -n brlapi
Version: @api_release@
Release: 1
@@ -572,6 +498,80 @@ Install this package if you have a Tcl application
which directly accesses a refreshable braille display.
+%package systemd
+Version: @PACKAGE_VERSION@
+Release: 1
+Group: System Environment/Daemons
+License: LGPL
+BuildArch: noarch
+
+AutoProv: no
+AutoReq: yes
+Requires: systemd
+
+Summary: Systemd units and wrappers for BRLTTY.
+%description systemd
+This package provides the units and wrapper for managing BRLTTY via Systemd.
+
+Install this package if you'd like to manage BRLTTY processes via Systemd.
+
+
+%package udev
+Version: @PACKAGE_VERSION@
+Release: 1
+Group: System Environment/Daemons
+License: LGPL
+BuildArch: noarch
+
+AutoProv: no
+AutoReq: yes
+Requires: systemd-udev
+
+Summary: BRLTTY Udev rules.
+%description udev
+This package provides the rules and the wrapper for managing BRLTTY via Udev.
+
+Install this package if you'd like to manage BRLTTY processes via Udev.
+It doesn't include the rules for braille devices that use generic USB to serial adapters.
+
+
+%package udev-generic
+Version: @PACKAGE_VERSION@
+Release: 1
+Group: System Environment/Daemons
+License: LGPL
+BuildArch: noarch
+
+AutoProv: no
+AutoReq: yes
+Requires: systemd-udev
+
+Summary: BRLTTY Udev rules for braille devices that use a generic USB to serial adapter.
+%description udev-generic
+This package provides additional rules for managing BRLTTY via Udev.
+
+Install this package in order to support braille devices that use a generic USB to serial adapter.
+
+
+%package dracut
+Version: @PACKAGE_VERSION@
+Release: 1
+Group: System Environment/Daemons
+License: LGPL
+BuildArch: noarch
+
+AutoProv: no
+AutoReq: yes
+Requires: dracut
+Requires: brltty-utils
+
+Summary: Dracut module for BRLTTY.
+%description dracut
+This package provides the module for adding BRLTTY to an initial ramdisk image.
+
+Install this package if you'd like to have braille accessibility BRLTTY processes via Udev.
+
+
%prep
# %setup -n %{name}-%{version}
%setup -n @PACKAGE_TARNAME@-@PACKAGE_VERSION@
@@ -633,58 +633,39 @@ rm -fr "${RPM_BUILD_ROOT}"
%doc %{_docdir}/*/Manual-BRLTTY
%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty.conf
-%files -n brltty-braille-brlapi
+%files utils
+%{_bindir}/brltty-*
+
+%files devel
+%{_includedir}/brltty
+
+%files braille-brlapi
%{_pkglibdir}/libbrlttybba.so
-%files -n brltty-braille-xwindow
+%files braille-xwindow
%{_pkglibdir}/libbrlttybxw.so
-%files -n brltty-speech-espeak
+%files speech-espeak
%{_pkglibdir}/libbrlttyses.so
-%files -n brltty-speech-espeak-ng
+%files speech-espeak-ng
%{_pkglibdir}/libbrlttysen.so
-%files -n brltty-speech-festival
+%files speech-festival
%{_pkglibdir}/libbrlttysfv.so
-%files -n brltty-speech-flite
+%files speech-flite
%{_pkglibdir}/libbrlttysfl.so
-%files -n brltty-speech-speechd
+%files speech-speechd
%{_pkglibdir}/libbrlttyssd.so
-%files -n brltty-screen-atspi2
+%files screen-atspi2
%{_pkglibdir}/libbrlttyxa2.so
-%files -n brltty-screen-screen
+%files screen-screen
%{_pkglibdir}/libbrlttyxsc.so
-%files -n brltty-utils
-%{_bindir}/brltty-*
-
-%files -n brltty-devel
-%{_includedir}/brltty
-
-%files -n brltty-systemd
-%{_unitdir}/*
-%{_sysusersdir}/*
-%{_tmpfilesdir}/*
-%{_pkglibexecdir}/systemd-*
-
-%files -n brltty-udev
-%{_udevrulesdir}/*
-%exclude %{_udevrulesdir}/*-generic*
-%{_pkglibexecdir}/udev-*
-
-%files -n brltty-udev-generic
-%{_udevrulesdir}/*-generic*
-
-%files -n brltty-dracut
-/usr/lib/dracut/modules.d/99brltty
-%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/dracut.conf
-%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
-
%files -n brlapi
%defattr(-,root,root)
%{_libdir}/libbrlapi.so.*
@@ -726,90 +707,73 @@ rm -fr "${RPM_BUILD_ROOT}"
@TCL_DIR@/brlapi-@api_release@/libbrlapi_tcl.so
@TCL_DIR@/brlapi-@api_release@/pkgIndex.tcl
+%files systemd
+%{_unitdir}/*
+%{_sysusersdir}/*
+%{_tmpfilesdir}/*
+%{_pkglibexecdir}/systemd-*
+
+%files udev
+%{_udevrulesdir}/*
+%exclude %{_udevrulesdir}/*-generic*
+%{_pkglibexecdir}/udev-*
+
+%files udev-generic
+%{_udevrulesdir}/*-generic*
+
+%files dracut
+/usr/lib/dracut/modules.d/99brltty
+%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/dracut.conf
+%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
+
%changelog
-* Sat Jul 22 2023 Dave Mielke <Dave@Mielke.cc> 6.6
+* Tue Oct 15 2024 Dave Mielke <Dave@Mielke.cc> 6.7
General changes:
- The -H (uppercase) option and the concept of hidden options have been removed.
- For consistency (with -A, -B, -S, -X), the -z and -Z short options have been swapped:
- -z is now --stay-privileged
- -Z is now --privilege-parameters
- Multi-line contracted braille is now supported.
- The cursor style can now be set to no dots.
- A rectangular append to the clipboard now ensures a leading newline.
- README.CommandReference has been added.
-Speech changes:
- Speech can now be interrupted when writing new text to the input FIFO.
- Autospeak now provides correct character highlighting to the speech driver.
- A word is now a whitespace-delimited (rather than an alphanumeric) sequence of characters.
- Word completion for single-character words now works correctly.
- The ROUTE_SPEECH command (go to the speech cursor) has been added.
- The DESC_CURR_CHAR command now speaks phonetically.
-Preferences Menu changes:
- The PREFRESET command has been added.
- Space + p + Dots 7-8 is bound to the new PREFRESET command.
- If the preferences file can't be found then try loading /etc/brltty/default.prefs.
- Save on Exit now also saves the preferences on program termination.
- The Speak Key Context preference has been added.
- The Speak Modifier Key preference has been added.
-Baum braille driver changes:
- More recent Orbit Reader models have routing keys.
-BrlAPI braille driver changes:
- The speechChanges (no, yes) parameter has been added.
-CombiBraille braille driver changes:
- Upgraded to use generic (rather than direct serial) I/O.
- The routing keys are now supported.
-DotPad braille driver:
- New - its two-letter driver code is dp.
- A multi-line text display is supported within its graphic area.
-Freedom Scientific braille driver changes:
- Minor Focus key binding changes:
- LeftShift + RoutingKey -> SETLEFT
- RightShift + RoutingKey -> SWITCHVT
- LeftSelector + NavrowKey -> PRDIFCHAR
- RightSelector + NavrowKey -> NXDIFCHAR
+ The -g [--gui-keyboard=] command line option has been added.
+ The -G (--gui-keyboard-table) command line option has been added.
+ The Speak Empty Line preference (default is yes) has been added.
+ The ASPK_EMP_LINE toggle command has been added.
+BrailleMemo braille driver changes:
+ The KGS Next Touch models are now supported.
+FreedomScientific braille driver changes:
+ Bluetooth service discovery is now used to find the serial channel.
HandyTech braille driver changes:
- Bluetooth service discovery now needs to be performed (for newer models).
-External Speech speech driver changes:
- The volume and pitch can now be set.
- Now disconnects from the server when a write error or timeout occurs.
- Now tries to reconnect to the server if disconnected.
- Now correctly handles the receipt of tracking data.
-AtSpi2 screen driver changes:
- A potential crash on receipt of a cursor routing request has been resolved.
-File Viewer screen driver:
- New. Its two-letter driver code is fv.
- A virtual screen presents the specified file (via its file parameter).
- The height of the screen is the number of lines within the file.
- The width of the screen is the length of the file's longest line.
+ The Activator Pro models are now supported.
+ USB support for the Basic Braille Plus models has been enabled.
+HIMS braille driver changes:
+ The eMotion is now supported.
+ USB detection of the BrailleSense 6 has been fixed.
Linux screen driver changes:
- A message is shown on the braille display if character injection (TIOCSTI) is disabled.
-Terminal Emulator screen driver:
- New. Its two-letter driver code is em.
- It monitors a shared memory segment maintained by a terminal emulator
- for screen content and size, cursor position, etc.
- It uses a message queue to know when the segment has been updated
- and to send input typed on the braille device to the terminal emulator.
- BRLTTY's provided terminal emulator is the new brltty-pty command (in libexec/brltty/).
- The new brltty-term command runs a shell or terminal manager via brltty-pty,
- and also runs BRLTTY with its Terminal Emulator screen driver to interact with it.
+ Keyboard input when in graphical mode is now supported.
+ Modifying a character with the Left Alt key is now supported.
+ The CapsLock key is now supported as a modifier (for Orca's laptop mode).
+ Shifted keys have been added to the XT key entry table.
+AtSpi screen driver changes:
+ The Enter key is now mapped to the Return key rather than to Keypad Enter.
+FileViewer screen driver changes:
+ The show=yes,no parameter has been added.
+ Typing any character now beeps as that's invalid on a read-only screen.
+ Home/End now go to the start/end of the current line.
+ Home/End with the Control modifier now go to the start/end of the file.
+Speech FIFO changes:
+ A single write may now contain several packets.
+ Packet options for each of the autospeak echo settings have been added.
+ A packet option allowing a tune to be written has been added.
BrlAPI changes:
- The version is now 0.8.5 (it was 0.8.4).
- Fuzzing support has been added to the server (see README.APIFuzzing).
- Various fuzzer-detected issues have been resolved.
-Contraction tables:
- The en-ueb-g1 (English, Unified, Grade 1) contraction table has been added.
-Key tables:
- A possible stack overflow during table compilation has been resolved.
- The run directive has been added.
- The macro directive has been added.
- The isolated directive has been added.
- The ktbcheck tool has been added.
+ The version is now 0.8.6 (it was 0.8.5).
+ Setting a subparameter value has been fixed.
+ The BRLAPI_PARAM_DRIVER_PROPERTY_VALUE parameter has been added.
+ The WM_COMMAND window manager property is now monitored for changes.
+ The --write-window and --write-command options have been added to xbrlapi.
+Key table changes:
+ The assignGlobal directive has been added.
Windows changes:
- The batch scripts have been improved.
- The tasks-brltty.bat script has been added.
- The regquery-brlapi.bat script has been added.
- The build now includes the Debug\ directory, which contains:
- The build's config.h, config.mk, and config.log files.
- Unstripped executables (.exe) and libraries (.dll).
+ The winsetup script now supports the python-location symbolic link.
+Android changes:
+ The release version is no longer allowed to upgrade itself.
+ Translations for the Ukrainian language have been added.
+Language changes:
+ The German contraction table has been updated.
+ A message catalog for the Georgian language has been added.
diff --git a/cfg-android b/cfg-android
index d500f721c..864a4c68b 100755
--- a/cfg-android
+++ b/cfg-android
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/cfg-android-abi b/cfg-android-abi
index 9c8c9436e..d81b707b4 100755
--- a/cfg-android-abi
+++ b/cfg-android-abi
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/cfg-darwin b/cfg-darwin
index 305f0db6c..9c6d7b04c 100755
--- a/cfg-darwin
+++ b/cfg-darwin
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/cfg-dos b/cfg-dos
index 990f14cc4..2d6367d9e 100755
--- a/cfg-dos
+++ b/cfg-dos
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/cfg-grub b/cfg-grub
index 384974a3c..f25e49fd2 100755
--- a/cfg-grub
+++ b/cfg-grub
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/cfg-iris b/cfg-iris
index 59c7bc52b..928c51798 100755
--- a/cfg-iris
+++ b/cfg-iris
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/cfg-openbsd b/cfg-openbsd
index 33edf2b7f..07434dd22 100755
--- a/cfg-openbsd
+++ b/cfg-openbsd
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/cfg-windows b/cfg-windows
index 8337d5304..db4468ee5 100755
--- a/cfg-windows
+++ b/cfg-windows
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/chkhdrs b/chkhdrs
index 6ff2e7740..f1ae1d3b3 100755
--- a/chkhdrs
+++ b/chkhdrs
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/common.mk b/common.mk
index 4240e996c..9fccd3508 100644
--- a/common.mk
+++ b/common.mk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -55,9 +55,9 @@ INSTALL_PROGRAM_DIRECTORY = $(INSTALL_ROOT)$(PROGRAM_DIRECTORY)
install-program-directory:
$(INSTALL_DIRECTORY) $(INSTALL_PROGRAM_DIRECTORY)
-INSTALL_COMMANDS_DIRECTORY = $(INSTALL_ROOT)$(COMMANDS_DIRECTORY)
-install-commands-directory:
- $(INSTALL_DIRECTORY) $(INSTALL_COMMANDS_DIRECTORY)
+INSTALL_HELPERS_DIRECTORY = $(INSTALL_ROOT)$(HELPERS_DIRECTORY)
+install-helpers-directory:
+ $(INSTALL_DIRECTORY) $(INSTALL_HELPERS_DIRECTORY)
INSTALL_DRIVERS_DIRECTORY = $(INSTALL_ROOT)$(DRIVERS_DIRECTORY)
install-drivers-directory:
diff --git a/config.h.in b/config.h.in
index 718152385..537d3af92 100644
--- a/config.h.in
+++ b/config.h.in
@@ -2,7 +2,7 @@
* BRLTTY - A background process providing access to the console screen (when in
* text mode) for a blind person using a refreshable braille display.
*
- * Copyright (C) 1995-2024 by The BRLTTY Developers.
+ * Copyright (C) 1995-2025 by The BRLTTY Developers.
*
* BRLTTY comes with ABSOLUTELY NO WARRANTY.
*
@@ -539,7 +539,7 @@ extern "C" {
#undef PREFERENCES_FILE
/* Define this to be a string containing the path to the helper commands directory. */
-#undef COMMANDS_DIRECTORY
+#undef HELPERS_DIRECTORY
/* Define this to be a string containing the path to the drivers directory. */
#undef DRIVERS_DIRECTORY
diff --git a/config.mk.in b/config.mk.in
index db7a204f2..d6ec0bc4c 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -89,7 +89,7 @@ INSTALL_ROOT = @install_root@
EXECUTE_ROOT = @execute_root@
PROGRAM_DIRECTORY = @program_directory@
-COMMANDS_DIRECTORY = @commands_directory@
+HELPERS_DIRECTORY = @helpers_directory@
DRIVERS_DIRECTORY = @drivers_directory@
UPDATABLE_DIRECTORY = @updatable_directory@
WRITABLE_DIRECTORY = @writable_directory@
diff --git a/configure.ac b/configure.ac
index 00e914dcc..953e94ad7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
@@ -17,7 +17,7 @@
###############################################################################
AC_PREREQ([2.64])
-AC_INIT([BRLTTY], [6.6], [BRLTTY@brltty.app], [brltty], [https://brltty.app/])
+AC_INIT([BRLTTY], [6.7], [BRLTTY@brltty.app], [brltty], [https://brltty.app/])
AC_CONFIG_SRCDIR([Programs/brltty.c])
AC_CONFIG_MACRO_DIR([m4])
@@ -29,14 +29,14 @@ m4_include([Bindings/OCaml/bindings.m4])
m4_include([Bindings/Python/bindings.m4])
m4_include([Bindings/Tcl/bindings.m4])
-copyright="© 1995-2024 by The BRLTTY Developers"
+copyright="© 1995-2025 by The BRLTTY Developers"
AC_SUBST([PACKAGE_COPYRIGHT], ["${copyright}"])
AC_DEFINE_UNQUOTED([PACKAGE_COPYRIGHT], ["${copyright}"],
[Define this to be a string containing the copyright notice.])
AC_SUBST([api_major], [0])
AC_SUBST([api_minor], [8])
-AC_SUBST([api_revision], [5])
+AC_SUBST([api_revision], [6])
AC_SUBST([api_name], [BrlAPI])
AC_SUBST([api_version], [${api_major}.${api_minor}])
@@ -142,9 +142,9 @@ BRLTTY_ARG_REQUIRED(
)
BRLTTY_ARG_REQUIRED(
- [commands-directory], [DIRECTORY],
+ [helpers-directory], [DIRECTORY],
[path to directory containing helper commands],
- [commands_directory], ["${libexecdir}/${PACKAGE_TARNAME}"]
+ [helpers_directory], ["${libexecdir}/${PACKAGE_TARNAME}"]
)
BRLTTY_ARG_REQUIRED(
@@ -806,8 +806,8 @@ BRLTTY_ARG_ENABLE(
[],
[dnl
AC_CACHE_CHECK([for LLVM fuzzer], [brltty_cv_llvm_fuzzer], [dnl
- HOST_CPU="`$CC -print-multiarch | sed -e 's/-.*//'`"
- fuzzer_libs="`$CC -print-runtime-dir`/libclang_rt.fuzzer_no_main-$HOST_CPU.a -lstdc++ -lm"
+ HOST_CPU="`$CC -print-target-triple | sed -e 's/-.*//'`"
+ fuzzer_libs="`$CC -print-file-name=libclang_rt.fuzzer_no_main-$HOST_CPU.a` -lstdc++ -lm"
CFLAGS="$CFLAGS -fsanitize=fuzzer-no-link -fsanitize=address,undefined -fstack-protector-strong"
LIBS="$LIBS -fsanitize=address,undefined -lubsan"
OLD_LIBS="$LIBS"
@@ -1992,7 +1992,7 @@ BRLTTY_DEFINE_DIRECTORY([TABLES_DIRECTORY], [${execute_root}${tables_directory}]
BRLTTY_DEFINE_DIRECTORY([DRIVERS_DIRECTORY], [${execute_root}${drivers_directory}],
[Define this to be a string containing the path to the drivers directory.])
-BRLTTY_DEFINE_DIRECTORY([COMMANDS_DIRECTORY], [${execute_root}${commands_directory}],
+BRLTTY_DEFINE_DIRECTORY([HELPERS_DIRECTORY], [${execute_root}${helpers_directory}],
[Define this to be a string containing the path to the helper commands directory.])
BRLTTY_PUBLIC_DIRECTORY([CONFIGURATION_DIRECTORY], [${sysconfdir}],
diff --git a/document.mk b/document.mk
index 8a5f79443..e82e27da5 100644
--- a/document.mk
+++ b/document.mk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/getrevid b/getrevid
index 6fe3fe095..8b46cb341 100755
--- a/getrevid
+++ b/getrevid
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/m4/brltty.m4 b/m4/brltty.m4
index e32a26c37..49f972832 100644
--- a/m4/brltty.m4
+++ b/m4/brltty.m4
@@ -1,7 +1,7 @@
###############################################################################
# libbrlapi - A library providing access to braille terminals for applications.
#
-# Copyright (C) 1995-2024 by Dave Mielke <dave@mielke.cc>
+# Copyright (C) 1995-2025 by Dave Mielke <dave@mielke.cc>
#
# libbrlapi comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/mk4build b/mk4build
index 0c23155f3..2a4979ec9 100755
--- a/mk4build
+++ b/mk4build
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/mkdocktb b/mkdocktb
index 6ff3fe959..e0a610996 100755
--- a/mkdocktb
+++ b/mkdocktb
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/mkdocs b/mkdocs
index 545632e55..96f56ee27 100755
--- a/mkdocs
+++ b/mkdocs
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/mkpot b/mkpot
index 2f46cc1f4..33854a99d 100755
--- a/mkpot
+++ b/mkpot
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/mkrpm b/mkrpm
index 39e512198..4a6ba54c4 100755
--- a/mkrpm
+++ b/mkrpm
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/mktar b/mktar
index 596b59057..666d4ab52 100755
--- a/mktar
+++ b/mktar
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/mkzip b/mkzip
index e9a46cdd5..4e032e099 100755
--- a/mkzip
+++ b/mkzip
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/prologue.mk b/prologue.mk
index 4f54bcc9b..491b97469 100644
--- a/prologue.mk
+++ b/prologue.mk
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/prologue.sh b/prologue.sh
index b9223f0a5..6b8917d09 100644
--- a/prologue.sh
+++ b/prologue.sh
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/prologue.tcl b/prologue.tcl
index 76c9c7667..a27c76d6c 100644
--- a/prologue.tcl
+++ b/prologue.tcl
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/run-brltty b/run-brltty
index 88c34f6f5..5106f5d77 100755
--- a/run-brltty
+++ b/run-brltty
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/run-command b/run-command
index 856b63175..4fc744205 100755
--- a/run-command
+++ b/run-command
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/run-xbrlapi b/run-xbrlapi
index efb8ffcf7..2b703c674 100755
--- a/run-xbrlapi
+++ b/run-xbrlapi
@@ -3,7 +3,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/screen.mk b/screen.mk
index 67549334b..51beca228 100644
--- a/screen.mk
+++ b/screen.mk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
diff --git a/speech.mk b/speech.mk
index f603a142f..3a739f0aa 100644
--- a/speech.mk
+++ b/speech.mk
@@ -2,7 +2,7 @@
# BRLTTY - A background process providing access to the console screen (when in
# text mode) for a blind person using a refreshable braille display.
#
-# Copyright (C) 1995-2024 by The BRLTTY Developers.
+# Copyright (C) 1995-2025 by The BRLTTY Developers.
#
# BRLTTY comes with ABSOLUTELY NO WARRANTY.
#
|