v2.7.1

setfont:
+ Fixed regression in argument parsing. Allow arguments and options to
  be mixed.

dumpkeys:
+ Fixed dumpkeys on pc and non-pc architectures. The value of keycode 0
  has a special meaning, but on some architectures (like powerpc)
  keyboards may generate keycode zero.

Signed-off-by: Alexey Gladkov <[email protected]>

configure.ac

@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([kbd],[2.7],[[email protected]],[],[https://kbd-project.org/])
+AC_INIT([kbd],[2.7.1],[[email protected]],[],[https://kbd-project.org/])
 
 AC_PREREQ([2.71])
 

po/cs.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kbd 2.7-rc1\n"
 "Report-Msgid-Bugs-To: Alexey Gladkov <[email protected]>\n"
-"POT-Creation-Date: 2024-12-09 15:49+0100\n"
+"POT-Creation-Date: 2024-12-16 18:11+0100\n"
 "PO-Revision-Date: 2024-12-03 21:09+01:00\n"
 "Last-Translator: Petr Pisar <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -29,7 +29,7 @@ msgstr "Použití: %s [PŘEPÍNAČE…] N\n"
 
 #: src/chvt.c:55 src/clrunimap.c:44 src/deallocvt.c:49 src/dumpkeys.c:98
 #: src/fgconsole.c:46 src/getunimap.c:64 src/kbdinfo.c:65 src/kbd_mode.c:82
-#: src/loadkeys.c:94 src/loadunimap.c:56 src/mapscrn.c:54 src/setfont.c:182
+#: src/loadkeys.c:94 src/loadunimap.c:56 src/mapscrn.c:54 src/setfont.c:185
 #: src/setkeycodes.c:86 src/setlogcons.c:56 src/setmetamode.c:91
 #: src/setpalette.c:40 src/setvtrgb.c:157 src/showconsolefont.c:133
 msgid "the console device to be used."
@@ -39,7 +39,7 @@ msgstr "použije toto zařízení konzoly."
 #: src/fgconsole.c:49 src/getkeycodes.c:47 src/getunimap.c:66 src/kbdinfo.c:67
 #: src/kbd_mode.c:84 src/kbdrate.c:354 src/loadkeys.c:106 src/loadunimap.c:58
 #: src/mapscrn.c:57 src/openvt.c:268 src/outpsfheader.c:40 src/screendump.c:64
-#: src/setfont.c:188 src/setkeycodes.c:88 src/setleds.c:216 src/setlogcons.c:58
+#: src/setfont.c:191 src/setkeycodes.c:88 src/setleds.c:216 src/setlogcons.c:58
 #: src/setmetamode.c:93 src/setpalette.c:42 src/setvtrgb.c:159
 #: src/showconsolefont.c:137 src/showkey.c:126
 msgid "print this usage message."
@@ -49,7 +49,7 @@ msgstr "zobrazí tento návod na použití."
 #: src/fgconsole.c:48 src/getkeycodes.c:48 src/getunimap.c:65 src/kbdinfo.c:66
 #: src/kbd_mode.c:83 src/kbdrate.c:353 src/loadkeys.c:105 src/loadunimap.c:57
 #: src/mapscrn.c:56 src/openvt.c:267 src/outpsfheader.c:39 src/screendump.c:63
-#: src/setfont.c:187 src/setkeycodes.c:87 src/setleds.c:214 src/setlogcons.c:57
+#: src/setfont.c:190 src/setkeycodes.c:87 src/setleds.c:214 src/setlogcons.c:57
 #: src/setmetamode.c:92 src/setpalette.c:41 src/setvtrgb.c:158
 #: src/showconsolefont.c:136 src/showkey.c:127
 msgid "print version number."
@@ -63,7 +63,7 @@ msgstr "Málo argumentů."
 #: src/fgconsole.c:74 src/getkeycodes.c:67 src/getunimap.c:94 src/kbdinfo.c:100
 #: src/kbd_mode.c:135 src/libcommon/getfd.c:88 src/loadkeys.c:183
 #: src/loadunimap.c:88 src/mapscrn.c:90 src/openvt.c:328 src/resizecons.c:168
-#: src/setfont.c:304 src/setkeycodes.c:117 src/setlogcons.c:96
+#: src/setfont.c:313 src/setkeycodes.c:117 src/setlogcons.c:96
 #: src/setmetamode.c:117 src/setpalette.c:80 src/setvesablank.c:31
 #: src/setvtrgb.c:202 src/showconsolefont.c:173 src/showkey.c:198
 #: src/totextmode.c:31
@@ -177,7 +177,7 @@ msgid ""
 msgstr "interpretuje kódy akce znaků jako z určené znakové sady."
 
 #: src/dumpkeys.c:99 src/loadkeys.c:104 src/mapscrn.c:55 src/openvt.c:266
-#: src/setfont.c:186 src/setleds.c:215 src/showconsolefont.c:135
+#: src/setfont.c:189 src/setleds.c:215 src/showconsolefont.c:135
 msgid "be more verbose."
 msgstr "bude podrobnější."
 
@@ -478,17 +478,17 @@ msgstr "Záznam číslo %d v tabulce diakritiky neexistuje"
 msgid "Unable to remove item from the diacritical table"
 msgstr "Z tabulky diakritiky nelze odstranit položku"
 
-#: src/libkeymap/dump.c:76 src/libkeymap/loadkeys.c:43
+#: src/libkeymap/dump.c:87 src/libkeymap/loadkeys.c:43
 #, c-format
 msgid "can not bind key %d to value %d because it is too large"
 msgstr "navázat klávesu %d na hodnotu %d nelze, protože je příliš velká"
 
-#: src/libkeymap/dump.c:88 src/libkfont/mapscrn.c:253
+#: src/libkeymap/dump.c:99 src/libkfont/mapscrn.c:253
 #: src/libkfont/mapscrn.c:258
 msgid "Error writing map to file"
 msgstr "Chyba při zápisu mapy do souboru"
 
-#: src/libkeymap/dump.c:536
+#: src/libkeymap/dump.c:547
 #, c-format
 msgid "impossible: not meta?\n"
 msgstr "nemožné: není meta?\n"
@@ -1427,56 +1427,56 @@ msgstr ""
 "\n"
 "Soubory jsou načítány z %s/*/.\n"
 
-#: src/setfont.c:174
+#: src/setfont.c:177
 msgid "load font \"default8x<N>\"."
 msgstr "zavede písmo „default8x<N>“."
 
-#: src/setfont.c:175
+#: src/setfont.c:178
 msgid "override font height (there shouldn't be a space in the short option)."
 msgstr "vnutí výšku písma (za krátkým přepínačem by neměla být mezera)."
 
-#: src/setfont.c:176
+#: src/setfont.c:179
 msgid "write current font to <FILE>."
 msgstr "zapíše aktuální písmo do <SOUBORU>."
 
-#: src/setfont.c:177
+#: src/setfont.c:180
 msgid "write current consolemap to <FILE>."
 msgstr "zapíše aktuální mapu konzoly do <SOUBORU>."
 
-#: src/setfont.c:178
+#: src/setfont.c:181
 msgid "write current unicodemap to <FILE>."
 msgstr "zapíše aktuální mapu Unicode do <SOUBORU>."
 
-#: src/setfont.c:179
+#: src/setfont.c:182
 msgid "write current font and unicode map to <FILE>."
 msgstr "zapíše aktuální písmo a mapu Unicode do <SOUBORU>."
 
-#: src/setfont.c:180
+#: src/setfont.c:183
 msgid "load console screen map ('none' means don't load it)."
 msgstr "zavede mapu konzoly a obrazovky („none“ znamená nezavádět)."
 
-#: src/setfont.c:181
+#: src/setfont.c:184
 msgid "load font unicode map ('none' means don't load it)."
 msgstr "zavede mapu Unicode a písma („none“ znamená nezavádět)."
 
-#: src/setfont.c:183
+#: src/setfont.c:186
 msgid "double size of font horizontally and vertically."
 msgstr "zdvojnásobí velikost písma vodorovně i svisle."
 
-#: src/setfont.c:184
+#: src/setfont.c:187
 msgid "force load unicode map."
 msgstr "vynutí zavedení mapy Unicode."
 
-#: src/setfont.c:185
+#: src/setfont.c:188
 msgid "reset the screen font, size, and unicode map to the bootup defaults."
 msgstr ""
 "Obnoví písmo a velikost písma a mapu Unicode na výchozí po startu systému."
 
-#: src/setfont.c:295
+#: src/setfont.c:296 src/setfont.c:304
 msgid "Too many input files."
 msgstr "Příliš mnoho vstupních souborů."
 
-#: src/setfont.c:300
+#: src/setfont.c:309
 msgid "Cannot both restore from character ROM and from file. Font unchanged."
 msgstr "Nelze zároveň obnovovat z ROM znaků a ze souboru. Písmo nezměněno."
 

po/da.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kbd-1.15.3-rc1\n"
 "Report-Msgid-Bugs-To: Alexey Gladkov <[email protected]>\n"
-"POT-Creation-Date: 2024-12-09 15:49+0100\n"
+"POT-Creation-Date: 2024-12-16 18:11+0100\n"
 "PO-Revision-Date: 2011-06-03 22:01+0200\n"
 "Last-Translator: Keld Simonsen <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: src/chvt.c:55 src/clrunimap.c:44 src/deallocvt.c:49 src/dumpkeys.c:98
 #: src/fgconsole.c:46 src/getunimap.c:64 src/kbdinfo.c:65 src/kbd_mode.c:82
-#: src/loadkeys.c:94 src/loadunimap.c:56 src/mapscrn.c:54 src/setfont.c:182
+#: src/loadkeys.c:94 src/loadunimap.c:56 src/mapscrn.c:54 src/setfont.c:185
 #: src/setkeycodes.c:86 src/setlogcons.c:56 src/setmetamode.c:91
 #: src/setpalette.c:40 src/setvtrgb.c:157 src/showconsolefont.c:133
 msgid "the console device to be used."
@@ -36,7 +36,7 @@ msgstr ""
 #: src/fgconsole.c:49 src/getkeycodes.c:47 src/getunimap.c:66 src/kbdinfo.c:67
 #: src/kbd_mode.c:84 src/kbdrate.c:354 src/loadkeys.c:106 src/loadunimap.c:58
 #: src/mapscrn.c:57 src/openvt.c:268 src/outpsfheader.c:40 src/screendump.c:64
-#: src/setfont.c:188 src/setkeycodes.c:88 src/setleds.c:216 src/setlogcons.c:58
+#: src/setfont.c:191 src/setkeycodes.c:88 src/setleds.c:216 src/setlogcons.c:58
 #: src/setmetamode.c:93 src/setpalette.c:42 src/setvtrgb.c:159
 #: src/showconsolefont.c:137 src/showkey.c:126
 msgid "print this usage message."
@@ -46,7 +46,7 @@ msgstr ""
 #: src/fgconsole.c:48 src/getkeycodes.c:48 src/getunimap.c:65 src/kbdinfo.c:66
 #: src/kbd_mode.c:83 src/kbdrate.c:353 src/loadkeys.c:105 src/loadunimap.c:57
 #: src/mapscrn.c:56 src/openvt.c:267 src/outpsfheader.c:39 src/screendump.c:63
-#: src/setfont.c:187 src/setkeycodes.c:87 src/setleds.c:214 src/setlogcons.c:57
+#: src/setfont.c:190 src/setkeycodes.c:87 src/setleds.c:214 src/setlogcons.c:57
 #: src/setmetamode.c:92 src/setpalette.c:41 src/setvtrgb.c:158
 #: src/showconsolefont.c:136 src/showkey.c:127
 msgid "print version number."
@@ -61,7 +61,7 @@ msgstr "Fejl: Ikke nok argumenter.\n"
 #: src/fgconsole.c:74 src/getkeycodes.c:67 src/getunimap.c:94 src/kbdinfo.c:100
 #: src/kbd_mode.c:135 src/libcommon/getfd.c:88 src/loadkeys.c:183
 #: src/loadunimap.c:88 src/mapscrn.c:90 src/openvt.c:328 src/resizecons.c:168
-#: src/setfont.c:304 src/setkeycodes.c:117 src/setlogcons.c:96
+#: src/setfont.c:313 src/setkeycodes.c:117 src/setlogcons.c:96
 #: src/setmetamode.c:117 src/setpalette.c:80 src/setvesablank.c:31
 #: src/setvtrgb.c:202 src/showconsolefont.c:173 src/showkey.c:198
 #: src/totextmode.c:31
@@ -180,7 +180,7 @@ msgstr ""
 "\t\t\t    angivne tegnsæt\n"
 
 #: src/dumpkeys.c:99 src/loadkeys.c:104 src/mapscrn.c:55 src/openvt.c:266
-#: src/setfont.c:186 src/setleds.c:215 src/showconsolefont.c:135
+#: src/setfont.c:189 src/setleds.c:215 src/showconsolefont.c:135
 msgid "be more verbose."
 msgstr ""
 
@@ -481,18 +481,18 @@ msgstr ""
 msgid "Unable to remove item from the diacritical table"
 msgstr ""
 
-#: src/libkeymap/dump.c:76 src/libkeymap/loadkeys.c:43
+#: src/libkeymap/dump.c:87 src/libkeymap/loadkeys.c:43
 #, fuzzy, c-format
 msgid "can not bind key %d to value %d because it is too large"
 msgstr "kunne ikke binde tast %d til værdien %d\n"
 
-#: src/libkeymap/dump.c:88 src/libkfont/mapscrn.c:253
+#: src/libkeymap/dump.c:99 src/libkfont/mapscrn.c:253
 #: src/libkfont/mapscrn.c:258
 #, fuzzy
 msgid "Error writing map to file"
 msgstr "Fejl ved skrivning af tabel til fil\n"
 
-#: src/libkeymap/dump.c:536
+#: src/libkeymap/dump.c:547
 #, c-format
 msgid "impossible: not meta?\n"
 msgstr "umuligt: ikke meta?\n"
@@ -1455,56 +1455,56 @@ msgid ""
 "Files are loaded from the %s/*/.\n"
 msgstr ""
 
-#: src/setfont.c:174
+#: src/setfont.c:177
 msgid "load font \"default8x<N>\"."
 msgstr ""
 
-#: src/setfont.c:175
+#: src/setfont.c:178
 msgid "override font height (there shouldn't be a space in the short option)."
 msgstr ""
 
-#: src/setfont.c:176
+#: src/setfont.c:179
 msgid "write current font to <FILE>."
 msgstr ""
 
-#: src/setfont.c:177
+#: src/setfont.c:180
 msgid "write current consolemap to <FILE>."
 msgstr ""
 
-#: src/setfont.c:178
+#: src/setfont.c:181
 msgid "write current unicodemap to <FILE>."
 msgstr ""
 
-#: src/setfont.c:179
+#: src/setfont.c:182
 msgid "write current font and unicode map to <FILE>."
 msgstr ""
 
-#: src/setfont.c:180
+#: src/setfont.c:183
 msgid "load console screen map ('none' means don't load it)."
 msgstr ""
 
-#: src/setfont.c:181
+#: src/setfont.c:184
 msgid "load font unicode map ('none' means don't load it)."
 msgstr ""
 
-#: src/setfont.c:183
+#: src/setfont.c:186
 msgid "double size of font horizontally and vertically."
 msgstr ""
 
-#: src/setfont.c:184
+#: src/setfont.c:187
 msgid "force load unicode map."
 msgstr ""
 
-#: src/setfont.c:185
+#: src/setfont.c:188
 msgid "reset the screen font, size, and unicode map to the bootup defaults."
 msgstr ""
 
-#: src/setfont.c:295
+#: src/setfont.c:296 src/setfont.c:304
 #, fuzzy
 msgid "Too many input files."
 msgstr "setfont: for mange inddatafiler\n"
 
-#: src/setfont.c:300
+#: src/setfont.c:309
 #, fuzzy
 msgid "Cannot both restore from character ROM and from file. Font unchanged."
 msgstr ""